diff --git a/src/main/java/org/w3id/cwl/cwl1_1/utils/OneOrListOf.java b/src/main/java/org/w3id/cwl/cwl1_1/utils/OneOrListOf.java
deleted file mode 100644
index 9643dc3e..00000000
--- a/src/main/java/org/w3id/cwl/cwl1_1/utils/OneOrListOf.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package org.w3id.cwl.cwl1_1.utils;
-
-import java.util.List;
-import java.util.Optional;
-
-public class OneOrListOf<T> {
-    private Optional<T> object;
-    private Optional<List<T>> objects;
-
-    private OneOrListOf(final T object, final List<T> objects) {
-        this.object = Optional.ofNullable(object);
-        this.objects = Optional.ofNullable(objects);
-    }
-
-    public static <T> OneOrListOf<T> oneOf(T object) {
-        return new OneOrListOf(object, null);
-    }
-
-    public static <T> OneOrListOf<T> listOf(List<T> objects) {
-        assert objects != null;
-        return new OneOrListOf(null, objects);
-    }
-
-    public boolean isOne() {
-        return this.getOneOptional().isPresent();
-    }
-
-    public boolean isList() {
-        return this.getListOptional().isPresent();
-    }
-
-    public Optional<T> getOneOptional() {
-        return this.object;
-    }
-    
-    public Optional<List<T>> getListOptional() {
-        return this.objects;
-    }
-
-    public T getOne() {
-        return this.getOneOptional().get();
-    }
-
-    public List<T> getList() {
-        return this.getListOptional().get();
-    }
-
-}
diff --git a/src/main/java/org/w3id/cwl/cwl1_1/utils/OneOrListOfLoader.java b/src/main/java/org/w3id/cwl/cwl1_1/utils/OneOrListOfLoader.java
deleted file mode 100644
index 94d1125f..00000000
--- a/src/main/java/org/w3id/cwl/cwl1_1/utils/OneOrListOfLoader.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package org.w3id.cwl.cwl1_1.utils;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Optional;
-
-
-public class OneOrListOfLoader<T> implements Loader<OneOrListOf<T>> {
-  private final Loader<T> oneLoader;
-  private final Loader<List<T>> listLoader;
-
-  public OneOrListOfLoader(Loader<T> oneLoader, Loader<List<T>> listLoader) {
-      this.oneLoader = oneLoader;
-      this.listLoader = listLoader;
-  }
-
-  public OneOrListOf<T> load(
-      final Object doc,
-      final String baseUri,
-      final LoadingOptions loadingOptions,
-      final String docRoot) {
-    final List<ValidationException> errors = new ArrayList();
-    try {
-      return OneOrListOf.oneOf(this.oneLoader.load(doc, baseUri, loadingOptions, docRoot));
-    } catch (ValidationException e) {
-      errors.add(e);
-    }
-    try {
-      return OneOrListOf.listOf(this.listLoader.load(doc, baseUri, loadingOptions, docRoot));
-    } catch (ValidationException e) {
-      errors.add(e);
-    }
-    throw new ValidationException("Failed to one or list of of type", errors);
-  }
-}
diff --git a/src/main/java/org/w3id/cwl/cwl1_2/ArraySchema.java b/src/main/java/org/w3id/cwl/cwl1_2/ArraySchema.java
index 2c0aee6c..c91e6927 100644
--- a/src/main/java/org/w3id/cwl/cwl1_2/ArraySchema.java
+++ b/src/main/java/org/w3id/cwl/cwl1_2/ArraySchema.java
@@ -33,5 +33,5 @@ public interface ArraySchema extends Saveable {
    * Must be `array`   * </BLOCKQUOTE>
    */
 
-  enum_d062602be0b4b8fd33e69e29a841317b6ab665bc getType();
+  Array_name getType();
 }
diff --git a/src/main/java/org/w3id/cwl/cwl1_2/ArraySchemaImpl.java b/src/main/java/org/w3id/cwl/cwl1_2/ArraySchemaImpl.java
index 05a1f2ce..8a0005e5 100644
--- a/src/main/java/org/w3id/cwl/cwl1_2/ArraySchemaImpl.java
+++ b/src/main/java/org/w3id/cwl/cwl1_2/ArraySchemaImpl.java
@@ -40,7 +40,7 @@ public Object getItems() {
     return this.items;
   }
 
-  private enum_d062602be0b4b8fd33e69e29a841317b6ab665bc type;
+  private Array_name type;
 
   /**
    * Getter for property <I>https://w3id.org/cwl/salad#type</I><BR>
@@ -48,7 +48,7 @@ public Object getItems() {
    * Must be `array`   * </BLOCKQUOTE>
    */
 
-  public enum_d062602be0b4b8fd33e69e29a841317b6ab665bc getType() {
+  public Array_name getType() {
     return this.type;
   }
 
@@ -86,18 +86,18 @@ public ArraySchemaImpl(
     try {
       items =
           LoaderInstances
-              .typedsl_union_of_PrimitiveType_or_RecordSchema_or_EnumSchema_or_ArraySchema_or_StringInstance_or_array_of_union_of_PrimitiveType_or_RecordSchema_or_EnumSchema_or_ArraySchema_or_StringInstance_2
+              .uri_union_of_PrimitiveType_or_RecordSchema_or_EnumSchema_or_ArraySchema_or_StringInstance_or_array_of_union_of_PrimitiveType_or_RecordSchema_or_EnumSchema_or_ArraySchema_or_StringInstance_False_True_2
               .loadField(__doc.get("items"), __baseUri, __loadingOptions);
     } catch (ValidationException e) {
       items = null; // won't be used but prevents compiler from complaining.
       final String __message = "the `items` field is not valid because:";
       __errors.add(new ValidationException(__message, e));
     }
-    enum_d062602be0b4b8fd33e69e29a841317b6ab665bc type;
+    Array_name type;
     try {
       type =
           LoaderInstances
-              .typedsl_enum_d062602be0b4b8fd33e69e29a841317b6ab665bc_2
+              .typedsl_Array_name_2
               .loadField(__doc.get("type"), __baseUri, __loadingOptions);
     } catch (ValidationException e) {
       type = null; // won't be used but prevents compiler from complaining.
@@ -108,6 +108,6 @@ public ArraySchemaImpl(
       throw new ValidationException("Trying 'RecordField'", __errors);
     }
     this.items = (Object) items;
-    this.type = (enum_d062602be0b4b8fd33e69e29a841317b6ab665bc) type;
+    this.type = (Array_name) type;
   }
 }
diff --git a/src/main/java/org/w3id/cwl/cwl1_2/Array_name.java b/src/main/java/org/w3id/cwl/cwl1_2/Array_name.java
new file mode 100644
index 00000000..48982ad0
--- /dev/null
+++ b/src/main/java/org/w3id/cwl/cwl1_2/Array_name.java
@@ -0,0 +1,37 @@
+// Copyright Common Workflow Language project contributors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package org.w3id.cwl.cwl1_2;
+
+import org.w3id.cwl.cwl1_2.utils.ValidationException;
+
+public enum Array_name {
+  ARRAY("array");
+
+  private static String[] symbols = new String[] {"array"};
+  private String docVal;
+
+  private Array_name(final String docVal) {
+    this.docVal = docVal;
+  }
+
+  public static Array_name fromDocumentVal(final String docVal) {
+    for(final Array_name val : Array_name.values()) {
+      if(val.docVal.equals(docVal)) {
+        return val;
+      }
+    }
+    throw new ValidationException(String.format("Expected one of %s", Array_name.symbols, docVal));
+  }
+}
diff --git a/src/main/java/org/w3id/cwl/cwl1_2/CommandInputArraySchema.java b/src/main/java/org/w3id/cwl/cwl1_2/CommandInputArraySchema.java
index a1fe9618..9dbdeb84 100644
--- a/src/main/java/org/w3id/cwl/cwl1_2/CommandInputArraySchema.java
+++ b/src/main/java/org/w3id/cwl/cwl1_2/CommandInputArraySchema.java
@@ -40,7 +40,7 @@ public interface CommandInputArraySchema extends InputArraySchema, CommandInputS
    * Must be `array`   * </BLOCKQUOTE>
    */
 
-  enum_d062602be0b4b8fd33e69e29a841317b6ab665bc getType();
+  Array_name getType();
   /**
    * Getter for property <I>https://w3id.org/cwl/cwl#Labeled/label</I><BR>
    * <BLOCKQUOTE>
diff --git a/src/main/java/org/w3id/cwl/cwl1_2/CommandInputArraySchemaImpl.java b/src/main/java/org/w3id/cwl/cwl1_2/CommandInputArraySchemaImpl.java
index 3b6fbd1a..c3b59c61 100644
--- a/src/main/java/org/w3id/cwl/cwl1_2/CommandInputArraySchemaImpl.java
+++ b/src/main/java/org/w3id/cwl/cwl1_2/CommandInputArraySchemaImpl.java
@@ -52,7 +52,7 @@ public Object getItems() {
     return this.items;
   }
 
-  private enum_d062602be0b4b8fd33e69e29a841317b6ab665bc type;
+  private Array_name type;
 
   /**
    * Getter for property <I>https://w3id.org/cwl/salad#type</I><BR>
@@ -60,7 +60,7 @@ public Object getItems() {
    * Must be `array`   * </BLOCKQUOTE>
    */
 
-  public enum_d062602be0b4b8fd33e69e29a841317b6ab665bc getType() {
+  public Array_name getType() {
     return this.type;
   }
 
@@ -165,18 +165,18 @@ public CommandInputArraySchemaImpl(
     try {
       items =
           LoaderInstances
-              .typedsl_union_of_CWLType_or_CommandInputRecordSchema_or_CommandInputEnumSchema_or_CommandInputArraySchema_or_StringInstance_or_array_of_union_of_CWLType_or_CommandInputRecordSchema_or_CommandInputEnumSchema_or_CommandInputArraySchema_or_StringInstance_2
+              .uri_union_of_CWLType_or_CommandInputRecordSchema_or_CommandInputEnumSchema_or_CommandInputArraySchema_or_StringInstance_or_array_of_union_of_CWLType_or_CommandInputRecordSchema_or_CommandInputEnumSchema_or_CommandInputArraySchema_or_StringInstance_False_True_2
               .loadField(__doc.get("items"), __baseUri, __loadingOptions);
     } catch (ValidationException e) {
       items = null; // won't be used but prevents compiler from complaining.
       final String __message = "the `items` field is not valid because:";
       __errors.add(new ValidationException(__message, e));
     }
-    enum_d062602be0b4b8fd33e69e29a841317b6ab665bc type;
+    Array_name type;
     try {
       type =
           LoaderInstances
-              .typedsl_enum_d062602be0b4b8fd33e69e29a841317b6ab665bc_2
+              .typedsl_Array_name_2
               .loadField(__doc.get("type"), __baseUri, __loadingOptions);
     } catch (ValidationException e) {
       type = null; // won't be used but prevents compiler from complaining.
@@ -238,7 +238,7 @@ public CommandInputArraySchemaImpl(
       throw new ValidationException("Trying 'RecordField'", __errors);
     }
     this.items = (Object) items;
-    this.type = (enum_d062602be0b4b8fd33e69e29a841317b6ab665bc) type;
+    this.type = (Array_name) type;
     this.label = (java.util.Optional<String>) label;
     this.doc = (Object) doc;
     this.name = (java.util.Optional<String>) name;
diff --git a/src/main/java/org/w3id/cwl/cwl1_2/CommandInputEnumSchema.java b/src/main/java/org/w3id/cwl/cwl1_2/CommandInputEnumSchema.java
index f112b932..b0e5f58c 100644
--- a/src/main/java/org/w3id/cwl/cwl1_2/CommandInputEnumSchema.java
+++ b/src/main/java/org/w3id/cwl/cwl1_2/CommandInputEnumSchema.java
@@ -40,7 +40,7 @@ public interface CommandInputEnumSchema extends InputEnumSchema, CommandInputSch
    * Must be `enum`   * </BLOCKQUOTE>
    */
 
-  enum_d961d79c225752b9fadb617367615ab176b47d77 getType();
+  Enum_name getType();
   /**
    * Getter for property <I>https://w3id.org/cwl/cwl#Labeled/label</I><BR>
    * <BLOCKQUOTE>
diff --git a/src/main/java/org/w3id/cwl/cwl1_2/CommandInputEnumSchemaImpl.java b/src/main/java/org/w3id/cwl/cwl1_2/CommandInputEnumSchemaImpl.java
index 68c769d0..5e23bc52 100644
--- a/src/main/java/org/w3id/cwl/cwl1_2/CommandInputEnumSchemaImpl.java
+++ b/src/main/java/org/w3id/cwl/cwl1_2/CommandInputEnumSchemaImpl.java
@@ -52,7 +52,7 @@ public java.util.List<String> getSymbols() {
     return this.symbols;
   }
 
-  private enum_d961d79c225752b9fadb617367615ab176b47d77 type;
+  private Enum_name type;
 
   /**
    * Getter for property <I>https://w3id.org/cwl/salad#type</I><BR>
@@ -60,7 +60,7 @@ public java.util.List<String> getSymbols() {
    * Must be `enum`   * </BLOCKQUOTE>
    */
 
-  public enum_d961d79c225752b9fadb617367615ab176b47d77 getType() {
+  public Enum_name getType() {
     return this.type;
   }
 
@@ -172,11 +172,11 @@ public CommandInputEnumSchemaImpl(
       final String __message = "the `symbols` field is not valid because:";
       __errors.add(new ValidationException(__message, e));
     }
-    enum_d961d79c225752b9fadb617367615ab176b47d77 type;
+    Enum_name type;
     try {
       type =
           LoaderInstances
-              .typedsl_enum_d961d79c225752b9fadb617367615ab176b47d77_2
+              .typedsl_Enum_name_2
               .loadField(__doc.get("type"), __baseUri, __loadingOptions);
     } catch (ValidationException e) {
       type = null; // won't be used but prevents compiler from complaining.
@@ -237,11 +237,11 @@ public CommandInputEnumSchemaImpl(
     if (!__errors.isEmpty()) {
       throw new ValidationException("Trying 'RecordField'", __errors);
     }
+    this.name = (java.util.Optional<String>) name;
     this.symbols = (java.util.List<String>) symbols;
-    this.type = (enum_d961d79c225752b9fadb617367615ab176b47d77) type;
+    this.type = (Enum_name) type;
     this.label = (java.util.Optional<String>) label;
     this.doc = (Object) doc;
-    this.name = (java.util.Optional<String>) name;
     this.inputBinding = (java.util.Optional<CommandLineBinding>) inputBinding;
   }
 }
diff --git a/src/main/java/org/w3id/cwl/cwl1_2/CommandInputRecordSchema.java b/src/main/java/org/w3id/cwl/cwl1_2/CommandInputRecordSchema.java
index 88372149..96efd636 100644
--- a/src/main/java/org/w3id/cwl/cwl1_2/CommandInputRecordSchema.java
+++ b/src/main/java/org/w3id/cwl/cwl1_2/CommandInputRecordSchema.java
@@ -40,7 +40,7 @@ public interface CommandInputRecordSchema extends InputRecordSchema, CommandInpu
    * Must be `record`   * </BLOCKQUOTE>
    */
 
-  enum_d9cba076fca539106791a4f46d198c7fcfbdb779 getType();
+  Record_name getType();
   /**
    * Getter for property <I>https://w3id.org/cwl/cwl#Labeled/label</I><BR>
    * <BLOCKQUOTE>
diff --git a/src/main/java/org/w3id/cwl/cwl1_2/CommandInputRecordSchemaImpl.java b/src/main/java/org/w3id/cwl/cwl1_2/CommandInputRecordSchemaImpl.java
index cd927522..e43d10b6 100644
--- a/src/main/java/org/w3id/cwl/cwl1_2/CommandInputRecordSchemaImpl.java
+++ b/src/main/java/org/w3id/cwl/cwl1_2/CommandInputRecordSchemaImpl.java
@@ -52,7 +52,7 @@ public java.util.Optional<java.util.List<Object>> getFields() {
     return this.fields;
   }
 
-  private enum_d9cba076fca539106791a4f46d198c7fcfbdb779 type;
+  private Record_name type;
 
   /**
    * Getter for property <I>https://w3id.org/cwl/salad#type</I><BR>
@@ -60,7 +60,7 @@ public java.util.Optional<java.util.List<Object>> getFields() {
    * Must be `record`   * </BLOCKQUOTE>
    */
 
-  public enum_d9cba076fca539106791a4f46d198c7fcfbdb779 getType() {
+  public Record_name getType() {
     return this.type;
   }
 
@@ -178,11 +178,11 @@ public CommandInputRecordSchemaImpl(
     } else {
       fields = null;
     }
-    enum_d9cba076fca539106791a4f46d198c7fcfbdb779 type;
+    Record_name type;
     try {
       type =
           LoaderInstances
-              .typedsl_enum_d9cba076fca539106791a4f46d198c7fcfbdb779_2
+              .typedsl_Record_name_2
               .loadField(__doc.get("type"), __baseUri, __loadingOptions);
     } catch (ValidationException e) {
       type = null; // won't be used but prevents compiler from complaining.
@@ -244,7 +244,7 @@ public CommandInputRecordSchemaImpl(
       throw new ValidationException("Trying 'RecordField'", __errors);
     }
     this.fields = (java.util.Optional<java.util.List<Object>>) fields;
-    this.type = (enum_d9cba076fca539106791a4f46d198c7fcfbdb779) type;
+    this.type = (Record_name) type;
     this.label = (java.util.Optional<String>) label;
     this.doc = (Object) doc;
     this.name = (java.util.Optional<String>) name;
diff --git a/src/main/java/org/w3id/cwl/cwl1_2/CommandLineTool.java b/src/main/java/org/w3id/cwl/cwl1_2/CommandLineTool.java
index 52f13f53..d2daf66c 100644
--- a/src/main/java/org/w3id/cwl/cwl1_2/CommandLineTool.java
+++ b/src/main/java/org/w3id/cwl/cwl1_2/CommandLineTool.java
@@ -117,8 +117,9 @@ public interface CommandLineTool extends Process, Saveable {
    * Getter for property <I>https://w3id.org/cwl/cwl#Process/intent</I><BR>
    * <BLOCKQUOTE>
    * An identifier for the type of computational operation, of this Process.
-   * Especially useful for "class: Operation", but can also be used for
-   * CommandLineTool, Workflow, or ExpressionTool.
+   * Especially useful for [`Operation`](Workflow.html#Operation), but can also be used for
+   * [`CommandLineTool`](CommandLineTool.html#CommandLineTool),
+   * [`Workflow`](Workflow.html#Workflow), or [ExpressionTool](Workflow.html#ExpressionTool).
    * 
    * If provided, then this must be an IRI of a concept node that
    * represents the type of operation, preferably defined within an ontology.
diff --git a/src/main/java/org/w3id/cwl/cwl1_2/CommandLineToolImpl.java b/src/main/java/org/w3id/cwl/cwl1_2/CommandLineToolImpl.java
index 88b271a9..abd925f8 100644
--- a/src/main/java/org/w3id/cwl/cwl1_2/CommandLineToolImpl.java
+++ b/src/main/java/org/w3id/cwl/cwl1_2/CommandLineToolImpl.java
@@ -172,8 +172,9 @@ public java.util.Optional<CWLVersion> getCwlVersion() {
    * Getter for property <I>https://w3id.org/cwl/cwl#Process/intent</I><BR>
    * <BLOCKQUOTE>
    * An identifier for the type of computational operation, of this Process.
-   * Especially useful for "class: Operation", but can also be used for
-   * CommandLineTool, Workflow, or ExpressionTool.
+   * Especially useful for [`Operation`](Workflow.html#Operation), but can also be used for
+   * [`CommandLineTool`](CommandLineTool.html#CommandLineTool),
+   * [`Workflow`](Workflow.html#Workflow), or [ExpressionTool](Workflow.html#ExpressionTool).
    * 
    * If provided, then this must be an IRI of a concept node that
    * represents the type of operation, preferably defined within an ontology.
diff --git a/src/main/java/org/w3id/cwl/cwl1_2/CommandOutputArraySchema.java b/src/main/java/org/w3id/cwl/cwl1_2/CommandOutputArraySchema.java
index 4f6aee74..d8e7a3f5 100644
--- a/src/main/java/org/w3id/cwl/cwl1_2/CommandOutputArraySchema.java
+++ b/src/main/java/org/w3id/cwl/cwl1_2/CommandOutputArraySchema.java
@@ -40,7 +40,7 @@ public interface CommandOutputArraySchema extends OutputArraySchema, Saveable {
    * Must be `array`   * </BLOCKQUOTE>
    */
 
-  enum_d062602be0b4b8fd33e69e29a841317b6ab665bc getType();
+  Array_name getType();
   /**
    * Getter for property <I>https://w3id.org/cwl/cwl#Labeled/label</I><BR>
    * <BLOCKQUOTE>
diff --git a/src/main/java/org/w3id/cwl/cwl1_2/CommandOutputArraySchemaImpl.java b/src/main/java/org/w3id/cwl/cwl1_2/CommandOutputArraySchemaImpl.java
index 55b53e42..251a420d 100644
--- a/src/main/java/org/w3id/cwl/cwl1_2/CommandOutputArraySchemaImpl.java
+++ b/src/main/java/org/w3id/cwl/cwl1_2/CommandOutputArraySchemaImpl.java
@@ -52,7 +52,7 @@ public Object getItems() {
     return this.items;
   }
 
-  private enum_d062602be0b4b8fd33e69e29a841317b6ab665bc type;
+  private Array_name type;
 
   /**
    * Getter for property <I>https://w3id.org/cwl/salad#type</I><BR>
@@ -60,7 +60,7 @@ public Object getItems() {
    * Must be `array`   * </BLOCKQUOTE>
    */
 
-  public enum_d062602be0b4b8fd33e69e29a841317b6ab665bc getType() {
+  public Array_name getType() {
     return this.type;
   }
 
@@ -153,18 +153,18 @@ public CommandOutputArraySchemaImpl(
     try {
       items =
           LoaderInstances
-              .typedsl_union_of_CWLType_or_CommandOutputRecordSchema_or_CommandOutputEnumSchema_or_CommandOutputArraySchema_or_StringInstance_or_array_of_union_of_CWLType_or_CommandOutputRecordSchema_or_CommandOutputEnumSchema_or_CommandOutputArraySchema_or_StringInstance_2
+              .uri_union_of_CWLType_or_CommandOutputRecordSchema_or_CommandOutputEnumSchema_or_CommandOutputArraySchema_or_StringInstance_or_array_of_union_of_CWLType_or_CommandOutputRecordSchema_or_CommandOutputEnumSchema_or_CommandOutputArraySchema_or_StringInstance_False_True_2
               .loadField(__doc.get("items"), __baseUri, __loadingOptions);
     } catch (ValidationException e) {
       items = null; // won't be used but prevents compiler from complaining.
       final String __message = "the `items` field is not valid because:";
       __errors.add(new ValidationException(__message, e));
     }
-    enum_d062602be0b4b8fd33e69e29a841317b6ab665bc type;
+    Array_name type;
     try {
       type =
           LoaderInstances
-              .typedsl_enum_d062602be0b4b8fd33e69e29a841317b6ab665bc_2
+              .typedsl_Array_name_2
               .loadField(__doc.get("type"), __baseUri, __loadingOptions);
     } catch (ValidationException e) {
       type = null; // won't be used but prevents compiler from complaining.
@@ -209,7 +209,7 @@ public CommandOutputArraySchemaImpl(
       throw new ValidationException("Trying 'RecordField'", __errors);
     }
     this.items = (Object) items;
-    this.type = (enum_d062602be0b4b8fd33e69e29a841317b6ab665bc) type;
+    this.type = (Array_name) type;
     this.label = (java.util.Optional<String>) label;
     this.doc = (Object) doc;
     this.name = (java.util.Optional<String>) name;
diff --git a/src/main/java/org/w3id/cwl/cwl1_2/CommandOutputEnumSchema.java b/src/main/java/org/w3id/cwl/cwl1_2/CommandOutputEnumSchema.java
index 519bb8e0..cf9aa402 100644
--- a/src/main/java/org/w3id/cwl/cwl1_2/CommandOutputEnumSchema.java
+++ b/src/main/java/org/w3id/cwl/cwl1_2/CommandOutputEnumSchema.java
@@ -40,7 +40,7 @@ public interface CommandOutputEnumSchema extends OutputEnumSchema, Saveable {
    * Must be `enum`   * </BLOCKQUOTE>
    */
 
-  enum_d961d79c225752b9fadb617367615ab176b47d77 getType();
+  Enum_name getType();
   /**
    * Getter for property <I>https://w3id.org/cwl/cwl#Labeled/label</I><BR>
    * <BLOCKQUOTE>
diff --git a/src/main/java/org/w3id/cwl/cwl1_2/CommandOutputEnumSchemaImpl.java b/src/main/java/org/w3id/cwl/cwl1_2/CommandOutputEnumSchemaImpl.java
index 11e1a736..0414472d 100644
--- a/src/main/java/org/w3id/cwl/cwl1_2/CommandOutputEnumSchemaImpl.java
+++ b/src/main/java/org/w3id/cwl/cwl1_2/CommandOutputEnumSchemaImpl.java
@@ -52,7 +52,7 @@ public java.util.List<String> getSymbols() {
     return this.symbols;
   }
 
-  private enum_d961d79c225752b9fadb617367615ab176b47d77 type;
+  private Enum_name type;
 
   /**
    * Getter for property <I>https://w3id.org/cwl/salad#type</I><BR>
@@ -60,7 +60,7 @@ public java.util.List<String> getSymbols() {
    * Must be `enum`   * </BLOCKQUOTE>
    */
 
-  public enum_d961d79c225752b9fadb617367615ab176b47d77 getType() {
+  public Enum_name getType() {
     return this.type;
   }
 
@@ -160,11 +160,11 @@ public CommandOutputEnumSchemaImpl(
       final String __message = "the `symbols` field is not valid because:";
       __errors.add(new ValidationException(__message, e));
     }
-    enum_d961d79c225752b9fadb617367615ab176b47d77 type;
+    Enum_name type;
     try {
       type =
           LoaderInstances
-              .typedsl_enum_d961d79c225752b9fadb617367615ab176b47d77_2
+              .typedsl_Enum_name_2
               .loadField(__doc.get("type"), __baseUri, __loadingOptions);
     } catch (ValidationException e) {
       type = null; // won't be used but prevents compiler from complaining.
@@ -208,10 +208,10 @@ public CommandOutputEnumSchemaImpl(
     if (!__errors.isEmpty()) {
       throw new ValidationException("Trying 'RecordField'", __errors);
     }
+    this.name = (java.util.Optional<String>) name;
     this.symbols = (java.util.List<String>) symbols;
-    this.type = (enum_d961d79c225752b9fadb617367615ab176b47d77) type;
+    this.type = (Enum_name) type;
     this.label = (java.util.Optional<String>) label;
     this.doc = (Object) doc;
-    this.name = (java.util.Optional<String>) name;
   }
 }
diff --git a/src/main/java/org/w3id/cwl/cwl1_2/CommandOutputRecordSchema.java b/src/main/java/org/w3id/cwl/cwl1_2/CommandOutputRecordSchema.java
index d4954513..55f41695 100644
--- a/src/main/java/org/w3id/cwl/cwl1_2/CommandOutputRecordSchema.java
+++ b/src/main/java/org/w3id/cwl/cwl1_2/CommandOutputRecordSchema.java
@@ -40,7 +40,7 @@ public interface CommandOutputRecordSchema extends OutputRecordSchema, Saveable
    * Must be `record`   * </BLOCKQUOTE>
    */
 
-  enum_d9cba076fca539106791a4f46d198c7fcfbdb779 getType();
+  Record_name getType();
   /**
    * Getter for property <I>https://w3id.org/cwl/cwl#Labeled/label</I><BR>
    * <BLOCKQUOTE>
diff --git a/src/main/java/org/w3id/cwl/cwl1_2/CommandOutputRecordSchemaImpl.java b/src/main/java/org/w3id/cwl/cwl1_2/CommandOutputRecordSchemaImpl.java
index d616e3bc..17215bad 100644
--- a/src/main/java/org/w3id/cwl/cwl1_2/CommandOutputRecordSchemaImpl.java
+++ b/src/main/java/org/w3id/cwl/cwl1_2/CommandOutputRecordSchemaImpl.java
@@ -52,7 +52,7 @@ public java.util.Optional<java.util.List<Object>> getFields() {
     return this.fields;
   }
 
-  private enum_d9cba076fca539106791a4f46d198c7fcfbdb779 type;
+  private Record_name type;
 
   /**
    * Getter for property <I>https://w3id.org/cwl/salad#type</I><BR>
@@ -60,7 +60,7 @@ public java.util.Optional<java.util.List<Object>> getFields() {
    * Must be `record`   * </BLOCKQUOTE>
    */
 
-  public enum_d9cba076fca539106791a4f46d198c7fcfbdb779 getType() {
+  public Record_name getType() {
     return this.type;
   }
 
@@ -166,11 +166,11 @@ public CommandOutputRecordSchemaImpl(
     } else {
       fields = null;
     }
-    enum_d9cba076fca539106791a4f46d198c7fcfbdb779 type;
+    Record_name type;
     try {
       type =
           LoaderInstances
-              .typedsl_enum_d9cba076fca539106791a4f46d198c7fcfbdb779_2
+              .typedsl_Record_name_2
               .loadField(__doc.get("type"), __baseUri, __loadingOptions);
     } catch (ValidationException e) {
       type = null; // won't be used but prevents compiler from complaining.
@@ -215,7 +215,7 @@ public CommandOutputRecordSchemaImpl(
       throw new ValidationException("Trying 'RecordField'", __errors);
     }
     this.fields = (java.util.Optional<java.util.List<Object>>) fields;
-    this.type = (enum_d9cba076fca539106791a4f46d198c7fcfbdb779) type;
+    this.type = (Record_name) type;
     this.label = (java.util.Optional<String>) label;
     this.doc = (Object) doc;
     this.name = (java.util.Optional<String>) name;
diff --git a/src/main/java/org/w3id/cwl/cwl1_2/Directory.java b/src/main/java/org/w3id/cwl/cwl1_2/Directory.java
index 60e75eba..968b416f 100644
--- a/src/main/java/org/w3id/cwl/cwl1_2/Directory.java
+++ b/src/main/java/org/w3id/cwl/cwl1_2/Directory.java
@@ -23,8 +23,8 @@
  Directories are represented as objects with `class` of `Directory`.  Directory objects have
  a number of properties that provide metadata about the directory.
  
- The `location` property of a Directory is a URI that uniquely identifies
- the directory.  Implementations must support the file:// URI scheme and may
+ The `location` property of a Directory is a IRI that uniquely identifies
+ the directory.  Implementations must support the file:// IRI scheme and may
  support other schemes such as http://.  Alternately to `location`,
  implementations must also accept the `path` property on Directory, which
  must be a filesystem path available on the same host as the CWL runner (for
@@ -53,7 +53,7 @@ must be a filesystem path available on the same host as the CWL runner (for
  first and have local values of `path` assigned.
  
  Directory objects in CommandLineTool output must provide either a
- `location` URI or a `path` property in the context of the tool execution
+ `location` IRI or a `path` property in the context of the tool execution
  runtime (local to the compute node, or within the executing container).
  
  An ExpressionTool may forward file references from input to output by using
diff --git a/src/main/java/org/w3id/cwl/cwl1_2/DirectoryImpl.java b/src/main/java/org/w3id/cwl/cwl1_2/DirectoryImpl.java
index f289d4be..ce7b0422 100644
--- a/src/main/java/org/w3id/cwl/cwl1_2/DirectoryImpl.java
+++ b/src/main/java/org/w3id/cwl/cwl1_2/DirectoryImpl.java
@@ -27,8 +27,8 @@
  Directories are represented as objects with `class` of `Directory`.  Directory objects have
  a number of properties that provide metadata about the directory.
  
- The `location` property of a Directory is a URI that uniquely identifies
- the directory.  Implementations must support the file:// URI scheme and may
+ The `location` property of a Directory is a IRI that uniquely identifies
+ the directory.  Implementations must support the file:// IRI scheme and may
  support other schemes such as http://.  Alternately to `location`,
  implementations must also accept the `path` property on Directory, which
  must be a filesystem path available on the same host as the CWL runner (for
@@ -57,7 +57,7 @@ must be a filesystem path available on the same host as the CWL runner (for
  first and have local values of `path` assigned.
  
  Directory objects in CommandLineTool output must provide either a
- `location` URI or a `path` property in the context of the tool execution
+ `location` IRI or a `path` property in the context of the tool execution
  runtime (local to the compute node, or within the executing container).
  
  An ExpressionTool may forward file references from input to output by using
diff --git a/src/main/java/org/w3id/cwl/cwl1_2/EnumSchema.java b/src/main/java/org/w3id/cwl/cwl1_2/EnumSchema.java
index d13db5a3..20033829 100644
--- a/src/main/java/org/w3id/cwl/cwl1_2/EnumSchema.java
+++ b/src/main/java/org/w3id/cwl/cwl1_2/EnumSchema.java
@@ -22,6 +22,12 @@
   </BLOCKQUOTE>
  */
 public interface EnumSchema extends Saveable {
+  /**
+   * Getter for property <I>https://w3id.org/cwl/salad#EnumSchema/name</I><BR>
+
+   */
+
+  java.util.Optional<String> getName();
   /**
    * Getter for property <I>https://w3id.org/cwl/salad#symbols</I><BR>
    * <BLOCKQUOTE>
@@ -35,5 +41,5 @@ public interface EnumSchema extends Saveable {
    * Must be `enum`   * </BLOCKQUOTE>
    */
 
-  enum_d961d79c225752b9fadb617367615ab176b47d77 getType();
+  Enum_name getType();
 }
diff --git a/src/main/java/org/w3id/cwl/cwl1_2/EnumSchemaImpl.java b/src/main/java/org/w3id/cwl/cwl1_2/EnumSchemaImpl.java
index f822cf27..cd0c8c8c 100644
--- a/src/main/java/org/w3id/cwl/cwl1_2/EnumSchemaImpl.java
+++ b/src/main/java/org/w3id/cwl/cwl1_2/EnumSchemaImpl.java
@@ -30,6 +30,17 @@ public class EnumSchemaImpl extends SaveableImpl implements EnumSchema {
   private java.util.Map<String, Object> extensionFields_ =
       new java.util.HashMap<String, Object>();
 
+  private java.util.Optional<String> name;
+
+  /**
+   * Getter for property <I>https://w3id.org/cwl/salad#EnumSchema/name</I><BR>
+
+   */
+
+  public java.util.Optional<String> getName() {
+    return this.name;
+  }
+
   private java.util.List<String> symbols;
 
   /**
@@ -42,7 +53,7 @@ public java.util.List<String> getSymbols() {
     return this.symbols;
   }
 
-  private enum_d961d79c225752b9fadb617367615ab176b47d77 type;
+  private Enum_name type;
 
   /**
    * Getter for property <I>https://w3id.org/cwl/salad#type</I><BR>
@@ -50,7 +61,7 @@ public java.util.List<String> getSymbols() {
    * Must be `enum`   * </BLOCKQUOTE>
    */
 
-  public enum_d961d79c225752b9fadb617367615ab176b47d77 getType() {
+  public Enum_name getType() {
     return this.type;
   }
 
@@ -84,6 +95,37 @@ public EnumSchemaImpl(
     if (__loadingOptions != null) {
       this.loadingOptions_ = __loadingOptions;
     }
+    java.util.Optional<String> name;
+
+    if (__doc.containsKey("name")) {
+      try {
+        name =
+            LoaderInstances
+                .uri_optional_StringInstance_True_False_None
+                .loadField(__doc.get("name"), __baseUri, __loadingOptions);
+      } catch (ValidationException e) {
+        name = null; // won't be used but prevents compiler from complaining.
+        final String __message = "the `name` field is not valid because:";
+        __errors.add(new ValidationException(__message, e));
+      }
+
+    } else {
+      name = null;
+    }
+
+    Boolean __original_is_null = name == null;
+    if (name == null) {
+      if (__docRoot != null) {
+        name = java.util.Optional.of(__docRoot);
+      } else {
+        name = java.util.Optional.of("_:" + java.util.UUID.randomUUID().toString());
+      }
+    }
+    if (__original_is_null) {
+        __baseUri = __baseUri_;
+    } else {
+        __baseUri = (String) name.orElse(null);
+    }
     java.util.List<String> symbols;
     try {
       symbols =
@@ -95,11 +137,11 @@ public EnumSchemaImpl(
       final String __message = "the `symbols` field is not valid because:";
       __errors.add(new ValidationException(__message, e));
     }
-    enum_d961d79c225752b9fadb617367615ab176b47d77 type;
+    Enum_name type;
     try {
       type =
           LoaderInstances
-              .typedsl_enum_d961d79c225752b9fadb617367615ab176b47d77_2
+              .typedsl_Enum_name_2
               .loadField(__doc.get("type"), __baseUri, __loadingOptions);
     } catch (ValidationException e) {
       type = null; // won't be used but prevents compiler from complaining.
@@ -109,7 +151,8 @@ public EnumSchemaImpl(
     if (!__errors.isEmpty()) {
       throw new ValidationException("Trying 'RecordField'", __errors);
     }
+    this.name = (java.util.Optional<String>) name;
     this.symbols = (java.util.List<String>) symbols;
-    this.type = (enum_d961d79c225752b9fadb617367615ab176b47d77) type;
+    this.type = (Enum_name) type;
   }
 }
diff --git a/src/main/java/org/w3id/cwl/cwl1_2/Enum_name.java b/src/main/java/org/w3id/cwl/cwl1_2/Enum_name.java
new file mode 100644
index 00000000..09c8b689
--- /dev/null
+++ b/src/main/java/org/w3id/cwl/cwl1_2/Enum_name.java
@@ -0,0 +1,37 @@
+// Copyright Common Workflow Language project contributors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package org.w3id.cwl.cwl1_2;
+
+import org.w3id.cwl.cwl1_2.utils.ValidationException;
+
+public enum Enum_name {
+  ENUM("enum");
+
+  private static String[] symbols = new String[] {"enum"};
+  private String docVal;
+
+  private Enum_name(final String docVal) {
+    this.docVal = docVal;
+  }
+
+  public static Enum_name fromDocumentVal(final String docVal) {
+    for(final Enum_name val : Enum_name.values()) {
+      if(val.docVal.equals(docVal)) {
+        return val;
+      }
+    }
+    throw new ValidationException(String.format("Expected one of %s", Enum_name.symbols, docVal));
+  }
+}
diff --git a/src/main/java/org/w3id/cwl/cwl1_2/ExpressionTool.java b/src/main/java/org/w3id/cwl/cwl1_2/ExpressionTool.java
index 07209d1e..4a29792f 100644
--- a/src/main/java/org/w3id/cwl/cwl1_2/ExpressionTool.java
+++ b/src/main/java/org/w3id/cwl/cwl1_2/ExpressionTool.java
@@ -123,8 +123,9 @@ public interface ExpressionTool extends Process, Saveable {
    * Getter for property <I>https://w3id.org/cwl/cwl#Process/intent</I><BR>
    * <BLOCKQUOTE>
    * An identifier for the type of computational operation, of this Process.
-   * Especially useful for "class: Operation", but can also be used for
-   * CommandLineTool, Workflow, or ExpressionTool.
+   * Especially useful for [`Operation`](Workflow.html#Operation), but can also be used for
+   * [`CommandLineTool`](CommandLineTool.html#CommandLineTool),
+   * [`Workflow`](Workflow.html#Workflow), or [ExpressionTool](Workflow.html#ExpressionTool).
    * 
    * If provided, then this must be an IRI of a concept node that
    * represents the type of operation, preferably defined within an ontology.
diff --git a/src/main/java/org/w3id/cwl/cwl1_2/ExpressionToolImpl.java b/src/main/java/org/w3id/cwl/cwl1_2/ExpressionToolImpl.java
index 49e74c4e..efab2913 100644
--- a/src/main/java/org/w3id/cwl/cwl1_2/ExpressionToolImpl.java
+++ b/src/main/java/org/w3id/cwl/cwl1_2/ExpressionToolImpl.java
@@ -178,8 +178,9 @@ public java.util.Optional<CWLVersion> getCwlVersion() {
    * Getter for property <I>https://w3id.org/cwl/cwl#Process/intent</I><BR>
    * <BLOCKQUOTE>
    * An identifier for the type of computational operation, of this Process.
-   * Especially useful for "class: Operation", but can also be used for
-   * CommandLineTool, Workflow, or ExpressionTool.
+   * Especially useful for [`Operation`](Workflow.html#Operation), but can also be used for
+   * [`CommandLineTool`](CommandLineTool.html#CommandLineTool),
+   * [`Workflow`](Workflow.html#Workflow), or [ExpressionTool](Workflow.html#ExpressionTool).
    * 
    * If provided, then this must be an IRI of a concept node that
    * represents the type of operation, preferably defined within an ontology.
diff --git a/src/main/java/org/w3id/cwl/cwl1_2/ExpressionToolOutputParameter.java b/src/main/java/org/w3id/cwl/cwl1_2/ExpressionToolOutputParameter.java
index 94c9717e..bca11d27 100644
--- a/src/main/java/org/w3id/cwl/cwl1_2/ExpressionToolOutputParameter.java
+++ b/src/main/java/org/w3id/cwl/cwl1_2/ExpressionToolOutputParameter.java
@@ -117,6 +117,8 @@ public interface ExpressionToolOutputParameter extends OutputParameter, Saveable
    * Getter for property <I>https://w3id.org/cwl/salad#type</I><BR>
    * <BLOCKQUOTE>
    * Specify valid types of data that may be assigned to this parameter.
+   * Note that this field just acts as a hint, as the outputs of an
+   * ExpressionTool process are always considered valid.
    *    * </BLOCKQUOTE>
    */
 
diff --git a/src/main/java/org/w3id/cwl/cwl1_2/ExpressionToolOutputParameterImpl.java b/src/main/java/org/w3id/cwl/cwl1_2/ExpressionToolOutputParameterImpl.java
index 7c7ddce5..2dc6c4e5 100644
--- a/src/main/java/org/w3id/cwl/cwl1_2/ExpressionToolOutputParameterImpl.java
+++ b/src/main/java/org/w3id/cwl/cwl1_2/ExpressionToolOutputParameterImpl.java
@@ -157,6 +157,8 @@ public Object getFormat() {
    * Getter for property <I>https://w3id.org/cwl/salad#type</I><BR>
    * <BLOCKQUOTE>
    * Specify valid types of data that may be assigned to this parameter.
+   * Note that this field just acts as a hint, as the outputs of an
+   * ExpressionTool process are always considered valid.
    *    * </BLOCKQUOTE>
    */
 
diff --git a/src/main/java/org/w3id/cwl/cwl1_2/File.java b/src/main/java/org/w3id/cwl/cwl1_2/File.java
index 8c21662d..01275ca4 100644
--- a/src/main/java/org/w3id/cwl/cwl1_2/File.java
+++ b/src/main/java/org/w3id/cwl/cwl1_2/File.java
@@ -25,10 +25,10 @@ Represents a file (or group of files when `secondaryFiles` is provided) that
  Files are represented as objects with `class` of `File`.  File objects have
  a number of properties that provide metadata about the file.
  
- The `location` property of a File is a URI that uniquely identifies the
- file.  Implementations must support the `file://` URI scheme and may support
+ The `location` property of a File is a IRI that uniquely identifies the
+ file.  Implementations must support the `file://` IRI scheme and may support
  other schemes such as `http://` and `https://`.  The value of `location` may also be a
- relative reference, in which case it must be resolved relative to the URI
+ relative reference, in which case it must be resolved relative to the IRI
  of the document it appears in.  Alternately to `location`, implementations
  must also accept the `path` property on File, which must be a filesystem
  path available on the same host as the CWL runner (for inputs) or the
@@ -71,7 +71,7 @@ tool execution runtime (local to the compute node, or within the executing
  modified by `outputEval`.  Alternately, if the file `cwl.output.json` is
  present in the output, `outputBinding` is ignored.
  
- File objects in the output must provide either a `location` URI or a `path`
+ File objects in the output must provide either a `location` IRI or a `path`
  property in the context of the tool execution runtime (local to the compute
  node, or within the executing container).
  
diff --git a/src/main/java/org/w3id/cwl/cwl1_2/FileImpl.java b/src/main/java/org/w3id/cwl/cwl1_2/FileImpl.java
index 92ffcaa6..7e0b5aa8 100644
--- a/src/main/java/org/w3id/cwl/cwl1_2/FileImpl.java
+++ b/src/main/java/org/w3id/cwl/cwl1_2/FileImpl.java
@@ -29,10 +29,10 @@ Represents a file (or group of files when `secondaryFiles` is provided) that
  Files are represented as objects with `class` of `File`.  File objects have
  a number of properties that provide metadata about the file.
  
- The `location` property of a File is a URI that uniquely identifies the
- file.  Implementations must support the `file://` URI scheme and may support
+ The `location` property of a File is a IRI that uniquely identifies the
+ file.  Implementations must support the `file://` IRI scheme and may support
  other schemes such as `http://` and `https://`.  The value of `location` may also be a
- relative reference, in which case it must be resolved relative to the URI
+ relative reference, in which case it must be resolved relative to the IRI
  of the document it appears in.  Alternately to `location`, implementations
  must also accept the `path` property on File, which must be a filesystem
  path available on the same host as the CWL runner (for inputs) or the
@@ -75,7 +75,7 @@ tool execution runtime (local to the compute node, or within the executing
  modified by `outputEval`.  Alternately, if the file `cwl.output.json` is
  present in the output, `outputBinding` is ignored.
  
- File objects in the output must provide either a `location` URI or a `path`
+ File objects in the output must provide either a `location` IRI or a `path`
  property in the context of the tool execution runtime (local to the compute
  node, or within the executing container).
  
diff --git a/src/main/java/org/w3id/cwl/cwl1_2/InputArraySchema.java b/src/main/java/org/w3id/cwl/cwl1_2/InputArraySchema.java
index 4fa0a1b9..ef2a55dc 100644
--- a/src/main/java/org/w3id/cwl/cwl1_2/InputArraySchema.java
+++ b/src/main/java/org/w3id/cwl/cwl1_2/InputArraySchema.java
@@ -40,7 +40,7 @@ public interface InputArraySchema extends ArraySchema, InputSchema, Saveable {
    * Must be `array`   * </BLOCKQUOTE>
    */
 
-  enum_d062602be0b4b8fd33e69e29a841317b6ab665bc getType();
+  Array_name getType();
   /**
    * Getter for property <I>https://w3id.org/cwl/cwl#Labeled/label</I><BR>
    * <BLOCKQUOTE>
diff --git a/src/main/java/org/w3id/cwl/cwl1_2/InputArraySchemaImpl.java b/src/main/java/org/w3id/cwl/cwl1_2/InputArraySchemaImpl.java
index f9106c00..42ff1a3d 100644
--- a/src/main/java/org/w3id/cwl/cwl1_2/InputArraySchemaImpl.java
+++ b/src/main/java/org/w3id/cwl/cwl1_2/InputArraySchemaImpl.java
@@ -52,7 +52,7 @@ public Object getItems() {
     return this.items;
   }
 
-  private enum_d062602be0b4b8fd33e69e29a841317b6ab665bc type;
+  private Array_name type;
 
   /**
    * Getter for property <I>https://w3id.org/cwl/salad#type</I><BR>
@@ -60,7 +60,7 @@ public Object getItems() {
    * Must be `array`   * </BLOCKQUOTE>
    */
 
-  public enum_d062602be0b4b8fd33e69e29a841317b6ab665bc getType() {
+  public Array_name getType() {
     return this.type;
   }
 
@@ -153,18 +153,18 @@ public InputArraySchemaImpl(
     try {
       items =
           LoaderInstances
-              .typedsl_union_of_CWLType_or_InputRecordSchema_or_InputEnumSchema_or_InputArraySchema_or_StringInstance_or_array_of_union_of_CWLType_or_InputRecordSchema_or_InputEnumSchema_or_InputArraySchema_or_StringInstance_2
+              .uri_union_of_CWLType_or_InputRecordSchema_or_InputEnumSchema_or_InputArraySchema_or_StringInstance_or_array_of_union_of_CWLType_or_InputRecordSchema_or_InputEnumSchema_or_InputArraySchema_or_StringInstance_False_True_2
               .loadField(__doc.get("items"), __baseUri, __loadingOptions);
     } catch (ValidationException e) {
       items = null; // won't be used but prevents compiler from complaining.
       final String __message = "the `items` field is not valid because:";
       __errors.add(new ValidationException(__message, e));
     }
-    enum_d062602be0b4b8fd33e69e29a841317b6ab665bc type;
+    Array_name type;
     try {
       type =
           LoaderInstances
-              .typedsl_enum_d062602be0b4b8fd33e69e29a841317b6ab665bc_2
+              .typedsl_Array_name_2
               .loadField(__doc.get("type"), __baseUri, __loadingOptions);
     } catch (ValidationException e) {
       type = null; // won't be used but prevents compiler from complaining.
@@ -209,7 +209,7 @@ public InputArraySchemaImpl(
       throw new ValidationException("Trying 'RecordField'", __errors);
     }
     this.items = (Object) items;
-    this.type = (enum_d062602be0b4b8fd33e69e29a841317b6ab665bc) type;
+    this.type = (Array_name) type;
     this.label = (java.util.Optional<String>) label;
     this.doc = (Object) doc;
     this.name = (java.util.Optional<String>) name;
diff --git a/src/main/java/org/w3id/cwl/cwl1_2/InputEnumSchema.java b/src/main/java/org/w3id/cwl/cwl1_2/InputEnumSchema.java
index 7a12a90e..9fbf9b58 100644
--- a/src/main/java/org/w3id/cwl/cwl1_2/InputEnumSchema.java
+++ b/src/main/java/org/w3id/cwl/cwl1_2/InputEnumSchema.java
@@ -40,7 +40,7 @@ public interface InputEnumSchema extends EnumSchema, InputSchema, Saveable {
    * Must be `enum`   * </BLOCKQUOTE>
    */
 
-  enum_d961d79c225752b9fadb617367615ab176b47d77 getType();
+  Enum_name getType();
   /**
    * Getter for property <I>https://w3id.org/cwl/cwl#Labeled/label</I><BR>
    * <BLOCKQUOTE>
diff --git a/src/main/java/org/w3id/cwl/cwl1_2/InputEnumSchemaImpl.java b/src/main/java/org/w3id/cwl/cwl1_2/InputEnumSchemaImpl.java
index 14f157ad..2f0251b2 100644
--- a/src/main/java/org/w3id/cwl/cwl1_2/InputEnumSchemaImpl.java
+++ b/src/main/java/org/w3id/cwl/cwl1_2/InputEnumSchemaImpl.java
@@ -52,7 +52,7 @@ public java.util.List<String> getSymbols() {
     return this.symbols;
   }
 
-  private enum_d961d79c225752b9fadb617367615ab176b47d77 type;
+  private Enum_name type;
 
   /**
    * Getter for property <I>https://w3id.org/cwl/salad#type</I><BR>
@@ -60,7 +60,7 @@ public java.util.List<String> getSymbols() {
    * Must be `enum`   * </BLOCKQUOTE>
    */
 
-  public enum_d961d79c225752b9fadb617367615ab176b47d77 getType() {
+  public Enum_name getType() {
     return this.type;
   }
 
@@ -160,11 +160,11 @@ public InputEnumSchemaImpl(
       final String __message = "the `symbols` field is not valid because:";
       __errors.add(new ValidationException(__message, e));
     }
-    enum_d961d79c225752b9fadb617367615ab176b47d77 type;
+    Enum_name type;
     try {
       type =
           LoaderInstances
-              .typedsl_enum_d961d79c225752b9fadb617367615ab176b47d77_2
+              .typedsl_Enum_name_2
               .loadField(__doc.get("type"), __baseUri, __loadingOptions);
     } catch (ValidationException e) {
       type = null; // won't be used but prevents compiler from complaining.
@@ -208,10 +208,10 @@ public InputEnumSchemaImpl(
     if (!__errors.isEmpty()) {
       throw new ValidationException("Trying 'RecordField'", __errors);
     }
+    this.name = (java.util.Optional<String>) name;
     this.symbols = (java.util.List<String>) symbols;
-    this.type = (enum_d961d79c225752b9fadb617367615ab176b47d77) type;
+    this.type = (Enum_name) type;
     this.label = (java.util.Optional<String>) label;
     this.doc = (Object) doc;
-    this.name = (java.util.Optional<String>) name;
   }
 }
diff --git a/src/main/java/org/w3id/cwl/cwl1_2/InputRecordSchema.java b/src/main/java/org/w3id/cwl/cwl1_2/InputRecordSchema.java
index 0b87d9bd..e07c447c 100644
--- a/src/main/java/org/w3id/cwl/cwl1_2/InputRecordSchema.java
+++ b/src/main/java/org/w3id/cwl/cwl1_2/InputRecordSchema.java
@@ -40,7 +40,7 @@ public interface InputRecordSchema extends RecordSchema, InputSchema, Saveable {
    * Must be `record`   * </BLOCKQUOTE>
    */
 
-  enum_d9cba076fca539106791a4f46d198c7fcfbdb779 getType();
+  Record_name getType();
   /**
    * Getter for property <I>https://w3id.org/cwl/cwl#Labeled/label</I><BR>
    * <BLOCKQUOTE>
diff --git a/src/main/java/org/w3id/cwl/cwl1_2/InputRecordSchemaImpl.java b/src/main/java/org/w3id/cwl/cwl1_2/InputRecordSchemaImpl.java
index ecde0159..223c3f65 100644
--- a/src/main/java/org/w3id/cwl/cwl1_2/InputRecordSchemaImpl.java
+++ b/src/main/java/org/w3id/cwl/cwl1_2/InputRecordSchemaImpl.java
@@ -52,7 +52,7 @@ public java.util.Optional<java.util.List<Object>> getFields() {
     return this.fields;
   }
 
-  private enum_d9cba076fca539106791a4f46d198c7fcfbdb779 type;
+  private Record_name type;
 
   /**
    * Getter for property <I>https://w3id.org/cwl/salad#type</I><BR>
@@ -60,7 +60,7 @@ public java.util.Optional<java.util.List<Object>> getFields() {
    * Must be `record`   * </BLOCKQUOTE>
    */
 
-  public enum_d9cba076fca539106791a4f46d198c7fcfbdb779 getType() {
+  public Record_name getType() {
     return this.type;
   }
 
@@ -166,11 +166,11 @@ public InputRecordSchemaImpl(
     } else {
       fields = null;
     }
-    enum_d9cba076fca539106791a4f46d198c7fcfbdb779 type;
+    Record_name type;
     try {
       type =
           LoaderInstances
-              .typedsl_enum_d9cba076fca539106791a4f46d198c7fcfbdb779_2
+              .typedsl_Record_name_2
               .loadField(__doc.get("type"), __baseUri, __loadingOptions);
     } catch (ValidationException e) {
       type = null; // won't be used but prevents compiler from complaining.
@@ -215,7 +215,7 @@ public InputRecordSchemaImpl(
       throw new ValidationException("Trying 'RecordField'", __errors);
     }
     this.fields = (java.util.Optional<java.util.List<Object>>) fields;
-    this.type = (enum_d9cba076fca539106791a4f46d198c7fcfbdb779) type;
+    this.type = (Record_name) type;
     this.label = (java.util.Optional<String>) label;
     this.doc = (Object) doc;
     this.name = (java.util.Optional<String>) name;
diff --git a/src/main/java/org/w3id/cwl/cwl1_2/Operation.java b/src/main/java/org/w3id/cwl/cwl1_2/Operation.java
index ca6ede19..6670c394 100644
--- a/src/main/java/org/w3id/cwl/cwl1_2/Operation.java
+++ b/src/main/java/org/w3id/cwl/cwl1_2/Operation.java
@@ -123,8 +123,9 @@ public interface Operation extends Process, Saveable {
    * Getter for property <I>https://w3id.org/cwl/cwl#Process/intent</I><BR>
    * <BLOCKQUOTE>
    * An identifier for the type of computational operation, of this Process.
-   * Especially useful for "class: Operation", but can also be used for
-   * CommandLineTool, Workflow, or ExpressionTool.
+   * Especially useful for [`Operation`](Workflow.html#Operation), but can also be used for
+   * [`CommandLineTool`](CommandLineTool.html#CommandLineTool),
+   * [`Workflow`](Workflow.html#Workflow), or [ExpressionTool](Workflow.html#ExpressionTool).
    * 
    * If provided, then this must be an IRI of a concept node that
    * represents the type of operation, preferably defined within an ontology.
diff --git a/src/main/java/org/w3id/cwl/cwl1_2/OperationImpl.java b/src/main/java/org/w3id/cwl/cwl1_2/OperationImpl.java
index e19c5c96..7f06613e 100644
--- a/src/main/java/org/w3id/cwl/cwl1_2/OperationImpl.java
+++ b/src/main/java/org/w3id/cwl/cwl1_2/OperationImpl.java
@@ -178,8 +178,9 @@ public java.util.Optional<CWLVersion> getCwlVersion() {
    * Getter for property <I>https://w3id.org/cwl/cwl#Process/intent</I><BR>
    * <BLOCKQUOTE>
    * An identifier for the type of computational operation, of this Process.
-   * Especially useful for "class: Operation", but can also be used for
-   * CommandLineTool, Workflow, or ExpressionTool.
+   * Especially useful for [`Operation`](Workflow.html#Operation), but can also be used for
+   * [`CommandLineTool`](CommandLineTool.html#CommandLineTool),
+   * [`Workflow`](Workflow.html#Workflow), or [ExpressionTool](Workflow.html#ExpressionTool).
    * 
    * If provided, then this must be an IRI of a concept node that
    * represents the type of operation, preferably defined within an ontology.
diff --git a/src/main/java/org/w3id/cwl/cwl1_2/OutputArraySchema.java b/src/main/java/org/w3id/cwl/cwl1_2/OutputArraySchema.java
index 3424bece..32a3f19c 100644
--- a/src/main/java/org/w3id/cwl/cwl1_2/OutputArraySchema.java
+++ b/src/main/java/org/w3id/cwl/cwl1_2/OutputArraySchema.java
@@ -40,7 +40,7 @@ public interface OutputArraySchema extends ArraySchema, OutputSchema, Saveable {
    * Must be `array`   * </BLOCKQUOTE>
    */
 
-  enum_d062602be0b4b8fd33e69e29a841317b6ab665bc getType();
+  Array_name getType();
   /**
    * Getter for property <I>https://w3id.org/cwl/cwl#Labeled/label</I><BR>
    * <BLOCKQUOTE>
diff --git a/src/main/java/org/w3id/cwl/cwl1_2/OutputArraySchemaImpl.java b/src/main/java/org/w3id/cwl/cwl1_2/OutputArraySchemaImpl.java
index b047e47c..a7d4475b 100644
--- a/src/main/java/org/w3id/cwl/cwl1_2/OutputArraySchemaImpl.java
+++ b/src/main/java/org/w3id/cwl/cwl1_2/OutputArraySchemaImpl.java
@@ -52,7 +52,7 @@ public Object getItems() {
     return this.items;
   }
 
-  private enum_d062602be0b4b8fd33e69e29a841317b6ab665bc type;
+  private Array_name type;
 
   /**
    * Getter for property <I>https://w3id.org/cwl/salad#type</I><BR>
@@ -60,7 +60,7 @@ public Object getItems() {
    * Must be `array`   * </BLOCKQUOTE>
    */
 
-  public enum_d062602be0b4b8fd33e69e29a841317b6ab665bc getType() {
+  public Array_name getType() {
     return this.type;
   }
 
@@ -153,18 +153,18 @@ public OutputArraySchemaImpl(
     try {
       items =
           LoaderInstances
-              .typedsl_union_of_CWLType_or_OutputRecordSchema_or_OutputEnumSchema_or_OutputArraySchema_or_StringInstance_or_array_of_union_of_CWLType_or_OutputRecordSchema_or_OutputEnumSchema_or_OutputArraySchema_or_StringInstance_2
+              .uri_union_of_CWLType_or_OutputRecordSchema_or_OutputEnumSchema_or_OutputArraySchema_or_StringInstance_or_array_of_union_of_CWLType_or_OutputRecordSchema_or_OutputEnumSchema_or_OutputArraySchema_or_StringInstance_False_True_2
               .loadField(__doc.get("items"), __baseUri, __loadingOptions);
     } catch (ValidationException e) {
       items = null; // won't be used but prevents compiler from complaining.
       final String __message = "the `items` field is not valid because:";
       __errors.add(new ValidationException(__message, e));
     }
-    enum_d062602be0b4b8fd33e69e29a841317b6ab665bc type;
+    Array_name type;
     try {
       type =
           LoaderInstances
-              .typedsl_enum_d062602be0b4b8fd33e69e29a841317b6ab665bc_2
+              .typedsl_Array_name_2
               .loadField(__doc.get("type"), __baseUri, __loadingOptions);
     } catch (ValidationException e) {
       type = null; // won't be used but prevents compiler from complaining.
@@ -209,7 +209,7 @@ public OutputArraySchemaImpl(
       throw new ValidationException("Trying 'RecordField'", __errors);
     }
     this.items = (Object) items;
-    this.type = (enum_d062602be0b4b8fd33e69e29a841317b6ab665bc) type;
+    this.type = (Array_name) type;
     this.label = (java.util.Optional<String>) label;
     this.doc = (Object) doc;
     this.name = (java.util.Optional<String>) name;
diff --git a/src/main/java/org/w3id/cwl/cwl1_2/OutputEnumSchema.java b/src/main/java/org/w3id/cwl/cwl1_2/OutputEnumSchema.java
index 72a0daa7..9eb2a423 100644
--- a/src/main/java/org/w3id/cwl/cwl1_2/OutputEnumSchema.java
+++ b/src/main/java/org/w3id/cwl/cwl1_2/OutputEnumSchema.java
@@ -40,7 +40,7 @@ public interface OutputEnumSchema extends EnumSchema, OutputSchema, Saveable {
    * Must be `enum`   * </BLOCKQUOTE>
    */
 
-  enum_d961d79c225752b9fadb617367615ab176b47d77 getType();
+  Enum_name getType();
   /**
    * Getter for property <I>https://w3id.org/cwl/cwl#Labeled/label</I><BR>
    * <BLOCKQUOTE>
diff --git a/src/main/java/org/w3id/cwl/cwl1_2/OutputEnumSchemaImpl.java b/src/main/java/org/w3id/cwl/cwl1_2/OutputEnumSchemaImpl.java
index de919afb..90f05dae 100644
--- a/src/main/java/org/w3id/cwl/cwl1_2/OutputEnumSchemaImpl.java
+++ b/src/main/java/org/w3id/cwl/cwl1_2/OutputEnumSchemaImpl.java
@@ -52,7 +52,7 @@ public java.util.List<String> getSymbols() {
     return this.symbols;
   }
 
-  private enum_d961d79c225752b9fadb617367615ab176b47d77 type;
+  private Enum_name type;
 
   /**
    * Getter for property <I>https://w3id.org/cwl/salad#type</I><BR>
@@ -60,7 +60,7 @@ public java.util.List<String> getSymbols() {
    * Must be `enum`   * </BLOCKQUOTE>
    */
 
-  public enum_d961d79c225752b9fadb617367615ab176b47d77 getType() {
+  public Enum_name getType() {
     return this.type;
   }
 
@@ -160,11 +160,11 @@ public OutputEnumSchemaImpl(
       final String __message = "the `symbols` field is not valid because:";
       __errors.add(new ValidationException(__message, e));
     }
-    enum_d961d79c225752b9fadb617367615ab176b47d77 type;
+    Enum_name type;
     try {
       type =
           LoaderInstances
-              .typedsl_enum_d961d79c225752b9fadb617367615ab176b47d77_2
+              .typedsl_Enum_name_2
               .loadField(__doc.get("type"), __baseUri, __loadingOptions);
     } catch (ValidationException e) {
       type = null; // won't be used but prevents compiler from complaining.
@@ -208,10 +208,10 @@ public OutputEnumSchemaImpl(
     if (!__errors.isEmpty()) {
       throw new ValidationException("Trying 'RecordField'", __errors);
     }
+    this.name = (java.util.Optional<String>) name;
     this.symbols = (java.util.List<String>) symbols;
-    this.type = (enum_d961d79c225752b9fadb617367615ab176b47d77) type;
+    this.type = (Enum_name) type;
     this.label = (java.util.Optional<String>) label;
     this.doc = (Object) doc;
-    this.name = (java.util.Optional<String>) name;
   }
 }
diff --git a/src/main/java/org/w3id/cwl/cwl1_2/OutputRecordSchema.java b/src/main/java/org/w3id/cwl/cwl1_2/OutputRecordSchema.java
index 30af4182..f249db8c 100644
--- a/src/main/java/org/w3id/cwl/cwl1_2/OutputRecordSchema.java
+++ b/src/main/java/org/w3id/cwl/cwl1_2/OutputRecordSchema.java
@@ -40,7 +40,7 @@ public interface OutputRecordSchema extends RecordSchema, OutputSchema, Saveable
    * Must be `record`   * </BLOCKQUOTE>
    */
 
-  enum_d9cba076fca539106791a4f46d198c7fcfbdb779 getType();
+  Record_name getType();
   /**
    * Getter for property <I>https://w3id.org/cwl/cwl#Labeled/label</I><BR>
    * <BLOCKQUOTE>
diff --git a/src/main/java/org/w3id/cwl/cwl1_2/OutputRecordSchemaImpl.java b/src/main/java/org/w3id/cwl/cwl1_2/OutputRecordSchemaImpl.java
index 8aa74964..82dc76d7 100644
--- a/src/main/java/org/w3id/cwl/cwl1_2/OutputRecordSchemaImpl.java
+++ b/src/main/java/org/w3id/cwl/cwl1_2/OutputRecordSchemaImpl.java
@@ -52,7 +52,7 @@ public java.util.Optional<java.util.List<Object>> getFields() {
     return this.fields;
   }
 
-  private enum_d9cba076fca539106791a4f46d198c7fcfbdb779 type;
+  private Record_name type;
 
   /**
    * Getter for property <I>https://w3id.org/cwl/salad#type</I><BR>
@@ -60,7 +60,7 @@ public java.util.Optional<java.util.List<Object>> getFields() {
    * Must be `record`   * </BLOCKQUOTE>
    */
 
-  public enum_d9cba076fca539106791a4f46d198c7fcfbdb779 getType() {
+  public Record_name getType() {
     return this.type;
   }
 
@@ -166,11 +166,11 @@ public OutputRecordSchemaImpl(
     } else {
       fields = null;
     }
-    enum_d9cba076fca539106791a4f46d198c7fcfbdb779 type;
+    Record_name type;
     try {
       type =
           LoaderInstances
-              .typedsl_enum_d9cba076fca539106791a4f46d198c7fcfbdb779_2
+              .typedsl_Record_name_2
               .loadField(__doc.get("type"), __baseUri, __loadingOptions);
     } catch (ValidationException e) {
       type = null; // won't be used but prevents compiler from complaining.
@@ -215,7 +215,7 @@ public OutputRecordSchemaImpl(
       throw new ValidationException("Trying 'RecordField'", __errors);
     }
     this.fields = (java.util.Optional<java.util.List<Object>>) fields;
-    this.type = (enum_d9cba076fca539106791a4f46d198c7fcfbdb779) type;
+    this.type = (Record_name) type;
     this.label = (java.util.Optional<String>) label;
     this.doc = (Object) doc;
     this.name = (java.util.Optional<String>) name;
diff --git a/src/main/java/org/w3id/cwl/cwl1_2/Process.java b/src/main/java/org/w3id/cwl/cwl1_2/Process.java
index 75086d64..fe7af3ca 100644
--- a/src/main/java/org/w3id/cwl/cwl1_2/Process.java
+++ b/src/main/java/org/w3id/cwl/cwl1_2/Process.java
@@ -103,8 +103,9 @@ public interface Process extends Identified, Labeled, Documented, Saveable {
    * Getter for property <I>https://w3id.org/cwl/cwl#Process/intent</I><BR>
    * <BLOCKQUOTE>
    * An identifier for the type of computational operation, of this Process.
-   * Especially useful for "class: Operation", but can also be used for
-   * CommandLineTool, Workflow, or ExpressionTool.
+   * Especially useful for [`Operation`](Workflow.html#Operation), but can also be used for
+   * [`CommandLineTool`](CommandLineTool.html#CommandLineTool),
+   * [`Workflow`](Workflow.html#Workflow), or [ExpressionTool](Workflow.html#ExpressionTool).
    * 
    * If provided, then this must be an IRI of a concept node that
    * represents the type of operation, preferably defined within an ontology.
diff --git a/src/main/java/org/w3id/cwl/cwl1_2/RecordSchema.java b/src/main/java/org/w3id/cwl/cwl1_2/RecordSchema.java
index a50eb9a0..95e56e6c 100644
--- a/src/main/java/org/w3id/cwl/cwl1_2/RecordSchema.java
+++ b/src/main/java/org/w3id/cwl/cwl1_2/RecordSchema.java
@@ -33,5 +33,5 @@ public interface RecordSchema extends Saveable {
    * Must be `record`   * </BLOCKQUOTE>
    */
 
-  enum_d9cba076fca539106791a4f46d198c7fcfbdb779 getType();
+  Record_name getType();
 }
diff --git a/src/main/java/org/w3id/cwl/cwl1_2/RecordSchemaImpl.java b/src/main/java/org/w3id/cwl/cwl1_2/RecordSchemaImpl.java
index 096fc041..ddc3b343 100644
--- a/src/main/java/org/w3id/cwl/cwl1_2/RecordSchemaImpl.java
+++ b/src/main/java/org/w3id/cwl/cwl1_2/RecordSchemaImpl.java
@@ -40,7 +40,7 @@ public java.util.Optional<java.util.List<Object>> getFields() {
     return this.fields;
   }
 
-  private enum_d9cba076fca539106791a4f46d198c7fcfbdb779 type;
+  private Record_name type;
 
   /**
    * Getter for property <I>https://w3id.org/cwl/salad#type</I><BR>
@@ -48,7 +48,7 @@ public java.util.Optional<java.util.List<Object>> getFields() {
    * Must be `record`   * </BLOCKQUOTE>
    */
 
-  public enum_d9cba076fca539106791a4f46d198c7fcfbdb779 getType() {
+  public Record_name getType() {
     return this.type;
   }
 
@@ -99,11 +99,11 @@ public RecordSchemaImpl(
     } else {
       fields = null;
     }
-    enum_d9cba076fca539106791a4f46d198c7fcfbdb779 type;
+    Record_name type;
     try {
       type =
           LoaderInstances
-              .typedsl_enum_d9cba076fca539106791a4f46d198c7fcfbdb779_2
+              .typedsl_Record_name_2
               .loadField(__doc.get("type"), __baseUri, __loadingOptions);
     } catch (ValidationException e) {
       type = null; // won't be used but prevents compiler from complaining.
@@ -114,6 +114,6 @@ public RecordSchemaImpl(
       throw new ValidationException("Trying 'RecordField'", __errors);
     }
     this.fields = (java.util.Optional<java.util.List<Object>>) fields;
-    this.type = (enum_d9cba076fca539106791a4f46d198c7fcfbdb779) type;
+    this.type = (Record_name) type;
   }
 }
diff --git a/src/main/java/org/w3id/cwl/cwl1_2/Record_name.java b/src/main/java/org/w3id/cwl/cwl1_2/Record_name.java
new file mode 100644
index 00000000..82fd14c9
--- /dev/null
+++ b/src/main/java/org/w3id/cwl/cwl1_2/Record_name.java
@@ -0,0 +1,37 @@
+// Copyright Common Workflow Language project contributors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package org.w3id.cwl.cwl1_2;
+
+import org.w3id.cwl.cwl1_2.utils.ValidationException;
+
+public enum Record_name {
+  RECORD("record");
+
+  private static String[] symbols = new String[] {"record"};
+  private String docVal;
+
+  private Record_name(final String docVal) {
+    this.docVal = docVal;
+  }
+
+  public static Record_name fromDocumentVal(final String docVal) {
+    for(final Record_name val : Record_name.values()) {
+      if(val.docVal.equals(docVal)) {
+        return val;
+      }
+    }
+    throw new ValidationException(String.format("Expected one of %s", Record_name.symbols, docVal));
+  }
+}
diff --git a/src/main/java/org/w3id/cwl/cwl1_2/ShellCommandRequirement.java b/src/main/java/org/w3id/cwl/cwl1_2/ShellCommandRequirement.java
index f0329ad2..fff3ffbd 100644
--- a/src/main/java/org/w3id/cwl/cwl1_2/ShellCommandRequirement.java
+++ b/src/main/java/org/w3id/cwl/cwl1_2/ShellCommandRequirement.java
@@ -21,7 +21,7 @@
  Modify the behavior of CommandLineTool to generate a single string
  containing a shell command line.  Each item in the `arguments` list must
  be joined into a string separated by single spaces and quoted to prevent
- intepretation by the shell, unless `CommandLineBinding` for that argument
+ interpretation by the shell, unless `CommandLineBinding` for that argument
  contains `shellQuote: false`.  If `shellQuote: false` is specified, the
  argument is joined into the command string without quoting, which allows
  the use of shell metacharacters such as `|` for pipes.
diff --git a/src/main/java/org/w3id/cwl/cwl1_2/ShellCommandRequirementImpl.java b/src/main/java/org/w3id/cwl/cwl1_2/ShellCommandRequirementImpl.java
index 3bab1566..7136002f 100644
--- a/src/main/java/org/w3id/cwl/cwl1_2/ShellCommandRequirementImpl.java
+++ b/src/main/java/org/w3id/cwl/cwl1_2/ShellCommandRequirementImpl.java
@@ -25,7 +25,7 @@
  Modify the behavior of CommandLineTool to generate a single string
  containing a shell command line.  Each item in the `arguments` list must
  be joined into a string separated by single spaces and quoted to prevent
- intepretation by the shell, unless `CommandLineBinding` for that argument
+ interpretation by the shell, unless `CommandLineBinding` for that argument
  contains `shellQuote: false`.  If `shellQuote: false` is specified, the
  argument is joined into the command string without quoting, which allows
  the use of shell metacharacters such as `|` for pipes.
diff --git a/src/main/java/org/w3id/cwl/cwl1_2/Workflow.java b/src/main/java/org/w3id/cwl/cwl1_2/Workflow.java
index 8802e1fb..86979c04 100644
--- a/src/main/java/org/w3id/cwl/cwl1_2/Workflow.java
+++ b/src/main/java/org/w3id/cwl/cwl1_2/Workflow.java
@@ -167,8 +167,9 @@ public interface Workflow extends Process, Saveable {
    * Getter for property <I>https://w3id.org/cwl/cwl#Process/intent</I><BR>
    * <BLOCKQUOTE>
    * An identifier for the type of computational operation, of this Process.
-   * Especially useful for "class: Operation", but can also be used for
-   * CommandLineTool, Workflow, or ExpressionTool.
+   * Especially useful for [`Operation`](Workflow.html#Operation), but can also be used for
+   * [`CommandLineTool`](CommandLineTool.html#CommandLineTool),
+   * [`Workflow`](Workflow.html#Workflow), or [ExpressionTool](Workflow.html#ExpressionTool).
    * 
    * If provided, then this must be an IRI of a concept node that
    * represents the type of operation, preferably defined within an ontology.
diff --git a/src/main/java/org/w3id/cwl/cwl1_2/WorkflowImpl.java b/src/main/java/org/w3id/cwl/cwl1_2/WorkflowImpl.java
index 8740a343..aed7b140 100644
--- a/src/main/java/org/w3id/cwl/cwl1_2/WorkflowImpl.java
+++ b/src/main/java/org/w3id/cwl/cwl1_2/WorkflowImpl.java
@@ -222,8 +222,9 @@ public java.util.Optional<CWLVersion> getCwlVersion() {
    * Getter for property <I>https://w3id.org/cwl/cwl#Process/intent</I><BR>
    * <BLOCKQUOTE>
    * An identifier for the type of computational operation, of this Process.
-   * Especially useful for "class: Operation", but can also be used for
-   * CommandLineTool, Workflow, or ExpressionTool.
+   * Especially useful for [`Operation`](Workflow.html#Operation), but can also be used for
+   * [`CommandLineTool`](CommandLineTool.html#CommandLineTool),
+   * [`Workflow`](Workflow.html#Workflow), or [ExpressionTool](Workflow.html#ExpressionTool).
    * 
    * If provided, then this must be an IRI of a concept node that
    * represents the type of operation, preferably defined within an ontology.
diff --git a/src/main/java/org/w3id/cwl/cwl1_2/utils/LoaderInstances.java b/src/main/java/org/w3id/cwl/cwl1_2/utils/LoaderInstances.java
index 2e8e3827..3255d41a 100644
--- a/src/main/java/org/w3id/cwl/cwl1_2/utils/LoaderInstances.java
+++ b/src/main/java/org/w3id/cwl/cwl1_2/utils/LoaderInstances.java
@@ -111,23 +111,24 @@ public class LoaderInstances {
   public static Loader<java.util.List<RecordField>> array_of_RecordField = new ArrayLoader(RecordField);
   public static Loader<java.util.Optional<java.util.List<Object>>> optional_array_of_RecordField = new OptionalLoader(array_of_RecordField);
   public static Loader<java.util.Optional<java.util.List<Object>>> idmap_fields_optional_array_of_RecordField = new IdMapLoader(optional_array_of_RecordField, "name", "type");
-  public static Loader<enum_d9cba076fca539106791a4f46d198c7fcfbdb779> enum_d9cba076fca539106791a4f46d198c7fcfbdb779 = new EnumLoader(enum_d9cba076fca539106791a4f46d198c7fcfbdb779.class);
-  public static Loader<enum_d9cba076fca539106791a4f46d198c7fcfbdb779> typedsl_enum_d9cba076fca539106791a4f46d198c7fcfbdb779_2 = new TypeDslLoader(enum_d9cba076fca539106791a4f46d198c7fcfbdb779, 2);
+  public static Loader<Record_name> Record_name = new EnumLoader(Record_name.class);
+  public static Loader<Record_name> typedsl_Record_name_2 = new TypeDslLoader(Record_name, 2);
+  public static Loader<java.util.Optional<String>> optional_StringInstance = new OptionalLoader(StringInstance);
+  public static Loader<java.util.Optional<String>> uri_optional_StringInstance_True_False_None = new UriLoader(optional_StringInstance, true, false, null);
   public static Loader<java.util.List<String>> uri_array_of_StringInstance_True_False_None = new UriLoader(array_of_StringInstance, true, false, null);
-  public static Loader<enum_d961d79c225752b9fadb617367615ab176b47d77> enum_d961d79c225752b9fadb617367615ab176b47d77 = new EnumLoader(enum_d961d79c225752b9fadb617367615ab176b47d77.class);
-  public static Loader<enum_d961d79c225752b9fadb617367615ab176b47d77> typedsl_enum_d961d79c225752b9fadb617367615ab176b47d77_2 = new TypeDslLoader(enum_d961d79c225752b9fadb617367615ab176b47d77, 2);
-  public static Loader<enum_d062602be0b4b8fd33e69e29a841317b6ab665bc> enum_d062602be0b4b8fd33e69e29a841317b6ab665bc = new EnumLoader(enum_d062602be0b4b8fd33e69e29a841317b6ab665bc.class);
-  public static Loader<enum_d062602be0b4b8fd33e69e29a841317b6ab665bc> typedsl_enum_d062602be0b4b8fd33e69e29a841317b6ab665bc_2 = new TypeDslLoader(enum_d062602be0b4b8fd33e69e29a841317b6ab665bc, 2);
+  public static Loader<Enum_name> Enum_name = new EnumLoader(Enum_name.class);
+  public static Loader<Enum_name> typedsl_Enum_name_2 = new TypeDslLoader(Enum_name, 2);
+  public static Loader<Object> uri_union_of_PrimitiveType_or_RecordSchema_or_EnumSchema_or_ArraySchema_or_StringInstance_or_array_of_union_of_PrimitiveType_or_RecordSchema_or_EnumSchema_or_ArraySchema_or_StringInstance_False_True_2 = new UriLoader(union_of_PrimitiveType_or_RecordSchema_or_EnumSchema_or_ArraySchema_or_StringInstance_or_array_of_union_of_PrimitiveType_or_RecordSchema_or_EnumSchema_or_ArraySchema_or_StringInstance, false, true, 2);
+  public static Loader<Array_name> Array_name = new EnumLoader(Array_name.class);
+  public static Loader<Array_name> typedsl_Array_name_2 = new TypeDslLoader(Array_name, 2);
   public static Loader<File_class> File_class = new EnumLoader(File_class.class);
   public static Loader<File_class> uri_File_class_False_True_None = new UriLoader(File_class, false, true, null);
-  public static Loader<java.util.Optional<String>> optional_StringInstance = new OptionalLoader(StringInstance);
   public static Loader<java.util.Optional<String>> uri_optional_StringInstance_False_False_None = new UriLoader(optional_StringInstance, false, false, null);
   public static Loader<Object> union_of_NullInstance_or_IntegerInstance_or_LongInstance = new UnionLoader(new Loader[] { NullInstance, IntegerInstance, LongInstance });
   public static Loader<Object> union_of_File_or_Directory = new UnionLoader(new Loader[] { File, Directory });
   public static Loader<java.util.List<Object>> array_of_union_of_File_or_Directory = new ArrayLoader(union_of_File_or_Directory);
   public static Loader<java.util.Optional<java.util.List<Object>>> optional_array_of_union_of_File_or_Directory = new OptionalLoader(array_of_union_of_File_or_Directory);
   public static Loader<java.util.Optional<java.util.List<Object>>> secondaryfilesdsl_optional_array_of_union_of_File_or_Directory = new SecondaryFilesDslLoader(optional_array_of_union_of_File_or_Directory);
-  public static Loader<java.util.Optional<String>> uri_optional_StringInstance_True_False_None = new UriLoader(optional_StringInstance, true, false, null);
   public static Loader<Directory_class> Directory_class = new EnumLoader(Directory_class.class);
   public static Loader<Directory_class> uri_Directory_class_False_True_None = new UriLoader(Directory_class, false, true, null);
   public static Loader<java.util.Optional<Boolean>> optional_BooleanInstance = new OptionalLoader(BooleanInstance);
@@ -147,6 +148,7 @@ public class LoaderInstances {
   public static Loader<java.util.List<InputRecordField>> array_of_InputRecordField = new ArrayLoader(InputRecordField);
   public static Loader<java.util.Optional<java.util.List<Object>>> optional_array_of_InputRecordField = new OptionalLoader(array_of_InputRecordField);
   public static Loader<java.util.Optional<java.util.List<Object>>> idmap_fields_optional_array_of_InputRecordField = new IdMapLoader(optional_array_of_InputRecordField, "name", "type");
+  public static Loader<Object> uri_union_of_CWLType_or_InputRecordSchema_or_InputEnumSchema_or_InputArraySchema_or_StringInstance_or_array_of_union_of_CWLType_or_InputRecordSchema_or_InputEnumSchema_or_InputArraySchema_or_StringInstance_False_True_2 = new UriLoader(union_of_CWLType_or_InputRecordSchema_or_InputEnumSchema_or_InputArraySchema_or_StringInstance_or_array_of_union_of_CWLType_or_InputRecordSchema_or_InputEnumSchema_or_InputArraySchema_or_StringInstance, false, true, 2);
   public static Loader<Object> union_of_CWLType_or_OutputRecordSchema_or_OutputEnumSchema_or_OutputArraySchema_or_StringInstance = new UnionLoader(new Loader[] { CWLType, OutputRecordSchema, OutputEnumSchema, OutputArraySchema, StringInstance });
   public static Loader<java.util.List<Object>> array_of_union_of_CWLType_or_OutputRecordSchema_or_OutputEnumSchema_or_OutputArraySchema_or_StringInstance = new ArrayLoader(union_of_CWLType_or_OutputRecordSchema_or_OutputEnumSchema_or_OutputArraySchema_or_StringInstance);
   public static Loader<Object> union_of_CWLType_or_OutputRecordSchema_or_OutputEnumSchema_or_OutputArraySchema_or_StringInstance_or_array_of_union_of_CWLType_or_OutputRecordSchema_or_OutputEnumSchema_or_OutputArraySchema_or_StringInstance = new UnionLoader(new Loader[] { CWLType, OutputRecordSchema, OutputEnumSchema, OutputArraySchema, StringInstance, array_of_union_of_CWLType_or_OutputRecordSchema_or_OutputEnumSchema_or_OutputArraySchema_or_StringInstance });
@@ -154,6 +156,7 @@ public class LoaderInstances {
   public static Loader<java.util.List<OutputRecordField>> array_of_OutputRecordField = new ArrayLoader(OutputRecordField);
   public static Loader<java.util.Optional<java.util.List<Object>>> optional_array_of_OutputRecordField = new OptionalLoader(array_of_OutputRecordField);
   public static Loader<java.util.Optional<java.util.List<Object>>> idmap_fields_optional_array_of_OutputRecordField = new IdMapLoader(optional_array_of_OutputRecordField, "name", "type");
+  public static Loader<Object> uri_union_of_CWLType_or_OutputRecordSchema_or_OutputEnumSchema_or_OutputArraySchema_or_StringInstance_or_array_of_union_of_CWLType_or_OutputRecordSchema_or_OutputEnumSchema_or_OutputArraySchema_or_StringInstance_False_True_2 = new UriLoader(union_of_CWLType_or_OutputRecordSchema_or_OutputEnumSchema_or_OutputArraySchema_or_StringInstance_or_array_of_union_of_CWLType_or_OutputRecordSchema_or_OutputEnumSchema_or_OutputArraySchema_or_StringInstance, false, true, 2);
   public static Loader<Object> union_of_NullInstance_or_File_or_Directory_or_AnyInstance = new UnionLoader(new Loader[] { NullInstance, File, Directory, AnyInstance });
   public static Loader<Object> union_of_CommandInputParameter_or_WorkflowInputParameter_or_OperationInputParameter = new UnionLoader(new Loader[] { CommandInputParameter, WorkflowInputParameter, OperationInputParameter });
   public static Loader<java.util.List<Object>> array_of_union_of_CommandInputParameter_or_WorkflowInputParameter_or_OperationInputParameter = new ArrayLoader(union_of_CommandInputParameter_or_WorkflowInputParameter_or_OperationInputParameter);
@@ -194,6 +197,7 @@ public class LoaderInstances {
   public static Loader<java.util.List<CommandInputRecordField>> array_of_CommandInputRecordField = new ArrayLoader(CommandInputRecordField);
   public static Loader<java.util.Optional<java.util.List<Object>>> optional_array_of_CommandInputRecordField = new OptionalLoader(array_of_CommandInputRecordField);
   public static Loader<java.util.Optional<java.util.List<Object>>> idmap_fields_optional_array_of_CommandInputRecordField = new IdMapLoader(optional_array_of_CommandInputRecordField, "name", "type");
+  public static Loader<Object> uri_union_of_CWLType_or_CommandInputRecordSchema_or_CommandInputEnumSchema_or_CommandInputArraySchema_or_StringInstance_or_array_of_union_of_CWLType_or_CommandInputRecordSchema_or_CommandInputEnumSchema_or_CommandInputArraySchema_or_StringInstance_False_True_2 = new UriLoader(union_of_CWLType_or_CommandInputRecordSchema_or_CommandInputEnumSchema_or_CommandInputArraySchema_or_StringInstance_or_array_of_union_of_CWLType_or_CommandInputRecordSchema_or_CommandInputEnumSchema_or_CommandInputArraySchema_or_StringInstance, false, true, 2);
   public static Loader<Object> union_of_CWLType_or_CommandOutputRecordSchema_or_CommandOutputEnumSchema_or_CommandOutputArraySchema_or_StringInstance = new UnionLoader(new Loader[] { CWLType, CommandOutputRecordSchema, CommandOutputEnumSchema, CommandOutputArraySchema, StringInstance });
   public static Loader<java.util.List<Object>> array_of_union_of_CWLType_or_CommandOutputRecordSchema_or_CommandOutputEnumSchema_or_CommandOutputArraySchema_or_StringInstance = new ArrayLoader(union_of_CWLType_or_CommandOutputRecordSchema_or_CommandOutputEnumSchema_or_CommandOutputArraySchema_or_StringInstance);
   public static Loader<Object> union_of_CWLType_or_CommandOutputRecordSchema_or_CommandOutputEnumSchema_or_CommandOutputArraySchema_or_StringInstance_or_array_of_union_of_CWLType_or_CommandOutputRecordSchema_or_CommandOutputEnumSchema_or_CommandOutputArraySchema_or_StringInstance = new UnionLoader(new Loader[] { CWLType, CommandOutputRecordSchema, CommandOutputEnumSchema, CommandOutputArraySchema, StringInstance, array_of_union_of_CWLType_or_CommandOutputRecordSchema_or_CommandOutputEnumSchema_or_CommandOutputArraySchema_or_StringInstance });
@@ -202,6 +206,7 @@ public class LoaderInstances {
   public static Loader<java.util.List<CommandOutputRecordField>> array_of_CommandOutputRecordField = new ArrayLoader(CommandOutputRecordField);
   public static Loader<java.util.Optional<java.util.List<Object>>> optional_array_of_CommandOutputRecordField = new OptionalLoader(array_of_CommandOutputRecordField);
   public static Loader<java.util.Optional<java.util.List<Object>>> idmap_fields_optional_array_of_CommandOutputRecordField = new IdMapLoader(optional_array_of_CommandOutputRecordField, "name", "type");
+  public static Loader<Object> uri_union_of_CWLType_or_CommandOutputRecordSchema_or_CommandOutputEnumSchema_or_CommandOutputArraySchema_or_StringInstance_or_array_of_union_of_CWLType_or_CommandOutputRecordSchema_or_CommandOutputEnumSchema_or_CommandOutputArraySchema_or_StringInstance_False_True_2 = new UriLoader(union_of_CWLType_or_CommandOutputRecordSchema_or_CommandOutputEnumSchema_or_CommandOutputArraySchema_or_StringInstance_or_array_of_union_of_CWLType_or_CommandOutputRecordSchema_or_CommandOutputEnumSchema_or_CommandOutputArraySchema_or_StringInstance, false, true, 2);
   public static Loader<Object> union_of_CWLType_or_stdin_or_CommandInputRecordSchema_or_CommandInputEnumSchema_or_CommandInputArraySchema_or_StringInstance_or_array_of_union_of_CWLType_or_CommandInputRecordSchema_or_CommandInputEnumSchema_or_CommandInputArraySchema_or_StringInstance = new UnionLoader(new Loader[] { CWLType, stdin, CommandInputRecordSchema, CommandInputEnumSchema, CommandInputArraySchema, StringInstance, array_of_union_of_CWLType_or_CommandInputRecordSchema_or_CommandInputEnumSchema_or_CommandInputArraySchema_or_StringInstance });
   public static Loader<Object> typedsl_union_of_CWLType_or_stdin_or_CommandInputRecordSchema_or_CommandInputEnumSchema_or_CommandInputArraySchema_or_StringInstance_or_array_of_union_of_CWLType_or_CommandInputRecordSchema_or_CommandInputEnumSchema_or_CommandInputArraySchema_or_StringInstance_2 = new TypeDslLoader(union_of_CWLType_or_stdin_or_CommandInputRecordSchema_or_CommandInputEnumSchema_or_CommandInputArraySchema_or_StringInstance_or_array_of_union_of_CWLType_or_CommandInputRecordSchema_or_CommandInputEnumSchema_or_CommandInputArraySchema_or_StringInstance, 2);
   public static Loader<Object> union_of_CWLType_or_stdout_or_stderr_or_CommandOutputRecordSchema_or_CommandOutputEnumSchema_or_CommandOutputArraySchema_or_StringInstance_or_array_of_union_of_CWLType_or_CommandOutputRecordSchema_or_CommandOutputEnumSchema_or_CommandOutputArraySchema_or_StringInstance = new UnionLoader(new Loader[] { CWLType, stdout, stderr, CommandOutputRecordSchema, CommandOutputEnumSchema, CommandOutputArraySchema, StringInstance, array_of_union_of_CWLType_or_CommandOutputRecordSchema_or_CommandOutputEnumSchema_or_CommandOutputArraySchema_or_StringInstance });