diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/LicenseManagerImpl.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/LicenseManagerImpl.java
index ca1cfa4cf7..413e1fe12b 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/LicenseManagerImpl.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/LicenseManagerImpl.java
@@ -73,8 +73,10 @@ public class LicenseManagerImpl implements LicenseManager {
             filteredArtifacts = artifactManager.findGenericArtifacts(
                     new GenericArtifactFilter() {
                         public boolean matches(GenericArtifact artifact) throws GovernanceException {
-                            String attributeNameVal = artifact.getAttribute("overview_name");
-                            String attributeLangVal = artifact.getAttribute("overview_language");
+                            String attributeNameVal = artifact.getAttribute(
+                                    DeviceManagementConstants.LicenseProperties.OVERVIEW_NAME);
+                            String attributeLangVal = artifact.getAttribute(
+                                    DeviceManagementConstants.LicenseProperties.OVERVIEW_LANGUAGE);
                             return (attributeNameVal != null && attributeLangVal != null && attributeNameVal.equals
                                     (deviceType) && attributeLangVal.equals(languageCodes));
                         }