diff --git a/src/monitoring/service/ManagementDBTools.py b/src/monitoring/service/ManagementDBTools.py
index 2533707a6d701091e5a5ff41634db490678dc4bc..bf36d3517c5976f3687b69286508ac9723cc09e8 100644
--- a/src/monitoring/service/ManagementDBTools.py
+++ b/src/monitoring/service/ManagementDBTools.py
@@ -85,13 +85,13 @@ class ManagementDB():
             LOGGER.debug(f"Alarm table cannot be created in the ManagementDB. {e}")
             raise Exception
 
-    def insert_KPI(self,kpi_description,kpi_sample_type,device_id,endpoint_id,service_id, connection_id):
+    def insert_KPI(self,kpi_description,kpi_sample_type,device_id,endpoint_id,service_id,connection_id):
         try:
             c = self.client.cursor()
-            c.execute("SELECT kpi_id FROM kpi WHERE device_id is ? AND kpi_sample_type is ? AND endpoint_id is ? AND service_id is ?",(device_id,kpi_sample_type,endpoint_id,service_id, connection_id))
+            c.execute("SELECT kpi_id FROM kpi WHERE device_id is ? AND kpi_sample_type is ? AND endpoint_id is ? AND service_id is ? AND connection_id is ?",(device_id,kpi_sample_type,endpoint_id,service_id, connection_id))
             data=c.fetchone()
             if data is None:
-                c.execute("INSERT INTO kpi (kpi_description,kpi_sample_type,device_id,endpoint_id,service_id) VALUES (?,?,?,?,?)", (kpi_description,kpi_sample_type,device_id,endpoint_id,service_id, connection_id))
+                c.execute("INSERT INTO kpi (kpi_description,kpi_sample_type,device_id,endpoint_id,service_id,connection_id) VALUES (?,?,?,?,?,?)", (kpi_description,kpi_sample_type,device_id,endpoint_id,service_id, connection_id))
                 self.client.commit()
                 kpi_id = c.lastrowid
                 LOGGER.debug(f"KPI {kpi_id} succesfully inserted in the ManagementDB")
diff --git a/src/monitoring/service/MonitoringServiceServicerImpl.py b/src/monitoring/service/MonitoringServiceServicerImpl.py
index 48dfeb8231e6c8b2e100649c58c331fc27234fe6..f26819063315121b40362ac6b5671cbd3b8d4158 100644
--- a/src/monitoring/service/MonitoringServiceServicerImpl.py
+++ b/src/monitoring/service/MonitoringServiceServicerImpl.py
@@ -85,7 +85,9 @@ class MonitoringServiceServicerImpl(MonitoringServiceServicer):
             kpi_device_id = request.device_id.device_uuid.uuid
             kpi_endpoint_id = request.endpoint_id.endpoint_uuid.uuid
             kpi_service_id = request.service_id.service_uuid.uuid
-            kpi_connection_id = request.connection_id.connection_id.uuid
+            kpi_connection_id = request.connection_id.connection_uuid.uuid
+
+            LOGGER.debug(kpi_connection_id)
 
             if request.kpi_id.kpi_id.uuid is not "":
                 response.kpi_id.uuid = request.kpi_id.kpi_id.uuid
@@ -137,7 +139,7 @@ class MonitoringServiceServicerImpl(MonitoringServiceServicer):
                 kpiDescriptor.device_id.device_uuid.uuid = str(kpi_db[3])
                 kpiDescriptor.endpoint_id.endpoint_uuid.uuid = str(kpi_db[4])
                 kpiDescriptor.service_id.service_uuid.uuid = str(kpi_db[5])
-                kpiDescriptor.connection_id.connection_id.uuid = str(kpi_db[6])
+                kpiDescriptor.connection_id.connection_uuid.uuid = str(kpi_db[6])
             return kpiDescriptor
         except ServiceException as e:
             LOGGER.exception('GetKpiDescriptor exception')
@@ -162,7 +164,7 @@ class MonitoringServiceServicerImpl(MonitoringServiceServicer):
                 kpi_descriptor.device_id.device_uuid.uuid = str(item[3])
                 kpi_descriptor.endpoint_id.endpoint_uuid.uuid = str(item[4])
                 kpi_descriptor.service_id.service_uuid.uuid = str(item[5])
-                kpi_descriptor.connection_id.connection_id.uuid = str(item[6])
+                kpi_descriptor.connection_id.connection_uuid.uuid = str(item[6])
 
                 kpi_descriptor_list.kpi_descriptor_list.append(kpi_descriptor)
 
@@ -189,7 +191,7 @@ class MonitoringServiceServicerImpl(MonitoringServiceServicer):
                 deviceId = kpiDescriptor.device_id.device_uuid.uuid
                 endpointId = kpiDescriptor.endpoint_id.endpoint_uuid.uuid
                 serviceId = kpiDescriptor.service_id.service_uuid.uuid
-                connectionId = kpiDescriptor.connection_id.connection_id.uuid
+                connectionId = kpiDescriptor.connection_id.connection_uuid.uuid
                 time_stamp = request.timestamp.timestamp
                 kpi_value = getattr(request.kpi_value, request.kpi_value.WhichOneof('value'))
 
diff --git a/src/monitoring/tests/Messages.py b/src/monitoring/tests/Messages.py
index 7c10ea44a2ae9454f97fc6a858c8db6785afde33..534810f4bc25a59b8fef57e694180643551e82b7 100644
--- a/src/monitoring/tests/Messages.py
+++ b/src/monitoring/tests/Messages.py
@@ -30,7 +30,7 @@ def create_kpi_request():
     _create_kpi_request.device_id.device_uuid.uuid     = 'DEV1'     # pylint: disable=maybe-no-member
     _create_kpi_request.service_id.service_uuid.uuid   = 'SERV1'    # pylint: disable=maybe-no-member
     _create_kpi_request.endpoint_id.endpoint_uuid.uuid = 'END1'     # pylint: disable=maybe-no-member
-    _create_kpi_request.connection_id.connection_id.uuid = 'CON1'  # pylint: disable=maybe-no-member
+    _create_kpi_request.connection_id.connection_uuid.uuid = 'CON1'  # pylint: disable=maybe-no-member
     return _create_kpi_request
 
 def create_kpi_request_b():
@@ -40,7 +40,7 @@ def create_kpi_request_b():
     _create_kpi_request.device_id.device_uuid.uuid     = 'DEV2'     # pylint: disable=maybe-no-member
     _create_kpi_request.service_id.service_uuid.uuid   = 'SERV2'    # pylint: disable=maybe-no-member
     _create_kpi_request.endpoint_id.endpoint_uuid.uuid = 'END2'     # pylint: disable=maybe-no-member
-    _create_kpi_request.connection_id.connection_id.uuid = 'CON2'  # pylint: disable=maybe-no-member
+    _create_kpi_request.connection_id.connection_uuid.uuid = 'CON2'  # pylint: disable=maybe-no-member
     return _create_kpi_request
 
 def create_kpi_request_c():
@@ -50,7 +50,7 @@ def create_kpi_request_c():
     _create_kpi_request.device_id.device_uuid.uuid     = 'DEV3'     # pylint: disable=maybe-no-member
     _create_kpi_request.service_id.service_uuid.uuid   = 'SERV3'    # pylint: disable=maybe-no-member
     _create_kpi_request.endpoint_id.endpoint_uuid.uuid = 'END3'     # pylint: disable=maybe-no-member
-    _create_kpi_request.connection_id.connection_id.uuid = 'CON3'  # pylint: disable=maybe-no-member
+    _create_kpi_request.connection_id.connection_uuid.uuid = 'CON3'  # pylint: disable=maybe-no-member
     return _create_kpi_request
 
 def monitor_kpi_request(kpi_uuid, monitoring_window_s, sampling_rate_s):
diff --git a/src/monitoring/tests/test_unitary.py b/src/monitoring/tests/test_unitary.py
index 290431af543cab9690ec44ff43b6bb6a68247e16..acbb10fd80322501873f1ce03888946abcd04133 100644
--- a/src/monitoring/tests/test_unitary.py
+++ b/src/monitoring/tests/test_unitary.py
@@ -395,7 +395,7 @@ def test_managementdb_tools_insert_kpi(management_db): # pylint: disable=redefin
     kpi_device_id   = _create_kpi_request.device_id.device_uuid.uuid     # pylint: disable=maybe-no-member
     kpi_endpoint_id = _create_kpi_request.endpoint_id.endpoint_uuid.uuid # pylint: disable=maybe-no-member
     kpi_service_id  = _create_kpi_request.service_id.service_uuid.uuid   # pylint: disable=maybe-no-member
-    kpi_connection_id = _create_kpi_request.connection_id.connection_id.uuid
+    kpi_connection_id = _create_kpi_request.connection_id.connection_uuid.uuid
 
     response = management_db.insert_KPI(kpi_description, kpi_sample_type, kpi_device_id, kpi_endpoint_id, kpi_service_id,kpi_connection_id)
     assert isinstance(response, int)
@@ -408,7 +408,7 @@ def test_managementdb_tools_get_kpi(management_db): # pylint: disable=redefined-
     kpi_device_id   = _create_kpi_request.device_id.device_uuid.uuid     # pylint: disable=maybe-no-member
     kpi_endpoint_id = _create_kpi_request.endpoint_id.endpoint_uuid.uuid # pylint: disable=maybe-no-member
     kpi_service_id  = _create_kpi_request.service_id.service_uuid.uuid   # pylint: disable=maybe-no-member
-    kpi_connection_id  = _create_kpi_request.connection_id.connection_id.uuid
+    kpi_connection_id  = _create_kpi_request.connection_id.connection_uuid.uuid
 
     _kpi_id = management_db.insert_KPI(kpi_description, kpi_sample_type, kpi_device_id, kpi_endpoint_id, kpi_service_id,kpi_connection_id)
     response = management_db.get_KPI(_kpi_id)
@@ -428,7 +428,7 @@ def test_managementdb_tools_delete_kpi(management_db): # pylint: disable=redefin
     kpi_device_id = _create_kpi_request.device_id.device_uuid.uuid  # pylint: disable=maybe-no-member
     kpi_endpoint_id = _create_kpi_request.endpoint_id.endpoint_uuid.uuid  # pylint: disable=maybe-no-member
     kpi_service_id = _create_kpi_request.service_id.service_uuid.uuid  # pylint: disable=maybe-no-member
-    kpi_connection_id = _create_kpi_request.connection_id.connection_id.uuid
+    kpi_connection_id = _create_kpi_request.connection_id.connection_uuid.uuid
 
     _kpi_id = management_db.insert_KPI(kpi_description, kpi_sample_type, kpi_device_id, kpi_endpoint_id,
                                         kpi_service_id, kpi_connection_id)