diff --git a/core/access/src/main/java/uk/gov/gchq/gaffer/access/predicate/AccessPredicate.java b/core/access/src/main/java/uk/gov/gchq/gaffer/access/predicate/AccessPredicate.java
index 9851d2d8249..6661351493a 100644
--- a/core/access/src/main/java/uk/gov/gchq/gaffer/access/predicate/AccessPredicate.java
+++ b/core/access/src/main/java/uk/gov/gchq/gaffer/access/predicate/AccessPredicate.java
@@ -39,7 +39,7 @@
  * admin role. If not it uses a predicate to determine if the user can access a resource.
  */
 @SuppressFBWarnings(value = "SE_BAD_FIELD", justification = "Gets serialised by the JSC cache")
-@JsonTypeInfo(use = JsonTypeInfo.Id.CLASS, property = "class")
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, property = "class")
 public class AccessPredicate implements BiPredicate<User, String>, Serializable {
 
     private final Predicate<User> userPredicate;
diff --git a/core/data/src/main/java/uk/gov/gchq/gaffer/data/elementdefinition/view/View.java b/core/data/src/main/java/uk/gov/gchq/gaffer/data/elementdefinition/view/View.java
index d6447c3a7c4..ad7b9f78cc4 100644
--- a/core/data/src/main/java/uk/gov/gchq/gaffer/data/elementdefinition/view/View.java
+++ b/core/data/src/main/java/uk/gov/gchq/gaffer/data/elementdefinition/view/View.java
@@ -65,7 +65,7 @@
  * @see uk.gov.gchq.gaffer.data.element.function.ElementTransformer
  */
 @JsonDeserialize(builder = View.Builder.class)
-@JsonTypeInfo(use = JsonTypeInfo.Id.CLASS, include = As.EXISTING_PROPERTY, property = "class", defaultImpl = View.class)
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = As.EXISTING_PROPERTY, property = "class", defaultImpl = View.class)
 @JsonPropertyOrder(value = {"class", "edges", "entities", "allEdges", "allEntities", "globalElements", "globalEntities", "globalEdges"}, alphabetic = true)
 @JsonSimpleClassName(includeSubtypes = true)
 @JsonInclude(JsonInclude.Include.NON_DEFAULT)
diff --git a/core/data/src/main/java/uk/gov/gchq/gaffer/data/generator/ElementGenerator.java b/core/data/src/main/java/uk/gov/gchq/gaffer/data/generator/ElementGenerator.java
index 2a934e33fb3..bb48d05d5c6 100644
--- a/core/data/src/main/java/uk/gov/gchq/gaffer/data/generator/ElementGenerator.java
+++ b/core/data/src/main/java/uk/gov/gchq/gaffer/data/generator/ElementGenerator.java
@@ -31,7 +31,7 @@
  *
  * @param <OBJ> the type of domain object
  */
-@JsonTypeInfo(use = Id.CLASS, include = As.PROPERTY, property = "class")
+@JsonTypeInfo(use = Id.NAME, include = As.PROPERTY, property = "class")
 public interface ElementGenerator<OBJ> extends Function<Iterable<? extends OBJ>, Iterable<? extends Element>> {
     // Empty marker interface
 }
diff --git a/core/data/src/main/java/uk/gov/gchq/gaffer/data/generator/ObjectGenerator.java b/core/data/src/main/java/uk/gov/gchq/gaffer/data/generator/ObjectGenerator.java
index 91fb656c273..4891bcd0f42 100644
--- a/core/data/src/main/java/uk/gov/gchq/gaffer/data/generator/ObjectGenerator.java
+++ b/core/data/src/main/java/uk/gov/gchq/gaffer/data/generator/ObjectGenerator.java
@@ -31,6 +31,6 @@
  *
  * @param <OBJ> the type of domain object
  */
-@JsonTypeInfo(use = Id.CLASS, include = As.PROPERTY, property = "class")
+@JsonTypeInfo(use = Id.NAME, include = As.PROPERTY, property = "class")
 public interface ObjectGenerator<OBJ> extends Function<Iterable<? extends Element>, Iterable<? extends OBJ>> {
 }
diff --git a/core/graph/src/main/java/uk/gov/gchq/gaffer/graph/hook/GraphHook.java b/core/graph/src/main/java/uk/gov/gchq/gaffer/graph/hook/GraphHook.java
index 2902fda75d6..f97157b2070 100644
--- a/core/graph/src/main/java/uk/gov/gchq/gaffer/graph/hook/GraphHook.java
+++ b/core/graph/src/main/java/uk/gov/gchq/gaffer/graph/hook/GraphHook.java
@@ -38,7 +38,7 @@
  * be modified.
  * </p>
  */
-@JsonTypeInfo(use = JsonTypeInfo.Id.CLASS, include = JsonTypeInfo.As.PROPERTY, property = "class")
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "class")
 public interface GraphHook {
     /**
      * Called from {@link uk.gov.gchq.gaffer.graph.Graph} before an {@link OperationChain}
diff --git a/core/operation/src/main/java/uk/gov/gchq/gaffer/operation/Operation.java b/core/operation/src/main/java/uk/gov/gchq/gaffer/operation/Operation.java
index bbc7fa22cb6..b576684157a 100644
--- a/core/operation/src/main/java/uk/gov/gchq/gaffer/operation/Operation.java
+++ b/core/operation/src/main/java/uk/gov/gchq/gaffer/operation/Operation.java
@@ -88,7 +88,7 @@
  * }
  * </pre>
  */
-@JsonTypeInfo(use = JsonTypeInfo.Id.CLASS, include = As.PROPERTY, property = "class", defaultImpl = OperationChain.class)
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = As.PROPERTY, property = "class", defaultImpl = OperationChain.class)
 @JsonSimpleClassName(includeSubtypes = true)
 public interface Operation extends Closeable {
 
diff --git a/core/operation/src/main/java/uk/gov/gchq/gaffer/operation/impl/join/match/Match.java b/core/operation/src/main/java/uk/gov/gchq/gaffer/operation/impl/join/match/Match.java
index 8986bf5a4ad..40117214f68 100644
--- a/core/operation/src/main/java/uk/gov/gchq/gaffer/operation/impl/join/match/Match.java
+++ b/core/operation/src/main/java/uk/gov/gchq/gaffer/operation/impl/join/match/Match.java
@@ -22,7 +22,7 @@
 
 import java.util.List;
 
-@JsonTypeInfo(use = JsonTypeInfo.Id.CLASS, include = JsonTypeInfo.As.PROPERTY, property = "class")
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "class")
 @JsonSimpleClassName(includeSubtypes = true)
 public interface Match {
 
diff --git a/core/store/src/main/java/uk/gov/gchq/gaffer/store/StoreProperties.java b/core/store/src/main/java/uk/gov/gchq/gaffer/store/StoreProperties.java
index 85b1f221e63..1c60032090d 100644
--- a/core/store/src/main/java/uk/gov/gchq/gaffer/store/StoreProperties.java
+++ b/core/store/src/main/java/uk/gov/gchq/gaffer/store/StoreProperties.java
@@ -66,7 +66,7 @@
  * All StoreProperties classes must be JSON serialisable.
  * </p>
  */
-@JsonTypeInfo(use = JsonTypeInfo.Id.CLASS, include = JsonTypeInfo.As.EXISTING_PROPERTY, property = "storePropertiesClassName")
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.EXISTING_PROPERTY, property = "storePropertiesClassName")
 public class StoreProperties implements Cloneable {
     public static final String STORE_CLASS = "gaffer.store.class";
     public static final String SCHEMA_CLASS = "gaffer.store.schema.class";
diff --git a/core/store/src/main/java/uk/gov/gchq/gaffer/store/operation/resolver/ScoreResolver.java b/core/store/src/main/java/uk/gov/gchq/gaffer/store/operation/resolver/ScoreResolver.java
index 25d262f6b5c..56605e7e33f 100644
--- a/core/store/src/main/java/uk/gov/gchq/gaffer/store/operation/resolver/ScoreResolver.java
+++ b/core/store/src/main/java/uk/gov/gchq/gaffer/store/operation/resolver/ScoreResolver.java
@@ -25,7 +25,7 @@
  *
  * @param <T> the {@link Operation} type
  */
-@JsonTypeInfo(use = JsonTypeInfo.Id.CLASS, include = JsonTypeInfo.As.PROPERTY, property = "class")
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "class")
 public interface ScoreResolver<T extends Operation> {
     /**
      * Should return a (nullable) score for a given operation.
diff --git a/core/type/src/main/java/uk/gov/gchq/gaffer/types/CustomMap.java b/core/type/src/main/java/uk/gov/gchq/gaffer/types/CustomMap.java
index 5e7a89f309b..1954a642fd7 100644
--- a/core/type/src/main/java/uk/gov/gchq/gaffer/types/CustomMap.java
+++ b/core/type/src/main/java/uk/gov/gchq/gaffer/types/CustomMap.java
@@ -41,7 +41,7 @@
 import static java.util.Objects.requireNonNull;
 
 @JsonPropertyOrder(value = {"class", "keySerialiser", "valueSerialiser", "jsonStorage"})
-@JsonTypeInfo(use = JsonTypeInfo.Id.CLASS, property = "class")
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, property = "class")
 public class CustomMap<K, V> {
     private final ToBytesSerialiser<? super K> keySerialiser;
     private final ToBytesSerialiser<? super V> valueSerialiser;
diff --git a/core/type/src/main/java/uk/gov/gchq/gaffer/types/FreqMap.java b/core/type/src/main/java/uk/gov/gchq/gaffer/types/FreqMap.java
index bd9be2a5329..d6e5bb8b8da 100644
--- a/core/type/src/main/java/uk/gov/gchq/gaffer/types/FreqMap.java
+++ b/core/type/src/main/java/uk/gov/gchq/gaffer/types/FreqMap.java
@@ -28,7 +28,7 @@
  * {@code FreqMap} extends {@link HashMap} with String keys and Long values, adding an upsert operation.
  */
 @JsonSimpleClassName
-@JsonTypeInfo(use = JsonTypeInfo.Id.CLASS, property = "class")
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, property = "class")
 public class FreqMap extends HashMap<String, Long> {
     private static final long serialVersionUID = -851105369975081220L;
 
diff --git a/core/type/src/main/java/uk/gov/gchq/gaffer/types/TypeSubTypeValue.java b/core/type/src/main/java/uk/gov/gchq/gaffer/types/TypeSubTypeValue.java
index d73463e4fa5..783b6cdd783 100644
--- a/core/type/src/main/java/uk/gov/gchq/gaffer/types/TypeSubTypeValue.java
+++ b/core/type/src/main/java/uk/gov/gchq/gaffer/types/TypeSubTypeValue.java
@@ -32,7 +32,7 @@
  * sub-types and associated values.
  */
 @JsonSimpleClassName
-@JsonTypeInfo(use = JsonTypeInfo.Id.CLASS, property = "class")
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, property = "class")
 public class TypeSubTypeValue implements Comparable<TypeSubTypeValue>, Serializable {
 
     private static Comparator<String> stringComparator = Comparator
diff --git a/core/type/src/main/java/uk/gov/gchq/gaffer/types/TypeValue.java b/core/type/src/main/java/uk/gov/gchq/gaffer/types/TypeValue.java
index 4f12018880a..f7db128d0c7 100644
--- a/core/type/src/main/java/uk/gov/gchq/gaffer/types/TypeValue.java
+++ b/core/type/src/main/java/uk/gov/gchq/gaffer/types/TypeValue.java
@@ -32,7 +32,7 @@
  * values.
  */
 @JsonSimpleClassName
-@JsonTypeInfo(use = JsonTypeInfo.Id.CLASS, property = "class")
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, property = "class")
 public class TypeValue implements Comparable<TypeValue>, Serializable {
 
     private static Comparator<String> stringComparator = Comparator
diff --git a/core/type/src/main/java/uk/gov/gchq/gaffer/types/binaryoperator/CustomMapAggregator.java b/core/type/src/main/java/uk/gov/gchq/gaffer/types/binaryoperator/CustomMapAggregator.java
index 04dae0167ba..ec0bb0826ad 100644
--- a/core/type/src/main/java/uk/gov/gchq/gaffer/types/binaryoperator/CustomMapAggregator.java
+++ b/core/type/src/main/java/uk/gov/gchq/gaffer/types/binaryoperator/CustomMapAggregator.java
@@ -33,7 +33,7 @@
 @Summary("Merges 2 CustomMaps by applying a binary operator to each of the values")
 public class CustomMapAggregator<K, V> extends KorypheBinaryOperator<CustomMap<K, V>> {
     @JsonTypeInfo(
-            use = Id.CLASS,
+            use = Id.NAME,
             include = As.PROPERTY,
             property = "class"
     )
diff --git a/library/sketches-library/src/main/java/uk/gov/gchq/gaffer/sketches/CardinalityEntityGenerator.java b/library/sketches-library/src/main/java/uk/gov/gchq/gaffer/sketches/CardinalityEntityGenerator.java
index 996b2f4d502..a765c0e01bb 100755
--- a/library/sketches-library/src/main/java/uk/gov/gchq/gaffer/sketches/CardinalityEntityGenerator.java
+++ b/library/sketches-library/src/main/java/uk/gov/gchq/gaffer/sketches/CardinalityEntityGenerator.java
@@ -44,7 +44,7 @@
  */
 @JsonInclude(JsonInclude.Include.NON_DEFAULT)
 public abstract class CardinalityEntityGenerator<T> implements OneToManyElementGenerator<Element> {
-    @JsonTypeInfo(use = JsonTypeInfo.Id.CLASS, include = JsonTypeInfo.As.PROPERTY, property = "class")
+    @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "class")
     private Function<Object, Object> vertexValueConverter;
 
     private String group = "Cardinality";
diff --git a/library/sketches-library/src/main/java/uk/gov/gchq/gaffer/sketches/datasketches/cardinality/serialisation/json/HllSketchWithValues.java b/library/sketches-library/src/main/java/uk/gov/gchq/gaffer/sketches/datasketches/cardinality/serialisation/json/HllSketchWithValues.java
index ceeb4eb0443..444d67883f3 100644
--- a/library/sketches-library/src/main/java/uk/gov/gchq/gaffer/sketches/datasketches/cardinality/serialisation/json/HllSketchWithValues.java
+++ b/library/sketches-library/src/main/java/uk/gov/gchq/gaffer/sketches/datasketches/cardinality/serialisation/json/HllSketchWithValues.java
@@ -44,7 +44,7 @@ public class HllSketchWithValues {
 
     private byte[] bytes = null;
 
-    @JsonTypeInfo(use = JsonTypeInfo.Id.CLASS, property = "class")
+    @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, property = "class")
     private List<Object> values = new ArrayList<>();
 
     public int getLogK() {