diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/config/geo/location/GeoLocationConfiguration.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/config/geo/location/GeoLocationConfiguration.java
index a4a3492804..d81b525df0 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/config/geo/location/GeoLocationConfiguration.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/config/geo/location/GeoLocationConfiguration.java
@@ -27,14 +27,14 @@ import javax.xml.bind.annotation.XmlRootElement;
 @XmlRootElement(name = "GeoLocationConfiguration")
 public class GeoLocationConfiguration {
 
-    private boolean isEnabled;
+    private boolean enabled;
 
-    public boolean getIsEnabled() {
-        return isEnabled;
+    public boolean getEnabled() {
+        return enabled;
     }
 
-    @XmlElement(name = "isEnabled", required = true)
-    public void setIsEnabled(boolean isEnabled) {
-        this.isEnabled = isEnabled;
+    @XmlElement(name = "Enabled", required = true)
+    public void setEnabled(boolean enabled) {
+        this.enabled = enabled;
     }
 }
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/resources/carbon-home/repository/conf/cdm-config.xml b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/resources/carbon-home/repository/conf/cdm-config.xml
index 0bd2486331..4082f0ceec 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/resources/carbon-home/repository/conf/cdm-config.xml
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/resources/carbon-home/repository/conf/cdm-config.xml
@@ -89,13 +89,13 @@
         <ExpiryTime>86400</ExpiryTime>
     </CertificateCacheConfiguration>
     <GeoLocationConfiguration>
-        <isEnabled>false</isEnabled>
+        <Enabled>false</Enabled>
     </GeoLocationConfiguration>
     <OperationAnalyticsConfiguration>
         <PublishLocationResponse>false</PublishLocationResponse>
         <PublishDeviceInfoResponse>false</PublishDeviceInfoResponse>
         <PublishOperationResponse>
-            <isEnabled>false</isEnabled>
+            <Enabled>false</Enabled>
             <Operations>
                 <!-- Publish specific operation responses -->
                 <!--
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/modules/business-controllers/device.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/modules/business-controllers/device.js
index c83585e96b..16be67eb43 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/modules/business-controllers/device.js
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/modules/business-controllers/device.js
@@ -73,7 +73,7 @@ deviceModule = function () {
         }
         var userName = carbonUser.username + "@" + carbonUser.domain;
         var locationHistory = [];
-        var geoServicesEnabled = devicemgtProps.serverConfig.geoLocationConfiguration.isEnabled;
+        var geoServicesEnabled = devicemgtProps.serverConfig.geoLocationConfiguration.enabled;
         if (geoServicesEnabled) {
             try {
                 var fromDate = new Date();
diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/conf/cdm-config.xml b/features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/conf/cdm-config.xml
index 32e200f6d1..3755d4daf0 100644
--- a/features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/conf/cdm-config.xml
+++ b/features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/conf/cdm-config.xml
@@ -119,13 +119,13 @@
         </ArchivalTask>
     </ArchivalConfiguration>
     <GeoLocationConfiguration>
-        <isEnabled>false</isEnabled>
+        <Enabled>false</Enabled>
     </GeoLocationConfiguration>
     <OperationAnalyticsConfiguration>
         <PublishLocationResponse>false</PublishLocationResponse>
         <PublishDeviceInfoResponse>false</PublishDeviceInfoResponse>
         <PublishOperationResponse>
-            <isEnabled>false</isEnabled>
+            <Enabled>false</Enabled>
             <Operations>
                 <!-- Publish specific operation responses -->
                 <!--