diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/impl/windows/util/WindowsPluginConstants.java b/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/impl/windows/util/WindowsPluginConstants.java
index e13b4642d..edae380d4 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/impl/windows/util/WindowsPluginConstants.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/impl/windows/util/WindowsPluginConstants.java
@@ -39,7 +39,7 @@ public class WindowsPluginConstants {
     public static final String DEVICE_NAME = "DEVICE_NAME";
 
     //Properties related to WIN_FEATURE table
-    public static final String WINDOWS_FEATURE_ID = "FEATURE_ID";
+    public static final String WINDOWS_FEATURE_ID = "ID";
     public static final String WINDOWS_FEATURE_CODE = "CODE";
     public static final String WINDOWS_FEATURE_NAME = "NAME";
     public static final String WINDOWS_FEATURE_DESCRIPTION = "DESCRIPTION";
diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.mobile.feature/src/main/resources/dbscripts/plugins/windows/mysql.sql b/features/device-mgt/org.wso2.carbon.device.mgt.mobile.feature/src/main/resources/dbscripts/plugins/windows/mysql.sql
index 347f1ad2e..a942795b9 100644
--- a/features/device-mgt/org.wso2.carbon.device.mgt.mobile.feature/src/main/resources/dbscripts/plugins/windows/mysql.sql
+++ b/features/device-mgt/org.wso2.carbon.device.mgt.mobile.feature/src/main/resources/dbscripts/plugins/windows/mysql.sql
@@ -24,7 +24,6 @@ ENGINE = InnoDB;
 -- -----------------------------------------------------
 CREATE TABLE IF NOT EXISTS `WIN_FEATURE` (
   `FEATURE_ID` INT NOT NULL AUTO_INCREMENT,
-  `DEVICE_TYPE` VARCHAR(45) NOT NULL,
   `CODE` VARCHAR(45) NULL,
   `NAME` VARCHAR(100) NULL,
   `DESCRIPTION` VARCHAR(200) NULL,
diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.mobile.feature/src/main/resources/dbscripts/plugins/windows/oracle.sql b/features/device-mgt/org.wso2.carbon.device.mgt.mobile.feature/src/main/resources/dbscripts/plugins/windows/oracle.sql
index 8a96b7947..7fc3f38d4 100644
--- a/features/device-mgt/org.wso2.carbon.device.mgt.mobile.feature/src/main/resources/dbscripts/plugins/windows/oracle.sql
+++ b/features/device-mgt/org.wso2.carbon.device.mgt.mobile.feature/src/main/resources/dbscripts/plugins/windows/oracle.sql
@@ -24,7 +24,6 @@ CREATE TABLE WIN_DEVICE (
 -- -----------------------------------------------------
 CREATE TABLE WIN_FEATURE (
   ID INT NOT NULL,
-  DEVICE_TYPE VARCHAR(45) NOT NULL,
   CODE VARCHAR(45) NOT NULL,
   NAME VARCHAR(100) NOT NULL,
   DESCRIPTION VARCHAR(200) NULL,
diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.mobile.feature/src/main/resources/dbscripts/plugins/windows/postgresql.sql b/features/device-mgt/org.wso2.carbon.device.mgt.mobile.feature/src/main/resources/dbscripts/plugins/windows/postgresql.sql
index 865f30682..ae9ddb615 100644
--- a/features/device-mgt/org.wso2.carbon.device.mgt.mobile.feature/src/main/resources/dbscripts/plugins/windows/postgresql.sql
+++ b/features/device-mgt/org.wso2.carbon.device.mgt.mobile.feature/src/main/resources/dbscripts/plugins/windows/postgresql.sql
@@ -23,7 +23,6 @@ CREATE TABLE IF NOT EXISTS WIN_DEVICE (
 -- -----------------------------------------------------
 CREATE TABLE IF NOT EXISTS WIN_FEATURE (
   ID SERIAL NOT NULL,
-  DEVICE_TYPE VARCHAR(45) NOT NULL,
   CODE VARCHAR(45) NULL,
   NAME VARCHAR(100) NULL,
   DESCRIPTION VARCHAR(200) NULL,