@@ -6,11 +6,11 @@
  * A value with type information.
  */
 public class NormalizedInputValue {
-    private final String type;
+    private final String typeName;
     private final Object value;
 
-    public NormalizedInputValue(String type, Object value) {
-        this.type = type;
+    public NormalizedInputValue(String typeName, Object value) {
+        this.typeName = typeName;
         this.value = value;
     }
 
@@ -19,8 +19,8 @@ public NormalizedInputValue(String type, Object value) {
      *
      * @return
      */
-    public String getType() {
-        return type;
+    public String getTypeName() {
+        return typeName;
     }
 
     /**
@@ -44,18 +44,18 @@ public boolean equals(Object o) {
             return false;
         }
         NormalizedInputValue that = (NormalizedInputValue) o;
-        return Objects.equals(type, that.type) && Objects.equals(value, that.value);
+        return Objects.equals(typeName, that.typeName) && Objects.equals(value, that.value);
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(type, value);
+        return Objects.hash(typeName, value);
     }
 
     @Override
     public String toString() {
         return "NormalizedInputValue{" +
-                "type='" + type + '\'' +
+                "typeName='" + typeName + '\'' +
                 ", value=" + value +
                 '}';
     }
 
@@ -1101,14 +1101,14 @@ schema {
         def arg3 = secondField.getNormalizedArgument("arg3")
 
         then:
-        topLevelField.getNormalizedArgument("id").getType() == "ID"
+        topLevelField.getNormalizedArgument("id").getTypeName() == "ID"
         topLevelField.getNormalizedArgument("id").getValue() == "123"
 
-        arg1.getType() == "Input1"
+        arg1.getTypeName() == "Input1"
         arg1.getValue() == expectedNormalizedArgValue
-        arg2.getType() == "Input1"
+        arg2.getTypeName() == "Input1"
         arg2.value == expectedNormalizedArgValue
-        arg3.getType() == "Input1"
+        arg3.getTypeName() == "Input1"
         arg3.value == expectedNormalizedArgValue
 
     }
@@ -1149,15 +1149,15 @@ schema {
         def arg3 = topLevelField.getNormalizedArgument("arg3")
 
         then:
-        arg1.type == "[ID!]"
+        arg1.typeName == "[ID!]"
         arg1.value == ["1", "2"]
-        arg2.type == "[[Input1]]"
+        arg2.typeName == "[[Input1]]"
         arg2.value == [[
                                [foo: new NormalizedInputValue("String", "foo1"), input2: new NormalizedInputValue("Input2", [bar: new NormalizedInputValue("Int", 123)])],
                                [foo: new NormalizedInputValue("String", "foo2"), input2: new NormalizedInputValue("Input2", [bar: new NormalizedInputValue("Int", 456)])]
                        ]]
 
-        arg3.getType() == "[Input1]"
+        arg3.getTypeName() == "[Input1]"
         arg3.value == [
                 [foo: new NormalizedInputValue("String", "foo3"), input2: new NormalizedInputValue("Input2", [bar: new NormalizedInputValue("Int", 789)])],
         ]