diff --git a/components/device-mgt/io.entgra.device.mgt.core.device.mgt.core/src/test/resources/config/operation/mdm-ui-config.xml b/components/device-mgt/io.entgra.device.mgt.core.device.mgt.core/src/test/resources/config/operation/mdm-ui-config.xml
index 0b04668453..fe3674fac1 100644
--- a/components/device-mgt/io.entgra.device.mgt.core.device.mgt.core/src/test/resources/config/operation/mdm-ui-config.xml
+++ b/components/device-mgt/io.entgra.device.mgt.core.device.mgt.core/src/test/resources/config/operation/mdm-ui-config.xml
@@ -343,7 +343,7 @@
         <Scope>and:ops:lock-devices</Scope>
         <Scope>and:ops:unlock-devices</Scope>
         <Scope>and:ops:location</Scope>
-        <Scope>and:ops:clear-password</Scope>
+        <Scope>and:ops:clear-pwd</Scope>
         <Scope>and:ops:control-camera</Scope>
         <Scope>and:ops:enterprise-wipe</Scope>
         <Scope>and:ops:wipe</Scope>
@@ -356,7 +356,7 @@
         <Scope>and:ops:send-app-restrictions</Scope>
         <Scope>and:ops:file-transfer</Scope>
         <Scope>and:ops:set-webclip</Scope>
-        <Scope>and:ops:password-policy</Scope>
+        <Scope>and:ops:pwd-policy</Scope>
         <Scope>and:ops:change-lock-code</Scope>
         <Scope>and:ops:upgrade-firmware</Scope>
         <Scope>and:ops:send-notif</Scope>
diff --git a/features/device-mgt/io.entgra.device.mgt.core.device.mgt.basics.feature/src/main/resources/conf/mdm-ui-config.xml b/features/device-mgt/io.entgra.device.mgt.core.device.mgt.basics.feature/src/main/resources/conf/mdm-ui-config.xml
index e3145564e1..45c3ebe581 100644
--- a/features/device-mgt/io.entgra.device.mgt.core.device.mgt.basics.feature/src/main/resources/conf/mdm-ui-config.xml
+++ b/features/device-mgt/io.entgra.device.mgt.core.device.mgt.basics.feature/src/main/resources/conf/mdm-ui-config.xml
@@ -345,7 +345,7 @@
         <Scope>and:ops:lock-devices</Scope>
         <Scope>and:ops:unlock-devices</Scope>
         <Scope>and:ops:location</Scope>
-        <Scope>and:ops:clear-password</Scope>
+        <Scope>and:ops:clear-pwd</Scope>
         <Scope>and:ops:control-camera</Scope>
         <Scope>and:ops:enterprise-wipe</Scope>
         <Scope>and:ops:wipe</Scope>
@@ -358,7 +358,7 @@
         <Scope>and:ops:send-app-restrictions</Scope>
         <Scope>and:ops:file-transfer</Scope>
         <Scope>and:ops:set-webclip</Scope>
-        <Scope>and:ops:password-policy</Scope>
+        <Scope>and:ops:pwd-policy</Scope>
         <Scope>and:ops:change-lock-code</Scope>
         <Scope>and:ops:upgrade-firmware</Scope>
         <Scope>and:ops:send-notif</Scope>