diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/DeviceManagementService.java b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/DeviceManagementService.java
index 05a22be16d..6bf11f4ac4 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/DeviceManagementService.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/DeviceManagementService.java
@@ -321,9 +321,8 @@ public interface DeviceManagementService {
     Response getDevice(
             @ApiParam(
                     name = "type",
-                    value = "The device type, such as ios, android or windows.",
-                    required = true,
-                    allowableValues = "android, ios, windows")
+                    value = "The device type name, such as ios, android, windows or fire-alarm.",
+                    required = true)
             @PathParam("type")
             @Size(max = 45)
             String type,
@@ -556,9 +555,8 @@ public interface DeviceManagementService {
     Response getFeaturesOfDevice(
             @ApiParam(
                     name = "type",
-                    value = "The device type, such as ios, android or windows.",
-                    required = true,
-                    allowableValues = "android, ios, windows")
+                    value = "The device type name, such as ios, android, windows or fire-alarm.",
+                    required = true)
             @PathParam("type")
             @Size(max = 45)
             String type,
@@ -723,9 +721,8 @@ public interface DeviceManagementService {
     Response getInstalledApplications(
             @ApiParam(
                     name = "type",
-                    value = "The device type, such as ios, android or windows.",
-                    required = true,
-                    allowableValues = "android, ios, windows")
+                    value = "The device type name, such as ios, android, windows or fire-alarm.",
+                    required = true)
             @PathParam("type")
             @Size(max = 45)
             String type,
@@ -825,9 +822,8 @@ public interface DeviceManagementService {
     Response getDeviceOperations(
             @ApiParam(
                     name = "type",
-                    value = "The device type, such as ios, android or windows.",
-                    required = true,
-                    allowableValues = "android, ios, windows")
+                    value = "The device type name, such as ios, android, windows or fire-alarm.",
+                    required = true)
             @PathParam("type")
             @Size(max = 45)
             String type,
@@ -936,9 +932,8 @@ public interface DeviceManagementService {
     Response getEffectivePolicyOfDevice(
             @ApiParam(
                     name = "type",
-                    value = "The device type, such as ios, android or windows.",
-                    required = true,
-                    allowableValues = "android, ios, windows")
+                    value = "The device type name, such as ios, android, windows or fire-alarm.",
+                    required = true)
             @PathParam("type")
             @Size(max = 45)
             String type,
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/DeviceTypeManagementService.java b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/DeviceTypeManagementService.java
index 83566b6f12..b71c918fca 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/DeviceTypeManagementService.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/DeviceTypeManagementService.java
@@ -192,9 +192,8 @@ public interface DeviceTypeManagementService {
     Response getFeatures(
             @ApiParam(
                     name = "type",
-                    value = "The device type, such as ios, android or windows.",
-                    required = true,
-                    allowableValues = "android, ios, windows")
+                    value = "The device type name, such as ios, android, windows or fire-alarm.",
+                    required = true)
             @PathParam("type")
             @Size(max = 45)
                     String type,
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/PolicyManagementService.java b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/PolicyManagementService.java
index 8656456f1f..ed49af08cc 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/PolicyManagementService.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/PolicyManagementService.java
@@ -672,9 +672,8 @@ public interface PolicyManagementService {
     Response getEffectivePolicy(
             @ApiParam(
                     name = "deviceType",
-                    value = "The device type, such as ios, android or windows.",
-                    required = true,
-                    allowableValues = "android, ios, windows")
+                    value = "The device type name, such as ios, android, windows or fire-alarm.",
+                    required = true)
             @PathParam("deviceType")
             @Size(max = 45)
                     String deviceType,
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/admin/DeviceManagementAdminService.java b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/admin/DeviceManagementAdminService.java
index 14a34d3520..0ac0677151 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/admin/DeviceManagementAdminService.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/admin/DeviceManagementAdminService.java
@@ -136,9 +136,8 @@ public interface DeviceManagementAdminService {
             String name,
             @ApiParam(
                     name = "type",
-                    value = "The type of the device, such as android, ios or windows.",
-                    required = true,
-                    allowableValues = "android, ios, windows")
+                    value = "The device type name, such as ios, android, windows or fire-alarm.",
+                    required = true)
             @QueryParam("type")
             @Size(min = 2, max = 45)
             String type,