diff --git a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.api/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/api/services/impl/ConfigurationMgtServiceImpl.java b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.api/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/api/services/impl/ConfigurationMgtServiceImpl.java
index 5f0d8f7e1..c2a6607b3 100644
--- a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.api/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/api/services/impl/ConfigurationMgtServiceImpl.java
+++ b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.api/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/api/services/impl/ConfigurationMgtServiceImpl.java
@@ -81,7 +81,7 @@ public class ConfigurationMgtServiceImpl implements ConfigurationMgtService {
                 platformConfiguration.setConfiguration(configs);
             }
         } catch (DeviceManagementException e) {
-            msg = "Error occurred while retrieving the Android tenant configuration";
+            msg = "Error occurred while retrieving the Windows tenant configuration";
             log.error(msg, e);
             throw new UnexpectedServerErrorException(
                     new ErrorResponse.ErrorResponseBuilder().setCode(500l).setMessage(msg).build());
@@ -129,7 +129,8 @@ public class ConfigurationMgtServiceImpl implements ConfigurationMgtService {
             throw new UnexpectedServerErrorException(
                     new ErrorResponse.ErrorResponseBuilder().setCode(500l).setMessage(message).build());
         }
-        return Response.status(Response.Status.OK).entity("Android platform configuration has been updated successfully.").build();
+        return Response.status(Response.Status.OK).
+                entity("Windows platform configuration has been updated successfully.").build();
 
     }