diff --git a/components/org.wso2.carbon.identity.scim2.common/src/main/java/org/wso2/carbon/identity/scim2/common/impl/SCIMUserManager.java b/components/org.wso2.carbon.identity.scim2.common/src/main/java/org/wso2/carbon/identity/scim2/common/impl/SCIMUserManager.java
index dd064b68..68a032ba 100644
--- a/components/org.wso2.carbon.identity.scim2.common/src/main/java/org/wso2/carbon/identity/scim2/common/impl/SCIMUserManager.java
+++ b/components/org.wso2.carbon.identity.scim2.common/src/main/java/org/wso2/carbon/identity/scim2/common/impl/SCIMUserManager.java
@@ -6300,10 +6300,10 @@ private void publishEvent(User user, String eventName, boolean isAdminUpdate)
         properties.put(IdentityEventConstants.EventProperty.CREDENTIAL, user.getPassword());
         if (isAdminUpdate) {
             properties.put(IdentityEventConstants.EventProperty.SCENARIO,
-                    SCIMCommonConstants.EventScenarioTypes.POST_CREDENTIAL_UPDATE_BY_ADMIN.name());
+                    IdentityEventConstants.EventProperty.Scenario.ScenarioTypes.POST_CREDENTIAL_UPDATE_BY_ADMIN);
         } else {
             properties.put(IdentityEventConstants.EventProperty.SCENARIO,
-                    SCIMCommonConstants.EventScenarioTypes.POST_CREDENTIAL_UPDATE_BY_USER.name());
+                    IdentityEventConstants.EventProperty.Scenario.ScenarioTypes.POST_CREDENTIAL_UPDATE_BY_USER);
         }
 
         Event identityMgtEvent = new Event(eventName, properties);
diff --git a/components/org.wso2.carbon.identity.scim2.common/src/main/java/org/wso2/carbon/identity/scim2/common/utils/SCIMCommonConstants.java b/components/org.wso2.carbon.identity.scim2.common/src/main/java/org/wso2/carbon/identity/scim2/common/utils/SCIMCommonConstants.java
index 03d18ef5..b372bd78 100644
--- a/components/org.wso2.carbon.identity.scim2.common/src/main/java/org/wso2/carbon/identity/scim2/common/utils/SCIMCommonConstants.java
+++ b/components/org.wso2.carbon.identity.scim2.common/src/main/java/org/wso2/carbon/identity/scim2/common/utils/SCIMCommonConstants.java
@@ -213,14 +213,5 @@ public String toString() {
             return code + " : " + message;
         }
     }
-
-    /**
-     * Enum which contains the event scenario types.
-     */
-    public enum EventScenarioTypes {
-
-        POST_CREDENTIAL_UPDATE_BY_ADMIN,
-        POST_CREDENTIAL_UPDATE_BY_USER,
-    }
 }