diff --git a/shipyard_airflow/dags/common_step_factory.py b/shipyard_airflow/dags/common_step_factory.py
index f05498c8..b920d895 100644
--- a/shipyard_airflow/dags/common_step_factory.py
+++ b/shipyard_airflow/dags/common_step_factory.py
@@ -88,7 +88,7 @@ class CommonStepFactory(object):
             on_failure_callback=step_failure_handler,
             dag=self.dag)
 
-    def get_get_design_version(self, task_id=dn.DECKHAND_GET_DESIGN_VERSION):
+    def get_get_design_version(self, task_id=dn.GET_DESIGN_VERSION):
         """Generate the get design version step
 
         Retrieves the version of the design to use from deckhand
diff --git a/shipyard_airflow/dags/dag_names.py b/shipyard_airflow/dags/dag_names.py
index 1e48e3c7..a7af54e6 100644
--- a/shipyard_airflow/dags/dag_names.py
+++ b/shipyard_airflow/dags/dag_names.py
@@ -16,7 +16,7 @@
 ALL_PREFLIGHT_CHECKS_DAG_NAME = 'preflight'
 ARMADA_BUILD_DAG_NAME = 'armada_build'
 DAG_CONCURRENCY_CHECK_DAG_NAME = 'dag_concurrency_check'
-DECKHAND_GET_DESIGN_VERSION = 'deckhand_get_design_version'
+GET_DESIGN_VERSION = 'get_design_version'
 GET_DEPLOY_CONF_DAG_NAME = 'dag_deployment_configuration'
 DRYDOCK_BUILD_DAG_NAME = 'drydock_build'
 VALIDATE_SITE_DESIGN_DAG_NAME = 'validate_site_design'
diff --git a/shipyard_airflow/plugins/deckhand_base_operator.py b/shipyard_airflow/plugins/deckhand_base_operator.py
index 53b703db..18899508 100644
--- a/shipyard_airflow/plugins/deckhand_base_operator.py
+++ b/shipyard_airflow/plugins/deckhand_base_operator.py
@@ -94,8 +94,8 @@ class DeckhandBaseOperator(BaseOperator):
         self.do_execute()
 
         # Push last committed version to xcom for the
-        # 'deckhand_get_design_version' subdag
-        if self.sub_dag_name == 'deckhand_get_design_version':
+        # 'get_design_version' subdag
+        if self.sub_dag_name == 'get_design_version':
             return self.committed_ver
 
     @shipyard_service_token
@@ -145,7 +145,7 @@ class DeckhandBaseOperator(BaseOperator):
         # 'deckhand_get_design_version'
         #
         # NOTE: In the case of 'deploy_site', the dag_id will
-        # be 'deploy_site.deckhand_get_design_version' for the
+        # be 'deploy_site.get_design_version' for the
         # 'deckhand_get_design_version' task. We need to extract
         # the xcom value from it in order to get the value of the
         # last committed revision ID
diff --git a/shipyard_airflow/plugins/deployment_configuration_operator.py b/shipyard_airflow/plugins/deployment_configuration_operator.py
index 58bc5f9f..70c6b9f3 100644
--- a/shipyard_airflow/plugins/deployment_configuration_operator.py
+++ b/shipyard_airflow/plugins/deployment_configuration_operator.py
@@ -105,7 +105,7 @@ class DeploymentConfigurationOperator(BaseOperator):
             # Set the revision_id to the revision on the xcom
             revision_id = task_instance.xcom_pull(
                 task_ids='deckhand_get_design_version',
-                dag_id=self.main_dag_name + '.deckhand_get_design_version')
+                dag_id=self.main_dag_name + '.get_design_version')
             if revision_id:
                 LOG.info("Revision is set to: %s for deployment configuration",
                          revision_id)
diff --git a/shipyard_airflow/plugins/xcom_puller.py b/shipyard_airflow/plugins/xcom_puller.py
index 5b3ddef9..e400fc66 100644
--- a/shipyard_airflow/plugins/xcom_puller.py
+++ b/shipyard_airflow/plugins/xcom_puller.py
@@ -77,7 +77,7 @@ class XcomPuller(object):
     def get_design_version(self):
         """Retrieve the design version being used for this workflow"""
         source_task = 'deckhand_get_design_version'
-        source_dag = 'deckhand_get_design_version'
+        source_dag = 'get_design_version'
         key = None
         return self._get_xcom(source_task=source_task,
                               dag_id=source_dag,