Duplicate keys for same permission in different files

components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/services/DeviceTypeConfigurationService.java

@@ -66,7 +66,7 @@ import javax.ws.rs.core.Response;
                 @Scope(
                         name = "Enroll Device",
                         description = "Register an Android device",
-                        key = "and:conf:devices:enroll",
+                        key = "and:devices:enroll",
                         roles = {"Internal/devicemgt-user"},
                         permissions = {"/device-mgt/devices/enroll/android"}
                 ),
@@ -207,7 +207,7 @@ public interface DeviceTypeConfigurationService {
             tags = "Android Configuration Management",
             extensions = {
                     @Extension(properties = {
-                            @ExtensionProperty(name = AndroidConstants.SCOPE, value = "and:conf:devices:enroll")
+                            @ExtensionProperty(name = AndroidConstants.SCOPE, value = "and:devices:enroll")
                     })
             }
     )

components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/services/EventReceiverService.java

@@ -66,7 +66,7 @@ import javax.ws.rs.core.Response;
                 @Scope(
                         name = "Enroll Device",
                         description = "Register an Android device",
-                        key = "and:event:devices:enroll",
+                        key = "and:devices:enroll",
                         roles = {"Internal/devicemgt-user"},
                         permissions = {"/device-mgt/devices/enroll/android"}
                 )
@@ -85,7 +85,7 @@ public interface EventReceiverService {
             tags = "Event Receiver",
             extensions = {
                     @Extension(properties = {
-                            @ExtensionProperty(name = AndroidConstants.SCOPE, value = "and:event:devices:enroll")
+                            @ExtensionProperty(name = AndroidConstants.SCOPE, value = "and:devices:enroll")
                     })
             }
     )
@@ -148,7 +148,7 @@ public interface EventReceiverService {
             tags = "Event Receiver",
             extensions = {
                     @Extension(properties = {
-                            @ExtensionProperty(name = AndroidConstants.SCOPE, value = "and:event:devices:enroll")
+                            @ExtensionProperty(name = AndroidConstants.SCOPE, value = "and:devices:enroll")
                     })
             }
     )

components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.type-view/private/config.json

@@ -13,8 +13,7 @@
             "and:ops:lock-devices",
             "and:ops:configure-vpn",
             "and:ops:configure-wifi",
-            "and:conf:devices:enroll",
-            "and:event:devices:enroll",
+            "and:devices:enroll",
             "and:ops:uninstall-app",
             "and:conf:manage",
             "and:ops:location",