diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/DeviceManagementServiceImpl.java b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/DeviceManagementServiceImpl.java
index b8c626cb41..821a47319f 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/DeviceManagementServiceImpl.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/DeviceManagementServiceImpl.java
@@ -715,8 +715,35 @@ public class DeviceManagementServiceImpl implements DeviceManagementService {
             Device persistedDevice = deviceManagementProviderService.getDevice(new DeviceIdentifier
                     (deviceId, deviceType), true);
             persistedDevice.setName(device.getName());
-            boolean response = deviceManagementProviderService.modifyEnrollment(persistedDevice);
+            System.out.println("This is rename device");
+            boolean responseOfmodifyEnrollment = deviceManagementProviderService.modifyEnrollment(persistedDevice);
+            boolean responseOfDeviceNameChanged = deviceManagementProviderService.SendDeviceNameChangedNotification(persistedDevice);
+
+//            boolean response = responseOfmodifyEnrollment || responseOfDeviceNameChanged;
+
+
+//                ProfileOperation operation = new ProfileOperation();
+//                operation.setCode("SEND_USERNAME");
+//                operation.setType(Operation.Type.PROFILE);
+//                operation.setPayLoad(device.getName());
+//
+//                DeviceIdentifier deviceIdentifier = new DeviceIdentifier();
+//                deviceIdentifier.setId(persistedDevice.getDeviceIdentifier());
+//                deviceIdentifier.setType(persistedDevice.getType());
+//
+//                List<DeviceIdentifier> deviceIdentifiers = new ArrayList<>();
+//                deviceIdentifiers.add(deviceIdentifier);
+//
+////                Activity activity;
+//            Activity activity = deviceManagementProviderService.addOperation(persistedDevice.getType(), operation, deviceIdentifiers);
+//            ;
+//            boolean responseOfDeviceNameChanged = activity != null;
+
+            boolean response = responseOfmodifyEnrollment || responseOfDeviceNameChanged;
+
+
             return Response.status(Response.Status.CREATED).entity(response).build();
+//            return Response.status(Response.Status.CREATED).entity(responseOfmodifyEnrollment).build();
 
         } catch (DeviceManagementException e) {
             log.error("Error encountered while updating device of type : " + deviceType + " and " +
@@ -724,6 +751,10 @@ public class DeviceManagementServiceImpl implements DeviceManagementService {
             return Response.status(Response.Status.BAD_REQUEST).entity(
                     new ErrorResponse.ErrorResponseBuilder().setMessage("Error while updating " +
                             "device of type " + deviceType + " and ID : " + deviceId).build()).build();
+//        } catch (OperationManagementException e) {
+//            throw new RuntimeException(e);
+//        } catch (InvalidDeviceException e) {
+//            throw new RuntimeException(e);
         }
     }
 
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/DeviceManagementProviderService.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/DeviceManagementProviderService.java
index a84deb8894..cbf57941d2 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/DeviceManagementProviderService.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/DeviceManagementProviderService.java
@@ -1042,4 +1042,6 @@ public interface DeviceManagementProviderService {
      */
     PaginationResult getDevicesDetails(PaginationRequest request, List<Integer> devicesIds, String groupName)
             throws DeviceManagementException;
+
+    Boolean SendDeviceNameChangedNotification(Device device) throws DeviceManagementException;
 }
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/DeviceManagementProviderServiceImpl.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/DeviceManagementProviderServiceImpl.java
index 2f0439f8ca..786bbc9b05 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/DeviceManagementProviderServiceImpl.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/DeviceManagementProviderServiceImpl.java
@@ -143,6 +143,7 @@ import org.wso2.carbon.device.mgt.core.internal.PluginInitializationListener;
 import org.wso2.carbon.device.mgt.core.metadata.mgt.dao.MetadataDAO;
 import org.wso2.carbon.device.mgt.core.metadata.mgt.dao.MetadataManagementDAOFactory;
 import org.wso2.carbon.device.mgt.core.operation.mgt.CommandOperation;
+import org.wso2.carbon.device.mgt.core.operation.mgt.ProfileOperation;
 import org.wso2.carbon.device.mgt.core.util.DeviceManagerUtil;
 import org.wso2.carbon.device.mgt.core.util.HttpReportingUtil;
 import org.wso2.carbon.email.sender.core.ContentProviderInfo;
@@ -4860,4 +4861,37 @@ public class DeviceManagementProviderServiceImpl implements DeviceManagementProv
         paginationResult.setData(populateAllDeviceInfo(subscribedDeviceDetails));
         return paginationResult;
     }
+
+    @Override
+    public Boolean SendDeviceNameChangedNotification(Device device) throws DeviceManagementException {
+
+        try {
+            ProfileOperation operation = new ProfileOperation();
+            operation.setCode("SEND_USERNAME");
+            operation.setType(Operation.Type.PROFILE);
+            operation.setPayLoad(device.getName());
+
+            DeviceIdentifier deviceIdentifier = new DeviceIdentifier();
+            deviceIdentifier.setId(device.getDeviceIdentifier());
+            deviceIdentifier.setType(device.getType());
+
+            List<DeviceIdentifier> deviceIdentifiers = new ArrayList<>();
+            deviceIdentifiers.add(deviceIdentifier);
+
+            Activity activity;
+            activity = addOperation(device.getType(), operation, deviceIdentifiers);
+
+            return activity != null;
+
+        } catch (OperationManagementException e) {
+            String msg = "Error occurred while sending operation" ;
+            log.error(msg, e);
+            throw new DeviceManagementException(msg, e);
+        } catch (InvalidDeviceException e) {
+            String msg = "Invalid Device exception occurred";
+            log.error(msg, e);
+            throw new DeviceManagementException(msg, e);
+        }
+
+    }
 }