diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/exception/CDMDAOException.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/exception/DeviceDAOException.java
similarity index 87%
rename from components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/exception/CDMDAOException.java
rename to components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/exception/DeviceDAOException.java
index dd5ca1eba99..7d59beddce7 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/exception/CDMDAOException.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/exception/DeviceDAOException.java
@@ -21,7 +21,7 @@ package org.wso2.carbon.device.mgt.core.dao.exception;
 /**
  * Custom exception class for data access related exceptions
  */
-public class CDMDAOException extends Exception {
+public class DeviceDAOException extends Exception {
 
     private String message;
     private static final long serialVersionUID = 2021891706072918864L;
@@ -32,7 +32,7 @@ public class CDMDAOException extends Exception {
      * @param message error message
      * @param nestedException exception
      */
-    public CDMDAOException(String message, Exception nestedException) {
+    public DeviceDAOException(String message, Exception nestedException) {
         super(message, nestedException);
         setErrorMessage(message);
     }
@@ -43,7 +43,7 @@ public class CDMDAOException extends Exception {
      * @param message the detail message.
      * @param cause   the cause of this exception.
      */
-    public CDMDAOException(String message, Throwable cause) {
+    public DeviceDAOException(String message, Throwable cause) {
         super(message, cause);
         setErrorMessage(message);
     }
@@ -53,7 +53,7 @@ public class CDMDAOException extends Exception {
      *
      * @param message the detail message.
      */
-    public CDMDAOException(String message) {
+    public DeviceDAOException(String message) {
         super(message);
         setErrorMessage(message);
     }
@@ -63,7 +63,7 @@ public class CDMDAOException extends Exception {
      *
      * @param cause   the cause of this exception.
      */
-    public CDMDAOException(Throwable cause) {
+    public DeviceDAOException(Throwable cause) {
         super(cause);
     }
 
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/exception/CDMDatabaseConnectionException.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/exception/DeviceDatabaseConnectionException.java
similarity index 83%
rename from components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/exception/CDMDatabaseConnectionException.java
rename to components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/exception/DeviceDatabaseConnectionException.java
index 85028fafe4b..72823354a15 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/exception/CDMDatabaseConnectionException.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/exception/DeviceDatabaseConnectionException.java
@@ -17,7 +17,7 @@
  */
 package org.wso2.carbon.device.mgt.core.dao.exception;
 
-public class CDMDatabaseConnectionException extends Exception {
+public class DeviceDatabaseConnectionException extends Exception {
 
     private String message;
 
@@ -27,7 +27,7 @@ public class CDMDatabaseConnectionException extends Exception {
      * @param message error message
      * @param nestedException exception
      */
-    public CDMDatabaseConnectionException(String message, Exception nestedException) {
+    public DeviceDatabaseConnectionException(String message, Exception nestedException) {
         super(message, nestedException);
         setErrorMessage(message);
     }
@@ -38,7 +38,7 @@ public class CDMDatabaseConnectionException extends Exception {
      * @param message the detail message.
      * @param cause   the cause of this exception.
      */
-    public CDMDatabaseConnectionException(String message, Throwable cause) {
+    public DeviceDatabaseConnectionException(String message, Throwable cause) {
         super(message, cause);
         setErrorMessage(message);
     }
@@ -48,7 +48,7 @@ public class CDMDatabaseConnectionException extends Exception {
      *
      * @param message the detail message.
      */
-    public CDMDatabaseConnectionException(String message) {
+    public DeviceDatabaseConnectionException(String message) {
         super(message);
         setErrorMessage(message);
     }
@@ -58,7 +58,7 @@ public class CDMDatabaseConnectionException extends Exception {
      *
      * @param cause   the cause of this exception.
      */
-    public CDMDatabaseConnectionException(Throwable cause) {
+    public DeviceDatabaseConnectionException(Throwable cause) {
         super(cause);
     }