diff --git a/SAS/MoM/MoMQueryService/MoMQueryServiceClient/momqueryrpc.py b/SAS/MoM/MoMQueryService/MoMQueryServiceClient/momqueryrpc.py
index eea816a1754280b8572fa2192981304abf38d0b0..7222f119132e7683da0faa08975b29d8844f3738 100644
--- a/SAS/MoM/MoMQueryService/MoMQueryServiceClient/momqueryrpc.py
+++ b/SAS/MoM/MoMQueryService/MoMQueryServiceClient/momqueryrpc.py
@@ -121,7 +121,7 @@ class MoMQueryRPC(RPCClientContextManagerMixin):
         :return: Boolean
         """
         logger.info("Requesting if user %s is an operator", user_name)
-        result = self._rpc_client.execute('IsUserOperator', user_name=user_name)
+        result = self._rpc_client.execute('is_user_operator', user_name=user_name)
         logger.info("User %s is %san operator", user_name,
                     'not ' if result['is_operator'] is False else '')
         return result
@@ -326,8 +326,8 @@ class MoMQueryRPC(RPCClientContextManagerMixin):
         :param mom_id: int
         :return: list of dict
         """
-        logger.info("Calling getStationSelection for mom id "+str(mom_id))
-        station_selection = self._rpc_client.execute('getStationSelection', mom_id=mom_id)
+        logger.info("Calling get_station_selection for mom id "+str(mom_id))
+        station_selection = self._rpc_client.execute('get_station_selection', mom_id=mom_id)
         return station_selection
 
     def get_trigger_time_restrictions(self, mom_id):
@@ -336,8 +336,8 @@ class MoMQueryRPC(RPCClientContextManagerMixin):
         :param mom_id: int
         :return: dict
         """
-        logger.info("Calling getTimeRestrictions for mom id "+str(mom_id))
-        time_restrictions = self._rpc_client.execute('getTriggerTimeRestrictions', mom_id=mom_id)
+        logger.info("Calling get_trigger_time_restrictions for mom id "+str(mom_id))
+        time_restrictions = self._rpc_client.execute('get_trigger_time_restrictions', mom_id=mom_id)
         return time_restrictions
 
     def get_storagemanager(self, mom_id):
@@ -346,8 +346,8 @@ class MoMQueryRPC(RPCClientContextManagerMixin):
         :param mom_id: int
         :return: string
         """
-        logger.info("Calling GetStoragemanager for mom id "+str(mom_id))
-        storagemanager = self._rpc_client.execute('getStoragemanager', mom_id=mom_id)
+        logger.info("Calling get_storagemanager for mom id "+str(mom_id))
+        storagemanager = self._rpc_client.execute('get_storagemanager', mom_id=mom_id)
         return storagemanager
 
 
diff --git a/SAS/MoM/MoMQueryService/MoMQueryServiceServer/test/t_momqueryservice.py b/SAS/MoM/MoMQueryService/MoMQueryServiceServer/test/t_momqueryservice.py
index 41e9b334a1de97eebb1cae8e0ce58610c39949f8..2205c19ae078a9db4216bb4a5e1f07c5cbc39ed5 100755
--- a/SAS/MoM/MoMQueryService/MoMQueryServiceServer/test/t_momqueryservice.py
+++ b/SAS/MoM/MoMQueryService/MoMQueryServiceServer/test/t_momqueryservice.py
@@ -433,6 +433,7 @@ class TestMoMQueryServiceMessageHandler(unittest.TestCase):
         self.mom_database_wrapper_mock = mom_database_wrapper_patcher.start()
 
         self.project_details_query_handler = MoMQueryServiceMessageHandler(dbcreds = self.database_credentials)
+        self.project_details_query_handler.init_tobus()
         self.project_details_query_handler.start_handling()
 
     def test_IsProjectActive_returns_active_true_when_mom_wrapper_returns_true(self):
@@ -960,13 +961,13 @@ class TestMomQueryRPC(unittest.TestCase):
     def test_get_time_restrictions_query(self):
         self.momrpc.get_trigger_time_restrictions(self.test_id)
 
-        self.rpc_mock.execute.assert_called_with('getTriggerTimeRestrictions',
+        self.rpc_mock.execute.assert_called_with('get_trigger_time_restrictions',
                                                    mom_id=self.test_id)
 
     def test_get_station_selection_query(self):
         self.momrpc.get_station_selection(self.test_id)
 
-        self.rpc_mock.execute.assert_called_with('getStationSelection', mom_id=self.test_id)
+        self.rpc_mock.execute.assert_called_with('get_station_selection', mom_id=self.test_id)
 
     def test_get_trigger_quota_query(self):
         result = self.momrpc.get_trigger_quota(self.project_name)