diff --git a/src/main/java/com/iemr/common/controller/cti/CTIController.java b/src/main/java/com/iemr/common/controller/cti/ComputerTelephonyIntegrationController.java
similarity index 99%
rename from src/main/java/com/iemr/common/controller/cti/CTIController.java
rename to src/main/java/com/iemr/common/controller/cti/ComputerTelephonyIntegrationController.java
index 388e84bd..1fd62153 100644
--- a/src/main/java/com/iemr/common/controller/cti/CTIController.java
+++ b/src/main/java/com/iemr/common/controller/cti/ComputerTelephonyIntegrationController.java
@@ -43,7 +43,7 @@
 
 @RestController
 @RequestMapping(value = "/cti")
-public class CTIController {
+public class ComputerTelephonyIntegrationController {
 	InputMapper inputMapper = new InputMapper();
 	final Logger logger = LoggerFactory.getLogger(this.getClass().getName());
 
diff --git a/src/main/java/com/iemr/common/controller/helpline104history/H104BenHistoryController.java b/src/main/java/com/iemr/common/controller/helpline104history/Helpline104BeneficiaryHistoryController.java
similarity index 95%
rename from src/main/java/com/iemr/common/controller/helpline104history/H104BenHistoryController.java
rename to src/main/java/com/iemr/common/controller/helpline104history/Helpline104BeneficiaryHistoryController.java
index b876f1fe..7cd15a0c 100644
--- a/src/main/java/com/iemr/common/controller/helpline104history/H104BenHistoryController.java
+++ b/src/main/java/com/iemr/common/controller/helpline104history/Helpline104BeneficiaryHistoryController.java
@@ -44,9 +44,9 @@
 
 @RequestMapping(value = "/beneficiary")
 @RestController
-public class H104BenHistoryController {
+public class Helpline104BeneficiaryHistoryController {
 	InputMapper inputMapper = new InputMapper();
-	private Logger logger = LoggerFactory.getLogger(H104BenHistoryController.class);
+	private Logger logger = LoggerFactory.getLogger(Helpline104BeneficiaryHistoryController.class);
 	
 	@Autowired
 	private H104BenHistoryServiceImpl smpleBenHistoryServiceImpl;
diff --git a/src/main/java/com/iemr/common/controller/nhmdashboard/NHMDashboardController.java b/src/main/java/com/iemr/common/controller/nhmdashboard/NationalHealthMissionDashboardController.java
similarity index 98%
rename from src/main/java/com/iemr/common/controller/nhmdashboard/NHMDashboardController.java
rename to src/main/java/com/iemr/common/controller/nhmdashboard/NationalHealthMissionDashboardController.java
index 641d83c3..e9eda369 100644
--- a/src/main/java/com/iemr/common/controller/nhmdashboard/NHMDashboardController.java
+++ b/src/main/java/com/iemr/common/controller/nhmdashboard/NationalHealthMissionDashboardController.java
@@ -43,7 +43,7 @@
 
 @RequestMapping(value = "/nhm_dashboard")
 @RestController
-public class NHMDashboardController {
+public class NationalHealthMissionDashboardController {
 	private final Logger logger = LoggerFactory.getLogger(this.getClass().getName());
 
 	@Autowired
diff --git a/src/main/java/com/iemr/common/controller/report/CRMReports.java b/src/main/java/com/iemr/common/controller/report/CustomerRelationshipManagementReports.java
similarity index 98%
rename from src/main/java/com/iemr/common/controller/report/CRMReports.java
rename to src/main/java/com/iemr/common/controller/report/CustomerRelationshipManagementReports.java
index d434f8fb..a17a88f8 100644
--- a/src/main/java/com/iemr/common/controller/report/CRMReports.java
+++ b/src/main/java/com/iemr/common/controller/report/CustomerRelationshipManagementReports.java
@@ -42,7 +42,7 @@
 @CrossOrigin
 @RequestMapping({ "/crmReports" })
 @RestController
-public class CRMReports {
+public class CustomerRelationshipManagementReports {
 
 	private final Logger logger = LoggerFactory.getLogger(this.getClass().getName());
 	InputMapper inputMapper = new InputMapper();
diff --git a/src/main/java/com/iemr/common/controller/secondaryReport/CRMSecondaryReports.java b/src/main/java/com/iemr/common/controller/secondaryReport/CustomerRelationshipManagementSecondaryReports.java
similarity index 99%
rename from src/main/java/com/iemr/common/controller/secondaryReport/CRMSecondaryReports.java
rename to src/main/java/com/iemr/common/controller/secondaryReport/CustomerRelationshipManagementSecondaryReports.java
index 5df0eb6f..999313ae 100644
--- a/src/main/java/com/iemr/common/controller/secondaryReport/CRMSecondaryReports.java
+++ b/src/main/java/com/iemr/common/controller/secondaryReport/CustomerRelationshipManagementSecondaryReports.java
@@ -49,7 +49,7 @@
 @CrossOrigin
 @RequestMapping({ "/crmReports" })
 @RestController
-public class CRMSecondaryReports {
+public class CustomerRelationshipManagementSecondaryReports {
 	private final Logger logger = LoggerFactory.getLogger(this.getClass().getName());
 	@Autowired
 	private SecondaryReportService secondaryReportService;
diff --git a/src/test/java/com/iemr/common/cti/CTIControllerTest.java b/src/test/java/com/iemr/common/cti/CTIControllerTest.java
index ff884e30..ce9fa49d 100644
--- a/src/test/java/com/iemr/common/cti/CTIControllerTest.java
+++ b/src/test/java/com/iemr/common/cti/CTIControllerTest.java
@@ -35,7 +35,7 @@
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
-import com.iemr.common.controller.cti.CTIController;
+import com.iemr.common.controller.cti.ComputerTelephonyIntegrationController;
 import com.iemr.common.service.cti.CTIService;
 import com.iemr.common.service.cti.CTIServiceImpl;
 import com.iemr.common.utils.mapper.InputMapper;
@@ -45,7 +45,7 @@
 @FixMethodOrder(MethodSorters.NAME_ASCENDING)
 public class CTIControllerTest {
 	@InjectMocks
-	private CTIController controllerMock = spy(CTIController.class);
+	private ComputerTelephonyIntegrationController controllerMock = spy(ComputerTelephonyIntegrationController.class);
 
 	private CTIService ctiServiceSpy = spy(new CTIServiceImpl());