diff --git a/steps/DirSelector.cwl b/steps/DirSelector.cwl
index cdc23ba5f0e64294d9f523d1e7a7ab107fa7624f..136a6ce0a3986aae1edee1d8234e7756a6b77f38 100644
--- a/steps/DirSelector.cwl
+++ b/steps/DirSelector.cwl
@@ -10,7 +10,7 @@ inputs:
     doc: >-
       id of the step that generates the output file or directory
       (e.g. 'demixstepgenerator')
-  - id: keyname
+  - id: key_name
     type: string
     doc: >-
       key of the parset that contains the name of the outputfile
@@ -22,8 +22,8 @@ outputs:
 expression: |
   ${
     var step_name = inputs.step_name
-    var keyname = inputs.keyname
-    return {'output': inputs.inputs[step_name][keyname]}
+    var key_name = inputs.key_name
+    return {'output': inputs.inputs[step_name][key_name]}
   }
 label: DirSelector
 
diff --git a/steps/FileSelector.cwl b/steps/FileSelector.cwl
index 85e02115baf89c99ae78a49a4e3e6c283f3179aa..f935adca0125043812f663d913ef039819f6a52e 100644
--- a/steps/FileSelector.cwl
+++ b/steps/FileSelector.cwl
@@ -10,7 +10,7 @@ inputs:
     doc: >-
       id of the step that generates the output file or directory
       (e.g. 'demixstepgenerator')
-  - id: keyname
+  - id: key_name
     type: string
     doc: >-
       key of the parset that contains the name of the outputfile
@@ -22,8 +22,8 @@ outputs:
 expression: |
   ${
     var step_name = inputs.step_name
-    var keyname = inputs.keyname
-    return {'output': inputs.inputs[step_name][keyname]}
+    var key_name = inputs.key_name
+    return {'output': inputs.inputs[step_name][key_name]}
   }
 label: FileSelector
 
diff --git a/subworkflow/ndppp_prep_cal.cwl b/subworkflow/ndppp_prep_cal.cwl
index 0e44500f8eb3d50a5defdc6d1fb0925d2d1de866..33a66f9ad7bdee6cfdcb120df81cd83a9c0d42f6 100644
--- a/subworkflow/ndppp_prep_cal.cwl
+++ b/subworkflow/ndppp_prep_cal.cwl
@@ -39,11 +39,9 @@ outputs:
   - id: output
     outputSource:
       - filter_demix_parmdb/output
-    type:
-      - File
-      - Directory
-    'sbg:x': 2973.0185546875
-    'sbg:y': -197.36175537109375
+    type: Directory
+    'sbg:x': 3000.845703125
+    'sbg:y': -213.68421936035156
 steps:
   - id: flagbaseline
     in:
@@ -195,11 +193,11 @@ steps:
         source: dppp/secondary_output_directories
       - id: step_name
         valueFrom: demixstepgenerator
-      - id: keyname
+      - id: key_name
         valueFrom: instrumentmodel
     out:
       - id: output
-    run: ../steps/FileDirSelector.cwl
+    run: ../steps/DirSelector.cwl
     label: FileDirSelector
     'sbg:x': 2838.8115234375
     'sbg:y': -151.54710388183594
diff --git a/test_jobs/file_selector.json b/test_jobs/file_selector.json
index 072bdc5bacbb931151a48dc4430ad36dd3798dbc..9abb9c7629f059e3f14ddd183f6713949838d5ac 100644
--- a/test_jobs/file_selector.json
+++ b/test_jobs/file_selector.json
@@ -8,5 +8,5 @@
         }
     },
     "step_name": "average",
-    "type": "parmdb"
+    "keyname": "parmdb"
 }