diff --git a/aeron-cluster/src/main/java/io/aeron/cluster/service/ClusterMarkFile.java b/aeron-cluster/src/main/java/io/aeron/cluster/service/ClusterMarkFile.java
index 03eb7a0dfa..11ef022efc 100644
--- a/aeron-cluster/src/main/java/io/aeron/cluster/service/ClusterMarkFile.java
+++ b/aeron-cluster/src/main/java/io/aeron/cluster/service/ClusterMarkFile.java
@@ -178,7 +178,7 @@ else if (SemanticVersion.major(version) != MAJOR_VERSION)
 
         final ClusterComponentType existingType = headerDecoder.componentType();
 
-        if (existingType != ClusterComponentType.NULL && existingType != type)
+        if (existingType != ClusterComponentType.NONE && existingType != type)
         {
             if (existingType != ClusterComponentType.BACKUP || ClusterComponentType.CONSENSUS_MODULE != type)
             {
diff --git a/aeron-cluster/src/main/resources/cluster/aeron-cluster-mark-codecs.xml b/aeron-cluster/src/main/resources/cluster/aeron-cluster-mark-codecs.xml
index 245d866322..a800f91180 100644
--- a/aeron-cluster/src/main/resources/cluster/aeron-cluster-mark-codecs.xml
+++ b/aeron-cluster/src/main/resources/cluster/aeron-cluster-mark-codecs.xml
@@ -23,7 +23,7 @@
         </composite>
         <type name="time_t" primitiveType="int64" description="Epoch time in milliseconds since 1 Jan 1970 UTC."/>
         <enum name="ClusterComponentType" encodingType="int32" description="Type of Cluster Component">
-            <validValue name="NULL">0</validValue>
+            <validValue name="NONE">0</validValue>
             <validValue name="CONSENSUS_MODULE">1</validValue>
             <validValue name="CONTAINER">2</validValue>
             <validValue name="BACKUP">3</validValue>