diff --git a/fhirmapper/src/main/java/org/openmrs/module/fhir/MRSProperties.java b/fhirmapper/src/main/java/org/openmrs/module/fhir/MRSProperties.java
index de46c476..5c78220e 100644
--- a/fhirmapper/src/main/java/org/openmrs/module/fhir/MRSProperties.java
+++ b/fhirmapper/src/main/java/org/openmrs/module/fhir/MRSProperties.java
@@ -107,8 +107,8 @@ public class MRSProperties {
     public static final String GLOBAL_PROPERTY_SHR_SYSTEM_USER_TAG = "shr.system.user";
     public static final String GLOBAL_PROPERTY_SHR_CATEGORY_EVENT = "shr.system.shrCategoryForEncounterEvents";
 
-    public static final String GLOBAL_PROPERTY_EMR_PRIMARY_IDENTIFIER_TYPE = "emr.primaryIdentifierType";
-    public static final String GLOBAL_PROPERTY_DEFAULT_IDENTIFIER_TYPE_ID = "shr.defaultPatientIdentifierSourceId";
+    public static final String GLOBAL_PROPERTY_EMR_PRIMARY_IDENTIFIER_TYPE = "bahmni.primaryIdentifierType";
+    public static final String GLOBAL_PROPERTY_DEFAULT_IDENTIFIER_SOURCE_ID = "shr.defaultPatientIdentifierSourceId";
     public static final String GLOBAL_PROPERTY_FIELD_WORKER_ROLE_NAME = "user.fieldWorkerRoleName";
 
     public static final String BAHMNI_DRUG_ORDER_ADDITIONAL_INSTRCTIONS_KEY = "additionalInstructions";
diff --git a/shrclient-omod/src/main/java/org/openmrs/module/shrclient/service/impl/EMRPatientServiceImpl.java b/shrclient-omod/src/main/java/org/openmrs/module/shrclient/service/impl/EMRPatientServiceImpl.java
index 3f170da3..e1257aa0 100644
--- a/shrclient-omod/src/main/java/org/openmrs/module/shrclient/service/impl/EMRPatientServiceImpl.java
+++ b/shrclient-omod/src/main/java/org/openmrs/module/shrclient/service/impl/EMRPatientServiceImpl.java
@@ -230,7 +230,7 @@ private PatientIdentifier generateIdentifier() {
     }
 
     private IdentifierSource getIdentifierSource(IdentifierSourceService identifierSourceService, PatientIdentifierType identifierType) {
-        String defaultPatientIdSourceId = globalPropertyLookUpService.getGlobalPropertyValue(MRSProperties.GLOBAL_PROPERTY_DEFAULT_IDENTIFIER_TYPE_ID);
+        String defaultPatientIdSourceId = globalPropertyLookUpService.getGlobalPropertyValue(MRSProperties.GLOBAL_PROPERTY_DEFAULT_IDENTIFIER_SOURCE_ID);
         if (defaultPatientIdSourceId != null)
             return identifierSourceService.getIdentifierSource(Integer.parseInt(defaultPatientIdSourceId));
         else {