diff --git a/features/mobile-plugins-feature/android-plugin-feature/org.wso2.carbon.device.mgt.mobile.android.feature/src/main/resources/devicetypes/android.xml b/features/mobile-plugins-feature/android-plugin-feature/org.wso2.carbon.device.mgt.mobile.android.feature/src/main/resources/devicetypes/android.xml
index b46fd8cec..477cf573b 100644
--- a/features/mobile-plugins-feature/android-plugin-feature/org.wso2.carbon.device.mgt.mobile.android.feature/src/main/resources/devicetypes/android.xml
+++ b/features/mobile-plugins-feature/android-plugin-feature/org.wso2.carbon.device.mgt.mobile.android.feature/src/main/resources/devicetypes/android.xml
@@ -24,11 +24,11 @@
     <License>
         <Language>en_US</Language>
         <Version>1.0.0</Version>
-        <Text>This End User License Agreement ("Agreement") is a legal agreement between you ("You") and WSO2,
-            Inc., regarding the enrollment of Your personal mobile device ("Device") in SoR's mobile device
-            management program, and the loading to and removal from Your Device and Your use of certain
+        <Text>This End User License Agreement ("Agreement") is a legal agreement between you ("You") and Entgra,
+            (Private) Limited, regarding the enrollment of Your personal mobile device ("Device") in SoR's mobile
+            device management program, and the loading to and removal from Your Device and Your use of certain
             applications and any associated software and user documentation, whether provided in "online" or
-            electronic format, used in connection with the operation of or provision of services to WSO2,
+            electronic format, used in connection with the operation of or provision of services to Entgra,
             Inc., BY SELECTING "I ACCEPT" DURING INSTALLATION, YOU ARE ENROLLING YOUR DEVICE, AND THEREBY
             AUTHORIZING SOR OR ITS AGENTS TO INSTALL, UPDATE AND REMOVE THE APPS FROM YOUR DEVICE AS DESCRIBED
             IN THIS AGREEMENT. YOU ARE ALSO EXPLICITLY ACKNOWLEDGING AND AGREEING THAT (1) THIS IS A BINDING
@@ -43,8 +43,8 @@
             (iii) the functioning of the Apps in the event of a violation of this Agreement or the cessation
             of Your relationship with SoR (including termination of Your employment if You are an employee or
             expiration or termination of Your applicable franchise or supply agreement if You are a franchisee
-            of or supplier to the WSO2 WSO2, Inc., system). SoR expressly reserves all rights not expressly
-            granted herein.
+            of or supplier to the Entgra (Private) Limited, system). SoR expressly reserves all rights not
+            expressly granted herein.
         </Text>
     </License>
 
diff --git a/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/devicetypes/windows.xml b/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/devicetypes/windows.xml
index 7f8b69495..783d3305c 100644
--- a/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/devicetypes/windows.xml
+++ b/features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/devicetypes/windows.xml
@@ -24,27 +24,27 @@
     <License>
         <Language>en_US</Language>
         <Version>1.0.0</Version>
-        <Text>This End User License Agreement ("Agreement") is a legal agreement between you ("You") and WSO2, Inc.,
-            regarding the enrollment of Your personal mobile device ("Device") in SoR's mobile device management
-            program, and the loading to and removal from Your Device and Your use of certain applications and any
-            associated software and user documentation, whether provided in "online" or electronic format, used in
-            connection with the operation of or provision of services to WSO2, Inc.,
-            BY SELECTING "I ACCEPT" DURING INSTALLATION, YOU ARE ENROLLING YOUR DEVICE,
-            AND THEREBY AUTHORIZING SOR OR ITS AGENTS TO INSTALL, UPDATE AND REMOVE THE APPS FROM YOUR DEVICE AS
-            DESCRIBED IN THIS AGREEMENT. YOU ARE ALSO EXPLICITLY ACKNOWLEDGING AND AGREEING THAT (1)
-            THIS IS A BINDING CONTRACT AND (2) YOU HAVE READ AND AGREE TO THE TERMS OF THIS AGREEMENT.
+        <Text>This End User License Agreement ("Agreement") is a legal agreement between you ("You") and Entgra,
+            (Private) Limited, regarding the enrollment of Your personal mobile device ("Device") in SoR's mobile
+            device management program, and the loading to and removal from Your Device and Your use of certain
+            applications and any associated software and user documentation, whether provided in "online" or
+            electronic format, used in connection with the operation of or provision of services to Entgra,
+            Inc., BY SELECTING "I ACCEPT" DURING INSTALLATION, YOU ARE ENROLLING YOUR DEVICE, AND THEREBY
+            AUTHORIZING SOR OR ITS AGENTS TO INSTALL, UPDATE AND REMOVE THE APPS FROM YOUR DEVICE AS DESCRIBED
+            IN THIS AGREEMENT. YOU ARE ALSO EXPLICITLY ACKNOWLEDGING AND AGREEING THAT (1) THIS IS A BINDING
+            CONTRACT AND (2) YOU HAVE READ AND AGREE TO THE TERMS OF THIS AGREEMENT.
 
             IF YOU DO NOT ACCEPT THESE TERMS, DO NOT ENROLL YOUR DEVICE AND DO NOT PROCEED ANY FURTHER.
 
-            You agree that: (1) You understand and agree to be bound by the terms and conditions
-            contained in this Agreement, and (2) You are at least 21 years old and have the legal capacity to enter
-            into this Agreement as defined by the laws of Your jurisdiction. SoR shall have the right,
-            without prior notice, to terminate or suspend (i) this Agreement, (ii) the enrollment of
-            Your Device, or (iii) the functioning of the Apps in the event of a violation of this Agreement or
-            the cessation of Your relationship with SoR (including termination of Your employment
-            if You are an employee or expiration or termination of Your applicable franchise or supply agreement
-            if You are a franchisee of or supplier to the WSO2 WSO2, Inc., system). SoR expressly
-            reserves all rights not expressly granted herein.
+            You agree that: (1) You understand and agree to be bound by the terms and conditions contained in
+            this Agreement, and (2) You are at least 21 years old and have the legal capacity to enter into
+            this Agreement as defined by the laws of Your jurisdiction. SoR shall have the right, without
+            prior notice, to terminate or suspend (i) this Agreement, (ii) the enrollment of Your Device, or
+            (iii) the functioning of the Apps in the event of a violation of this Agreement or the cessation
+            of Your relationship with SoR (including termination of Your employment if You are an employee or
+            expiration or termination of Your applicable franchise or supply agreement if You are a franchisee
+            of or supplier to the Entgra (Private) Limited, system). SoR expressly reserves all rights not
+            expressly granted herein.
         </Text>
     </License>