diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/admin/DeviceTypeManagementAdminServiceImpl.java b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/admin/DeviceTypeManagementAdminServiceImpl.java
index d7f659871db..02c807df559 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/admin/DeviceTypeManagementAdminServiceImpl.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/admin/DeviceTypeManagementAdminServiceImpl.java
@@ -137,7 +137,8 @@ public class DeviceTypeManagementAdminServiceImpl implements DeviceTypeManagemen
 
     @Override
     @PUT
-    public Response updateDeviceType(String type, DeviceType deviceType) {
+    @Path("/{type}")
+    public Response updateDeviceType(@PathParam("type") String type, DeviceType deviceType) {
         if (deviceType != null && deviceType.getDeviceTypeMetaDefinition() != null) {
             if (deviceType.getName() == null || !deviceType.getName().equals(type)) {
                 return Response.status(Response.Status.BAD_REQUEST).entity("Type name mismatch. Expected: '" + type +
@@ -163,7 +164,10 @@ public class DeviceTypeManagementAdminServiceImpl implements DeviceTypeManagemen
     }
 
     @Override
-    public Response addDeviceTypePlatformConfig(String type, PlatformConfiguration platformConfiguration) {
+    @POST
+    @Path("/{type}/configs")
+    public Response addDeviceTypePlatformConfig(@PathParam("type") String type,
+                                                PlatformConfiguration platformConfiguration) {
         boolean isSaved;
         if (platformConfiguration.getType() == null || !platformConfiguration.getType().equals(type)) {
             return Response.status(Response.Status.BAD_REQUEST).entity("Type name mismatch. Expected: '" + type +
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 ca8fa6dbd82..c39e797bc2a 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
@@ -327,15 +327,6 @@ deviceModule = function () {
         return response;
     };
 
-	publicMethods.getDeviceTypesConfig = function () {
-		var url = devicemgtProps["httpsURL"] + devicemgtProps["backendRestEndpoints"]["deviceMgt"] + "/device-types/config";
-		var response = privateMethods.callBackend(url, constants["HTTP_GET"]);
-		if (response.status == "success") {
-			response.content = parse(response.content);
-		}
-		return response;
-	};
-
     /*
      @Updated
      */
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.devicetype.edit/edit.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.devicetype.edit/edit.js
index 94284ac0164..692f6923023 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.devicetype.edit/edit.js
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.devicetype.edit/edit.js
@@ -35,7 +35,7 @@ function onRequest(context) {
 	var deviceType = request.getParameter("type");
 	var serviceInvokers = require("/app/modules/oauth/token-protected-service-invokers.js")["invokers"];
 	var restAPIEndpoint = deviceMgtProps["httpsURL"] + devicemgtProps["backendRestEndpoints"]["deviceMgt"]
-		+ "/device-types/config/" + deviceType;
+		+ "/device-types/" + deviceType;
 	displayData.name = deviceType;
 	serviceInvokers.XMLHttp.get(
 		restAPIEndpoint,
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.devicetype.edit/public/js/bottomJs.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.devicetype.edit/public/js/bottomJs.js
index 3fd2548a6fe..320d630efe8 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.devicetype.edit/public/js/bottomJs.js
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.devicetype.edit/public/js/bottomJs.js
@@ -210,7 +210,7 @@ $(document).ready(function () {
 		});
 		deviceType.deviceTypeMetaDefinition.features = features;
 
-		var addRoleAPI = apiBasePath + "/admin/device-types";
+		var addRoleAPI = apiBasePath + "/admin/device-types/" + deviceType.name;
 
 		invokerUtil.put(
 		        addRoleAPI,
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.default.device.type.device-view/device-view.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.default.device.type.device-view/device-view.js
index cf716ef35c2..a431c66a71f 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.default.device.type.device-view/device-view.js
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.default.device.type.device-view/device-view.js
@@ -42,7 +42,7 @@ function onRequest(context) {
 	var displayData = {};
 
 	var restAPIEndpoint = devicemgtProps["httpsURL"] + devicemgtProps["backendRestEndpoints"]["deviceMgt"]
-		+ "/device-types/config/" + deviceType;
+		+ "/device-types/" + deviceType;
 	displayData.deviceType = deviceType;
 	displayData.tenantDomain = tenantDomain;
 	serviceInvokers.XMLHttp.get(
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.default.device.type.type-view/type-view.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.default.device.type.type-view/type-view.js
index 0f3563bad17..0f24173632d 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.default.device.type.type-view/type-view.js
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.default.device.type.type-view/type-view.js
@@ -32,7 +32,7 @@ function onRequest(context) {
 			return opts.inverse(this);
 	});
 	var restAPIEndpoint = deviceMgtProps["httpsURL"] + devicemgtProps["backendRestEndpoints"]["deviceMgt"]
-		+ "/device-types/config/" + deviceType;
+		+ "/device-types/" + deviceType;
 	displayData.deviceType = deviceType;
 	displayData.tenantDomain = tenantDomain;
 	serviceInvokers.XMLHttp.get(