diff --git a/src/monitoring/service/EventTools.py b/src/monitoring/service/EventTools.py
index 8b8f0179b9438fd5822ded6011ddbc3e1bc3f87f..cbcf920f1c5dc98a18b0e48a123bc6490f55737c 100644
--- a/src/monitoring/service/EventTools.py
+++ b/src/monitoring/service/EventTools.py
@@ -91,7 +91,7 @@ class EventsDeviceCollector:
                             kpi_descriptor.device_id.CopyFrom(device.device_id)
                             kpi_descriptor.endpoint_id.CopyFrom(end_point.endpoint_id)
 
-                            kpi_id = self._monitoring_client.CreateKpi(kpi_descriptor)
+                            kpi_id = self._monitoring_client.SetKpi(kpi_descriptor)
                             kpi_id_list.append(kpi_id)
             return kpi_id_list
         except ServiceException as e:
diff --git a/src/monitoring/tests/test_unitary.py b/src/monitoring/tests/test_unitary.py
index f5f92986081ce2cf4d70cc55f121253c7f68e90e..f8b4d59bdf61b6897da36258496eb5be7faaf8a2 100644
--- a/src/monitoring/tests/test_unitary.py
+++ b/src/monitoring/tests/test_unitary.py
@@ -163,10 +163,10 @@ def metrics_db():
 ###########################
 
 # Test case that makes use of client fixture to test server's CreateKpi method
-def test_create_kpi(monitoring_client): # pylint: disable=redefined-outer-name
+def test_set_kpi(monitoring_client): # pylint: disable=redefined-outer-name
     # make call to server
     LOGGER.warning('test_create_kpi requesting')
-    response = monitoring_client.CreateKpi(create_kpi_request())
+    response = monitoring_client.SetKpi(create_kpi_request())
     LOGGER.debug(str(response))
     assert isinstance(response, KpiId)
 
@@ -199,7 +199,7 @@ def test_monitor_kpi(
     response = device_client.AddDevice(Device(**device_with_connect_rules))
     assert response.device_uuid.uuid == DEVICE_DEV1_UUID
 
-    response = monitoring_client.CreateKpi(create_kpi_request())
+    response = monitoring_client.SetKpi(create_kpi_request())
     _monitor_kpi_request = monitor_kpi_request(response.kpi_id.uuid, 120, 5) # pylint: disable=maybe-no-member
     response = monitoring_client.MonitorKpi(_monitor_kpi_request)
     LOGGER.debug(str(response))
@@ -231,7 +231,7 @@ def test_get_stream_kpi(monitoring_client): # pylint: disable=redefined-outer-na
 # Test case that makes use of client fixture to test server's GetInstantKpi method
 def test_get_kpidescritor_kpi(monitoring_client): # pylint: disable=redefined-outer-name
     LOGGER.warning('test_getkpidescritor_kpi begin')
-    response = monitoring_client.CreateKpi(create_kpi_request())
+    response = monitoring_client.SetKpi(create_kpi_request())
     response = monitoring_client.GetKpiDescriptor(response)
     LOGGER.debug(str(response))
     assert isinstance(response, KpiDescriptor)