diff --git a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/util/AndroidConstants.java b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/util/AndroidConstants.java
index 676ef4f4d..b92afb97e 100644
--- a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/util/AndroidConstants.java
+++ b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/util/AndroidConstants.java
@@ -74,8 +74,8 @@ public final class AndroidConstants {
         }
 
         public static final String DEVICE_LOCK = "DEVICE_LOCK";
-        public static final String FILE_DOWNLOAD = "FILE_UPLOAD_TO_THE_DEVICE";
-        public static final String FILE_UPLOAD = "FILE_UPLOAD_BY_THE_DEVICE";
+        public static final String FILE_DOWNLOAD = "FILE_UPLOAD";
+        public static final String FILE_UPLOAD = "FILE_DOWNLOAD";
         public static final String DEVICE_UNLOCK = "DEVICE_UNLOCK";
         public static final String DEVICE_LOCATION = "DEVICE_LOCATION";
         public static final String WIFI = "WIFI";
diff --git a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.type-view/private/config.json b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.type-view/private/config.json
index f3cf7a1ca..63fcf74c2 100644
--- a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.type-view/private/config.json
+++ b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.type-view/private/config.json
@@ -144,8 +144,8 @@
                         "name": "selection",
                         "id": "upload",
                         "optional": false,
-                        "yesValue": "Upload by the Device",
-                        "noValue": "Upload to the Device"
+                        "yesValue": "FILE DOWNLOAD",
+                        "noValue": "FILE UPLOAD"
                     },
                     {
                         "type": "text",