diff --git a/subworkflow/prep_target_applycal.cwl b/subworkflow/prep_target_applycal.cwl
index a46ab3228f388429608dd7b1c4aa1787bd607010..a35cbf07e9bf69907b56f6cc96c506429e0715ef 100644
--- a/subworkflow/prep_target_applycal.cwl
+++ b/subworkflow/prep_target_applycal.cwl
@@ -57,7 +57,7 @@ steps:
     in:
       - id: steps
         source:
-          - apply_clock?/selected_steps
+          - apply_clock/selected_steps
       - id: parmdb
         source: parmdb
     out:
@@ -81,7 +81,7 @@ steps:
     in:
       - id: steps
         source:
-          - apply_tec?/selected_steps
+          - apply_tec/selected_steps
       - id: parmdb
         source: parmdb
     out:
@@ -93,7 +93,7 @@ steps:
     in:
       - id: steps
         source:
-          - apply_rm?/selected_steps
+          - apply_rm/selected_steps
     out:
       - id: augmented_steps
     run: ../lofar-cwl/steps/DP3.ApplyBeamStepGenerator.cwl
@@ -109,14 +109,14 @@ steps:
       - id: b_steps
         default: []
         source:
-          - apply_rm?/selected_steps
+          - apply_rm/selected_steps
     out:
       - id: selected_steps
     run: ../lofar-cwl/steps/DP3.Selector.cwl
     label: apply_beam
     'sbg:x': 2648.432373046875
     'sbg:y': 167.062255859375
-  - id: apply_rm?
+  - id: apply_rm
     in:
       - id: select_a
         source: apply_rm_correction
@@ -126,14 +126,14 @@ steps:
       - id: b_steps
         default: []
         source:
-          - apply_tec?/selected_steps
+          - apply_tec/selected_steps
     out:
       - id: selected_steps
     run: ../lofar-cwl/steps/DP3.Selector.cwl
     label: apply_rm?
     'sbg:x': 2441.14599609375
     'sbg:y': 167.0730438232422
-  - id: apply_clock?
+  - id: apply_clock
     in:
       - id: select_a
         source: apply_clock_correction
@@ -150,7 +150,7 @@ steps:
     label: apply_clock?
     'sbg:x': 1909.072998046875
     'sbg:y': 167.82034301757812
-  - id: apply_tec?
+  - id: apply_tec
     in:
       - id: select_a
         source: apply_tec_correction
@@ -160,7 +160,7 @@ steps:
       - id: b_steps
         default: []
         source:
-          - apply_clock?/selected_steps
+          - apply_clock/selected_steps
     out:
       - id: selected_steps
     run: ../lofar-cwl/steps/DP3.Selector.cwl