diff --git a/hackfest/p4/tests/Objects.py b/hackfest/p4/tests/Objects.py
index c8b172244d714cd699ccc587e54c3751485a9a2e..dcef0255249cb0d7ed57ad18e2953a2e2796c303 100644
--- a/hackfest/p4/tests/Objects.py
+++ b/hackfest/p4/tests/Objects.py
@@ -14,7 +14,7 @@
 
 import os
 from typing import Dict, List, Tuple
-from common.Constants import DEFAULT_CONTEXT_UUID, DEFAULT_TOPOLOGY_UUID
+from common.Constants import DEFAULT_CONTEXT_NAME, DEFAULT_TOPOLOGY_NAME
 from common.tools.object_factory.Context import json_context, json_context_id
 from common.tools.object_factory.Device import (
     json_device_connect_rules, json_device_emulated_connect_rules, json_device_emulated_packet_router_disabled,
@@ -28,12 +28,12 @@ from common.tools.object_factory.Topology import json_topology, json_topology_id
 from common.proto.kpi_sample_types_pb2 import KpiSampleType
 
 # ----- Context --------------------------------------------------------------------------------------------------------
-CONTEXT_ID = json_context_id(DEFAULT_CONTEXT_UUID)
-CONTEXT    = json_context(DEFAULT_CONTEXT_UUID)
+CONTEXT_ID = json_context_id(DEFAULT_CONTEXT_NAME)
+CONTEXT    = json_context(DEFAULT_CONTEXT_NAME)
 
 # ----- Topology -------------------------------------------------------------------------------------------------------
-TOPOLOGY_ID = json_topology_id(DEFAULT_TOPOLOGY_UUID, context_id=CONTEXT_ID)
-TOPOLOGY    = json_topology(DEFAULT_TOPOLOGY_UUID, context_id=CONTEXT_ID)
+TOPOLOGY_ID = json_topology_id(DEFAULT_TOPOLOGY_NAME, context_id=CONTEXT_ID)
+TOPOLOGY    = json_topology(DEFAULT_TOPOLOGY_NAME, context_id=CONTEXT_ID)
 
 # ----- Monitoring Samples ---------------------------------------------------------------------------------------------
 PACKET_PORT_SAMPLE_TYPES = [
diff --git a/src/common/Constants.py b/src/common/Constants.py
index 0c3afe43c45d5a81984ef4c27e7c4387fd2fa218..c26409f27bc1fc809e2c7ece8949ac643314ac17 100644
--- a/src/common/Constants.py
+++ b/src/common/Constants.py
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import logging #, uuid
+import logging
 from enum import Enum
 
 # Default logging level
@@ -33,9 +33,6 @@ DEFAULT_METRICS_PORT = 9192
 DEFAULT_CONTEXT_NAME      = 'admin'
 DEFAULT_TOPOLOGY_NAME     = 'admin'     # contains the detailed local topology
 INTERDOMAIN_TOPOLOGY_NAME = 'inter'     # contains the abstract inter-domain topology
-#DEFAULT_CONTEXT_UUID      = str(uuid.uuid5(uuid.NAMESPACE_OID, DEFAULT_CONTEXT_NAME     ))
-#DEFAULT_TOPOLOGY_UUID     = str(uuid.uuid5(uuid.NAMESPACE_OID, DEFAULT_TOPOLOGY_NAME    ))
-#INTERDOMAIN_TOPOLOGY_UUID = str(uuid.uuid5(uuid.NAMESPACE_OID, INTERDOMAIN_TOPOLOGY_NAME))
 
 # Default service names
 class ServiceNameEnum(Enum):
diff --git a/src/compute/service/rest_server/nbi_plugins/ietf_l2vpn/L2VPN_Services.py b/src/compute/service/rest_server/nbi_plugins/ietf_l2vpn/L2VPN_Services.py
index 248b9989669ebb85930ec1a3534ca1dc9af536af..d27e55047567941fb1467dbd2b1745c163dfd6c3 100644
--- a/src/compute/service/rest_server/nbi_plugins/ietf_l2vpn/L2VPN_Services.py
+++ b/src/compute/service/rest_server/nbi_plugins/ietf_l2vpn/L2VPN_Services.py
@@ -18,7 +18,7 @@ from flask import request
 from flask.json import jsonify
 from flask_restful import Resource
 from werkzeug.exceptions import UnsupportedMediaType
-from common.Constants import DEFAULT_CONTEXT_UUID
+from common.Constants import DEFAULT_CONTEXT_NAME
 from common.proto.context_pb2 import SliceStatusEnum, Slice
 from slice.client.SliceClient import SliceClient
 from .schemas.vpn_service import SCHEMA_VPN_SERVICE
@@ -45,7 +45,7 @@ class L2VPN_Services(Resource):
             try:
                 # pylint: disable=no-member
                 slice_request = Slice()
-                slice_request.slice_id.context_id.context_uuid.uuid = DEFAULT_CONTEXT_UUID
+                slice_request.slice_id.context_id.context_uuid.uuid = DEFAULT_CONTEXT_NAME
                 slice_request.slice_id.slice_uuid.uuid = vpn_service['vpn-id']
                 slice_request.slice_status.slice_status = SliceStatusEnum.SLICESTATUS_PLANNED
 
diff --git a/src/compute/tests/test_debug_api.py b/src/compute/tests/test_debug_api.py
index 31d2049654d0449bbba486ad080ac7dfb1651bd0..6265c37511a5fd6ffb1647b2f76482e556c3b287 100644
--- a/src/compute/tests/test_debug_api.py
+++ b/src/compute/tests/test_debug_api.py
@@ -14,7 +14,7 @@
 
 import logging, os, pytest, requests, time, urllib
 from typing import Tuple
-from common.Constants import DEFAULT_CONTEXT_UUID, DEFAULT_TOPOLOGY_UUID, ServiceNameEnum
+from common.Constants import DEFAULT_CONTEXT_NAME, DEFAULT_TOPOLOGY_NAME, ServiceNameEnum
 from common.proto.context_pb2 import Connection, Context, Device, Link, Service, Slice, Topology
 from common.proto.policy_pb2 import PolicyRuleIdList, PolicyRuleId, PolicyRuleList, PolicyRule
 from common.Settings import (
@@ -119,54 +119,54 @@ def test_rest_get_contexts(context_service_rest : RestServer): # pylint: disable
     validate_contexts(reply)
 
 def test_rest_get_context(context_service_rest : RestServer): # pylint: disable=redefined-outer-name
-    context_uuid = urllib.parse.quote(DEFAULT_CONTEXT_UUID)
+    context_uuid = urllib.parse.quote(DEFAULT_CONTEXT_NAME)
     reply = do_rest_request('/context/{:s}'.format(context_uuid))
     validate_context(reply)
 
 def test_rest_get_topology_ids(context_service_rest : RestServer): # pylint: disable=redefined-outer-name
-    context_uuid = urllib.parse.quote(DEFAULT_CONTEXT_UUID)
+    context_uuid = urllib.parse.quote(DEFAULT_CONTEXT_NAME)
     reply = do_rest_request('/context/{:s}/topology_ids'.format(context_uuid))
     validate_topology_ids(reply)
 
 def test_rest_get_topologies(context_service_rest : RestServer): # pylint: disable=redefined-outer-name
-    context_uuid = urllib.parse.quote(DEFAULT_CONTEXT_UUID)
+    context_uuid = urllib.parse.quote(DEFAULT_CONTEXT_NAME)
     reply = do_rest_request('/context/{:s}/topologies'.format(context_uuid))
     validate_topologies(reply)
 
 def test_rest_get_topology(context_service_rest : RestServer): # pylint: disable=redefined-outer-name
-    context_uuid = urllib.parse.quote(DEFAULT_CONTEXT_UUID)
-    topology_uuid = urllib.parse.quote(DEFAULT_TOPOLOGY_UUID)
+    context_uuid = urllib.parse.quote(DEFAULT_CONTEXT_NAME)
+    topology_uuid = urllib.parse.quote(DEFAULT_TOPOLOGY_NAME)
     reply = do_rest_request('/context/{:s}/topology/{:s}'.format(context_uuid, topology_uuid))
     validate_topology(reply, num_devices=3, num_links=3)
 
 def test_rest_get_service_ids(context_service_rest : RestServer): # pylint: disable=redefined-outer-name
-    context_uuid = urllib.parse.quote(DEFAULT_CONTEXT_UUID)
+    context_uuid = urllib.parse.quote(DEFAULT_CONTEXT_NAME)
     reply = do_rest_request('/context/{:s}/service_ids'.format(context_uuid))
     validate_service_ids(reply)
 
 def test_rest_get_services(context_service_rest : RestServer): # pylint: disable=redefined-outer-name
-    context_uuid = urllib.parse.quote(DEFAULT_CONTEXT_UUID)
+    context_uuid = urllib.parse.quote(DEFAULT_CONTEXT_NAME)
     reply = do_rest_request('/context/{:s}/services'.format(context_uuid))
     validate_services(reply)
 
 def test_rest_get_service(context_service_rest : RestServer): # pylint: disable=redefined-outer-name
-    context_uuid = urllib.parse.quote(DEFAULT_CONTEXT_UUID)
+    context_uuid = urllib.parse.quote(DEFAULT_CONTEXT_NAME)
     service_uuid = urllib.parse.quote(SERVICE_R1_R2_UUID, safe='')
     reply = do_rest_request('/context/{:s}/service/{:s}'.format(context_uuid, service_uuid))
     validate_service(reply)
 
 def test_rest_get_slice_ids(context_service_rest : RestServer): # pylint: disable=redefined-outer-name
-    context_uuid = urllib.parse.quote(DEFAULT_CONTEXT_UUID)
+    context_uuid = urllib.parse.quote(DEFAULT_CONTEXT_NAME)
     reply = do_rest_request('/context/{:s}/slice_ids'.format(context_uuid))
     #validate_slice_ids(reply)
 
 def test_rest_get_slices(context_service_rest : RestServer): # pylint: disable=redefined-outer-name
-    context_uuid = urllib.parse.quote(DEFAULT_CONTEXT_UUID)
+    context_uuid = urllib.parse.quote(DEFAULT_CONTEXT_NAME)
     reply = do_rest_request('/context/{:s}/slices'.format(context_uuid))
     #validate_slices(reply)
 
 def test_rest_get_slice(context_service_rest : RestServer): # pylint: disable=redefined-outer-name
-    context_uuid = urllib.parse.quote(DEFAULT_CONTEXT_UUID)
+    context_uuid = urllib.parse.quote(DEFAULT_CONTEXT_NAME)
     slice_uuid = urllib.parse.quote(SLICE_R1_R3_UUID, safe='')
     reply = do_rest_request('/context/{:s}/slice/{:s}'.format(context_uuid, slice_uuid))
     #validate_slice(reply)
@@ -198,13 +198,13 @@ def test_rest_get_link(context_service_rest : RestServer): # pylint: disable=red
     validate_link(reply)
 
 def test_rest_get_connection_ids(context_service_rest : RestServer): # pylint: disable=redefined-outer-name
-    context_uuid = urllib.parse.quote(DEFAULT_CONTEXT_UUID)
+    context_uuid = urllib.parse.quote(DEFAULT_CONTEXT_NAME)
     service_uuid = urllib.parse.quote(SERVICE_R1_R3_UUID, safe='')
     reply = do_rest_request('/context/{:s}/service/{:s}/connection_ids'.format(context_uuid, service_uuid))
     validate_connection_ids(reply)
 
 def test_rest_get_connections(context_service_rest : RestServer): # pylint: disable=redefined-outer-name
-    context_uuid = urllib.parse.quote(DEFAULT_CONTEXT_UUID)
+    context_uuid = urllib.parse.quote(DEFAULT_CONTEXT_NAME)
     service_uuid = urllib.parse.quote(SERVICE_R1_R3_UUID, safe='')
     reply = do_rest_request('/context/{:s}/service/{:s}/connections'.format(context_uuid, service_uuid))
     validate_connections(reply)
diff --git a/src/dlt/connector/service/event_dispatcher/DltEventDispatcher.py b/src/dlt/connector/service/event_dispatcher/DltEventDispatcher.py
index 8973ae621c1291f8ed6e2673f0c64b59712143ee..c569d75c3d010805bccc9c611e9f33a27a637987 100644
--- a/src/dlt/connector/service/event_dispatcher/DltEventDispatcher.py
+++ b/src/dlt/connector/service/event_dispatcher/DltEventDispatcher.py
@@ -14,7 +14,7 @@
 
 import grpc, json, logging, threading
 from typing import Any, Dict, Set
-from common.Constants import DEFAULT_CONTEXT_UUID, DEFAULT_TOPOLOGY_UUID, INTERDOMAIN_TOPOLOGY_UUID
+from common.Constants import DEFAULT_CONTEXT_NAME, DEFAULT_TOPOLOGY_NAME, INTERDOMAIN_TOPOLOGY_NAME
 from common.proto.context_pb2 import ContextId, Device, EventTypeEnum, Link, Slice, TopologyId
 from common.proto.dlt_connector_pb2 import DltSliceId
 from common.proto.dlt_gateway_pb2 import DltRecordEvent, DltRecordOperationEnum, DltRecordTypeEnum
@@ -35,7 +35,7 @@ LOGGER = logging.getLogger(__name__)
 
 GET_EVENT_TIMEOUT = 0.5
 
-ADMIN_CONTEXT_ID = ContextId(**json_context_id(DEFAULT_CONTEXT_UUID))
+ADMIN_CONTEXT_ID = ContextId(**json_context_id(DEFAULT_CONTEXT_NAME))
 
 class Clients:
     def __init__(self) -> None:
@@ -66,9 +66,9 @@ class DltEventDispatcher(threading.Thread):
 
     def run(self) -> None:
         clients = Clients()
-        create_context(clients.context_client, DEFAULT_CONTEXT_UUID)
-        create_topology(clients.context_client, DEFAULT_CONTEXT_UUID, DEFAULT_TOPOLOGY_UUID)
-        create_topology(clients.context_client, DEFAULT_CONTEXT_UUID, INTERDOMAIN_TOPOLOGY_UUID)
+        create_context(clients.context_client, DEFAULT_CONTEXT_NAME)
+        create_topology(clients.context_client, DEFAULT_CONTEXT_NAME, DEFAULT_TOPOLOGY_NAME)
+        create_topology(clients.context_client, DEFAULT_CONTEXT_NAME, INTERDOMAIN_TOPOLOGY_NAME)
 
         dlt_events_collector = DltEventsCollector(clients.dlt_gateway_client, log_events_received=True)
         dlt_events_collector.start()
@@ -81,8 +81,8 @@ class DltEventDispatcher(threading.Thread):
             local_domain_uuids = {
                 topology_id.topology_uuid.uuid for topology_id in existing_topology_ids.topology_ids
             }
-            local_domain_uuids.discard(DEFAULT_TOPOLOGY_UUID)
-            local_domain_uuids.discard(INTERDOMAIN_TOPOLOGY_UUID)
+            local_domain_uuids.discard(DEFAULT_TOPOLOGY_NAME)
+            local_domain_uuids.discard(INTERDOMAIN_TOPOLOGY_NAME)
 
             self.dispatch_event(clients, local_domain_uuids, event)
 
@@ -118,13 +118,13 @@ class DltEventDispatcher(threading.Thread):
             LOGGER.info('[_dispatch_device] record={:s}'.format(grpc_message_to_json_string(record)))
 
             create_context(clients.context_client, domain_uuid)
-            create_topology(clients.context_client, domain_uuid, DEFAULT_TOPOLOGY_UUID)
+            create_topology(clients.context_client, domain_uuid, DEFAULT_TOPOLOGY_NAME)
             device = Device(**json.loads(record.data_json))
             clients.context_client.SetDevice(device)
             device_uuid = device.device_id.device_uuid.uuid # pylint: disable=no-member
-            add_device_to_topology(clients.context_client, ADMIN_CONTEXT_ID, INTERDOMAIN_TOPOLOGY_UUID, device_uuid)
+            add_device_to_topology(clients.context_client, ADMIN_CONTEXT_ID, INTERDOMAIN_TOPOLOGY_NAME, device_uuid)
             domain_context_id = ContextId(**json_context_id(domain_uuid))
-            add_device_to_topology(clients.context_client, domain_context_id, DEFAULT_TOPOLOGY_UUID, device_uuid)
+            add_device_to_topology(clients.context_client, domain_context_id, DEFAULT_TOPOLOGY_NAME, device_uuid)
         elif event_type in {EventTypeEnum.EVENTTYPE_DELETE}:
             raise NotImplementedError('Delete Device')
 
@@ -148,7 +148,7 @@ class DltEventDispatcher(threading.Thread):
             link = Link(**json.loads(record.data_json))
             clients.context_client.SetLink(link)
             link_uuid = link.link_id.link_uuid.uuid # pylint: disable=no-member
-            add_link_to_topology(clients.context_client, ADMIN_CONTEXT_ID, INTERDOMAIN_TOPOLOGY_UUID, link_uuid)
+            add_link_to_topology(clients.context_client, ADMIN_CONTEXT_ID, INTERDOMAIN_TOPOLOGY_NAME, link_uuid)
         elif event_type in {EventTypeEnum.EVENTTYPE_DELETE}:
             raise NotImplementedError('Delete Link')
 
@@ -165,7 +165,7 @@ class DltEventDispatcher(threading.Thread):
         context_uuid = slice_.slice_id.context_id.context_uuid.uuid
         owner_uuid = slice_.slice_owner.owner_uuid.uuid
         create_context(clients.context_client, context_uuid)
-        create_topology(clients.context_client, context_uuid, DEFAULT_TOPOLOGY_UUID)
+        create_topology(clients.context_client, context_uuid, DEFAULT_TOPOLOGY_NAME)
 
         if domain_uuid in local_domain_uuids:
             # it is for "me"
diff --git a/src/interdomain/service/RemoteDomainClients.py b/src/interdomain/service/RemoteDomainClients.py
index 0aaadfeff0aa05ab0d356b00069a6ec86e89926d..6eb2a9c062807d21377e3505ff13e1fb21603942 100644
--- a/src/interdomain/service/RemoteDomainClients.py
+++ b/src/interdomain/service/RemoteDomainClients.py
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 import logging, socket
-from common.Constants import DEFAULT_CONTEXT_UUID, ServiceNameEnum
+from common.Constants import DEFAULT_CONTEXT_NAME, ServiceNameEnum
 from common.Settings import get_service_host, get_service_port_grpc
 from common.proto.context_pb2 import TeraFlowController
 from interdomain.client.InterdomainClient import InterdomainClient
@@ -25,7 +25,7 @@ class RemoteDomainClients:
         self.peer_domain = {}
 
     def add_peer(
-            self, domain_name : str, host : str, port : int, context_uuid : str = DEFAULT_CONTEXT_UUID
+            self, domain_name : str, host : str, port : int, context_uuid : str = DEFAULT_CONTEXT_NAME
         ) -> None:
         while True:
             try:
@@ -36,7 +36,7 @@ class RemoteDomainClients:
 
         interdomain_client = InterdomainClient(host=host, port=port)
         request = TeraFlowController()
-        request.context_id.context_uuid.uuid = DEFAULT_CONTEXT_UUID # pylint: disable=no-member
+        request.context_id.context_uuid.uuid = DEFAULT_CONTEXT_NAME # pylint: disable=no-member
         request.ip_address = get_service_host(ServiceNameEnum.INTERDOMAIN)
         request.port = int(get_service_port_grpc(ServiceNameEnum.INTERDOMAIN))
 
diff --git a/src/interdomain/service/Tools.py b/src/interdomain/service/Tools.py
index fb6371603ea90437437541bb995a59813764d9ef..472132adb996c56673921e30bab342c6c4cd9413 100644
--- a/src/interdomain/service/Tools.py
+++ b/src/interdomain/service/Tools.py
@@ -14,7 +14,7 @@
 
 import json, logging
 from typing import List, Optional, Tuple
-from common.Constants import DEFAULT_CONTEXT_UUID, DEFAULT_TOPOLOGY_UUID, INTERDOMAIN_TOPOLOGY_UUID
+from common.Constants import DEFAULT_CONTEXT_NAME, DEFAULT_TOPOLOGY_NAME, INTERDOMAIN_TOPOLOGY_NAME
 from common.proto.context_pb2 import (
     ConfigRule, Constraint, ContextId, Device, Empty, EndPointId, Slice, SliceStatusEnum)
 from common.tools.context_queries.CheckType import device_type_is_network, endpoint_type_is_border
@@ -32,12 +32,12 @@ def compute_slice_owner(
 ) -> Optional[str]:
     traversed_domain_uuids = {traversed_domain[0] for traversed_domain in traversed_domains}
 
-    existing_topology_ids = context_client.ListTopologyIds(ContextId(**json_context_id(DEFAULT_CONTEXT_UUID)))
+    existing_topology_ids = context_client.ListTopologyIds(ContextId(**json_context_id(DEFAULT_CONTEXT_NAME)))
     existing_topology_uuids = {
         topology_id.topology_uuid.uuid for topology_id in existing_topology_ids.topology_ids
     }
-    existing_topology_uuids.discard(DEFAULT_TOPOLOGY_UUID)
-    existing_topology_uuids.discard(INTERDOMAIN_TOPOLOGY_UUID)
+    existing_topology_uuids.discard(DEFAULT_TOPOLOGY_NAME)
+    existing_topology_uuids.discard(INTERDOMAIN_TOPOLOGY_NAME)
 
     candidate_owner_uuids = traversed_domain_uuids.intersection(existing_topology_uuids)
     if len(candidate_owner_uuids) != 1:
diff --git a/src/interdomain/service/topology_abstractor/AbstractDevice.py b/src/interdomain/service/topology_abstractor/AbstractDevice.py
index 3448c1036d4ef086d679d5f4308ae95decfbffa7..4bb9683b0a597b06a4bc3a27cf4c90a2455ae995 100644
--- a/src/interdomain/service/topology_abstractor/AbstractDevice.py
+++ b/src/interdomain/service/topology_abstractor/AbstractDevice.py
@@ -14,7 +14,7 @@
 
 import copy, logging
 from typing import Dict, Optional
-from common.Constants import DEFAULT_CONTEXT_UUID, INTERDOMAIN_TOPOLOGY_UUID
+from common.Constants import DEFAULT_CONTEXT_NAME, INTERDOMAIN_TOPOLOGY_NAME
 from common.DeviceTypes import DeviceTypeEnum
 from common.proto.context_pb2 import (
     ContextId, Device, DeviceDriverEnum, DeviceId, DeviceOperationalStatusEnum, EndPoint)
@@ -67,9 +67,9 @@ class AbstractDevice:
         is_datacenter = device_type_is_datacenter(self.__device_type)
         is_network = device_type_is_network(self.__device_type)
         if is_datacenter or is_network:
-            # Add abstract device to topologies [INTERDOMAIN_TOPOLOGY_UUID]
-            context_id = ContextId(**json_context_id(DEFAULT_CONTEXT_UUID))
-            topology_uuids = [INTERDOMAIN_TOPOLOGY_UUID]
+            # Add abstract device to topologies [INTERDOMAIN_TOPOLOGY_NAME]
+            context_id = ContextId(**json_context_id(DEFAULT_CONTEXT_NAME))
+            topology_uuids = [INTERDOMAIN_TOPOLOGY_NAME]
             for topology_uuid in topology_uuids:
                 add_device_to_topology(self.__context_client, context_id, topology_uuid, self.__device_uuid)
 
@@ -80,7 +80,7 @@ class AbstractDevice:
         #        self.update_endpoints(dc_device)
         #elif is_network:
         #    devices_in_admin_topology = get_devices_in_topology(
-        #        self.__context_client, context_id, DEFAULT_TOPOLOGY_UUID)
+        #        self.__context_client, context_id, DEFAULT_TOPOLOGY_NAME)
         #    for device in devices_in_admin_topology:
         #        if device_type_is_datacenter(device.device_type): continue
         #        self.update_endpoints(device)
diff --git a/src/interdomain/service/topology_abstractor/AbstractLink.py b/src/interdomain/service/topology_abstractor/AbstractLink.py
index 7fe7b07b0708ebf8490cf4304646037973b05d56..552d40d41d8758a4b398e1d970b8fb600bed6a5b 100644
--- a/src/interdomain/service/topology_abstractor/AbstractLink.py
+++ b/src/interdomain/service/topology_abstractor/AbstractLink.py
@@ -14,7 +14,7 @@
 
 import copy, logging
 from typing import Dict, List, Optional, Tuple
-from common.Constants import DEFAULT_CONTEXT_UUID, INTERDOMAIN_TOPOLOGY_UUID
+from common.Constants import DEFAULT_CONTEXT_NAME, INTERDOMAIN_TOPOLOGY_NAME
 from common.proto.context_pb2 import ContextId, EndPointId, Link, LinkId
 from common.tools.context_queries.Link import add_link_to_topology, get_existing_link_uuids
 from common.tools.object_factory.Context import json_context_id
@@ -67,9 +67,9 @@ class AbstractLink:
         else:
             self._load_existing()
 
-        # Add abstract link to topologies [INTERDOMAIN_TOPOLOGY_UUID]
-        context_id = ContextId(**json_context_id(DEFAULT_CONTEXT_UUID))
-        topology_uuids = [INTERDOMAIN_TOPOLOGY_UUID]
+        # Add abstract link to topologies [INTERDOMAIN_TOPOLOGY_NAME]
+        context_id = ContextId(**json_context_id(DEFAULT_CONTEXT_NAME))
+        topology_uuids = [INTERDOMAIN_TOPOLOGY_NAME]
         for topology_uuid in topology_uuids:
             add_link_to_topology(self.__context_client, context_id, topology_uuid, self.__link_uuid)
 
diff --git a/src/interdomain/service/topology_abstractor/TopologyAbstractor.py b/src/interdomain/service/topology_abstractor/TopologyAbstractor.py
index 5729fe733c3a9a8f73f188b40338160ab286998b..db104144eb867ccc451f01afe2c46dd9f76fac4a 100644
--- a/src/interdomain/service/topology_abstractor/TopologyAbstractor.py
+++ b/src/interdomain/service/topology_abstractor/TopologyAbstractor.py
@@ -14,7 +14,7 @@
 
 import logging, threading
 from typing import Dict, Optional, Tuple
-from common.Constants import DEFAULT_CONTEXT_UUID, DEFAULT_TOPOLOGY_UUID, INTERDOMAIN_TOPOLOGY_UUID
+from common.Constants import DEFAULT_CONTEXT_NAME, DEFAULT_TOPOLOGY_NAME, INTERDOMAIN_TOPOLOGY_NAME
 from common.DeviceTypes import DeviceTypeEnum
 from common.proto.context_pb2 import (
     ContextEvent, ContextId, Device, DeviceEvent, DeviceId, EndPoint, EndPointId, Link, LinkEvent, TopologyId,
@@ -39,8 +39,8 @@ from .Types import EventTypes
 
 LOGGER = logging.getLogger(__name__)
 
-ADMIN_CONTEXT_ID = ContextId(**json_context_id(DEFAULT_CONTEXT_UUID))
-INTERDOMAIN_TOPOLOGY_ID = TopologyId(**json_topology_id(INTERDOMAIN_TOPOLOGY_UUID, context_id=ADMIN_CONTEXT_ID))
+ADMIN_CONTEXT_ID = ContextId(**json_context_id(DEFAULT_CONTEXT_NAME))
+INTERDOMAIN_TOPOLOGY_ID = TopologyId(**json_topology_id(INTERDOMAIN_TOPOLOGY_NAME, context_id=ADMIN_CONTEXT_ID))
 
 class TopologyAbstractor(threading.Thread):
     def __init__(self) -> None:
@@ -65,8 +65,8 @@ class TopologyAbstractor(threading.Thread):
 
     def run(self) -> None:
         self.context_client.connect()
-        create_context(self.context_client, DEFAULT_CONTEXT_UUID)
-        topology_uuids = [DEFAULT_TOPOLOGY_UUID, INTERDOMAIN_TOPOLOGY_UUID]
+        create_context(self.context_client, DEFAULT_CONTEXT_NAME)
+        topology_uuids = [DEFAULT_TOPOLOGY_NAME, INTERDOMAIN_TOPOLOGY_NAME]
         create_missing_topologies(self.context_client, ADMIN_CONTEXT_ID, topology_uuids)
 
         self.dlt_connector_client.connect()
@@ -96,7 +96,7 @@ class TopologyAbstractor(threading.Thread):
     #        context_uuid = event.topology_id.context_id.context_uuid.uuid
     #        if context_uuid != own_context_uuid: return True
     #        topology_uuid = event.topology_id.topology_uuid.uuid
-    #        if topology_uuid in {INTERDOMAIN_TOPOLOGY_UUID}: return True
+    #        if topology_uuid in {INTERDOMAIN_TOPOLOGY_NAME}: return True
     #
     #    return False
 
@@ -200,7 +200,7 @@ class TopologyAbstractor(threading.Thread):
         device_uuid = device.device_id.device_uuid.uuid
 
         interdomain_device_uuids = get_uuids_of_devices_in_topology(
-            self.context_client, ADMIN_CONTEXT_ID, INTERDOMAIN_TOPOLOGY_UUID)
+            self.context_client, ADMIN_CONTEXT_ID, INTERDOMAIN_TOPOLOGY_NAME)
 
         for endpoint in device.device_endpoints:
             if not endpoint_type_is_border(endpoint.endpoint_type): continue
@@ -236,8 +236,8 @@ class TopologyAbstractor(threading.Thread):
             topology_uuid = topology_id.topology_uuid.uuid
             context_id = topology_id.context_id
             context_uuid = context_id.context_uuid.uuid
-            topology_uuids = {DEFAULT_TOPOLOGY_UUID, INTERDOMAIN_TOPOLOGY_UUID}
-            if (context_uuid == DEFAULT_CONTEXT_UUID) and (topology_uuid not in topology_uuids):
+            topology_uuids = {DEFAULT_TOPOLOGY_NAME, INTERDOMAIN_TOPOLOGY_NAME}
+            if (context_uuid == DEFAULT_CONTEXT_NAME) and (topology_uuid not in topology_uuids):
                 abstract_topology_id = TopologyId(**json_topology_id(topology_uuid, context_id=ADMIN_CONTEXT_ID))
                 self._get_or_create_abstract_device(
                     topology_uuid, DeviceTypeEnum.NETWORK, dlt_record_sender, abstract_topology_id)
diff --git a/src/opticalcentralizedattackdetector/tests/example_objects.py b/src/opticalcentralizedattackdetector/tests/example_objects.py
index 3c5a26b6d0bde888560741f052906e0d2694c91d..09320f1c32e6b3d2ffdde2e4d061aa8c21f56ed2 100644
--- a/src/opticalcentralizedattackdetector/tests/example_objects.py
+++ b/src/opticalcentralizedattackdetector/tests/example_objects.py
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 from copy import deepcopy
-from common.Constants import DEFAULT_CONTEXT_UUID, DEFAULT_TOPOLOGY_UUID
+from common.Constants import DEFAULT_CONTEXT_NAME, DEFAULT_TOPOLOGY_NAME
 from context.proto.context_pb2 import (
     ConfigActionEnum, DeviceDriverEnum, DeviceOperationalStatusEnum, ServiceStatusEnum, ServiceTypeEnum)
 
@@ -31,7 +31,7 @@ def endpoint(topology_id, device_id, endpoint_uuid, endpoint_type):
     return {'endpoint_id': endpoint_id(topology_id, device_id, endpoint_uuid), 'endpoint_type': endpoint_type}
 
 ## use "deepcopy" to prevent propagating forced changes during tests
-CONTEXT_ID = {'context_uuid': {'uuid': DEFAULT_CONTEXT_UUID}}
+CONTEXT_ID = {'context_uuid': {'uuid': DEFAULT_CONTEXT_NAME}}
 CONTEXT = {
     'context_id': deepcopy(CONTEXT_ID),
     'topology_ids': [],
@@ -47,7 +47,7 @@ CONTEXT_2 = {
 
 TOPOLOGY_ID = {
     'context_id': deepcopy(CONTEXT_ID),
-    'topology_uuid': {'uuid': DEFAULT_TOPOLOGY_UUID},
+    'topology_uuid': {'uuid': DEFAULT_TOPOLOGY_NAME},
 }
 TOPOLOGY = {
     'topology_id': deepcopy(TOPOLOGY_ID),
diff --git a/src/tests/benchmark/automation/tests/Objects.py b/src/tests/benchmark/automation/tests/Objects.py
index 8ea6f500807e3dbcc2e34dbd559614ff91c955d8..1e8072f8fab4c2eca01b64d289866e7f5d230f0a 100644
--- a/src/tests/benchmark/automation/tests/Objects.py
+++ b/src/tests/benchmark/automation/tests/Objects.py
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 from typing import Dict, List, Tuple
-from common.Constants import DEFAULT_CONTEXT_UUID, DEFAULT_TOPOLOGY_UUID
+from common.Constants import DEFAULT_CONTEXT_NAME, DEFAULT_TOPOLOGY_NAME
 from common.tools.object_factory.Context import json_context, json_context_id
 from common.tools.object_factory.Device import (
     json_device_connect_rules, json_device_emulated_connect_rules, json_device_emulated_packet_router_disabled,
@@ -24,12 +24,12 @@ from common.tools.object_factory.Topology import json_topology, json_topology_id
 from common.proto.kpi_sample_types_pb2 import KpiSampleType
 
 # ----- Context --------------------------------------------------------------------------------------------------------
-CONTEXT_ID = json_context_id(DEFAULT_CONTEXT_UUID)
-CONTEXT    = json_context(DEFAULT_CONTEXT_UUID)
+CONTEXT_ID = json_context_id(DEFAULT_CONTEXT_NAME)
+CONTEXT    = json_context(DEFAULT_CONTEXT_NAME)
 
 # ----- Topology -------------------------------------------------------------------------------------------------------
-TOPOLOGY_ID = json_topology_id(DEFAULT_TOPOLOGY_UUID, context_id=CONTEXT_ID)
-TOPOLOGY    = json_topology(DEFAULT_TOPOLOGY_UUID, context_id=CONTEXT_ID)
+TOPOLOGY_ID = json_topology_id(DEFAULT_TOPOLOGY_NAME, context_id=CONTEXT_ID)
+TOPOLOGY    = json_topology(DEFAULT_TOPOLOGY_NAME, context_id=CONTEXT_ID)
 
 # ----- Monitoring Samples ---------------------------------------------------------------------------------------------
 PACKET_PORT_SAMPLE_TYPES = [
diff --git a/src/tests/benchmark/policy/tests/test_functional_delete_service.py b/src/tests/benchmark/policy/tests/test_functional_delete_service.py
index 0f8d088012bed164e4603a813bfe9154eda8f568..48c2a0d5a16db038ac35c1226c33989d31a23e74 100644
--- a/src/tests/benchmark/policy/tests/test_functional_delete_service.py
+++ b/src/tests/benchmark/policy/tests/test_functional_delete_service.py
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 import logging
-from common.Constants import DEFAULT_CONTEXT_UUID
+from common.Constants import DEFAULT_CONTEXT_NAME
 from common.DeviceTypes import DeviceTypeEnum
 from common.proto.context_pb2 import ContextId, Empty, ServiceTypeEnum
 from common.tools.descriptor.Loader import DescriptorLoader
@@ -55,7 +55,7 @@ def test_service_removal(context_client : ContextClient, osm_wim : MockOSM): # p
     assert len(response.links) == descriptor_loader.num_links
 
     l3nm_service_uuids = set()
-    response = context_client.ListServices(ContextId(**json_context_id(DEFAULT_CONTEXT_UUID)))
+    response = context_client.ListServices(ContextId(**json_context_id(DEFAULT_CONTEXT_NAME)))
     assert len(response.services) == 2 # OLS & L3NM => (L3NM + TAPI)
     for service in response.services:
         service_id = service.service_id
diff --git a/src/tests/ecoc22/tests/Objects_BigNet.py b/src/tests/ecoc22/tests/Objects_BigNet.py
index 592376ff9dbaebbf4d8d02b04189e5d4f24584e3..b9e70517cd29817774320c7efb1b28d11ba00527 100644
--- a/src/tests/ecoc22/tests/Objects_BigNet.py
+++ b/src/tests/ecoc22/tests/Objects_BigNet.py
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from common.Constants import DEFAULT_CONTEXT_UUID, DEFAULT_TOPOLOGY_UUID
+from common.Constants import DEFAULT_CONTEXT_NAME, DEFAULT_TOPOLOGY_NAME
 from common.tools.object_factory.Context import json_context, json_context_id
 from common.tools.object_factory.Device import (
     json_device_emulated_connect_rules, json_device_emulated_datacenter_disabled,
@@ -21,13 +21,13 @@ from common.tools.object_factory.Topology import json_topology, json_topology_id
 from .Tools import compose_bearer, compose_service_endpoint_id, json_endpoint_ids, link
 
 # ----- Context --------------------------------------------------------------------------------------------------------
-CONTEXT_ID = json_context_id(DEFAULT_CONTEXT_UUID)
-CONTEXT    = json_context(DEFAULT_CONTEXT_UUID)
+CONTEXT_ID = json_context_id(DEFAULT_CONTEXT_NAME)
+CONTEXT    = json_context(DEFAULT_CONTEXT_NAME)
 
 
 # ----- Topology -------------------------------------------------------------------------------------------------------
-TOPOLOGY_ID = json_topology_id(DEFAULT_TOPOLOGY_UUID, context_id=CONTEXT_ID)
-TOPOLOGY    = json_topology(DEFAULT_TOPOLOGY_UUID, context_id=CONTEXT_ID)
+TOPOLOGY_ID = json_topology_id(DEFAULT_TOPOLOGY_NAME, context_id=CONTEXT_ID)
+TOPOLOGY    = json_topology(DEFAULT_TOPOLOGY_NAME, context_id=CONTEXT_ID)
 
 
 # ----- Customer Equipment (CE) Devices --------------------------------------------------------------------------------
diff --git a/src/tests/ecoc22/tests/Objects_DC_CSGW_OLS.py b/src/tests/ecoc22/tests/Objects_DC_CSGW_OLS.py
index 94d205a64681c7b1978524c1938cbc6b944afb58..37ceeae6a3cf8cf3eebfb191d24a3864d56805ef 100644
--- a/src/tests/ecoc22/tests/Objects_DC_CSGW_OLS.py
+++ b/src/tests/ecoc22/tests/Objects_DC_CSGW_OLS.py
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 import os, uuid
-from common.Constants import DEFAULT_CONTEXT_UUID, DEFAULT_TOPOLOGY_UUID
+from common.Constants import DEFAULT_CONTEXT_NAME, DEFAULT_TOPOLOGY_NAME
 from common.tools.object_factory.Context import json_context, json_context_id
 from common.tools.object_factory.Device import (
     json_device_emulated_connect_rules, json_device_emulated_datacenter_disabled,
@@ -68,12 +68,12 @@ def compose_service(endpoint_a, endpoint_z, constraints=[]):
     return service
 
 # ----- Context --------------------------------------------------------------------------------------------------------
-CONTEXT_ID = json_context_id(DEFAULT_CONTEXT_UUID)
-CONTEXT    = json_context(DEFAULT_CONTEXT_UUID)
+CONTEXT_ID = json_context_id(DEFAULT_CONTEXT_NAME)
+CONTEXT    = json_context(DEFAULT_CONTEXT_NAME)
 
 # ----- Domains --------------------------------------------------------------------------------------------------------
 # Overall network topology
-TOPO_ADMIN_UUID = DEFAULT_TOPOLOGY_UUID
+TOPO_ADMIN_UUID = DEFAULT_TOPOLOGY_NAME
 TOPO_ADMIN_ID   = json_topology_id(TOPO_ADMIN_UUID, context_id=CONTEXT_ID)
 TOPO_ADMIN      = json_topology(TOPO_ADMIN_UUID, context_id=CONTEXT_ID)
 
diff --git a/src/tests/ecoc22/tests/Objects_DC_CSGW_TN.py b/src/tests/ecoc22/tests/Objects_DC_CSGW_TN.py
index 229e3d5fe3cee54fb7295ac0049507ec4e348a04..f29999d6c83ee00db2923261bb6bf2845e4edf38 100644
--- a/src/tests/ecoc22/tests/Objects_DC_CSGW_TN.py
+++ b/src/tests/ecoc22/tests/Objects_DC_CSGW_TN.py
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 import os
-from common.Constants import DEFAULT_CONTEXT_UUID, DEFAULT_TOPOLOGY_UUID
+from common.Constants import DEFAULT_CONTEXT_NAME, DEFAULT_TOPOLOGY_NAME
 from common.tools.object_factory.Context import json_context, json_context_id
 from common.tools.object_factory.Device import (
     json_device_emulated_connect_rules, json_device_emulated_datacenter_disabled,
@@ -59,12 +59,12 @@ def compose_service(endpoint_a, endpoint_z, constraints=[]):
     return service
 
 # ----- Context --------------------------------------------------------------------------------------------------------
-CONTEXT_ID = json_context_id(DEFAULT_CONTEXT_UUID)
-CONTEXT    = json_context(DEFAULT_CONTEXT_UUID)
+CONTEXT_ID = json_context_id(DEFAULT_CONTEXT_NAME)
+CONTEXT    = json_context(DEFAULT_CONTEXT_NAME)
 
 # ----- Domains --------------------------------------------------------------------------------------------------------
 # Overall network topology
-TOPO_ADMIN_UUID = DEFAULT_TOPOLOGY_UUID
+TOPO_ADMIN_UUID = DEFAULT_TOPOLOGY_NAME
 TOPO_ADMIN_ID   = json_topology_id(TOPO_ADMIN_UUID, context_id=CONTEXT_ID)
 TOPO_ADMIN      = json_topology(TOPO_ADMIN_UUID, context_id=CONTEXT_ID)
 
diff --git a/src/tests/ecoc22/tests/Objects_DC_CSGW_TN_OLS.py b/src/tests/ecoc22/tests/Objects_DC_CSGW_TN_OLS.py
index 7063265f47344555d5b99c9c9747029227a494e0..d6a0dad6d4bc9663c6728c8d7f639aff9a7b3ec6 100644
--- a/src/tests/ecoc22/tests/Objects_DC_CSGW_TN_OLS.py
+++ b/src/tests/ecoc22/tests/Objects_DC_CSGW_TN_OLS.py
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 import os, uuid
-from common.Constants import DEFAULT_CONTEXT_UUID, DEFAULT_TOPOLOGY_UUID
+from common.Constants import DEFAULT_CONTEXT_NAME, DEFAULT_TOPOLOGY_NAME
 from common.tools.object_factory.Context import json_context, json_context_id
 from common.tools.object_factory.Device import (
     json_device_emulated_connect_rules, json_device_emulated_datacenter_disabled,
@@ -68,12 +68,12 @@ def compose_service(endpoint_a, endpoint_z, constraints=[]):
     return service
 
 # ----- Context --------------------------------------------------------------------------------------------------------
-CONTEXT_ID = json_context_id(DEFAULT_CONTEXT_UUID)
-CONTEXT    = json_context(DEFAULT_CONTEXT_UUID)
+CONTEXT_ID = json_context_id(DEFAULT_CONTEXT_NAME)
+CONTEXT    = json_context(DEFAULT_CONTEXT_NAME)
 
 # ----- Domains --------------------------------------------------------------------------------------------------------
 # Overall network topology
-TOPO_ADMIN_UUID = DEFAULT_TOPOLOGY_UUID
+TOPO_ADMIN_UUID = DEFAULT_TOPOLOGY_NAME
 TOPO_ADMIN_ID   = json_topology_id(TOPO_ADMIN_UUID, context_id=CONTEXT_ID)
 TOPO_ADMIN      = json_topology(TOPO_ADMIN_UUID, context_id=CONTEXT_ID)
 
diff --git a/src/tests/oeccpsc22/tests/Objects_Domain_1.py b/src/tests/oeccpsc22/tests/Objects_Domain_1.py
index 8b26348c94b827e4e418a458f21b28a863c4cb68..3f0f680dfc21cc42075b87ad0a508ac64322a7f7 100644
--- a/src/tests/oeccpsc22/tests/Objects_Domain_1.py
+++ b/src/tests/oeccpsc22/tests/Objects_Domain_1.py
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from common.Constants import DEFAULT_CONTEXT_UUID, DEFAULT_TOPOLOGY_UUID
+from common.Constants import DEFAULT_CONTEXT_NAME, DEFAULT_TOPOLOGY_NAME
 from common.tools.object_factory.Context import json_context, json_context_id
 from common.tools.object_factory.Device import (
     json_device_emulated_connect_rules, json_device_emulated_packet_router_disabled, json_device_id)
@@ -21,12 +21,12 @@ from common.tools.object_factory.Topology import json_topology, json_topology_id
 from .Tools import get_link_uuid, json_endpoint_ids
 
 # ----- Context --------------------------------------------------------------------------------------------------------
-D1_CONTEXT_ID = json_context_id(DEFAULT_CONTEXT_UUID)
-D1_CONTEXT    = json_context(DEFAULT_CONTEXT_UUID)
+D1_CONTEXT_ID = json_context_id(DEFAULT_CONTEXT_NAME)
+D1_CONTEXT    = json_context(DEFAULT_CONTEXT_NAME)
 
 # ----- Topology -------------------------------------------------------------------------------------------------------
-D1_TOPOLOGY_ID = json_topology_id(DEFAULT_TOPOLOGY_UUID, context_id=D1_CONTEXT_ID)
-D1_TOPOLOGY    = json_topology(DEFAULT_TOPOLOGY_UUID, context_id=D1_CONTEXT_ID)
+D1_TOPOLOGY_ID = json_topology_id(DEFAULT_TOPOLOGY_NAME, context_id=D1_CONTEXT_ID)
+D1_TOPOLOGY    = json_topology(DEFAULT_TOPOLOGY_NAME, context_id=D1_CONTEXT_ID)
 
 # ----- Devices --------------------------------------------------------------------------------------------------------
 # Assume all devices have the same architecture of endpoints
diff --git a/src/tests/oeccpsc22/tests/Objects_Domain_2.py b/src/tests/oeccpsc22/tests/Objects_Domain_2.py
index f9133809243effc0a7d22c953046a4af4d6bad3e..e8a53725315c8f783f2c17471c84b62d55d51d1b 100644
--- a/src/tests/oeccpsc22/tests/Objects_Domain_2.py
+++ b/src/tests/oeccpsc22/tests/Objects_Domain_2.py
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from common.Constants import DEFAULT_CONTEXT_UUID, DEFAULT_TOPOLOGY_UUID
+from common.Constants import DEFAULT_CONTEXT_NAME, DEFAULT_TOPOLOGY_NAME
 from common.tools.object_factory.Context import json_context, json_context_id
 from common.tools.object_factory.Device import (
     json_device_emulated_connect_rules, json_device_emulated_packet_router_disabled, json_device_id)
@@ -21,12 +21,12 @@ from common.tools.object_factory.Topology import json_topology, json_topology_id
 from .Tools import get_link_uuid, json_endpoint_ids
 
 # ----- Context --------------------------------------------------------------------------------------------------------
-D2_CONTEXT_ID = json_context_id(DEFAULT_CONTEXT_UUID)
-D2_CONTEXT    = json_context(DEFAULT_CONTEXT_UUID)
+D2_CONTEXT_ID = json_context_id(DEFAULT_CONTEXT_NAME)
+D2_CONTEXT    = json_context(DEFAULT_CONTEXT_NAME)
 
 # ----- Topology -------------------------------------------------------------------------------------------------------
-D2_TOPOLOGY_ID = json_topology_id(DEFAULT_TOPOLOGY_UUID, context_id=D2_CONTEXT_ID)
-D2_TOPOLOGY    = json_topology(DEFAULT_TOPOLOGY_UUID, context_id=D2_CONTEXT_ID)
+D2_TOPOLOGY_ID = json_topology_id(DEFAULT_TOPOLOGY_NAME, context_id=D2_CONTEXT_ID)
+D2_TOPOLOGY    = json_topology(DEFAULT_TOPOLOGY_NAME, context_id=D2_CONTEXT_ID)
 
 # ----- Devices --------------------------------------------------------------------------------------------------------
 # Assume all devices have the same architecture of endpoints
diff --git a/src/tests/ofc22/tests/ObjectsXr.py b/src/tests/ofc22/tests/ObjectsXr.py
index 0cb223de2ede509443275496ba9ca57158335036..f743e7a81af3d6b5c4052ec6746834094580e8f3 100644
--- a/src/tests/ofc22/tests/ObjectsXr.py
+++ b/src/tests/ofc22/tests/ObjectsXr.py
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 from typing import Dict, List, Tuple
-from common.Constants import DEFAULT_CONTEXT_UUID, DEFAULT_TOPOLOGY_UUID
+from common.Constants import DEFAULT_CONTEXT_NAME, DEFAULT_TOPOLOGY_NAME
 from common.tools.object_factory.Context import json_context, json_context_id
 from common.tools.object_factory.Device import (
     json_device_connect_rules, json_device_emulated_connect_rules, json_device_emulated_packet_router_disabled,
@@ -24,12 +24,12 @@ from common.tools.object_factory.Topology import json_topology, json_topology_id
 from common.proto.kpi_sample_types_pb2 import KpiSampleType
 
 # ----- Context --------------------------------------------------------------------------------------------------------
-CONTEXT_ID = json_context_id(DEFAULT_CONTEXT_UUID)
-CONTEXT    = json_context(DEFAULT_CONTEXT_UUID)
+CONTEXT_ID = json_context_id(DEFAULT_CONTEXT_NAME)
+CONTEXT    = json_context(DEFAULT_CONTEXT_NAME)
 
 # ----- Topology -------------------------------------------------------------------------------------------------------
-TOPOLOGY_ID = json_topology_id(DEFAULT_TOPOLOGY_UUID, context_id=CONTEXT_ID)
-TOPOLOGY    = json_topology(DEFAULT_TOPOLOGY_UUID, context_id=CONTEXT_ID)
+TOPOLOGY_ID = json_topology_id(DEFAULT_TOPOLOGY_NAME, context_id=CONTEXT_ID)
+TOPOLOGY    = json_topology(DEFAULT_TOPOLOGY_NAME, context_id=CONTEXT_ID)
 
 # ----- Monitoring Samples ---------------------------------------------------------------------------------------------
 PACKET_PORT_SAMPLE_TYPES = [
diff --git a/src/tests/ofc22/tests/test_functional_delete_service.py b/src/tests/ofc22/tests/test_functional_delete_service.py
index 0f8d088012bed164e4603a813bfe9154eda8f568..48c2a0d5a16db038ac35c1226c33989d31a23e74 100644
--- a/src/tests/ofc22/tests/test_functional_delete_service.py
+++ b/src/tests/ofc22/tests/test_functional_delete_service.py
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 import logging
-from common.Constants import DEFAULT_CONTEXT_UUID
+from common.Constants import DEFAULT_CONTEXT_NAME
 from common.DeviceTypes import DeviceTypeEnum
 from common.proto.context_pb2 import ContextId, Empty, ServiceTypeEnum
 from common.tools.descriptor.Loader import DescriptorLoader
@@ -55,7 +55,7 @@ def test_service_removal(context_client : ContextClient, osm_wim : MockOSM): # p
     assert len(response.links) == descriptor_loader.num_links
 
     l3nm_service_uuids = set()
-    response = context_client.ListServices(ContextId(**json_context_id(DEFAULT_CONTEXT_UUID)))
+    response = context_client.ListServices(ContextId(**json_context_id(DEFAULT_CONTEXT_NAME)))
     assert len(response.services) == 2 # OLS & L3NM => (L3NM + TAPI)
     for service in response.services:
         service_id = service.service_id
diff --git a/src/tests/p4/tests/Objects.py b/src/tests/p4/tests/Objects.py
index 0473207a87ba9ea5c74b45d983db185f8c541cbf..544fe35ee49a63d3387568054dadcd42b8974cf3 100644
--- a/src/tests/p4/tests/Objects.py
+++ b/src/tests/p4/tests/Objects.py
@@ -14,7 +14,7 @@
 
 import os
 from typing import Dict, List, Tuple
-from common.Constants import DEFAULT_CONTEXT_UUID, DEFAULT_TOPOLOGY_UUID
+from common.Constants import DEFAULT_CONTEXT_NAME, DEFAULT_TOPOLOGY_NAME
 from common.tools.object_factory.Context import json_context, json_context_id
 from common.tools.object_factory.Device import (
     json_device_connect_rules, json_device_emulated_connect_rules, json_device_emulated_packet_router_disabled,
@@ -30,12 +30,12 @@ from common.tools.object_factory.Topology import json_topology, json_topology_id
 from common.proto.kpi_sample_types_pb2 import KpiSampleType
 
 # ----- Context --------------------------------------------------------------------------------------------------------
-CONTEXT_ID = json_context_id(DEFAULT_CONTEXT_UUID)
-CONTEXT    = json_context(DEFAULT_CONTEXT_UUID)
+CONTEXT_ID = json_context_id(DEFAULT_CONTEXT_NAME)
+CONTEXT    = json_context(DEFAULT_CONTEXT_NAME)
 
 # ----- Topology -------------------------------------------------------------------------------------------------------
-TOPOLOGY_ID = json_topology_id(DEFAULT_TOPOLOGY_UUID, context_id=CONTEXT_ID)
-TOPOLOGY    = json_topology(DEFAULT_TOPOLOGY_UUID, context_id=CONTEXT_ID)
+TOPOLOGY_ID = json_topology_id(DEFAULT_TOPOLOGY_NAME, context_id=CONTEXT_ID)
+TOPOLOGY    = json_topology(DEFAULT_TOPOLOGY_NAME, context_id=CONTEXT_ID)
 
 # ----- Monitoring Samples ---------------------------------------------------------------------------------------------
 PACKET_PORT_SAMPLE_TYPES = [