diff --git a/workflows/HBA_calibrator.cwl b/workflows/HBA_calibrator.cwl
index 841a3e46fbbd8844db8a8642c7749a00fbca696b..a763d790152b3534ec925d4ddbe8baaf6118bd06 100644
--- a/workflows/HBA_calibrator.cwl
+++ b/workflows/HBA_calibrator.cwl
@@ -1,7 +1,7 @@
 class: Workflow
 cwlVersion: v1.0
-id: _h_b_a
-label: HBA.cwl
+id: HBA_calibrator
+label: HBA_calibrator
 $namespaces:
   sbg: 'https://www.sevenbridges.com/'
 inputs:
@@ -163,7 +163,7 @@ inputs:
     default: /data/skymodels
     'sbg:x': -1000
     'sbg:y': 1300
-  - id: A-Team_sky_model
+  - id: A-Team_skymodel
     type: File?
     default: /data/skymodels/Ateam_LBA_CC.skymodel
     'sbg:x': -1000
@@ -290,8 +290,8 @@ steps:
         source: max_separation_arcmin
       - id: calibrator_path_skymodel
         source: calibrator_path_skymodel
-      - id: A-Team_sky_model
-        source: Team_sky_model
+      - id: A-Team_skymodel
+        source: A-Team_skymodel
       - id: cal_solutions
         source: cal_solutions
       - id: avg_timeresolution
diff --git a/workflows/prefactor_calibrator.cwl b/workflows/prefactor_calibrator.cwl
index 48d87871ee80ed6827ea3f743c8c7bab0dcc6455..f62f4eca3de314c41244d29cfb3de529810cdd8a 100644
--- a/workflows/prefactor_calibrator.cwl
+++ b/workflows/prefactor_calibrator.cwl
@@ -163,7 +163,7 @@ inputs:
     default: /data/skymodels
     'sbg:x': -1000
     'sbg:y': 1300
-  - id: A-Team_sky_model
+  - id: A-Team_skymodel
     type: File?
     default: /data/skymodels/Ateam_LBA_CC.skymodel
     'sbg:x': -1000
diff --git a/workflows/prefactor_calibrator/prep.cwl b/workflows/prefactor_calibrator/prep.cwl
index 135c8bd44209f3c2439ac853bd0cc0dcec2f2ff7..dd1b52699d5c7a294af569f93056a113ce31b3a9 100644
--- a/workflows/prefactor_calibrator/prep.cwl
+++ b/workflows/prefactor_calibrator/prep.cwl
@@ -1,7 +1,7 @@
 class: Workflow
 cwlVersion: v1.0
-id: prefactor_calibrator
-label: prefactor_calibrator
+id: prep
+label: prep_cal
 $namespaces:
   sbg: 'https://www.sevenbridges.com/'
 inputs:
@@ -29,7 +29,7 @@ inputs:
     type: float?
     'sbg:x': -638.4987182617188
     'sbg:y': 31.238996505737305
-  - id: A-Team_sky_model
+  - id: A-Team_skymodel
     default: /data/skymodels/Ateam_LBA_CC.skymodel
     type:
       - string?
@@ -136,7 +136,7 @@ steps:
   - id: make_sourcedb
     in:
       - id: sky_model
-        source: A-Team_sky_model
+        source: A-Team_skymodel
     out:
       - id: sourcedb
       - id: log