From 15b53568bbea7054d5f38a5b41274af1ebe79196 Mon Sep 17 00:00:00 2001
From: swetatech24 <sweta.prakash@wipro.com>
Date: Thu, 22 Jun 2023 14:49:11 +0530
Subject: [PATCH] code smell fixes

---
 .../controller/IdentityController.java        |  14 +-
 ...NCD_TB_HRP_data.java => NcdTbHrpData.java} |   2 +-
 ...anceSearch.java => VBenAdvanceSearch.java} |   4 +-
 .../exception/SearchCriteriaException.java    |  27 ---
 .../identity/mapper/IdentityEditMapper.java   |  24 +--
 .../identity/mapper/IdentityMapper.java       |  16 +-
 .../mapper/IdentityPartialMapper.java         |   4 +-
 .../identity/mapper/IdentitySearchMapper.java |   6 +-
 .../common/identity/repo/BenAddressRepo.java  |   8 +-
 .../common/identity/repo/BenConsentRepo.java  |   2 +-
 .../common/identity/repo/BenContactRepo.java  |   6 +-
 .../common/identity/repo/BenDetailRepo.java   |   8 +-
 .../common/identity/repo/BenMappingRepo.java  |   6 +-
 .../identity/repo/BenMappingRepoCustom.java   |   4 +-
 .../identity/repo/BenMappingRepoImpl.java     |  10 +-
 .../identity/repo/BenRegIdMappingRepo.java    |   2 +-
 .../identity/repo/BenServiceMappingRepo.java  |  28 +--
 .../repo/MBeneficiaryAccountRepo.java         |   2 +-
 .../identity/repo/MBeneficiaryImageRepo.java  |   4 +-
 .../identity/repo/V_BenAdvanceSearchRepo.java |   8 +-
 .../repo/rmnch/RMNCHCBACDetailsRepo.java      |   2 +-
 .../identity/service/IdentityService.java     |  71 +++---
 .../rmnch/RmnchDataSyncServiceImpl.java       | 202 +++++++++---------
 .../identity/service/IdentityServiceTest.java |  26 +--
 24 files changed, 229 insertions(+), 257 deletions(-)
 rename src/main/java/com/iemr/common/identity/data/rmnch/{NCD_TB_HRP_data.java => NcdTbHrpData.java} (97%)
 rename src/main/java/com/iemr/common/identity/domain/{V_BenAdvanceSearch.java => VBenAdvanceSearch.java} (98%)
 delete mode 100644 src/main/java/com/iemr/common/identity/exception/SearchCriteriaException.java

diff --git a/src/main/java/com/iemr/common/identity/controller/IdentityController.java b/src/main/java/com/iemr/common/identity/controller/IdentityController.java
index 3cd6d75e..ff2f1327 100644
--- a/src/main/java/com/iemr/common/identity/controller/IdentityController.java
+++ b/src/main/java/com/iemr/common/identity/controller/IdentityController.java
@@ -231,7 +231,7 @@ public class IdentityController {
 
 			healthIDValue = healthID;
 
-			List<BeneficiariesDTO> list = svc.getBeneficiaryByHealthID_AbhaAddress(healthIDValue);
+			List<BeneficiariesDTO> list = svc.getBeneficiaryByHealthIDAbhaAddress(healthIDValue);
 			list.removeIf(Objects::isNull);
 			Collections.sort(list);
 			response = getSuccessResponseString(list, 200, "success", "getIdentityByAgent");
@@ -264,7 +264,7 @@ public class IdentityController {
 
 			healthIDNoValue = healthIDNo;
 
-			List<BeneficiariesDTO> list = svc.getBeneficiaryByHealthIDNo_AbhaIdNo(healthIDNoValue);
+			List<BeneficiariesDTO> list = svc.getBeneficiaryByHealthIDNoAbhaIdNo(healthIDNoValue);
 			list.removeIf(Objects::isNull);
 			Collections.sort(list);
 			response = getSuccessResponseString(list, 200, "success", "getIdentityByAgent");
@@ -707,7 +707,7 @@ public class IdentityController {
 	private String getSuccessResponseString(MBeneficiarymapping map, Integer statusCode, String statusMsg,
 			String methodName) {
 		logger.info("IdentityController.getResponseString of map parameter - start");
-		BeneficiariesDTO bdto = mapper.MBeneficiarymappingToBeneficiariesDTO(map);
+		BeneficiariesDTO bdto = mapper.mBeneficiarymappingToBeneficiariesDTO(map);
 		bdto.setBeneficiaryFamilyTags(
 				mapper.mBeneficiaryfamilymappingListToBenFamilyDTOList(map.getMBeneficiaryfamilymappings()));
 		bdto.setBeneficiaryIdentites(
@@ -1005,17 +1005,17 @@ public String getJsonAsString(Object obj) {
 					+ "        \"benIDRequired\": \"Integer\"\r\n" + "       }") @RequestBody String regIDList) {
 		com.iemr.common.identity.utils.response.OutputResponse response = new com.iemr.common.identity.utils.response.OutputResponse();
 		try {
-			BenIdImportDTO[] BenIdImportDTOArr = InputMapper.getInstance().gson().fromJson(regIDList,
+			BenIdImportDTO[] benIdImportDTOArr = InputMapper.getInstance().gson().fromJson(regIDList,
 					BenIdImportDTO[].class);
 
-			List<BenIdImportDTO> BenIdImportDTOList = Arrays.asList(BenIdImportDTOArr);
+			List<BenIdImportDTO> benIdImportDTOList = Arrays.asList(benIdImportDTOArr);
 
-			int i = svc.importBenIdToLocalServer(BenIdImportDTOList);
+			int i = svc.importBenIdToLocalServer(benIdImportDTOList);
 			if (i > 0)
 				response.setResponse(i + " Unique benid imported to local server");
 			else {
 				response.setResponse("Empty or invalid data");
-				logger.error("Empty or invalid data. Data Size is : " + BenIdImportDTOList.size());
+				logger.error("Empty or invalid data. Data Size is : " + benIdImportDTOList.size());
 			}
 		} catch (Exception e) {
 			logger.error("Exception in importing benID to local server : " + e);
diff --git a/src/main/java/com/iemr/common/identity/data/rmnch/NCD_TB_HRP_data.java b/src/main/java/com/iemr/common/identity/data/rmnch/NcdTbHrpData.java
similarity index 97%
rename from src/main/java/com/iemr/common/identity/data/rmnch/NCD_TB_HRP_data.java
rename to src/main/java/com/iemr/common/identity/data/rmnch/NcdTbHrpData.java
index 18ec46da..c86f6048 100644
--- a/src/main/java/com/iemr/common/identity/data/rmnch/NCD_TB_HRP_data.java
+++ b/src/main/java/com/iemr/common/identity/data/rmnch/NcdTbHrpData.java
@@ -29,7 +29,7 @@
 import lombok.Data;
 
 @Data
-public class NCD_TB_HRP_data {
+public class NcdTbHrpData {
 
 	@Expose
 	private String confirmed_ncd;
diff --git a/src/main/java/com/iemr/common/identity/domain/V_BenAdvanceSearch.java b/src/main/java/com/iemr/common/identity/domain/VBenAdvanceSearch.java
similarity index 98%
rename from src/main/java/com/iemr/common/identity/domain/V_BenAdvanceSearch.java
rename to src/main/java/com/iemr/common/identity/domain/VBenAdvanceSearch.java
index ea615acd..8134468a 100644
--- a/src/main/java/com/iemr/common/identity/domain/V_BenAdvanceSearch.java
+++ b/src/main/java/com/iemr/common/identity/domain/VBenAdvanceSearch.java
@@ -33,7 +33,7 @@
 
 @Entity
 @Table(name = "v_benadvancesearch")
-public class V_BenAdvanceSearch {
+public class VBenAdvanceSearch {
 
 	@Id
 	@Expose
@@ -141,7 +141,7 @@ public void setHouseHoldID(Long houseHoldID) {
 		this.houseHoldID = houseHoldID;
 	}
 
-	public V_BenAdvanceSearch() {
+	public VBenAdvanceSearch() {
 		super();
 	}
 
diff --git a/src/main/java/com/iemr/common/identity/exception/SearchCriteriaException.java b/src/main/java/com/iemr/common/identity/exception/SearchCriteriaException.java
deleted file mode 100644
index 6fee444f..00000000
--- a/src/main/java/com/iemr/common/identity/exception/SearchCriteriaException.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
-* AMRIT – Accessible Medical Records via Integrated Technology 
-* Integrated EHR (Electronic Health Records) Solution 
-*
-* Copyright (C) "Piramal Swasthya Management and Research Institute" 
-*
-* This file is part of AMRIT.
-*
-* This program is free software: you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation, either version 3 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program.  If not, see https://www.gnu.org/licenses/.
-*/
-package com.iemr.common.identity.exception;
-
-public class SearchCriteriaException {
-	
-
-}
diff --git a/src/main/java/com/iemr/common/identity/mapper/IdentityEditMapper.java b/src/main/java/com/iemr/common/identity/mapper/IdentityEditMapper.java
index 2f08bf4d..9b172375 100644
--- a/src/main/java/com/iemr/common/identity/mapper/IdentityEditMapper.java
+++ b/src/main/java/com/iemr/common/identity/mapper/IdentityEditMapper.java
@@ -57,7 +57,7 @@ public interface IdentityEditMapper {
 			@Mapping(source = "dto.eventTypeDate", target = "lastModDate")
 
 	})
-	MBeneficiarymapping IdentityEditDTOToMBeneficiarymapping(IdentityEditDTO dto);
+	MBeneficiarymapping identityEditDTOToMBeneficiarymapping(IdentityEditDTO dto);
 
 	@Mappings({ @Mapping(source = "dto.currentAddress.addrLine1", target = "currAddrLine1"),
 			@Mapping(source = "dto.currentAddress.addrLine2", target = "currAddrLine2"),
@@ -141,7 +141,7 @@ public interface IdentityEditMapper {
 			// @Mapping(source = "dto.parkingPlaceId", target = "parkingPlaceID"),
 			// END
 	})
-	MBeneficiaryaddress IdentityEditDTOToMBeneficiaryaddress(IdentityEditDTO dto);
+	MBeneficiaryaddress identityEditDTOToMBeneficiaryaddress(IdentityEditDTO dto);
 
 	@Mappings({ @Mapping(source = "defaultNo", target = "shareAnonymousWithGovt"),
 			@Mapping(source = "defaultNo", target = "shareAnonymousWithMedicalCommunity"),
@@ -162,7 +162,7 @@ public interface IdentityEditMapper {
 			@Mapping(source = "defaultYes", target = "sharePersonalDetailsWithSpouse"),
 			@Mapping(source = "dto.agentName", target = "createdBy"),
 			@Mapping(source = "dto.eventTypeDate", target = "createdDate") })
-	MBeneficiaryconsent IdentityEditDTOToDefaultMBeneficiaryconsent(IdentityEditDTO dto, Boolean defaultYes,
+	MBeneficiaryconsent identityEditDTOToDefaultMBeneficiaryconsent(IdentityEditDTO dto, Boolean defaultYes,
 			Boolean defaultNo);
 
 	@Mappings({ @Mapping(source = "dto.contact.preferredPhoneNum", target = "preferredPhoneNum"),
@@ -188,7 +188,7 @@ MBeneficiaryconsent IdentityEditDTOToDefaultMBeneficiaryconsent(IdentityEditDTO
 			// @Mapping(source = "dto.parkingPlaceId", target = "parkingPlaceID"),
 			// END
 	})
-	MBeneficiarycontact IdentityEdiDTOToMBeneficiarycontact(IdentityEditDTO dto);
+	MBeneficiarycontact identityEdiDTOToMBeneficiarycontact(IdentityEditDTO dto);
 
 	@Mappings({ @Mapping(source = "dto.areaId", target = "areaId"),
 			@Mapping(source = "dto.beneficiaryRegId", target = "beneficiaryRegID"),
@@ -237,17 +237,17 @@ MBeneficiaryconsent IdentityEditDTOToDefaultMBeneficiaryconsent(IdentityEditDTO
 			// @Mapping(source = "dto.parkingPlaceId", target = "parkingPlaceID"),
 			// END
 	})
-	MBeneficiarydetail IdentityEditDTOToMBeneficiarydetail(IdentityEditDTO dto);
+	MBeneficiarydetail identityEditDTOToMBeneficiarydetail(IdentityEditDTO dto);
 
 	@Mappings({ @Mapping(source = "benFamilyDTO.isEmergencyContact", target = "isEmergencyContact"),
 			@Mapping(source = "benFamilyDTO.relationshipToSelf", target = "relationshipToSelf"),
 			@Mapping(source = "benFamilyDTO.associatedBenRegId", target = "associatedBenRegId"),
 			@Mapping(source = "createdBy", target = "createdBy"),
 			@Mapping(source = "createdDate", target = "createdDate") })
-	MBeneficiaryfamilymapping IdentityEditDTOToMBeneficiaryfamilymapping(BenFamilyDTO benFamilyDTO, String createdBy,
+	MBeneficiaryfamilymapping identityEditDTOToMBeneficiaryfamilymapping(BenFamilyDTO benFamilyDTO, String createdBy,
 			Timestamp createdDate);
 
-	List<MBeneficiaryfamilymapping> IdentityEditDTOListToMBeneficiaryfamilymappingList(List<BenFamilyDTO> list);
+	List<MBeneficiaryfamilymapping> identityEditDTOListToMBeneficiaryfamilymappingList(List<BenFamilyDTO> list);
 
 	@Mappings({ @Mapping(source = "identity.identityNo", target = "identityNo"),
 			@Mapping(source = "identity.identityName", target = "identityName"),
@@ -258,9 +258,9 @@ MBeneficiaryfamilymapping IdentityEditDTOToMBeneficiaryfamilymapping(BenFamilyDT
 			@Mapping(source = "identity.identityFilePath", target = "identityFilePath"),
 			@Mapping(source = "createdBy", target = "createdBy"),
 			@Mapping(source = "createdDate", target = "createdDate") })
-	MBeneficiaryidentity IdentityToMBeneficiaryidentity(Identity identity, String createdBy, Timestamp createdDate);
+	MBeneficiaryidentity identityToMBeneficiaryidentity(Identity identity, String createdBy, Timestamp createdDate);
 
-	List<MBeneficiaryidentity> IdentityEditDTOListToMBeneficiaryidentityList(List<Identity> list);
+	List<MBeneficiaryidentity> identityEditDTOListToMBeneficiaryidentityList(List<Identity> list);
 
 	@Mappings({ @Mapping(source = "dto.serviceId", target = "serviceId"),
 			@Mapping(source = "dto.serviceName", target = "serviceName"),
@@ -274,7 +274,7 @@ MBeneficiaryfamilymapping IdentityEditDTOToMBeneficiaryfamilymapping(BenFamilyDT
 			@Mapping(source = "dto.eventTypeDate", target = "registeredDate"),
 			@Mapping(source = "dto.agentName", target = "createdBy"),
 			@Mapping(source = "dto.eventTypeDate", target = "createdDate") })
-	MBeneficiaryservicemapping IdentityEditDTOToMBeneficiaryservicemapping(IdentityEditDTO dto);
+	MBeneficiaryservicemapping identityEditDTOToMBeneficiaryservicemapping(IdentityEditDTO dto);
 
 	@Mappings({ @Mapping(source = "beneficiaryDetailsId", target = "beneficiaryDetailsId"),
 			@Mapping(source = "areaId", target = "areaId"),
@@ -302,7 +302,7 @@ MBeneficiaryfamilymapping IdentityEditDTOToMBeneficiaryfamilymapping(BenFamilyDT
 			@Mapping(source = "sourceOfInfo", target = "sourceOfInfo"),
 			@Mapping(source = "spouseName", target = "spouseName"), @Mapping(source = "status", target = "status"),
 			@Mapping(source = "title", target = "title"), @Mapping(source = "zoneId", target = "zoneId") })
-	BenDetailDTO MBeneficiarydetailToBenDetailDTO(MBeneficiarydetail detail);
+	BenDetailDTO mBeneficiarydetailToBenDetailDTO(MBeneficiarydetail detail);
 
 	@Mappings({ @Mapping(source = "family.benFamilyMapId", target = "benFamilyMapId"),
 			@Mapping(source = "family.associatedBenRegId", target = "associatedBenRegId"),
@@ -313,7 +313,7 @@ MBeneficiaryfamilymapping IdentityEditDTOToMBeneficiaryfamilymapping(BenFamilyDT
 			@Mapping(source = "family.lastModDate", target = "lastModDate"),
 			@Mapping(source = "family.modifiedBy", target = "modifiedBy"),
 			@Mapping(source = "family.relationshipToSelf", target = "relationshipToSelf") })
-	BenFamilyDTO MBeneficiaryfamilymappingToBenFamilyDTO(MBeneficiaryfamilymapping family);
+	BenFamilyDTO mBeneficiaryfamilymappingToBenFamilyDTO(MBeneficiaryfamilymapping family);
 
 	List<BenFamilyDTO> mBeneficiaryfamilymappingListToBenFamilyDTOList(List<MBeneficiaryfamilymapping> families);
 
diff --git a/src/main/java/com/iemr/common/identity/mapper/IdentityMapper.java b/src/main/java/com/iemr/common/identity/mapper/IdentityMapper.java
index 85e47c19..aaa690cb 100644
--- a/src/main/java/com/iemr/common/identity/mapper/IdentityMapper.java
+++ b/src/main/java/com/iemr/common/identity/mapper/IdentityMapper.java
@@ -262,10 +262,10 @@ public interface IdentityMapper {
 			@Mapping(source = "benFamilyDTO.associatedBenRegId", target = "associatedBenRegId"),
 			@Mapping(source = "createdBy", target = "createdBy"),
 			@Mapping(source = "createdDate", target = "createdDate") })
-	MBeneficiaryfamilymapping IdentityDTOToMBeneficiaryfamilymapping(BenFamilyDTO benFamilyDTO, String createdBy,
+	MBeneficiaryfamilymapping identityDTOToMBeneficiaryfamilymapping(BenFamilyDTO benFamilyDTO, String createdBy,
 			Timestamp createdDate);
 
-	List<MBeneficiaryfamilymapping> IdentityDTOListToMBeneficiaryfamilymappingList(List<BenFamilyDTO> list);
+	List<MBeneficiaryfamilymapping> identityDTOListToMBeneficiaryfamilymappingList(List<BenFamilyDTO> list);
 
 	@Mappings({ @Mapping(source = "identity.identityNo", target = "identityNo"),
 			@Mapping(source = "identity.identityNameId", target = "identityNameId"),
@@ -278,9 +278,9 @@ MBeneficiaryfamilymapping IdentityDTOToMBeneficiaryfamilymapping(BenFamilyDTO be
 			@Mapping(source = "identity.identityFilePath", target = "identityFilePath"),
 			@Mapping(source = "createdBy", target = "createdBy"),
 			@Mapping(source = "createdDate", target = "createdDate") })
-	MBeneficiaryidentity IdentityToMBeneficiaryidentity(Identity identity, String createdBy, Timestamp createdDate);
+	MBeneficiaryidentity identityToMBeneficiaryidentity(Identity identity, String createdBy, Timestamp createdDate);
 
-	List<MBeneficiaryidentity> IdentityDTOListToMBeneficiaryidentityList(List<Identity> list);
+	List<MBeneficiaryidentity> identityDTOListToMBeneficiaryidentityList(List<Identity> list);
 
 	@Mappings({ @Mapping(source = "dto.serviceId", target = "serviceId"),
 			@Mapping(source = "dto.serviceName", target = "serviceName"),
@@ -483,10 +483,10 @@ MBeneficiaryfamilymapping IdentityDTOToMBeneficiaryfamilymapping(BenFamilyDTO be
 			// End 1097
 
 	})
-	BeneficiariesDTO MBeneficiarymappingToBeneficiariesDTO(MBeneficiarymapping map);
+	BeneficiariesDTO mBeneficiarymappingToBeneficiariesDTO(MBeneficiarymapping map);
 
 	@IterableMapping(elementTargetType = BeneficiariesDTO.class)
-	List<BeneficiariesDTO> MBeneficiarymappingToBeneficiariesDTO(List<MBeneficiarymapping> map);
+	List<BeneficiariesDTO> mbeneficiarymappingToBeneficiariesDTO(List<MBeneficiarymapping> map);
 
 	@Mappings({ @Mapping(source = "beneficiaryDetailsId", target = "beneficiaryDetailsId"),
 			@Mapping(source = "areaId", target = "areaId"),
@@ -514,7 +514,7 @@ MBeneficiaryfamilymapping IdentityDTOToMBeneficiaryfamilymapping(BenFamilyDTO be
 			@Mapping(source = "spouseName", target = "spouseName"), @Mapping(source = "status", target = "status"),
 			@Mapping(source = "title", target = "title"), @Mapping(source = "zoneId", target = "zoneId"),
 			@Mapping(expression = "java(MBeneficiarydetail.getIsHIVPositive(detail.getIsHIVPositive()))", target = "isHIVPositive"), })
-	BenDetailDTO MBeneficiarydetailToBenDetailDTO(MBeneficiarydetail detail);
+	BenDetailDTO mBeneficiarydetailToBenDetailDTO(MBeneficiarydetail detail);
 
 	@Mappings({ @Mapping(source = "family.benFamilyMapId", target = "benFamilyMapId"),
 			@Mapping(source = "family.associatedBenRegId", target = "associatedBenRegId"),
@@ -525,7 +525,7 @@ MBeneficiaryfamilymapping IdentityDTOToMBeneficiaryfamilymapping(BenFamilyDTO be
 			@Mapping(source = "family.lastModDate", target = "lastModDate"),
 			@Mapping(source = "family.modifiedBy", target = "modifiedBy"),
 			@Mapping(source = "family.relationshipToSelf", target = "relationshipToSelf") })
-	BenFamilyDTO MBeneficiaryfamilymappingToBenFamilyDTO(MBeneficiaryfamilymapping family);
+	BenFamilyDTO mBeneficiaryfamilymappingToBenFamilyDTO(MBeneficiaryfamilymapping family);
 
 	List<BenFamilyDTO> mBeneficiaryfamilymappingListToBenFamilyDTOList(List<MBeneficiaryfamilymapping> families);
 
diff --git a/src/main/java/com/iemr/common/identity/mapper/IdentityPartialMapper.java b/src/main/java/com/iemr/common/identity/mapper/IdentityPartialMapper.java
index befc03db..4696ae8f 100644
--- a/src/main/java/com/iemr/common/identity/mapper/IdentityPartialMapper.java
+++ b/src/main/java/com/iemr/common/identity/mapper/IdentityPartialMapper.java
@@ -47,9 +47,9 @@ public interface IdentityPartialMapper
 			@Mapping(target = "beneficiaryAge",
 					expression = "java(MBeneficiarydetail.calculateAge(map.getMBeneficiarydetail().getDob()))"), })
 
-	BeneficiariesPartialDTO MBeneficiarymappingToBeneficiariesPartialDTO(MBeneficiarymapping map);
+	BeneficiariesPartialDTO mBeneficiarymappingToBeneficiariesPartialDTO(MBeneficiarymapping map);
 
 	@Mappings({ @Mapping(target = "benId", source = "map.MBeneficiaryregidmapping.beneficiaryID"),
 			@Mapping(target = "benRegId", source = "map.MBeneficiaryregidmapping.benRegId") })
-	BeneficiaryCreateResp MBeneficiarymappingToBeneficiaryCreateResp(MBeneficiarymapping map);
+	BeneficiaryCreateResp mBeneficiarymappingToBeneficiaryCreateResp(MBeneficiarymapping map);
 }
diff --git a/src/main/java/com/iemr/common/identity/mapper/IdentitySearchMapper.java b/src/main/java/com/iemr/common/identity/mapper/IdentitySearchMapper.java
index e8962e6e..03bd85b4 100644
--- a/src/main/java/com/iemr/common/identity/mapper/IdentitySearchMapper.java
+++ b/src/main/java/com/iemr/common/identity/mapper/IdentitySearchMapper.java
@@ -50,7 +50,7 @@ public interface IdentitySearchMapper {
 			@Mapping(source = "dto.spouseName", target = "spouseName")
 
 			})
-	MBeneficiarydetail IdentitySearchDTOMBeneficiarydetail(IdentitySearchDTO dto);
+	MBeneficiarydetail identitySearchDTOMBeneficiarydetail(IdentitySearchDTO dto);
 
 	@Mappings({
 
@@ -60,7 +60,7 @@ public interface IdentitySearchMapper {
 			@Mapping(source = "dto.currentAddress.district", target = "currDistrict"),
 			@Mapping(source = "dto.pinCode", target = "currPinCode") 
 			})
-	MBeneficiaryaddress IdentitySearchDTOToMBeneficiaryaddress(IdentitySearchDTO dto);
+	MBeneficiaryaddress identitySearchDTOToMBeneficiaryaddress(IdentitySearchDTO dto);
 
 	@Mappings({
 
@@ -71,5 +71,5 @@ public interface IdentitySearchMapper {
 			@Mapping(source = "dto.contactNumber", target = "phoneNum4"),
 			@Mapping(source = "dto.contactNumber", target = "phoneNum5")
 			})
-	MBeneficiarycontact IdentitySearchDTOToMBeneficiarycontact(IdentitySearchDTO dto);
+	MBeneficiarycontact identitySearchDTOToMBeneficiarycontact(IdentitySearchDTO dto);
 }
diff --git a/src/main/java/com/iemr/common/identity/repo/BenAddressRepo.java b/src/main/java/com/iemr/common/identity/repo/BenAddressRepo.java
index 1c6d9906..d9339ab2 100644
--- a/src/main/java/com/iemr/common/identity/repo/BenAddressRepo.java
+++ b/src/main/java/com/iemr/common/identity/repo/BenAddressRepo.java
@@ -52,10 +52,10 @@ List<MBeneficiaryaddress> findByCurrStateIdAndCurrDistrictIdOrderByBenAddressIDA
 	List<MBeneficiaryaddress> findByPermStateIdAndPermDistrictIdOrderByBenAddressIDAsc(Integer permStateID,
 			Integer permDistID);
 
-	List<MBeneficiaryaddress> findByEmerStateAndEmerDistrictOrderByBenAddressIDAsc(String EmerState, String EmerDist);
+	List<MBeneficiaryaddress> findByEmerStateAndEmerDistrictOrderByBenAddressIDAsc(String emerState, String emerDist);
 
-	List<MBeneficiaryaddress> findByEmerStateIdAndEmerDistrictIdOrderByBenAddressIDAsc(Integer EmerStateID,
-			Integer EmerDistID);
+	List<MBeneficiaryaddress> findByEmerStateIdAndEmerDistrictIdOrderByBenAddressIDAsc(Integer emerStateID,
+			Integer emerDistID);
 
 	List<MBeneficiaryaddress> findByCreatedDateBetweenOrderByBenAddressIDAsc(Timestamp fromDate, Timestamp toDate);
 
@@ -72,6 +72,6 @@ List<MBeneficiaryaddress> findByEmerStateIdAndEmerDistrictIdOrderByBenAddressIDA
 	BigInteger findIdByVanSerialNoAndVanID(@Param("vanSerialNo") BigInteger vanSerialNo, @Param("vanID") Integer vanID);
 
 	@Query("SELECT a FROM MBeneficiaryaddress a WHERE a.vanSerialNo =:vanSerialNo AND a.vanID =:vanID ")
-	MBeneficiaryaddress getWith_vanSerialNo_vanID(@Param("vanSerialNo") BigInteger vanSerialNo,
+	MBeneficiaryaddress getWithVanSerialNoVanID(@Param("vanSerialNo") BigInteger vanSerialNo,
 			@Param("vanID") Integer vanID);
 }
diff --git a/src/main/java/com/iemr/common/identity/repo/BenConsentRepo.java b/src/main/java/com/iemr/common/identity/repo/BenConsentRepo.java
index f31ff771..9abb4cb8 100644
--- a/src/main/java/com/iemr/common/identity/repo/BenConsentRepo.java
+++ b/src/main/java/com/iemr/common/identity/repo/BenConsentRepo.java
@@ -46,6 +46,6 @@ public interface BenConsentRepo extends CrudRepository<MBeneficiaryconsent, BigI
 	int updateVanSerialNo(@Param("benConsentID") BigInteger benConsentID);
 
 	@Query("SELECT a FROM MBeneficiaryconsent a WHERE a.vanSerialNo =:vanSerialNo AND a.vanID =:vanID ")
-	MBeneficiaryconsent getWith_vanSerialNo_vanID(@Param("vanSerialNo") BigInteger vanSerialNo,
+	MBeneficiaryconsent getWithVanSerialNoVanID(@Param("vanSerialNo") BigInteger vanSerialNo,
 			@Param("vanID") Integer vanID);
 }
diff --git a/src/main/java/com/iemr/common/identity/repo/BenContactRepo.java b/src/main/java/com/iemr/common/identity/repo/BenContactRepo.java
index b9ba6524..fdbda216 100644
--- a/src/main/java/com/iemr/common/identity/repo/BenContactRepo.java
+++ b/src/main/java/com/iemr/common/identity/repo/BenContactRepo.java
@@ -36,7 +36,7 @@
 
 @Repository
 public interface BenContactRepo extends CrudRepository<MBeneficiarycontact, BigInteger> {
-	List<MBeneficiarycontact> findByBenContactsIDOrderByBenContactsIDAsc(BigInteger BenContactsID);
+	List<MBeneficiarycontact> findByBenContactsIDOrderByBenContactsIDAsc(BigInteger benContactsID);
 
 	List<MBeneficiarycontact> findByCreatedDateBetweenOrderByBenContactsIDAsc(Timestamp fromDate, Timestamp toDate);
 
@@ -46,7 +46,7 @@ public interface BenContactRepo extends CrudRepository<MBeneficiarycontact, BigI
 
 	List<MBeneficiarycontact> findByPreferredPhoneNumOrderByBenContactsIDAsc(String phoneNum);
 
-	List<MBeneficiarycontact> findByPreferredSMSPhoneNumOrderByBenContactsIDAsc(String SMSPhoneNum);
+	List<MBeneficiarycontact> findByPreferredSMSPhoneNumOrderByBenContactsIDAsc(String smsPhoneNum);
 
 	
 	@Query("select c from MBeneficiarycontact c where c.preferredPhoneNum = :phoneNum ")
@@ -67,7 +67,7 @@ public interface BenContactRepo extends CrudRepository<MBeneficiarycontact, BigI
 	BigInteger findIdByVanSerialNoAndVanID(@Param("vanSerialNo") BigInteger vanSerialNo, @Param("vanID") Integer vanID);
 
 	@Query("SELECT a FROM MBeneficiarycontact a WHERE a.vanSerialNo =:vanSerialNo AND a.vanID =:vanID ")
-	MBeneficiarycontact getWith_vanSerialNo_vanID(@Param("vanSerialNo") BigInteger vanSerialNo,
+	MBeneficiarycontact getWithVanSerialNoVanID(@Param("vanSerialNo") BigInteger vanSerialNo,
 			@Param("vanID") Integer vanID);
 
 }
diff --git a/src/main/java/com/iemr/common/identity/repo/BenDetailRepo.java b/src/main/java/com/iemr/common/identity/repo/BenDetailRepo.java
index af2998cd..8e5c9ea9 100644
--- a/src/main/java/com/iemr/common/identity/repo/BenDetailRepo.java
+++ b/src/main/java/com/iemr/common/identity/repo/BenDetailRepo.java
@@ -122,8 +122,8 @@ MBeneficiarydetail getWith_vanSerialNo_vanID(@Param("vanSerialNo") BigInteger va
 			+ " c.headOfFamily_Relation =:headofFamily_Relation,c.other =:other "
 			+ " WHERE c.vanSerialNo =:vanSerialNo AND c.vanID =:vanID ")
 	Integer updateFamilyDetails(@Param("familyId") String familyId,
-			@Param("headofFamily_RelationID") Integer headofFamily_RelationID,
-			@Param("headofFamily_Relation") String headofFamily_Relation, @Param("other") String other,
+			@Param("headofFamily_RelationID") Integer headofFamilyRelationID,
+			@Param("headofFamily_Relation") String headofFamilyRelation, @Param("other") String other,
 			@Param("vanSerialNo") BigInteger vanSerialNo, @Param("vanID") Integer vanID);
 
 	@Transactional
@@ -131,8 +131,8 @@ Integer updateFamilyDetails(@Param("familyId") String familyId,
 	@Query("UPDATE MBeneficiarydetail c SET c.headOfFamily_RelationID =:headofFamily_RelationID, "
 			+ " c.headOfFamily_Relation =:headofFamily_Relation,c.other =:other "
 			+ " WHERE c.vanSerialNo =:vanSerialNo AND c.vanID =:vanID AND c.familyId=:familyId ")
-	Integer editFamilyDetails(@Param("headofFamily_RelationID") Integer headofFamily_RelationID,
-			@Param("headofFamily_Relation") String headofFamily_Relation, @Param("other") String other,
+	Integer editFamilyDetails(@Param("headofFamily_RelationID") Integer headofFamilyRelationID,
+			@Param("headofFamily_Relation") String headofFamilyRelation, @Param("other") String other,
 			@Param("vanSerialNo") BigInteger vanSerialNo, @Param("vanID") Integer vanID,
 			@Param("familyId") String familyId);
 
diff --git a/src/main/java/com/iemr/common/identity/repo/BenMappingRepo.java b/src/main/java/com/iemr/common/identity/repo/BenMappingRepo.java
index ceaca5de..b55a243c 100644
--- a/src/main/java/com/iemr/common/identity/repo/BenMappingRepo.java
+++ b/src/main/java/com/iemr/common/identity/repo/BenMappingRepo.java
@@ -43,16 +43,16 @@ public interface BenMappingRepo extends CrudRepository<MBeneficiarymapping, BigI
 
 	MBeneficiarymapping findByBenRegIdOrderByBenMapIdAsc(BigInteger benRegId);
 
-	MBeneficiarymapping findByMBeneficiarycontactOrderByBenMapIdAsc(MBeneficiarycontact MBeneficiarycontact);
+	MBeneficiarymapping findByMBeneficiarycontactOrderByBenMapIdAsc(MBeneficiarycontact mBeneficiarycontact);
 
 	List<MBeneficiarymapping> findByMBeneficiaryregidmappingOrderByBenMapIdAsc(
-			MBeneficiaryregidmapping MBeneficiaryregidmapping);
+			MBeneficiaryregidmapping mBeneficiaryregidmapping);
 
 
 	List<MBeneficiarymapping> findByMBeneficiarydetailOrderByBenMapIdAsc(MBeneficiarydetail mBeneficiarydetail);
 
 	List<MBeneficiarymapping> findByMBeneficiarydetailAndMBeneficiaryaddressOrderByBenMapIdAsc(
-			MBeneficiarydetail mBeneficiarydetail, MBeneficiaryaddress MBeneficiaryaddress);
+			MBeneficiarydetail mBeneficiarydetail, MBeneficiaryaddress mBeneficiaryaddress);
 
 	List<MBeneficiarymapping> findByMBeneficiarydetailAndMBeneficiaryaddressAndMBeneficiarycontactOrderByBenMapIdAsc(
 			MBeneficiarydetail mBeneficiarydetail, MBeneficiaryaddress mBeneficiaryaddress,
diff --git a/src/main/java/com/iemr/common/identity/repo/BenMappingRepoCustom.java b/src/main/java/com/iemr/common/identity/repo/BenMappingRepoCustom.java
index efffc666..43f92050 100644
--- a/src/main/java/com/iemr/common/identity/repo/BenMappingRepoCustom.java
+++ b/src/main/java/com/iemr/common/identity/repo/BenMappingRepoCustom.java
@@ -24,7 +24,7 @@
 import java.util.List;
 
 import com.iemr.common.identity.domain.MBeneficiarymapping;
-import com.iemr.common.identity.domain.V_BenAdvanceSearch;
+import com.iemr.common.identity.domain.VBenAdvanceSearch;
 import com.iemr.common.identity.dto.IdentityDTO;
 import com.iemr.common.identity.dto.IdentitySearchDTO;
 
@@ -41,5 +41,5 @@ public interface BenMappingRepoCustom {
 	 */
 	List<MBeneficiarymapping> finiteSearch(IdentityDTO identityDTO);
 
-	List<V_BenAdvanceSearch> dynamicFilterSearchNew(IdentitySearchDTO searchDTO);
+	List<VBenAdvanceSearch> dynamicFilterSearchNew(IdentitySearchDTO searchDTO);
 }
diff --git a/src/main/java/com/iemr/common/identity/repo/BenMappingRepoImpl.java b/src/main/java/com/iemr/common/identity/repo/BenMappingRepoImpl.java
index ce01b507..0e7077ef 100644
--- a/src/main/java/com/iemr/common/identity/repo/BenMappingRepoImpl.java
+++ b/src/main/java/com/iemr/common/identity/repo/BenMappingRepoImpl.java
@@ -44,7 +44,7 @@
 import com.iemr.common.identity.domain.MBeneficiarycontact;
 import com.iemr.common.identity.domain.MBeneficiarydetail;
 import com.iemr.common.identity.domain.MBeneficiarymapping;
-import com.iemr.common.identity.domain.V_BenAdvanceSearch;
+import com.iemr.common.identity.domain.VBenAdvanceSearch;
 import com.iemr.common.identity.dto.IdentityDTO;
 import com.iemr.common.identity.dto.IdentitySearchDTO;
 import com.iemr.common.identity.mapper.IdentitySearchMapper;
@@ -347,10 +347,10 @@ public List<MBeneficiarymapping> finiteSearch(IdentityDTO identityDTO) {
 	}
 
 	@Override
-	public List<V_BenAdvanceSearch> dynamicFilterSearchNew(IdentitySearchDTO searchDTO) {
+	public List<VBenAdvanceSearch> dynamicFilterSearchNew(IdentitySearchDTO searchDTO) {
 		CriteriaBuilder criteriaBuilder = entityManager.getCriteriaBuilder();
-		CriteriaQuery<V_BenAdvanceSearch> criteriaQuery = criteriaBuilder.createQuery(V_BenAdvanceSearch.class);
-		Root<V_BenAdvanceSearch> root = criteriaQuery.from(V_BenAdvanceSearch.class);
+		CriteriaQuery<VBenAdvanceSearch> criteriaQuery = criteriaBuilder.createQuery(VBenAdvanceSearch.class);
+		Root<VBenAdvanceSearch> root = criteriaQuery.from(VBenAdvanceSearch.class);
 		List<Predicate> predicateList = new ArrayList<Predicate>();
 
 		// if firstName is not null
@@ -412,7 +412,7 @@ public List<V_BenAdvanceSearch> dynamicFilterSearchNew(IdentitySearchDTO searchD
 		}
 
 		criteriaQuery.select(root).where(predicateList.toArray(new Predicate[] {}));
-		TypedQuery<V_BenAdvanceSearch> typedQuery = entityManager.createQuery(criteriaQuery);
+		TypedQuery<VBenAdvanceSearch> typedQuery = entityManager.createQuery(criteriaQuery);
 		return typedQuery.getResultList();
 	}
 
diff --git a/src/main/java/com/iemr/common/identity/repo/BenRegIdMappingRepo.java b/src/main/java/com/iemr/common/identity/repo/BenRegIdMappingRepo.java
index 830b0f41..9154ab87 100644
--- a/src/main/java/com/iemr/common/identity/repo/BenRegIdMappingRepo.java
+++ b/src/main/java/com/iemr/common/identity/repo/BenRegIdMappingRepo.java
@@ -68,7 +68,7 @@ public int unreserveBeneficiaryIds(@Param("providerServiceMapID") Integer provid
 			@Param("vehicalNo") String vehicalNo);
 
 	@Query("SELECT a FROM MBeneficiaryregidmapping a WHERE a.benRegId =:vanSerialNo AND a.vanID =:vanID ")
-	MBeneficiaryregidmapping getWith_vanSerialNo_vanID(@Param("vanSerialNo") BigInteger vanSerialNo,
+	MBeneficiaryregidmapping getWithVanSerialNoVanID(@Param("vanSerialNo") BigInteger vanSerialNo,
 			@Param("vanID") Integer vanID);
 	
 
diff --git a/src/main/java/com/iemr/common/identity/repo/BenServiceMappingRepo.java b/src/main/java/com/iemr/common/identity/repo/BenServiceMappingRepo.java
index 761a5de9..15801662 100644
--- a/src/main/java/com/iemr/common/identity/repo/BenServiceMappingRepo.java
+++ b/src/main/java/com/iemr/common/identity/repo/BenServiceMappingRepo.java
@@ -41,40 +41,40 @@ public interface BenServiceMappingRepo extends CrudRepository<MBeneficiaryservic
 	List<MBeneficiaryservicemapping> findByProviderServiceMapId(Integer registeredProviderServiceMapId);
 
 	List<MBeneficiaryservicemapping> findByProviderServiceMapIdAndRegisteredDateBetween(
-			Integer registeredProviderServiceMapId, Timestamp from, Timestamp To);
+			Integer registeredProviderServiceMapId, Timestamp from, Timestamp to);
 
 	List<MBeneficiaryservicemapping> findByServiceIdAndRegisteredDateBetween(Integer serviceId, Timestamp from,
-			Timestamp To);
+			Timestamp to);
 
 	List<MBeneficiaryservicemapping> findByServiceNameAndRegisteredDateBetween(String serviceName, Timestamp from,
-			Timestamp To);
+			Timestamp to);
 
 	List<MBeneficiaryservicemapping> findByStateIdAndRegisteredDateBetween(Integer stateId, Timestamp from,
-			Timestamp To);
+			Timestamp to);
 
 	List<MBeneficiaryservicemapping> findByStateNameAndRegisteredDateBetween(String stateName, Timestamp from,
-			Timestamp To);
+			Timestamp to);
 
 	List<MBeneficiaryservicemapping> findByServiceProviderIdAndRegisteredDateBetween(Integer serviceProviderId,
-			Timestamp from, Timestamp To);
+			Timestamp from, Timestamp to);
 
 	List<MBeneficiaryservicemapping> findByServiceProviderNameAndRegisteredDateBetween(String serviceProviderName,
-			Timestamp from, Timestamp To);
+			Timestamp from, Timestamp to);
 
 	Long countByProviderServiceMapIdAndRegisteredDateBetween(Integer registeredProviderServiceMapId, Timestamp from,
-			Timestamp To);
+			Timestamp to);
 
-	Long countByServiceIdAndRegisteredDateBetween(Integer serviceId, Timestamp from, Timestamp To);
+	Long countByServiceIdAndRegisteredDateBetween(Integer serviceId, Timestamp from, Timestamp to);
 
-	Long countByServiceNameAndRegisteredDateBetween(String serviceName, Timestamp from, Timestamp To);
+	Long countByServiceNameAndRegisteredDateBetween(String serviceName, Timestamp from, Timestamp to);
 
-	Long countByStateIdAndRegisteredDateBetween(Integer stateId, Timestamp from, Timestamp To);
+	Long countByStateIdAndRegisteredDateBetween(Integer stateId, Timestamp from, Timestamp to);
 
-	Long countByStateNameAndRegisteredDateBetween(String stateName, Timestamp from, Timestamp To);
+	Long countByStateNameAndRegisteredDateBetween(String stateName, Timestamp from, Timestamp to);
 
-	Long countByServiceProviderIdAndRegisteredDateBetween(Integer serviceProviderId, Timestamp from, Timestamp To);
+	Long countByServiceProviderIdAndRegisteredDateBetween(Integer serviceProviderId, Timestamp from, Timestamp to);
 
-	Long countByServiceProviderNameAndRegisteredDateBetween(String serviceProviderName, Timestamp from, Timestamp To);
+	Long countByServiceProviderNameAndRegisteredDateBetween(String serviceProviderName, Timestamp from, Timestamp to);
 
 	List<MBeneficiaryservicemapping> findByCreatedDateBetween(Timestamp fromDate, Timestamp toDate);
 
diff --git a/src/main/java/com/iemr/common/identity/repo/MBeneficiaryAccountRepo.java b/src/main/java/com/iemr/common/identity/repo/MBeneficiaryAccountRepo.java
index aaedeb1b..0df9d358 100644
--- a/src/main/java/com/iemr/common/identity/repo/MBeneficiaryAccountRepo.java
+++ b/src/main/java/com/iemr/common/identity/repo/MBeneficiaryAccountRepo.java
@@ -41,7 +41,7 @@ public interface MBeneficiaryAccountRepo extends CrudRepository<MBeneficiaryAcco
 	BigInteger findIdByVanSerialNoAndVanID(@Param("vanSerialNo") BigInteger vanSerialNo, @Param("vanID") Integer vanID);
 
 	@Query("SELECT a FROM MBeneficiaryAccount a WHERE a.vanSerialNo =:vanSerialNo AND a.vanID =:vanID ")
-	MBeneficiaryAccount getWith_vanSerialNo_vanID(@Param("vanSerialNo") BigInteger vanSerialNo,
+	MBeneficiaryAccount getWithVanSerialNoVanID(@Param("vanSerialNo") BigInteger vanSerialNo,
 			@Param("vanID") Integer vanID);
 
 }
diff --git a/src/main/java/com/iemr/common/identity/repo/MBeneficiaryImageRepo.java b/src/main/java/com/iemr/common/identity/repo/MBeneficiaryImageRepo.java
index c1b5c415..2e2a162b 100644
--- a/src/main/java/com/iemr/common/identity/repo/MBeneficiaryImageRepo.java
+++ b/src/main/java/com/iemr/common/identity/repo/MBeneficiaryImageRepo.java
@@ -36,12 +36,12 @@ public interface MBeneficiaryImageRepo extends CrudRepository<MBeneficiaryImage,
 	@Transactional
 	@Modifying
 	@Query(" UPDATE MBeneficiaryImage set vanSerialNo = :BenImageId WHERE BenImageId = :BenImageId")
-	int updateVanSerialNo(@Param("BenImageId") Long BenImageId);
+	int updateVanSerialNo(@Param("BenImageId") Long benImageId);
 
 	@Query("SELECT benImageId FROM MBeneficiaryImage WHERE vanSerialNo =:vanSerialNo AND vanID =:vanID ")
 	Long findIdByVanSerialNoAndVanID(@Param("vanSerialNo") Long vanSerialNo, @Param("vanID") Integer vanID);
 
 	@Query("SELECT a FROM MBeneficiaryImage a WHERE a.vanSerialNo =:vanSerialNo AND a.vanID =:vanID ")
-	MBeneficiaryImage getWith_vanSerialNo_vanID(@Param("vanSerialNo") Long vanSerialNo,
+	MBeneficiaryImage getWithVanSerialNoVanID(@Param("vanSerialNo") Long vanSerialNo,
 			@Param("vanID") Integer vanID);
 }
diff --git a/src/main/java/com/iemr/common/identity/repo/V_BenAdvanceSearchRepo.java b/src/main/java/com/iemr/common/identity/repo/V_BenAdvanceSearchRepo.java
index 3679f575..0be61bb0 100644
--- a/src/main/java/com/iemr/common/identity/repo/V_BenAdvanceSearchRepo.java
+++ b/src/main/java/com/iemr/common/identity/repo/V_BenAdvanceSearchRepo.java
@@ -29,10 +29,10 @@
 import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 
-import com.iemr.common.identity.domain.V_BenAdvanceSearch;
+import com.iemr.common.identity.domain.VBenAdvanceSearch;
 
 @Repository
-public interface V_BenAdvanceSearchRepo extends CrudRepository<V_BenAdvanceSearch, BigInteger> {
+public interface V_BenAdvanceSearchRepo extends CrudRepository<VBenAdvanceSearch, BigInteger> {
 
 	@Query(nativeQuery = true, value = "SELECT BeneficiaryRegID, HealthID, HealthIDNumber, AuthenticationMode, CreatedDate"
 			+ "  FROM db_iemr.m_benhealthidmapping WHERE BeneficiaryRegID=:benRegID")
@@ -40,10 +40,10 @@ public interface V_BenAdvanceSearchRepo extends CrudRepository<V_BenAdvanceSearc
 
 	@Query(nativeQuery = true, value = "SELECT BeneficiaryRegID "
 			+ "  FROM db_iemr.m_benhealthidmapping WHERE HealthID=:healthID AND BeneficiaryRegID is not null ")
-	List<BigInteger> getBenRegIDByHealthID_AbhaAddress(@Param("healthID") String healthID);
+	List<BigInteger> getBenRegIDByHealthIDAbhaAddress(@Param("healthID") String healthID);
 
 	@Query(nativeQuery = true, value = "SELECT BeneficiaryRegID "
 			+ "  FROM db_iemr.m_benhealthidmapping WHERE HealthIDNumber=:healthIDNo  AND BeneficiaryRegID is not null ")
-	List<BigInteger> getBenRegIDByHealthIDNo_AbhaIdNo(@Param("healthIDNo") String healthIDNo);
+	List<BigInteger> getBenRegIDByHealthIDNoAbhaIdNo(@Param("healthIDNo") String healthIDNo);
 
 }
diff --git a/src/main/java/com/iemr/common/identity/repo/rmnch/RMNCHCBACDetailsRepo.java b/src/main/java/com/iemr/common/identity/repo/rmnch/RMNCHCBACDetailsRepo.java
index 3d0e4968..2ac98a61 100644
--- a/src/main/java/com/iemr/common/identity/repo/rmnch/RMNCHCBACDetailsRepo.java
+++ b/src/main/java/com/iemr/common/identity/repo/rmnch/RMNCHCBACDetailsRepo.java
@@ -51,6 +51,6 @@ public List<Object> getDiagnosisProvidedCommon(@Param("benRegID") Long benRegID,
 	
 	@Query(value = "select NCD_Condition from db_iemr.t_ncddiagnosis where BeneficiaryRegID=:benRegID AND visitcode=:visitCode AND NCD_Condition is not null AND NCD_Condition <> '' "
 	, nativeQuery = true)
-	public List<Object> getDiagnosisProvidedNCD_Care(@Param("benRegID") Long benRegID, @Param("visitCode") Long visitCode);
+	public List<Object> getDiagnosisProvidedNCDCare(@Param("benRegID") Long benRegID, @Param("visitCode") Long visitCode);
 	
 }
diff --git a/src/main/java/com/iemr/common/identity/service/IdentityService.java b/src/main/java/com/iemr/common/identity/service/IdentityService.java
index 40721cbf..9f925f64 100644
--- a/src/main/java/com/iemr/common/identity/service/IdentityService.java
+++ b/src/main/java/com/iemr/common/identity/service/IdentityService.java
@@ -58,7 +58,7 @@
 import com.iemr.common.identity.domain.MBeneficiarymapping;
 import com.iemr.common.identity.domain.MBeneficiaryregidmapping;
 import com.iemr.common.identity.domain.MBeneficiaryservicemapping;
-import com.iemr.common.identity.domain.V_BenAdvanceSearch;
+import com.iemr.common.identity.domain.VBenAdvanceSearch;
 import com.iemr.common.identity.dto.AbhaAddressDTO;
 import com.iemr.common.identity.dto.BenIdImportDTO;
 import com.iemr.common.identity.dto.BeneficiariesDTO;
@@ -293,8 +293,8 @@ public List<BeneficiariesDTO> getBeneficiaries(IdentitySearchDTO searchDTO)
 		/**
 		 * New logic for advance search, 03-10-2018
 		 */
-		List<V_BenAdvanceSearch> tmpList = mappingRepo.dynamicFilterSearchNew(searchDTO);
-		for (V_BenAdvanceSearch obj : tmpList) {
+		List<VBenAdvanceSearch> tmpList = mappingRepo.dynamicFilterSearchNew(searchDTO);
+		for (VBenAdvanceSearch obj : tmpList) {
 			list.add(this.getBeneficiariesDTO(this.getBeneficiariesDTONew1(obj)));
 			logger.debug("benMapId: " + obj.getBenMapID());
 		}
@@ -417,11 +417,11 @@ public List<BeneficiariesDTO> getBeneficiariesByPhoneNum(String phoneNum)
 	 * @throws Exception
 	 */
 
-	public List<BeneficiariesDTO> getBeneficiaryByHealthID_AbhaAddress(String healthID)
+	public List<BeneficiariesDTO> getBeneficiaryByHealthIDAbhaAddress(String healthID)
 			throws NoResultException, QueryTimeoutException, Exception {
 		List<BeneficiariesDTO> beneficiaryList = new ArrayList<BeneficiariesDTO>();
 		try {
-			List<BigInteger> regIDList = v_BenAdvanceSearchRepo.getBenRegIDByHealthID_AbhaAddress(healthID);
+			List<BigInteger> regIDList = v_BenAdvanceSearchRepo.getBenRegIDByHealthIDAbhaAddress(healthID);
 			if (regIDList != null && regIDList.size() > 0) {
 				for (BigInteger benRegID : regIDList) {
 					if (benRegID != null) {
@@ -448,11 +448,11 @@ public List<BeneficiariesDTO> getBeneficiaryByHealthID_AbhaAddress(String health
 	 * @throws Exception
 	 */
 
-	public List<BeneficiariesDTO> getBeneficiaryByHealthIDNo_AbhaIdNo(String healthIDNo)
+	public List<BeneficiariesDTO> getBeneficiaryByHealthIDNoAbhaIdNo(String healthIDNo)
 			throws NoResultException, QueryTimeoutException, Exception {
 		List<BeneficiariesDTO> beneficiaryList = new ArrayList<BeneficiariesDTO>();
 		try {
-			List<BigInteger> regIDList = v_BenAdvanceSearchRepo.getBenRegIDByHealthIDNo_AbhaIdNo(healthIDNo);
+			List<BigInteger> regIDList = v_BenAdvanceSearchRepo.getBenRegIDByHealthIDNoAbhaIdNo(healthIDNo);
 			if (regIDList != null && regIDList.size() > 0) {
 				for (BigInteger benRegID : regIDList) {
 					if (benRegID != null) {
@@ -559,19 +559,19 @@ private MBeneficiarymapping getBeneficiariesDTONew(Object[] benMapArr) {
 			}
 
 			benMapOBJ.setMBeneficiaryaddress(addressRepo
-					.getWith_vanSerialNo_vanID(getBigIntegerValueFromObject(benMapArr[1]), (Integer) benMapArr[8]));
+					.getWithVanSerialNoVanID(getBigIntegerValueFromObject(benMapArr[1]), (Integer) benMapArr[8]));
 			benMapOBJ.setMBeneficiaryconsent(consentRepo
-					.getWith_vanSerialNo_vanID(getBigIntegerValueFromObject(benMapArr[2]), (Integer) benMapArr[8]));
+					.getWithVanSerialNoVanID(getBigIntegerValueFromObject(benMapArr[2]), (Integer) benMapArr[8]));
 			benMapOBJ.setMBeneficiarycontact(contactRepo
-					.getWith_vanSerialNo_vanID(getBigIntegerValueFromObject(benMapArr[3]), (Integer) benMapArr[8]));
+					.getWithVanSerialNoVanID(getBigIntegerValueFromObject(benMapArr[3]), (Integer) benMapArr[8]));
 			benMapOBJ.setMBeneficiarydetail(detailRepo
 					.getWith_vanSerialNo_vanID(getBigIntegerValueFromObject(benMapArr[4]), (Integer) benMapArr[8]));
 			benMapOBJ.setMBeneficiaryregidmapping(regIdRepo
-					.getWith_vanSerialNo_vanID(getBigIntegerValueFromObject(benMapArr[5]), (Integer) benMapArr[8]));
+					.getWithVanSerialNoVanID(getBigIntegerValueFromObject(benMapArr[5]), (Integer) benMapArr[8]));
 			benMapOBJ.setMBeneficiaryImage(
-					imageRepo.getWith_vanSerialNo_vanID((Long) benMapArr[6], (Integer) benMapArr[8]));
+					imageRepo.getWithVanSerialNoVanID((Long) benMapArr[6], (Integer) benMapArr[8]));
 			benMapOBJ.setMBeneficiaryAccount(accountRepo
-					.getWith_vanSerialNo_vanID(getBigIntegerValueFromObject(benMapArr[7]), (Integer) benMapArr[8]));
+					.getWithVanSerialNoVanID(getBigIntegerValueFromObject(benMapArr[7]), (Integer) benMapArr[8]));
 
 			benMapOBJ.setMBeneficiaryfamilymappings(familyMapRepo.findByBenMapIdAndVanIDOrderByBenFamilyMapIdAsc(
 					getBigIntegerValueFromObject(benMapArr[9]), (Integer) benMapArr[8]));
@@ -594,14 +594,14 @@ private MBeneficiarymapping getBeneficiariesDTONewPartial(Object[] benMapArr) {
 			benMapOBJ.setMBeneficiarydetail(detailRepo
 					.getWith_vanSerialNo_vanID(getBigIntegerValueFromObject(benMapArr[4]), (Integer) benMapArr[8]));
 			benMapOBJ.setMBeneficiaryregidmapping(regIdRepo
-					.getWith_vanSerialNo_vanID(getBigIntegerValueFromObject(benMapArr[5]), (Integer) benMapArr[8]));
+					.getWithVanSerialNoVanID(getBigIntegerValueFromObject(benMapArr[5]), (Integer) benMapArr[8]));
 		}
 		return benMapOBJ;
 	}
 
 	// 03-10-2018
 	// get ben mapping object from v_benadvancesearch
-	private MBeneficiarymapping getBeneficiariesDTONew1(V_BenAdvanceSearch benAdvanceSearchOBJ) {
+	private MBeneficiarymapping getBeneficiariesDTONew1(VBenAdvanceSearch benAdvanceSearchOBJ) {
 		MBeneficiarymapping benMapOBJ = new MBeneficiarymapping();
 
 		// for createdBy & createdDate
@@ -621,18 +621,18 @@ private MBeneficiarymapping getBeneficiariesDTONew1(V_BenAdvanceSearch benAdvanc
 			benMapOBJ.setCreatedDate(benDetailsOBJ.getCreatedDate());
 
 			benMapOBJ.setMBeneficiaryaddress(addressRepo
-					.getWith_vanSerialNo_vanID(benAdvanceSearchOBJ.getBenAddressID(), benAdvanceSearchOBJ.getVanID()));
+					.getWithVanSerialNoVanID(benAdvanceSearchOBJ.getBenAddressID(), benAdvanceSearchOBJ.getVanID()));
 			benMapOBJ.setMBeneficiaryconsent(consentRepo
-					.getWith_vanSerialNo_vanID(benAdvanceSearchOBJ.getBenConsentID(), benAdvanceSearchOBJ.getVanID()));
+					.getWithVanSerialNoVanID(benAdvanceSearchOBJ.getBenConsentID(), benAdvanceSearchOBJ.getVanID()));
 			benMapOBJ.setMBeneficiarycontact(contactRepo
-					.getWith_vanSerialNo_vanID(benAdvanceSearchOBJ.getBenContactID(), benAdvanceSearchOBJ.getVanID()));
+					.getWithVanSerialNoVanID(benAdvanceSearchOBJ.getBenContactID(), benAdvanceSearchOBJ.getVanID()));
 			benMapOBJ.setMBeneficiarydetail(benDetailsOBJ);
-			benMapOBJ.setMBeneficiaryregidmapping(regIdRepo.getWith_vanSerialNo_vanID(benAdvanceSearchOBJ.getBenRegID(),
+			benMapOBJ.setMBeneficiaryregidmapping(regIdRepo.getWithVanSerialNoVanID(benAdvanceSearchOBJ.getBenRegID(),
 					benAdvanceSearchOBJ.getVanID()));
-			benMapOBJ.setMBeneficiaryImage(imageRepo.getWith_vanSerialNo_vanID(benAdvanceSearchOBJ.getBenImageID(),
+			benMapOBJ.setMBeneficiaryImage(imageRepo.getWithVanSerialNoVanID(benAdvanceSearchOBJ.getBenImageID(),
 					benAdvanceSearchOBJ.getVanID()));
 			benMapOBJ.setMBeneficiaryAccount(accountRepo
-					.getWith_vanSerialNo_vanID(benAdvanceSearchOBJ.getBenAccountID(), benAdvanceSearchOBJ.getVanID()));
+					.getWithVanSerialNoVanID(benAdvanceSearchOBJ.getBenAccountID(), benAdvanceSearchOBJ.getVanID()));
 
 			benMapOBJ.setMBeneficiaryfamilymappings(
 					familyMapRepo.findByBenMapIdOrderByBenFamilyMapIdAsc(benAdvanceSearchOBJ.getVanSerialNo()));
@@ -691,7 +691,7 @@ public void editIdentity(IdentityEditDTO identity) throws MissingMandatoryFields
 				|| Boolean.TRUE.equals(identity.getChangeInOtherDetails())
 				|| Boolean.TRUE.equals(identity.getChangeInAssociations())) {
 
-			MBeneficiarydetail mbDetl = editMapper.IdentityEditDTOToMBeneficiarydetail(identity);
+			MBeneficiarydetail mbDetl = editMapper.identityEditDTOToMBeneficiarydetail(identity);
 			/**
 			 * new logic for data sync, 26-09-2018
 			 */
@@ -724,7 +724,7 @@ public void editIdentity(IdentityEditDTO identity) throws MissingMandatoryFields
 		logger.debug("identity.getChangeInAddress = " + identity.getChangeInAddress());
 		if (Boolean.TRUE.equals(identity.getChangeInAddress())) {
 
-			MBeneficiaryaddress mbAddr = editMapper.IdentityEditDTOToMBeneficiaryaddress(identity);
+			MBeneficiaryaddress mbAddr = editMapper.identityEditDTOToMBeneficiaryaddress(identity);
 
 			/**
 			 * new logic for data sync, 26-09-2018
@@ -751,7 +751,7 @@ public void editIdentity(IdentityEditDTO identity) throws MissingMandatoryFields
 		logger.debug("identity.getChangeInContacts = " + identity.getChangeInContacts());
 		if (Boolean.TRUE.equals(identity.getChangeInContacts())) {
 
-			MBeneficiarycontact benCon = editMapper.IdentityEdiDTOToMBeneficiarycontact(identity);
+			MBeneficiarycontact benCon = editMapper.identityEdiDTOToMBeneficiarycontact(identity);
 
 			/**
 			 * new logic for data sync, 26-09-2018
@@ -780,7 +780,7 @@ public void editIdentity(IdentityEditDTO identity) throws MissingMandatoryFields
 
 			MBeneficiaryidentity beneficiaryidentity;
 			List<MBeneficiaryidentity> identities = editMapper
-					.IdentityEditDTOListToMBeneficiaryidentityList(identity.getIdentities());
+					.identityEditDTOListToMBeneficiaryidentityList(identity.getIdentities());
 			logger.debug("identities to upsert = " + OutputMapper.gson().toJson(identities));
 
 			// new logic for getting beneficiary identities, 26-09-2018
@@ -821,7 +821,7 @@ public void editIdentity(IdentityEditDTO identity) throws MissingMandatoryFields
 		logger.debug("identity.getChangeInFamilyDetails = " + identity.getChangeInFamilyDetails());
 		if (Boolean.TRUE.equals(identity.getChangeInFamilyDetails())) {
 			List<MBeneficiaryfamilymapping> fbMaps = editMapper
-					.IdentityEditDTOListToMBeneficiaryfamilymappingList(identity.getBenFamilyDTOs());
+					.identityEditDTOListToMBeneficiaryfamilymappingList(identity.getBenFamilyDTOs());
 
 			logger.debug("family map to upsert = " + OutputMapper.gson().toJson(fbMaps));
 
@@ -1043,7 +1043,7 @@ public BeneficiaryCreateResp createIdentity(IdentityDTO identity) throws IEMRExc
 
 		// new logic (18-09-2018, Neeraj kumar)
 		if (null != identity.getBenFamilyDTOs()) {
-			fIdenList = mapper.IdentityDTOListToMBeneficiaryfamilymappingList(identity.getBenFamilyDTOs());
+			fIdenList = mapper.identityDTOListToMBeneficiaryfamilymappingList(identity.getBenFamilyDTOs());
 			if (fIdenList != null) {
 				for (MBeneficiaryfamilymapping bfMapping : fIdenList) {
 					bfMapping.setBenMapId(benMapping2.getBenMapId());
@@ -1085,7 +1085,7 @@ public BeneficiaryCreateResp createIdentity(IdentityDTO identity) throws IEMRExc
 		List<MBeneficiaryidentity> mIdenList2 = new ArrayList<MBeneficiaryidentity>();
 		if (null != identity.getIdentities()) {
 			List<MBeneficiaryidentity> mIdenList = mapper
-					.IdentityDTOListToMBeneficiaryidentityList(identity.getIdentities());
+					.identityDTOListToMBeneficiaryidentityList(identity.getIdentities());
 			mIdenList.forEach(mIden -> {
 				mIden.setBenMapId(benMapping2.getBenMapId());
 				mIden.setCreatedBy(identity.getAgentName());
@@ -1108,7 +1108,7 @@ public BeneficiaryCreateResp createIdentity(IdentityDTO identity) throws IEMRExc
 		}
 
 		logger.info("IdentityService.createIdentity - end. id = " + benMapping.getBenMapId());
-		return partialMapper.MBeneficiarymappingToBeneficiaryCreateResp(benMapping);
+		return partialMapper.mBeneficiarymappingToBeneficiaryCreateResp(benMapping);
 	}
 
 	public String getReservedIdList() {
@@ -1171,7 +1171,7 @@ public List<BeneficiariesPartialDTO> getBeneficiariesPartialDeatilsByBenRegIdLis
 				for (Object[] objArr : benMapObjArr) {
 					MBeneficiarymapping benMap = this.getBeneficiariesDTONewPartial(objArr);
 
-					list.add(partialMapper.MBeneficiarymappingToBeneficiariesPartialDTO(benMap));
+					list.add(partialMapper.mBeneficiarymappingToBeneficiariesPartialDTO(benMap));
 				}
 			}
 			logger.info("benMap size" + (list.size() == 0 ? "No Beneficiary Found" : list.size()));
@@ -1187,22 +1187,21 @@ public List<BeneficiariesPartialDTO> getBeneficiariesPartialDeatilsByBenRegIdLis
 	 * Get partial details of beneficiaries (first name middle name and last name)
 	 * list on benId's list
 	 * 
-	 * @param BenRegIds
+	 * @param benRegIds
 	 * @return {@link List} Beneficiaries
 	 */
-	public List<BeneficiariesDTO> getBeneficiariesDeatilsByBenRegIdList(List<BigInteger> BenRegIds) {
+	public List<BeneficiariesDTO> getBeneficiariesDeatilsByBenRegIdList(List<BigInteger> benRegIds) {
 
 		logger.info("IdentityService.getBeneficiariesDeatilsByBenRegIdList - end");
 		List<BeneficiariesDTO> list = new ArrayList<BeneficiariesDTO>();
 
 		// new logic, 19-12-2018
 		List<Object[]> benMapObjArr = new ArrayList<>();
-		if (BenRegIds != null && BenRegIds.size() > 0) {
-			benMapObjArr = mappingRepo.getBenMappingByRegIDList(BenRegIds);
+		if (benRegIds != null && benRegIds.size() > 0) {
+			benMapObjArr = mappingRepo.getBenMappingByRegIDList(benRegIds);
 			if (benMapObjArr != null && benMapObjArr.size() > 0) {
 				for (Object[] objArr : benMapObjArr) {
 					MBeneficiarymapping benMap = this.getBeneficiariesDTONew(objArr);
-//					logger.info("benMap " + benMap);
 
 					list.add(this.getBeneficiariesDTO(benMap));
 				}
@@ -1224,7 +1223,7 @@ public List<BeneficiariesDTO> getBeneficiariesDeatilsByBenRegIdList(List<BigInte
 	 */
 	private BeneficiariesDTO getBeneficiariesDTO(MBeneficiarymapping benMap) {
 
-		BeneficiariesDTO bdto = mapper.MBeneficiarymappingToBeneficiariesDTO(benMap);
+		BeneficiariesDTO bdto = mapper.mBeneficiarymappingToBeneficiariesDTO(benMap);
 		bdto.setBeneficiaryFamilyTags(
 				mapper.mapToMBeneficiaryfamilymappingWithBenFamilyDTOList(benMap.getMBeneficiaryfamilymappings()));
 		bdto.setBeneficiaryIdentites(
diff --git a/src/main/java/com/iemr/common/identity/service/rmnch/RmnchDataSyncServiceImpl.java b/src/main/java/com/iemr/common/identity/service/rmnch/RmnchDataSyncServiceImpl.java
index ddeffe17..5c9bd728 100644
--- a/src/main/java/com/iemr/common/identity/service/rmnch/RmnchDataSyncServiceImpl.java
+++ b/src/main/java/com/iemr/common/identity/service/rmnch/RmnchDataSyncServiceImpl.java
@@ -51,7 +51,7 @@
 import com.iemr.common.identity.controller.rmnch.RmnchMobileAppController;
 import com.iemr.common.identity.data.rmnch.BenHealthIDDetails;
 import com.iemr.common.identity.data.rmnch.GetBenRequestHandler;
-import com.iemr.common.identity.data.rmnch.NCD_TB_HRP_data;
+import com.iemr.common.identity.data.rmnch.NcdTbHrpData;
 import com.iemr.common.identity.data.rmnch.RMNCHBeneficiaryDetailsRmnch;
 import com.iemr.common.identity.data.rmnch.RMNCHBornBirthDetails;
 import com.iemr.common.identity.data.rmnch.RMNCHCBACdetails;
@@ -337,10 +337,10 @@ public String getBenDataByAsha(String requestOBJ, String authorisation) throws E
 
 	private String getMappingsForAddressIDs(List<RMNCHMBeneficiaryaddress> addressList, int totalPage,
 			String authorisation) {
-		RMNCHHouseHoldDetails benHouseHoldRMNCH_ROBJ;
-		RMNCHBeneficiaryDetailsRmnch benDetailsRMNCH_OBJ;
-		RMNCHBornBirthDetails benBotnBirthRMNCH_ROBJ;
-		RMNCHCBACdetails benCABCRMNCH_ROBJ;
+		RMNCHHouseHoldDetails benHouseHoldRMNCHROBJ;
+		RMNCHBeneficiaryDetailsRmnch benDetailsRMNCHOBJ;
+		RMNCHBornBirthDetails benBotnBirthRMNCHROBJ;
+		RMNCHCBACdetails benCABCRMNCHROBJ;
 
 		RMNCHMBeneficiarydetail benDetailsOBJ;
 		RMNCHMBeneficiaryAccount benAccountOBJ;
@@ -356,10 +356,10 @@ private String getMappingsForAddressIDs(List<RMNCHMBeneficiaryaddress> addressLi
 			try {
 				RMNCHMBeneficiarymapping m = rMNCHMBenMappingRepo.getByAddressIDAndVanID(a.getId(), a.getVanID());
 				if (m != null) {
-					benHouseHoldRMNCH_ROBJ = new RMNCHHouseHoldDetails();
-					benDetailsRMNCH_OBJ = new RMNCHBeneficiaryDetailsRmnch();
-					benBotnBirthRMNCH_ROBJ = new RMNCHBornBirthDetails();
-					benCABCRMNCH_ROBJ = new RMNCHCBACdetails();
+					benHouseHoldRMNCHROBJ = new RMNCHHouseHoldDetails();
+					benDetailsRMNCHOBJ = new RMNCHBeneficiaryDetailsRmnch();
+					benBotnBirthRMNCHROBJ = new RMNCHBornBirthDetails();
+					benCABCRMNCHROBJ = new RMNCHCBACdetails();
 
 					benDetailsOBJ = new RMNCHMBeneficiarydetail();
 					benAccountOBJ = new RMNCHMBeneficiaryAccount();
@@ -388,105 +388,105 @@ private String getMappingsForAddressIDs(List<RMNCHMBeneficiaryaddress> addressLi
 						benID = rMNCHMBenRegIdMapRepo.getBenIdFromRegID(m.getBenRegId().longValue());
 
 					if (m.getBenRegId() != null) {
-						benDetailsRMNCH_OBJ = rMNCHBeneficiaryDetailsRmnchRepo
+						benDetailsRMNCHOBJ = rMNCHBeneficiaryDetailsRmnchRepo
 								.getByRegID((m.getBenRegId()).longValue());
-						benBotnBirthRMNCH_ROBJ = rMNCHBornBirthDetailsRepo.getByRegID((m.getBenRegId()).longValue());
+						benBotnBirthRMNCHROBJ = rMNCHBornBirthDetailsRepo.getByRegID((m.getBenRegId()).longValue());
 
-						benCABCRMNCH_ROBJ = rMNCHCBACDetailsRepo.getByRegID((m.getBenRegId()).longValue());
+						benCABCRMNCHROBJ = rMNCHCBACDetailsRepo.getByRegID((m.getBenRegId()).longValue());
 						// 20-09-2021,start
-						NCD_TB_HRP_data res = getHRP_NCD_TB_SuspectedStatus(m.getBenRegId().longValue(), authorisation,
+						NcdTbHrpData res = getHRP_NCD_TB_SuspectedStatus(m.getBenRegId().longValue(), authorisation,
 								benDetailsOBJ);
-						if (res != null && benCABCRMNCH_ROBJ != null) {
+						if (res != null && benCABCRMNCHROBJ != null) {
 							if (res.getConfirmed_hrp() != null)
-								benCABCRMNCH_ROBJ.setConfirmed_hrp(res.getConfirmed_hrp());
+								benCABCRMNCHROBJ.setConfirmed_hrp(res.getConfirmed_hrp());
 							if (res.getConfirmed_ncd() != null)
-								benCABCRMNCH_ROBJ.setConfirmed_ncd(res.getConfirmed_ncd());
+								benCABCRMNCHROBJ.setConfirmed_ncd(res.getConfirmed_ncd());
 							if (res.getConfirmed_tb() != null)
-								benCABCRMNCH_ROBJ.setConfirmed_tb(res.getConfirmed_tb());
+								benCABCRMNCHROBJ.setConfirmed_tb(res.getConfirmed_tb());
 							if (res.getConfirmed_ncd_diseases() != null)
-								benCABCRMNCH_ROBJ.setConfirmed_ncd_diseases(res.getConfirmed_ncd_diseases());
+								benCABCRMNCHROBJ.setConfirmed_ncd_diseases(res.getConfirmed_ncd_diseases());
 							if (res.getDiagnosis_status() != null)
-								benCABCRMNCH_ROBJ.setDiagnosis_status(res.getDiagnosis_status());
-							benCABCRMNCH_ROBJ = rMNCHCBACDetailsRepo.save(benCABCRMNCH_ROBJ);
+								benCABCRMNCHROBJ.setDiagnosis_status(res.getDiagnosis_status());
+							benCABCRMNCHROBJ = rMNCHCBACDetailsRepo.save(benCABCRMNCHROBJ);
 
 						}
 
 						// 20-09-2021,end
-						if (benDetailsRMNCH_OBJ != null && benDetailsRMNCH_OBJ.getHouseoldId() != null)
-							benHouseHoldRMNCH_ROBJ = rMNCHHouseHoldDetailsRepo
-									.getByHouseHoldID(benDetailsRMNCH_OBJ.getHouseoldId());
+						if (benDetailsRMNCHOBJ != null && benDetailsRMNCHOBJ.getHouseoldId() != null)
+							benHouseHoldRMNCHROBJ = rMNCHHouseHoldDetailsRepo
+									.getByHouseHoldID(benDetailsRMNCHOBJ.getHouseoldId());
 
 					}
-					if (benDetailsRMNCH_OBJ == null)
-						benDetailsRMNCH_OBJ = new RMNCHBeneficiaryDetailsRmnch();
+					if (benDetailsRMNCHOBJ == null)
+						benDetailsRMNCHOBJ = new RMNCHBeneficiaryDetailsRmnch();
 
 					// new mapping 30-06-2021
 					if (benDetailsOBJ.getMotherName() != null)
-						benDetailsRMNCH_OBJ.setMotherName(benDetailsOBJ.getMotherName());
+						benDetailsRMNCHOBJ.setMotherName(benDetailsOBJ.getMotherName());
 					if (benDetailsOBJ.getLiteracyStatus() != null)
-						benDetailsRMNCH_OBJ.setLiteracyStatus(benDetailsOBJ.getLiteracyStatus());
+						benDetailsRMNCHOBJ.setLiteracyStatus(benDetailsOBJ.getLiteracyStatus());
 
 					// bank
 					if (benAccountOBJ.getNameOfBank() != null)
-						benDetailsRMNCH_OBJ.setNameOfBank(benAccountOBJ.getNameOfBank());
+						benDetailsRMNCHOBJ.setNameOfBank(benAccountOBJ.getNameOfBank());
 					if (benAccountOBJ.getBranchName() != null)
-						benDetailsRMNCH_OBJ.setBranchName(benAccountOBJ.getBranchName());
+						benDetailsRMNCHOBJ.setBranchName(benAccountOBJ.getBranchName());
 					if (benAccountOBJ.getIfscCode() != null)
-						benDetailsRMNCH_OBJ.setIfscCode(benAccountOBJ.getIfscCode());
+						benDetailsRMNCHOBJ.setIfscCode(benAccountOBJ.getIfscCode());
 					if (benAccountOBJ.getBankAccount() != null)
-						benDetailsRMNCH_OBJ.setBankAccount(benAccountOBJ.getBankAccount());
+						benDetailsRMNCHOBJ.setBankAccount(benAccountOBJ.getBankAccount());
 
 					// location
 					if (benAddressOBJ.getCountyid() != null)
-						benDetailsRMNCH_OBJ.setCountryId(benAddressOBJ.getCountyid());
+						benDetailsRMNCHOBJ.setCountryId(benAddressOBJ.getCountyid());
 					if (benAddressOBJ.getPermCountry() != null)
-						benDetailsRMNCH_OBJ.setCountryName(benAddressOBJ.getPermCountry());
+						benDetailsRMNCHOBJ.setCountryName(benAddressOBJ.getPermCountry());
 
 					if (benAddressOBJ.getStatePerm() != null)
-						benDetailsRMNCH_OBJ.setStateId(benAddressOBJ.getStatePerm());
+						benDetailsRMNCHOBJ.setStateId(benAddressOBJ.getStatePerm());
 					if (benAddressOBJ.getPermState() != null)
-						benDetailsRMNCH_OBJ.setStateName(benAddressOBJ.getPermState());
+						benDetailsRMNCHOBJ.setStateName(benAddressOBJ.getPermState());
 
 					if (benAddressOBJ.getDistrictidPerm() != null) {
-						benDetailsRMNCH_OBJ.setDistrictid(benAddressOBJ.getDistrictidPerm());
+						benDetailsRMNCHOBJ.setDistrictid(benAddressOBJ.getDistrictidPerm());
 
 					}
 					if (benAddressOBJ.getDistrictnamePerm() != null) {
-						benDetailsRMNCH_OBJ.setDistrictname(benAddressOBJ.getDistrictnamePerm());
+						benDetailsRMNCHOBJ.setDistrictname(benAddressOBJ.getDistrictnamePerm());
 
 					}
 
 					if (benAddressOBJ.getPermSubDistrictId() != null)
-						benDetailsRMNCH_OBJ.setBlockId(benAddressOBJ.getPermSubDistrictId());
+						benDetailsRMNCHOBJ.setBlockId(benAddressOBJ.getPermSubDistrictId());
 					if (benAddressOBJ.getPermSubDistrict() != null)
-						benDetailsRMNCH_OBJ.setBlockName(benAddressOBJ.getPermSubDistrict());
+						benDetailsRMNCHOBJ.setBlockName(benAddressOBJ.getPermSubDistrict());
 
 					if (benAddressOBJ.getVillageidPerm() != null)
-						benDetailsRMNCH_OBJ.setVillageId(benAddressOBJ.getVillageidPerm());
+						benDetailsRMNCHOBJ.setVillageId(benAddressOBJ.getVillageidPerm());
 					if (benAddressOBJ.getVillagenamePerm() != null)
-						benDetailsRMNCH_OBJ.setVillageName(benAddressOBJ.getVillagenamePerm());
+						benDetailsRMNCHOBJ.setVillageName(benAddressOBJ.getVillagenamePerm());
 
 					if (benAddressOBJ.getPermServicePointId() != null)
-						benDetailsRMNCH_OBJ.setServicePointID(benAddressOBJ.getPermServicePointId());
+						benDetailsRMNCHOBJ.setServicePointID(benAddressOBJ.getPermServicePointId());
 					if (benAddressOBJ.getPermServicePoint() != null)
-						benDetailsRMNCH_OBJ.setServicePointName(benAddressOBJ.getPermServicePoint());
+						benDetailsRMNCHOBJ.setServicePointName(benAddressOBJ.getPermServicePoint());
 
 					if (benAddressOBJ.getPermZoneID() != null)
-						benDetailsRMNCH_OBJ.setZoneID(benAddressOBJ.getPermZoneID());
+						benDetailsRMNCHOBJ.setZoneID(benAddressOBJ.getPermZoneID());
 					if (benAddressOBJ.getPermZone() != null)
-						benDetailsRMNCH_OBJ.setZoneName(benAddressOBJ.getPermZone());
+						benDetailsRMNCHOBJ.setZoneName(benAddressOBJ.getPermZone());
 
 					if (benAddressOBJ.getPermAddrLine1() != null)
-						benDetailsRMNCH_OBJ.setAddressLine1(benAddressOBJ.getPermAddrLine1());
+						benDetailsRMNCHOBJ.setAddressLine1(benAddressOBJ.getPermAddrLine1());
 					if (benAddressOBJ.getPermAddrLine2() != null)
-						benDetailsRMNCH_OBJ.setAddressLine2(benAddressOBJ.getPermAddrLine2());
+						benDetailsRMNCHOBJ.setAddressLine2(benAddressOBJ.getPermAddrLine2());
 					if (benAddressOBJ.getPermAddrLine3() != null)
-						benDetailsRMNCH_OBJ.setAddressLine3(benAddressOBJ.getPermAddrLine3());
+						benDetailsRMNCHOBJ.setAddressLine3(benAddressOBJ.getPermAddrLine3());
 
 					// related benids
-					if (benDetailsRMNCH_OBJ.getRelatedBeneficiaryIdsDB() != null) {
+					if (benDetailsRMNCHOBJ.getRelatedBeneficiaryIdsDB() != null) {
 
-						String[] relatedBenIDsString = benDetailsRMNCH_OBJ.getRelatedBeneficiaryIdsDB().split(",");
+						String[] relatedBenIDsString = benDetailsRMNCHOBJ.getRelatedBeneficiaryIdsDB().split(",");
 						Long[] relatedBenIDs = new Long[relatedBenIDsString.length];
 						int pointer = 0;
 						for (String s : relatedBenIDsString) {
@@ -494,59 +494,59 @@ private String getMappingsForAddressIDs(List<RMNCHMBeneficiaryaddress> addressLi
 							pointer++;
 						}
 
-						benDetailsRMNCH_OBJ.setRelatedBeneficiaryIds(relatedBenIDs);
+						benDetailsRMNCHOBJ.setRelatedBeneficiaryIds(relatedBenIDs);
 					}
 
 					if (benDetailsOBJ.getCommunity() != null)
-						benDetailsRMNCH_OBJ.setCommunity(benDetailsOBJ.getCommunity());
+						benDetailsRMNCHOBJ.setCommunity(benDetailsOBJ.getCommunity());
 					if (benDetailsOBJ.getCommunityId() != null)
-						benDetailsRMNCH_OBJ.setCommunityId(benDetailsOBJ.getCommunityId());
+						benDetailsRMNCHOBJ.setCommunityId(benDetailsOBJ.getCommunityId());
 					if (benContactOBJ.getPreferredPhoneNum() != null)
-						benDetailsRMNCH_OBJ.setContact_number(benContactOBJ.getPreferredPhoneNum());
+						benDetailsRMNCHOBJ.setContact_number(benContactOBJ.getPreferredPhoneNum());
 
 					if (benDetailsOBJ.getDob() != null)
-						benDetailsRMNCH_OBJ.setDob(benDetailsOBJ.getDob());
+						benDetailsRMNCHOBJ.setDob(benDetailsOBJ.getDob());
 					if (benDetailsOBJ.getFatherName() != null)
-						benDetailsRMNCH_OBJ.setFatherName(benDetailsOBJ.getFatherName());
+						benDetailsRMNCHOBJ.setFatherName(benDetailsOBJ.getFatherName());
 					if (benDetailsOBJ.getFirstName() != null)
-						benDetailsRMNCH_OBJ.setFirstName(benDetailsOBJ.getFirstName());
+						benDetailsRMNCHOBJ.setFirstName(benDetailsOBJ.getFirstName());
 					if (benDetailsOBJ.getGender() != null)
-						benDetailsRMNCH_OBJ.setGender(benDetailsOBJ.getGender());
+						benDetailsRMNCHOBJ.setGender(benDetailsOBJ.getGender());
 					if (benDetailsOBJ.getGenderId() != null)
-						benDetailsRMNCH_OBJ.setGenderId(benDetailsOBJ.getGenderId());
+						benDetailsRMNCHOBJ.setGenderId(benDetailsOBJ.getGenderId());
 
 					if (benDetailsOBJ.getMaritalstatus() != null)
-						benDetailsRMNCH_OBJ.setMaritalstatus(benDetailsOBJ.getMaritalstatus());
+						benDetailsRMNCHOBJ.setMaritalstatus(benDetailsOBJ.getMaritalstatus());
 					if (benDetailsOBJ.getMaritalstatusId() != null)
-						benDetailsRMNCH_OBJ.setMaritalstatusId(benDetailsOBJ.getMaritalstatusId());
+						benDetailsRMNCHOBJ.setMaritalstatusId(benDetailsOBJ.getMaritalstatusId());
 					if (benDetailsOBJ.getMarriageDate() != null)
-						benDetailsRMNCH_OBJ.setMarriageDate(benDetailsOBJ.getMarriageDate());
+						benDetailsRMNCHOBJ.setMarriageDate(benDetailsOBJ.getMarriageDate());
 
 					if (benDetailsOBJ.getReligion() != null)
-						benDetailsRMNCH_OBJ.setReligion(benDetailsOBJ.getReligion());
+						benDetailsRMNCHOBJ.setReligion(benDetailsOBJ.getReligion());
 					if (benDetailsOBJ.getReligionID() != null)
-						benDetailsRMNCH_OBJ.setReligionID(benDetailsOBJ.getReligionID());
+						benDetailsRMNCHOBJ.setReligionID(benDetailsOBJ.getReligionID());
 					if (benDetailsOBJ.getSpousename() != null)
-						benDetailsRMNCH_OBJ.setSpousename(benDetailsOBJ.getSpousename());
+						benDetailsRMNCHOBJ.setSpousename(benDetailsOBJ.getSpousename());
 
 					if (benImageOBJ != null && benImageOBJ.getUser_image() != null)
-						benDetailsRMNCH_OBJ.setUser_image(benImageOBJ.getUser_image());
+						benDetailsRMNCHOBJ.setUser_image(benImageOBJ.getUser_image());
 
 					// new fields
-					benDetailsRMNCH_OBJ.setRegistrationDate(benDetailsOBJ.getCreatedDate());
+					benDetailsRMNCHOBJ.setRegistrationDate(benDetailsOBJ.getCreatedDate());
 					if (benID != null)
-						benDetailsRMNCH_OBJ.setBenficieryid(benID.longValue());
+						benDetailsRMNCHOBJ.setBenficieryid(benID.longValue());
 
 					if (benDetailsOBJ.getLastName() != null)
-						benDetailsRMNCH_OBJ.setLastName(benDetailsOBJ.getLastName());
+						benDetailsRMNCHOBJ.setLastName(benDetailsOBJ.getLastName());
 
-					if (benDetailsRMNCH_OBJ.getCreatedBy() == null)
+					if (benDetailsRMNCHOBJ.getCreatedBy() == null)
 						if (benDetailsOBJ.getCreatedBy() != null)
-							benDetailsRMNCH_OBJ.setCreatedBy(benDetailsOBJ.getCreatedBy());
+							benDetailsRMNCHOBJ.setCreatedBy(benDetailsOBJ.getCreatedBy());
 
 					// age calculation
 					String ageDetails = "";
-					int age_val = 0;
+					int ageVal = 0;
 					String ageUnit = null;
 					if (benDetailsOBJ.getDob() != null) {
 
@@ -569,47 +569,47 @@ private String getMappingsForAddressIDs(List<RMNCHMBeneficiaryaddress> addressLi
 
 						if (y > 0) {
 							ageDetails = y + " years - " + mo + " months";
-							age_val = y;
-							ageUnit = (age_val > 1) ? "Years" : "Year";
+							ageVal = y;
+							ageUnit = (ageVal > 1) ? "Years" : "Year";
 						} else {
 							if (mo > 0) {
 								ageDetails = mo + " months - " + d + " days";
-								age_val = mo;
-								ageUnit = (age_val > 1) ? "Months" : "Month";
+								ageVal = mo;
+								ageUnit = (ageVal > 1) ? "Months" : "Month";
 							} else {
 								ageDetails = d + " days";
-								age_val = d;
-								ageUnit = (age_val > 1) ? "Days" : "Day";
+								ageVal = d;
+								ageUnit = (ageVal > 1) ? "Days" : "Day";
 							}
 						}
 
 					}
 
-					benDetailsRMNCH_OBJ.setAgeFull(ageDetails);
-					benDetailsRMNCH_OBJ.setAge(age_val);
+					benDetailsRMNCHOBJ.setAgeFull(ageDetails);
+					benDetailsRMNCHOBJ.setAge(ageVal);
 					if (ageUnit != null)
-						benDetailsRMNCH_OBJ.setAge_unit(ageUnit);
+						benDetailsRMNCHOBJ.setAge_unit(ageUnit);
 
 					resultMap = new HashMap<>();
-					if (benHouseHoldRMNCH_ROBJ != null)
-						resultMap.put("householdDetails", benHouseHoldRMNCH_ROBJ);
+					if (benHouseHoldRMNCHROBJ != null)
+						resultMap.put("householdDetails", benHouseHoldRMNCHROBJ);
 					else
 						resultMap.put("householdDetails", new HashMap<String, Object>());
 
-					if (benBotnBirthRMNCH_ROBJ != null)
-						resultMap.put("bornbirthDeatils", benBotnBirthRMNCH_ROBJ);
+					if (benBotnBirthRMNCHROBJ != null)
+						resultMap.put("bornbirthDeatils", benBotnBirthRMNCHROBJ);
 					else
 						resultMap.put("bornbirthDeatils", new HashMap<String, Object>());
 
-					if (benCABCRMNCH_ROBJ != null)
-						resultMap.put("cbacDetails", benCABCRMNCH_ROBJ);
+					if (benCABCRMNCHROBJ != null)
+						resultMap.put("cbacDetails", benCABCRMNCHROBJ);
 					else
 						resultMap.put("cbacDetails", new HashMap<String, Object>());
 
-					resultMap.put("beneficiaryDetails", benDetailsRMNCH_OBJ);
+					resultMap.put("beneficiaryDetails", benDetailsRMNCHOBJ);
 
-					resultMap.put("houseoldId", benDetailsRMNCH_OBJ.getHouseoldId());
-					resultMap.put("benficieryid", benDetailsRMNCH_OBJ.getBenficieryid());
+					resultMap.put("houseoldId", benDetailsRMNCHOBJ.getHouseoldId());
+					resultMap.put("benficieryid", benDetailsRMNCHOBJ.getBenficieryid());
 					resultMap.put("BenRegId", m.getBenRegId());
 
 					// adding asha id / created by - user id
@@ -624,7 +624,7 @@ private String getMappingsForAddressIDs(List<RMNCHMBeneficiaryaddress> addressLi
 						if (healthID != null)
 							resultMap.put("HealthID", healthID);
 					}
-					resultMap.put("ProviderServiceMapID", benDetailsRMNCH_OBJ.getProviderServiceMapID());
+					resultMap.put("ProviderServiceMapID", benDetailsRMNCHOBJ.getProviderServiceMapID());
 					resultMap.put("VanID", m.getVanID());
 
 					resultList.add(resultMap);
@@ -680,15 +680,15 @@ public List<String> fetchHealthIdByBenRegID(Long benRegID, String authorization)
 
 	}
 
-	public NCD_TB_HRP_data getHRP_NCD_TB_SuspectedStatus(Long benRegID, String authorization,
+	public NcdTbHrpData getHRP_NCD_TB_SuspectedStatus(Long benRegID, String authorization,
 			RMNCHMBeneficiarydetail benDetails) throws IEMRException {
-		NCD_TB_HRP_data response = null;
+		NcdTbHrpData response = null;
 		try {
 
 			if (benRegID != null) {
 				List<Object[]> obj = rMNCHCBACDetailsRepo.getVisitDetailsbyRegID(benRegID);
 				if (obj != null && obj.size() > 0) {
-					response = new NCD_TB_HRP_data();
+					response = new NcdTbHrpData();
 					Long visitCode = (((BigInteger) obj.get(0)[0])).longValue();
 					String visitCategory = (String) obj.get(0)[1];
 					switch (visitCategory) {
@@ -772,8 +772,8 @@ public String getConfirmedHRP(Long benRegID, Long visitCode, String authorizatio
 
 	}
 
-	public NCD_TB_HRP_data getConfirmedNCD_TB_PNC(Long benRegID, Long visitCode) throws IEMRException {
-		NCD_TB_HRP_data response = new NCD_TB_HRP_data();
+	public NcdTbHrpData getConfirmedNCD_TB_PNC(Long benRegID, Long visitCode) throws IEMRException {
+		NcdTbHrpData response = new NcdTbHrpData();
 		String dp = null;
 		if (visitCode != null && benRegID != null) {
 			try {
@@ -829,8 +829,8 @@ public NCD_TB_HRP_data getConfirmedNCD_TB_PNC(Long benRegID, Long visitCode) thr
 		return response;
 	}
 
-	public NCD_TB_HRP_data getConfirmedNCD_TB_Common(Long benRegID, Long visitCode) throws IEMRException {
-		NCD_TB_HRP_data response = new NCD_TB_HRP_data();
+	public NcdTbHrpData getConfirmedNCD_TB_Common(Long benRegID, Long visitCode) throws IEMRException {
+		NcdTbHrpData response = new NcdTbHrpData();
 		String dp = null;
 		if (visitCode != null && benRegID != null) {
 			try {
@@ -888,12 +888,12 @@ public NCD_TB_HRP_data getConfirmedNCD_TB_Common(Long benRegID, Long visitCode)
 		return response;
 	}
 
-	public NCD_TB_HRP_data getConfirmedNCD_TB_NCD_CARE(Long benRegID, Long visitCode) throws IEMRException {
-		NCD_TB_HRP_data response = new NCD_TB_HRP_data();
+	public NcdTbHrpData getConfirmedNCD_TB_NCD_CARE(Long benRegID, Long visitCode) throws IEMRException {
+		NcdTbHrpData response = new NcdTbHrpData();
 		String dp = null;
 		if (visitCode != null && benRegID != null) {
 			try {
-				List<Object> obj = rMNCHCBACDetailsRepo.getDiagnosisProvidedNCD_Care(benRegID, visitCode);
+				List<Object> obj = rMNCHCBACDetailsRepo.getDiagnosisProvidedNCDCare(benRegID, visitCode);
 				if (obj != null && obj.size() > 0 && obj.get(0) != null) {
 					dp = obj.get(0).toString();
 					if (dp != null) {
diff --git a/src/test/java/com/iemr/common/identity/service/IdentityServiceTest.java b/src/test/java/com/iemr/common/identity/service/IdentityServiceTest.java
index 2dd5bd9b..b349e113 100644
--- a/src/test/java/com/iemr/common/identity/service/IdentityServiceTest.java
+++ b/src/test/java/com/iemr/common/identity/service/IdentityServiceTest.java
@@ -183,7 +183,7 @@ public void getBeneficiariesTest() throws NoResultException, QueryTimeoutExcepti
 		BeneficiariesDTO dto = new BeneficiariesDTO();
 		dto.setBenId(new BigInteger("301"));
 
-		doReturn(dto).when(identityMapper).MBeneficiarymappingToBeneficiariesDTO(mBeneficiarymapping);
+		doReturn(dto).when(identityMapper).mBeneficiarymappingToBeneficiariesDTO(mBeneficiarymapping);
 		List<BeneficiariesDTO> benDTOList=identityService.getBeneficiaries(Mockito.mock(IdentitySearchDTO.class));
 		assertTrue(benDTOList.size()>0);
 	}
@@ -219,7 +219,7 @@ public void getBeneficiariesBenRegIDTest() throws NoResultException, QueryTimeou
 		identitylist.add(identity);
 		mBeneficiarymapping.setMBeneficiaryidentities(identitylist);
 
-		doReturn(dto).when(identityMapper).MBeneficiarymappingToBeneficiariesDTO(mBeneficiarymapping);
+		doReturn(dto).when(identityMapper).mBeneficiarymappingToBeneficiariesDTO(mBeneficiarymapping);
 		
 		doReturn(mBeneficiarymapping).when(benMappingRepo).findByBenRegIdOrderByBenMapIdAsc(Mockito.any(BigInteger.class));
 		List<BeneficiariesDTO> benDTOList=identityService.getBeneficiaries(identitySearchDTO);
@@ -248,7 +248,7 @@ public void getBeneficiariesBenConTest1() throws NoResultException, QueryTimeout
 		
 		BeneficiariesDTO dto = new BeneficiariesDTO();
 		dto.setBenId(new BigInteger("301"));
-		doReturn(dto).when(identityMapper).MBeneficiarymappingToBeneficiariesDTO(mBeneficiarymapping);
+		doReturn(dto).when(identityMapper).mBeneficiarymappingToBeneficiariesDTO(mBeneficiarymapping);
 		
 		List<BeneficiariesDTO> benDTOList=identityService.getBeneficiaries(identitySearchDTO);
 		assertTrue(benDTOList.size()>0);
@@ -271,7 +271,7 @@ public void getBeneficiariesByBenIdTest() throws NoResultException, QueryTimeout
 
 		doReturn(mapping).when(benRegIdMappingRepo).findByBeneficiaryID(Mockito.any(BigInteger.class));
 		doReturn(benMapList).when(benMappingRepo).findByMBeneficiaryregidmappingOrderByBenMapIdAsc(anyObject());
-		doReturn(dto).when(identityMapper).MBeneficiarymappingToBeneficiariesDTO(Mbeneficiary);
+		doReturn(dto).when(identityMapper).mBeneficiarymappingToBeneficiariesDTO(Mbeneficiary);
 
 		List<BeneficiariesDTO> bList = identityService.getBeneficiariesByBenId(Mockito.any(BigInteger.class));
 		
@@ -313,7 +313,7 @@ public void getBeneficiariesByPhoneNumTest() throws NoResultException, QueryTime
 		
 		BeneficiariesDTO dto = new BeneficiariesDTO();
 		dto.setBenId(new BigInteger("301"));
-		doReturn(dto).when(identityMapper).MBeneficiarymappingToBeneficiariesDTO(mBeneficiarymapping);
+		doReturn(dto).when(identityMapper).mBeneficiarymappingToBeneficiariesDTO(mBeneficiarymapping);
 		List<BeneficiariesDTO> dtoList=identityService.getBeneficiariesByPhoneNum(Mockito.anyString());
 		assertTrue(dtoList.size() > 0);
 	}
@@ -428,7 +428,7 @@ public void getBeneficiariesPartialDeatilsByBenRegIdListTest1()
 			doReturn(benDetail).when(detailRepo).findPartialBeneficiaryDetailByBenRegId(Mockito.any(BigInteger.class));
 			BeneficiariesPartialDTO beneficiariesPartialDTO=new BeneficiariesPartialDTO();
 			beneficiariesPartialDTO.setBeneficiaryDetailsId(new BigInteger("202"));
-			doReturn(beneficiariesPartialDTO).when(partialMapper).MBeneficiarymappingToBeneficiariesPartialDTO(beneficiarymapping);
+			doReturn(beneficiariesPartialDTO).when(partialMapper).mBeneficiarymappingToBeneficiariesPartialDTO(beneficiarymapping);
 			
 			List<BeneficiariesPartialDTO> dtoList=identityService.getBeneficiariesPartialDeatilsByBenRegIdList(Mockito.anyListOf(BigInteger.class));
 			assertTrue(dtoList.size()>0);
@@ -483,7 +483,7 @@ public void editIdentityTest() throws MissingMandatoryFieldsException
 			
 			mBeneficiarymapping.setMBeneficiarydetail(beneficiarydetail);
 			
-			doReturn(mBeneficiarydetail).when(editMapper).IdentityEditDTOToMBeneficiarydetail(Mockito.any());
+			doReturn(mBeneficiarydetail).when(editMapper).identityEditDTOToMBeneficiarydetail(Mockito.any());
 
 			doReturn(mBeneficiarydetail).when(beneficiarymapping).getMBeneficiarydetail();
 			doReturn(new BigInteger("250")).when(beneficiarydetail).getBeneficiaryDetailsId();
@@ -500,7 +500,7 @@ public void editIdentityTest() throws MissingMandatoryFieldsException
 			mBeneficiaryaddressList.add(mBeneficiaryaddress);
 			
 
-			doReturn(mBeneficiaryaddress).when(editMapper).IdentityEditDTOToMBeneficiaryaddress(Mockito.any());
+			doReturn(mBeneficiaryaddress).when(editMapper).identityEditDTOToMBeneficiaryaddress(Mockito.any());
 			
 			
 			mBeneficiarymapping.setMBeneficiaryaddress(beneficiaryaddress);
@@ -514,7 +514,7 @@ public void editIdentityTest() throws MissingMandatoryFieldsException
 			MBeneficiaryidentity mBeneficiaryidentity=new MBeneficiaryidentity();
 			mBeneficiaryidentity.setBenIdentityId(new BigInteger("786"));
 			identityList.add(mBeneficiaryidentity);
-			doReturn(identityList).when(editMapper).IdentityEditDTOListToMBeneficiaryidentityList(Mockito.anyListOf(Identity.class));
+			doReturn(identityList).when(editMapper).identityEditDTOListToMBeneficiaryidentityList(Mockito.anyListOf(Identity.class));
 			doReturn(identityList).when(identityRepo).save(mBeneficiaryidentity);
 			
 			identityEditDTO.setChangeInContacts(true);
@@ -523,14 +523,14 @@ public void editIdentityTest() throws MissingMandatoryFieldsException
 			mBeneficiarymapping.setMBeneficiarycontact(contact);
 			doReturn(contact).when(beneficiarymapping).getMBeneficiarycontact();
 			doReturn(new BigInteger("901")).when(mBeneficiarycontact).getBenContactsID();
-			doReturn(contact).when(editMapper).IdentityEdiDTOToMBeneficiarycontact(Mockito.any());
+			doReturn(contact).when(editMapper).identityEdiDTOToMBeneficiarycontact(Mockito.any());
 			
 			identityEditDTO.setChangeInFamilyDetails(true);
 			List<MBeneficiaryfamilymapping> familyMappingList=Lists.newArrayList();
 			MBeneficiaryfamilymapping familyMap=new MBeneficiaryfamilymapping();
 			familyMap.setBenFamilyMapId(new BigInteger("303"));
 			familyMappingList.add(familyMap);
-			doReturn(familyMappingList).when(editMapper).IdentityEditDTOListToMBeneficiaryfamilymappingList(Mockito.anyListOf(BenFamilyDTO.class));
+			doReturn(familyMappingList).when(editMapper).identityEditDTOListToMBeneficiaryfamilymappingList(Mockito.anyListOf(BenFamilyDTO.class));
 			identityService.editIdentity(identityEditDTO);
 		}
 
@@ -546,7 +546,7 @@ public void getBeneficiariesByBenRegIdTest() throws NoResultException, QueryTime
 			
 			doReturn(mBeneficiarymapping).when(benMappingRepo).findByBenRegIdOrderByBenMapIdAsc(Mockito.any(BigInteger.class));
 			
-			doReturn(dto).when(identityMapper).MBeneficiarymappingToBeneficiariesDTO(mBeneficiarymapping);
+			doReturn(dto).when(identityMapper).mBeneficiarymappingToBeneficiariesDTO(mBeneficiarymapping);
 			
 			List<BeneficiariesDTO> dtoList=identityService.getBeneficiariesByBenRegId(Mockito.any(BigInteger.class));
 			assertTrue(dtoList.size() > 0);
@@ -563,7 +563,7 @@ public void getBeneficiariesDeatilsByBenRegIdListTest()
 			
 			BeneficiariesDTO dto = new BeneficiariesDTO();
 			dto.setBenId(new BigInteger("301"));
-			doReturn(dto).when(identityMapper).MBeneficiarymappingToBeneficiariesDTO(mBeneficiarymapping);
+			doReturn(dto).when(identityMapper).mBeneficiarymappingToBeneficiariesDTO(mBeneficiarymapping);
 			List<BeneficiariesDTO> dtoList=identityService.getBeneficiariesDeatilsByBenRegIdList(Mockito.anyListOf(BigInteger.class));
 			assertTrue(dtoList.size() > 0);
 		}
