diff --git a/src/_includes/cwl/additional-arguments-and-parameters/arguments.cwl b/src/_includes/cwl/additional-arguments-and-parameters/arguments.cwl
index 3a2e4538..afc834dc 100644
--- a/src/_includes/cwl/additional-arguments-and-parameters/arguments.cwl
+++ b/src/_includes/cwl/additional-arguments-and-parameters/arguments.cwl
@@ -11,7 +11,7 @@ arguments: ["-d", $(runtime.outdir)]
 inputs:
   src:
     type: File
-    inputBinding:
+    arguments:
       position: 1
 outputs:
   classfile:
diff --git a/src/_includes/cwl/custom-types/custom-types.cwl b/src/_includes/cwl/custom-types/custom-types.cwl
index 707d5c2a..8bdb6e9c 100644
--- a/src/_includes/cwl/custom-types/custom-types.cwl
+++ b/src/_includes/cwl/custom-types/custom-types.cwl
@@ -24,11 +24,11 @@ inputs:
   biom:
     type: File
     format: edam:format_3746  # BIOM
-    inputBinding:
+    arguments:
       prefix: --input-fp
   table_type:
     type: biom-convert-table.yaml#table_type
-    inputBinding:
+    arguments:
       prefix: --table-type
 
   header_key:
@@ -37,7 +37,7 @@ inputs:
       The observation metadata to include from the input BIOM table file when
       creating a tsv table file. By default no observation metadata will be
       included.
-    inputBinding:
+    arguments:
       prefix: --header-key
 
 baseCommand: [ biom, convert ]
diff --git a/src/_includes/cwl/echo.cwl b/src/_includes/cwl/echo.cwl
index 6248ae84..e914873f 100644
--- a/src/_includes/cwl/echo.cwl
+++ b/src/_includes/cwl/echo.cwl
@@ -8,7 +8,7 @@ stdout: output.txt
 inputs:
   message:
     type: string
-    inputBinding: {}
+    arguments: {}
 outputs:
   out:
     type: string
diff --git a/src/_includes/cwl/file-formats/metadata_example.cwl b/src/_includes/cwl/file-formats/metadata_example.cwl
index 9485522b..6b61f97a 100644
--- a/src/_includes/cwl/file-formats/metadata_example.cwl
+++ b/src/_includes/cwl/file-formats/metadata_example.cwl
@@ -9,7 +9,7 @@ inputs:
     type: File
     label: Aligned sequences in BAM format
     format: edam:format_2572
-    inputBinding:
+    arguments:
       position: 1
 
 baseCommand: [ wc, -l ]
diff --git a/src/_includes/cwl/hello_world.cwl b/src/_includes/cwl/hello_world.cwl
index 3d35dbb8..4ac26fcd 100644
--- a/src/_includes/cwl/hello_world.cwl
+++ b/src/_includes/cwl/hello_world.cwl
@@ -12,6 +12,6 @@ inputs:
     # A default value that can be overridden, e.g. --message "Hola mundo"
     default: "Hello World"
     # Bind this message value as an argument to "echo".
-    inputBinding:
+    arguments:
       position: 1
 outputs: []
diff --git a/src/_includes/cwl/inputs/array-inputs.cwl b/src/_includes/cwl/inputs/array-inputs.cwl
index bef63538..6ec6708e 100755
--- a/src/_includes/cwl/inputs/array-inputs.cwl
+++ b/src/_includes/cwl/inputs/array-inputs.cwl
@@ -5,7 +5,7 @@ class: CommandLineTool
 inputs:
   filesA:
     type: string[]
-    inputBinding:
+    arguments:
       prefix: -A
       position: 1
 
@@ -13,15 +13,15 @@ inputs:
     type:
       type: array
       items: string
-      inputBinding:
+      arguments:
         prefix: -B=
         separate: false
-    inputBinding:
+    arguments:
       position: 2
 
   filesC:
     type: string[]
-    inputBinding:
+    arguments:
       prefix: -C=
       itemSeparator: ","
       separate: false
diff --git a/src/_includes/cwl/inputs/exclusive-parameter-expressions.cwl b/src/_includes/cwl/inputs/exclusive-parameter-expressions.cwl
index dd98d0a5..0246b305 100644
--- a/src/_includes/cwl/inputs/exclusive-parameter-expressions.cwl
+++ b/src/_includes/cwl/inputs/exclusive-parameter-expressions.cwl
@@ -13,7 +13,7 @@ inputs:
           - fastq
           - fasta.gz
           - fastq.gz
-        inputBinding:
+        arguments:
           position: 0
           prefix: '--format'
 outputs:
diff --git a/src/_includes/cwl/inputs/inp.cwl b/src/_includes/cwl/inputs/inp.cwl
index 576c16da..b90c886c 100755
--- a/src/_includes/cwl/inputs/inp.cwl
+++ b/src/_includes/cwl/inputs/inp.cwl
@@ -6,23 +6,23 @@ baseCommand: echo
 inputs:
   example_flag:
     type: boolean
-    inputBinding:
+    arguments:
       position: 1
       prefix: -f
   example_string:
     type: string
-    inputBinding:
+    arguments:
       position: 3
       prefix: --example-string
   example_int:
     type: int
-    inputBinding:
+    arguments:
       position: 2
       prefix: -i
       separate: false
   example_file:
     type: File?
-    inputBinding:
+    arguments:
       prefix: --file=
       separate: false
       position: 4
diff --git a/src/_includes/cwl/inputs/record.cwl b/src/_includes/cwl/inputs/record.cwl
index e33cb44a..737ea48e 100755
--- a/src/_includes/cwl/inputs/record.cwl
+++ b/src/_includes/cwl/inputs/record.cwl
@@ -10,11 +10,11 @@ inputs:
       fields:
         itemA:
           type: string
-          inputBinding:
+          arguments:
             prefix: -A
         itemB:
           type: string
-          inputBinding:
+          arguments:
             prefix: -B
   exclusive_parameters:
     type:
@@ -23,14 +23,14 @@ inputs:
         fields:
           itemC:
             type: string
-            inputBinding:
+            arguments:
               prefix: -C
       - type: record
         name: itemD
         fields:
           itemD:
             type: string
-            inputBinding:
+            arguments:
               prefix: -D
 outputs:
   example_out:
diff --git a/src/_includes/cwl/metadata-and-authorship/metadata_example2.cwl b/src/_includes/cwl/metadata-and-authorship/metadata_example2.cwl
index 745c1779..16b77120 100644
--- a/src/_includes/cwl/metadata-and-authorship/metadata_example2.cwl
+++ b/src/_includes/cwl/metadata-and-authorship/metadata_example2.cwl
@@ -10,7 +10,7 @@ inputs:
     type: File
     label: Aligned sequences in BAM format
     format: edam:format_2572
-    inputBinding:
+    arguments:
       position: 1
 
 baseCommand: [ wc, -l ]
diff --git a/src/_includes/cwl/operations/echo.cwl b/src/_includes/cwl/operations/echo.cwl
index 3d35dbb8..4ac26fcd 100644
--- a/src/_includes/cwl/operations/echo.cwl
+++ b/src/_includes/cwl/operations/echo.cwl
@@ -12,6 +12,6 @@ inputs:
     # A default value that can be overridden, e.g. --message "Hola mundo"
     default: "Hello World"
     # Bind this message value as an argument to "echo".
-    inputBinding:
+    arguments:
       position: 1
 outputs: []
diff --git a/src/_includes/cwl/outputs/array-outputs.cwl b/src/_includes/cwl/outputs/array-outputs.cwl
index 2d6654ea..571b3fba 100755
--- a/src/_includes/cwl/outputs/array-outputs.cwl
+++ b/src/_includes/cwl/outputs/array-outputs.cwl
@@ -8,7 +8,7 @@ inputs:
     type:
       type: array
       items: string
-    inputBinding:
+    arguments:
       position: 1
 outputs:
   output:
diff --git a/src/_includes/cwl/outputs/stdout.cwl b/src/_includes/cwl/outputs/stdout.cwl
index 5908f88f..ad984983 100755
--- a/src/_includes/cwl/outputs/stdout.cwl
+++ b/src/_includes/cwl/outputs/stdout.cwl
@@ -7,7 +7,7 @@ stdout: output.txt
 inputs:
   message:
     type: string
-    inputBinding:
+    arguments:
       position: 1
 outputs:
   example_out:
diff --git a/src/_includes/cwl/outputs/tar.cwl b/src/_includes/cwl/outputs/tar.cwl
index f1b45964..c0c01c94 100644
--- a/src/_includes/cwl/outputs/tar.cwl
+++ b/src/_includes/cwl/outputs/tar.cwl
@@ -6,7 +6,7 @@ baseCommand: [tar, --extract]
 inputs:
   tarfile:
     type: File
-    inputBinding:
+    arguments:
       prefix: --file
 outputs:
   example_out:
diff --git a/src/_includes/cwl/parameter-references/tar-param.cwl b/src/_includes/cwl/parameter-references/tar-param.cwl
index 87ad9e0f..51c1d2d4 100644
--- a/src/_includes/cwl/parameter-references/tar-param.cwl
+++ b/src/_includes/cwl/parameter-references/tar-param.cwl
@@ -6,11 +6,11 @@ baseCommand: [tar, --extract]
 inputs:
   tarfile:
     type: File
-    inputBinding:
+    arguments:
       prefix: --file
   extractfile:
     type: string
-    inputBinding:
+    arguments:
       position: 1
 outputs:
   extracted_file:
diff --git a/src/_includes/cwl/specifying-software-requirements/custom-types.cwl b/src/_includes/cwl/specifying-software-requirements/custom-types.cwl
index 044db0bf..04c71399 100644
--- a/src/_includes/cwl/specifying-software-requirements/custom-types.cwl
+++ b/src/_includes/cwl/specifying-software-requirements/custom-types.cwl
@@ -28,11 +28,11 @@ hints:
 inputs:
   proteinFile:
     type: File
-    inputBinding:
+    arguments:
       prefix: --input
   applications:
     type: InterProScan-apps.yml#apps[]?
-    inputBinding:
+    arguments:
       itemSeparator: ','
       prefix: --applications
 
diff --git a/src/_includes/cwl/staging-input-files/linkfile.cwl b/src/_includes/cwl/staging-input-files/linkfile.cwl
index ffeb6996..9a20f8c3 100644
--- a/src/_includes/cwl/staging-input-files/linkfile.cwl
+++ b/src/_includes/cwl/staging-input-files/linkfile.cwl
@@ -15,7 +15,7 @@ requirements:
 inputs:
   src:
     type: File
-    inputBinding:
+    arguments:
       position: 1
       valueFrom: $(self.basename)
 
diff --git a/src/_includes/cwl/using-containers/docker.cwl b/src/_includes/cwl/using-containers/docker.cwl
index 9f6090a1..43609b7c 100755
--- a/src/_includes/cwl/using-containers/docker.cwl
+++ b/src/_includes/cwl/using-containers/docker.cwl
@@ -9,7 +9,7 @@ hints:
 inputs:
   src:
     type: File
-    inputBinding:
+    arguments:
       position: 1
 outputs:
   example_out:
diff --git a/src/_includes/cwl/workflows/arguments.cwl b/src/_includes/cwl/workflows/arguments.cwl
index c26d2642..8d7effdd 100644
--- a/src/_includes/cwl/workflows/arguments.cwl
+++ b/src/_includes/cwl/workflows/arguments.cwl
@@ -11,7 +11,7 @@ arguments: ["-d", $(runtime.outdir)]
 inputs:
   src:
     type: File
-    inputBinding:
+    arguments:
       position: 1
 outputs:
   classfile:
diff --git a/src/_includes/cwl/workflows/hello_world.cwl b/src/_includes/cwl/workflows/hello_world.cwl
index 48e2f792..1871a3d9 100755
--- a/src/_includes/cwl/workflows/hello_world.cwl
+++ b/src/_includes/cwl/workflows/hello_world.cwl
@@ -6,7 +6,7 @@ baseCommand: echo
 inputs:
   message:
     type: string
-    inputBinding:
+    arguments:
       position: 1
 outputs:
   echo_out:
diff --git a/src/_includes/cwl/workflows/hello_world_to_stdout.cwl b/src/_includes/cwl/workflows/hello_world_to_stdout.cwl
index 1d550fc2..2612b433 100755
--- a/src/_includes/cwl/workflows/hello_world_to_stdout.cwl
+++ b/src/_includes/cwl/workflows/hello_world_to_stdout.cwl
@@ -6,6 +6,6 @@ baseCommand: echo
 inputs:
   message:
     type: string
-    inputBinding:
+    arguments:
       position: 1
 outputs: []
diff --git a/src/_includes/cwl/workflows/tar-param.cwl b/src/_includes/cwl/workflows/tar-param.cwl
index 87ad9e0f..51c1d2d4 100644
--- a/src/_includes/cwl/workflows/tar-param.cwl
+++ b/src/_includes/cwl/workflows/tar-param.cwl
@@ -6,11 +6,11 @@ baseCommand: [tar, --extract]
 inputs:
   tarfile:
     type: File
-    inputBinding:
+    arguments:
       prefix: --file
   extractfile:
     type: string
-    inputBinding:
+    arguments:
       position: 1
 outputs:
   extracted_file:
diff --git a/src/_includes/cwl/workflows/wc-tool.cwl b/src/_includes/cwl/workflows/wc-tool.cwl
index c3064634..480cba12 100755
--- a/src/_includes/cwl/workflows/wc-tool.cwl
+++ b/src/_includes/cwl/workflows/wc-tool.cwl
@@ -7,6 +7,6 @@ arguments: ["-c"]
 inputs:
   input_file:
     type: File
-    inputBinding:
+    arguments:
       position: 1
 outputs: []