diff --git a/src/kpi_manager/service/KpiManagerServiceServicerImpl.py b/src/kpi_manager/service/KpiManagerServiceServicerImpl.py
index 3a40195da3093ad1b045d0a205a5dcf74814ed70..fc1ea3b96ca0610e177a44ffa0e32a48bea8a8b3 100644
--- a/src/kpi_manager/service/KpiManagerServiceServicerImpl.py
+++ b/src/kpi_manager/service/KpiManagerServiceServicerImpl.py
@@ -16,7 +16,7 @@ import logging, grpc
 from common.method_wrappers.Decorator import MetricsPool, safe_and_metered_rpc_method
 from common.proto.context_pb2 import Empty
 from common.proto.kpi_manager_pb2_grpc import KpiManagerServiceServicer
-from common.proto.kpi_manager_pb2 import KpiId, KpiDescriptor, KpiDescriptorList
+from common.proto.kpi_manager_pb2 import KpiId, KpiDescriptor, KpiDescriptorFilter, KpiDescriptorList
 from monitoring.service.NameMapping import NameMapping
 from monitoring.service import ManagementDBTools
 
@@ -34,7 +34,7 @@ class KpiManagerServiceServicerImpl(KpiManagerServiceServicer):
         LOGGER.info('MetricsDB initialized --- KPI Manager Service')
   
     @safe_and_metered_rpc_method(METRICS_POOL, LOGGER)
-    def SetKpi(
+    def SetKpiDescriptor(
             self, request: KpiDescriptor, grpc_context: grpc.ServicerContext
     ) -> KpiId:
         response = KpiId()
@@ -57,7 +57,7 @@ class KpiManagerServiceServicerImpl(KpiManagerServiceServicer):
         return response
 
     @safe_and_metered_rpc_method(METRICS_POOL, LOGGER)
-    def DeleteKpi(self, request: KpiId, grpc_context: grpc.ServicerContext) -> Empty:
+    def DeleteKpiDescriptor(self, request: KpiId, grpc_context: grpc.ServicerContext) -> Empty:
         kpi_id = int(request.kpi_id.uuid)
         kpi = self.management_db.get_KPI(kpi_id)
         if kpi:
@@ -85,7 +85,7 @@ class KpiManagerServiceServicerImpl(KpiManagerServiceServicer):
         return kpiDescriptor
 
     @safe_and_metered_rpc_method(METRICS_POOL, LOGGER)
-    def GetKpiDescriptorList(self, request: Empty, grpc_context: grpc.ServicerContext) -> KpiDescriptorList:
+    def SelectKpiDescriptor(self, request: KpiDescriptorFilter, grpc_context: grpc.ServicerContext) -> KpiDescriptorList:
         kpi_descriptor_list = KpiDescriptorList()
         data = self.management_db.get_KPIS()
         LOGGER.debug(f"data: {data}")