diff --git a/pom.xml b/pom.xml
index a9cdaf9411..1a826aedda 100644
--- a/pom.xml
+++ b/pom.xml
@@ -53,7 +53,7 @@
         <dependency.activiti.version>5.23.0</dependency.activiti.version>
         <dependency.transform.model.version>1.0.2.11</dependency.transform.model.version>
         <dependency.alfresco-greenmail.version>6.2</dependency.alfresco-greenmail.version>
-        <dependency.acs-event-model.version>0.0.10</dependency.acs-event-model.version>
+        <dependency.acs-event-model.version>0.0.11</dependency.acs-event-model.version>
 
         <dependency.spring.version>5.2.9.RELEASE</dependency.spring.version>
         <dependency.antlr.version>3.5.2</dependency.antlr.version>
diff --git a/repository/src/main/java/org/alfresco/repo/event2/ChildAssociationEventConsolidator.java b/repository/src/main/java/org/alfresco/repo/event2/ChildAssociationEventConsolidator.java
index 50b9c9b4a7..8837f3648e 100644
--- a/repository/src/main/java/org/alfresco/repo/event2/ChildAssociationEventConsolidator.java
+++ b/repository/src/main/java/org/alfresco/repo/event2/ChildAssociationEventConsolidator.java
@@ -31,6 +31,7 @@ import java.util.Deque;
 import org.alfresco.repo.event.v1.model.ChildAssociationResource;
 import org.alfresco.repo.event.v1.model.DataAttributes;
 import org.alfresco.repo.event.v1.model.EventData;
+import org.alfresco.repo.event.v1.model.EventType;
 import org.alfresco.repo.event.v1.model.RepoEvent;
 import org.alfresco.service.cmr.repository.ChildAssociationRef;
 import org.alfresco.service.namespace.QName;
diff --git a/repository/src/main/java/org/alfresco/repo/event2/EventConsolidator.java b/repository/src/main/java/org/alfresco/repo/event2/EventConsolidator.java
index f2bada96e5..610131b65c 100644
--- a/repository/src/main/java/org/alfresco/repo/event2/EventConsolidator.java
+++ b/repository/src/main/java/org/alfresco/repo/event2/EventConsolidator.java
@@ -42,6 +42,7 @@ import org.alfresco.model.ContentModel;
 import org.alfresco.repo.event.v1.model.ContentInfo;
 import org.alfresco.repo.event.v1.model.DataAttributes;
 import org.alfresco.repo.event.v1.model.EventData;
+import org.alfresco.repo.event.v1.model.EventType;
 import org.alfresco.repo.event.v1.model.NodeResource;
 import org.alfresco.repo.event.v1.model.NodeResource.Builder;
 import org.alfresco.repo.event.v1.model.RepoEvent;
diff --git a/repository/src/main/java/org/alfresco/repo/event2/EventGenerator.java b/repository/src/main/java/org/alfresco/repo/event2/EventGenerator.java
index 693f0f6239..06fea65ba9 100644
--- a/repository/src/main/java/org/alfresco/repo/event2/EventGenerator.java
+++ b/repository/src/main/java/org/alfresco/repo/event2/EventGenerator.java
@@ -33,6 +33,7 @@ import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.UUID;
 
+import org.alfresco.repo.event.v1.model.EventType;
 import org.alfresco.repo.event.v1.model.RepoEvent;
 import org.alfresco.repo.event2.filter.ChildAssociationTypeFilter;
 import org.alfresco.repo.event2.filter.EventFilterRegistry;
diff --git a/repository/src/main/java/org/alfresco/repo/event2/EventJSONSchema.java b/repository/src/main/java/org/alfresco/repo/event2/EventJSONSchema.java
index 56a4e900b6..45bcff161d 100644
--- a/repository/src/main/java/org/alfresco/repo/event2/EventJSONSchema.java
+++ b/repository/src/main/java/org/alfresco/repo/event2/EventJSONSchema.java
@@ -30,6 +30,7 @@ import java.util.HashMap;
 import java.util.Map;
 
 import org.alfresco.error.AlfrescoRuntimeException;
+import org.alfresco.repo.event.v1.model.EventType;
 import org.alfresco.util.Pair;
 
 /**
diff --git a/repository/src/main/java/org/alfresco/repo/event2/EventType.java b/repository/src/main/java/org/alfresco/repo/event2/EventType.java
deleted file mode 100644
index 9846c5b1e4..0000000000
--- a/repository/src/main/java/org/alfresco/repo/event2/EventType.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * #%L
- * Alfresco Repository
- * %%
- * Copyright (C) 2005 - 2020 Alfresco Software Limited
- * %%
- * This file is part of the Alfresco software.
- * If the software was purchased under a paid Alfresco license, the terms of
- * the paid license agreement will prevail.  Otherwise, the software is
- * provided under the following open source license terms:
- *
- * Alfresco is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Alfresco is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
- * #L%
- */
-package org.alfresco.repo.event2;
-
-/**
- * List of supported event types.
- *
- * @author Jamal Kaabi-Mofrad
- */
-public enum EventType
-{
-    NODE_CREATED(EventTypeConst.CREATED, ContextType.NODE), NODE_UPDATED(EventTypeConst.UPDATED, ContextType.NODE), NODE_DELETED(EventTypeConst.DELETED, ContextType.NODE),
-    CHILD_ASSOC_CREATED(EventTypeConst.CREATED, ContextType.CHILD_ASSOC), CHILD_ASSOC_DELETED(EventTypeConst.DELETED, ContextType.CHILD_ASSOC),
-    PEER_ASSOC_CREATED(EventTypeConst.CREATED, ContextType.PEER_ASSOC), PEER_ASSOC_DELETED(EventTypeConst.DELETED, ContextType.PEER_ASSOC), 
-    PERMISSION_UPDATED(EventTypeConst.UPDATED, ContextType.NODE);
-
-    private static final String PREFIX = "org.alfresco.event.";
-    private final String type;
-    private final ContextType contextType;
-
-    EventType(String type, ContextType contextType)
-    {
-        this.type = type;
-        this.contextType = contextType;
-    }
-
-    /* package*/ String getContext()
-    {
-        return contextType.getContext();
-    }
-
-    @Override
-    public String toString()
-    {
-        return PREFIX + getContext() + type;
-    }
-
-    /**
-     * Gets the type of an event prefixed with a reverse-DNS name.
-     * <p>
-     * See <a href="https://github.com/cloudevents/spec/blob/v1.0/spec.md#type">v1.0 spec#type</a>
-     */
-    public String getType()
-    {
-        return toString();
-    }
-
-    private enum ContextType
-    {
-        NODE("node."), CHILD_ASSOC("assoc.child."), PEER_ASSOC("assoc.peer.");
-
-        private final String context;
-        ContextType(String context)
-        {
-            this.context = context;
-        }
-
-        String getContext()
-        {
-            return context;
-        }
-    }
-    
-    private static class EventTypeConst
-    {
-        private static final String CREATED = "Created";
-        private static final String UPDATED = "Updated";
-        private static final String DELETED = "Deleted";
-    }
-}
-
diff --git a/repository/src/main/java/org/alfresco/repo/event2/PeerAssociationEventConsolidator.java b/repository/src/main/java/org/alfresco/repo/event2/PeerAssociationEventConsolidator.java
index 269f5c46d2..589c9c3061 100644
--- a/repository/src/main/java/org/alfresco/repo/event2/PeerAssociationEventConsolidator.java
+++ b/repository/src/main/java/org/alfresco/repo/event2/PeerAssociationEventConsolidator.java
@@ -30,6 +30,7 @@ import java.util.Deque;
 
 import org.alfresco.repo.event.v1.model.DataAttributes;
 import org.alfresco.repo.event.v1.model.EventData;
+import org.alfresco.repo.event.v1.model.EventType;
 import org.alfresco.repo.event.v1.model.PeerAssociationResource;
 import org.alfresco.repo.event.v1.model.RepoEvent;
 import org.alfresco.service.cmr.repository.AssociationRef;
diff --git a/repository/src/test/java/org/alfresco/repo/event2/AbstractContextAwareRepoEvent.java b/repository/src/test/java/org/alfresco/repo/event2/AbstractContextAwareRepoEvent.java
index 13cdd0c823..cec1f47af5 100644
--- a/repository/src/test/java/org/alfresco/repo/event2/AbstractContextAwareRepoEvent.java
+++ b/repository/src/test/java/org/alfresco/repo/event2/AbstractContextAwareRepoEvent.java
@@ -37,6 +37,7 @@ import javax.jms.ConnectionFactory;
 import org.alfresco.model.ContentModel;
 import org.alfresco.repo.event.v1.model.ChildAssociationResource;
 import org.alfresco.repo.event.v1.model.DataAttributes;
+import org.alfresco.repo.event.v1.model.EventType;
 import org.alfresco.repo.event.v1.model.NodeResource;
 import org.alfresco.repo.event.v1.model.PeerAssociationResource;
 import org.alfresco.repo.event.v1.model.RepoEvent;
diff --git a/repository/src/test/java/org/alfresco/repo/event2/ChildAssociationRepoEventIT.java b/repository/src/test/java/org/alfresco/repo/event2/ChildAssociationRepoEventIT.java
index bcdfd60e18..8fef4d42e1 100644
--- a/repository/src/test/java/org/alfresco/repo/event2/ChildAssociationRepoEventIT.java
+++ b/repository/src/test/java/org/alfresco/repo/event2/ChildAssociationRepoEventIT.java
@@ -32,6 +32,7 @@ import java.util.List;
 import org.alfresco.model.ContentModel;
 import org.alfresco.repo.event.v1.model.ChildAssociationResource;
 import org.alfresco.repo.event.v1.model.EventData;
+import org.alfresco.repo.event.v1.model.EventType;
 import org.alfresco.repo.event.v1.model.NodeResource;
 import org.alfresco.repo.event.v1.model.RepoEvent;
 import org.alfresco.service.cmr.repository.ChildAssociationRef;
diff --git a/repository/src/test/java/org/alfresco/repo/event2/CreateRepoEventIT.java b/repository/src/test/java/org/alfresco/repo/event2/CreateRepoEventIT.java
index 8a9a97b215..7496f7633a 100644
--- a/repository/src/test/java/org/alfresco/repo/event2/CreateRepoEventIT.java
+++ b/repository/src/test/java/org/alfresco/repo/event2/CreateRepoEventIT.java
@@ -30,6 +30,7 @@ import java.util.List;
 
 import org.alfresco.model.ContentModel;
 import org.alfresco.repo.event.v1.model.EventData;
+import org.alfresco.repo.event.v1.model.EventType;
 import org.alfresco.repo.event.v1.model.NodeResource;
 import org.alfresco.repo.event.v1.model.RepoEvent;
 import org.alfresco.service.cmr.repository.NodeRef;
diff --git a/repository/src/test/java/org/alfresco/repo/event2/DeleteRepoEventIT.java b/repository/src/test/java/org/alfresco/repo/event2/DeleteRepoEventIT.java
index 14240bdf74..52a69434af 100644
--- a/repository/src/test/java/org/alfresco/repo/event2/DeleteRepoEventIT.java
+++ b/repository/src/test/java/org/alfresco/repo/event2/DeleteRepoEventIT.java
@@ -28,6 +28,7 @@ package org.alfresco.repo.event2;
 
 import org.alfresco.model.ContentModel;
 import org.alfresco.repo.event.v1.model.EventData;
+import org.alfresco.repo.event.v1.model.EventType;
 import org.alfresco.repo.event.v1.model.NodeResource;
 import org.alfresco.repo.event.v1.model.RepoEvent;
 import org.alfresco.service.cmr.repository.NodeRef;
diff --git a/repository/src/test/java/org/alfresco/repo/event2/EventJSONSchemaUnitTest.java b/repository/src/test/java/org/alfresco/repo/event2/EventJSONSchemaUnitTest.java
index af3be4989d..2a6ef85c5b 100644
--- a/repository/src/test/java/org/alfresco/repo/event2/EventJSONSchemaUnitTest.java
+++ b/repository/src/test/java/org/alfresco/repo/event2/EventJSONSchemaUnitTest.java
@@ -29,6 +29,7 @@ package org.alfresco.repo.event2;
 import static org.junit.Assert.fail;
 
 import org.alfresco.error.AlfrescoRuntimeException;
+import org.alfresco.repo.event.v1.model.EventType;
 import org.junit.Test;
 
 /**
diff --git a/repository/src/test/java/org/alfresco/repo/event2/PeerAssociationRepoEventIT.java b/repository/src/test/java/org/alfresco/repo/event2/PeerAssociationRepoEventIT.java
index 5f4fd18b6d..851411cc12 100644
--- a/repository/src/test/java/org/alfresco/repo/event2/PeerAssociationRepoEventIT.java
+++ b/repository/src/test/java/org/alfresco/repo/event2/PeerAssociationRepoEventIT.java
@@ -30,6 +30,7 @@ import java.util.List;
 
 import org.alfresco.model.ContentModel;
 import org.alfresco.repo.event.v1.model.EventData;
+import org.alfresco.repo.event.v1.model.EventType;
 import org.alfresco.repo.event.v1.model.NodeResource;
 import org.alfresco.repo.event.v1.model.PeerAssociationResource;
 import org.alfresco.repo.event.v1.model.RepoEvent;
diff --git a/repository/src/test/java/org/alfresco/repo/event2/UpdateRepoEventIT.java b/repository/src/test/java/org/alfresco/repo/event2/UpdateRepoEventIT.java
index f1802e165b..413fa7d395 100644
--- a/repository/src/test/java/org/alfresco/repo/event2/UpdateRepoEventIT.java
+++ b/repository/src/test/java/org/alfresco/repo/event2/UpdateRepoEventIT.java
@@ -40,6 +40,7 @@ import org.alfresco.repo.dictionary.M2Model;
 import org.alfresco.repo.dictionary.M2Type;
 import org.alfresco.repo.event.v1.model.ContentInfo;
 import org.alfresco.repo.event.v1.model.EventData;
+import org.alfresco.repo.event.v1.model.EventType;
 import org.alfresco.repo.event.v1.model.NodeResource;
 import org.alfresco.repo.event.v1.model.RepoEvent;
 import org.alfresco.service.cmr.dictionary.CustomModelDefinition;