diff --git a/scripts/run_tests_locally.sh b/scripts/run_tests_locally.sh
index 1d48cc1af18629874b0275b1fa92bf31961741c3..486107994f85dc4cfb3ddd2d717815c0193e43c4 100755
--- a/scripts/run_tests_locally.sh
+++ b/scripts/run_tests_locally.sh
@@ -54,7 +54,7 @@ rm -f $COVERAGEFILE
 coverage run --rcfile=$RCFILE --append -m pytest --log-level=INFO --verbose \
     common/orm/tests/test_unitary.py \
     common/message_broker/tests/test_unitary.py \
-    common/rpc_method_wrapper/tests/test_unitary.py
+    common/method_wrappers/tests/test_unitary.py
 
 coverage run --rcfile=$RCFILE --append -m pytest --log-level=INFO --verbose \
     context/tests/test_unitary.py
diff --git a/src/context/service/database/Connection.py b/src/context/service/database/Connection.py
index 3ab0b83bff9322b02995b0545dcbee7e5564a7d1..42fc86ebf514d9a858495f79dbc150925ec11968 100644
--- a/src/context/service/database/Connection.py
+++ b/src/context/service/database/Connection.py
@@ -20,7 +20,7 @@ from sqlalchemy.orm import Session, sessionmaker
 from sqlalchemy_cockroachdb import run_transaction
 from typing import Dict, List, Optional, Tuple
 from common.proto.context_pb2 import Connection, ConnectionId, ConnectionIdList, ConnectionList, ServiceId
-from common.rpc_method_wrapper.ServiceExceptions import NotFoundException
+from common.method_wrappers.ServiceExceptions import NotFoundException
 from common.tools.grpc.Tools import grpc_message_to_json_string
 from common.tools.object_factory.Connection import json_connection_id
 from .models.ConnectionModel import ConnectionEndPointModel, ConnectionModel, ConnectionSubServiceModel
diff --git a/src/context/service/database/Context.py b/src/context/service/database/Context.py
index e136a4f83c2feff6b8da3d2df7de725b6b5d94cf..6c7003e95beca96d0b2f61449644489866c638db 100644
--- a/src/context/service/database/Context.py
+++ b/src/context/service/database/Context.py
@@ -19,7 +19,7 @@ from sqlalchemy.orm import Session, sessionmaker
 from sqlalchemy_cockroachdb import run_transaction
 from typing import Dict, List, Optional, Tuple
 from common.proto.context_pb2 import Context, ContextId, ContextIdList, ContextList
-from common.rpc_method_wrapper.ServiceExceptions import NotFoundException
+from common.method_wrappers.ServiceExceptions import NotFoundException
 from common.tools.object_factory.Context import json_context_id
 from .models.ContextModel import ContextModel
 from .uuids.Context import context_get_uuid
diff --git a/src/context/service/database/Device.py b/src/context/service/database/Device.py
index acb1603c6a3fcbe4296f2ae18cea1b421f3acad8..ccd991d7f4ccbd8b8ca40fbee95a7d21f8fc69e2 100644
--- a/src/context/service/database/Device.py
+++ b/src/context/service/database/Device.py
@@ -18,7 +18,7 @@ from sqlalchemy.orm import Session, sessionmaker
 from sqlalchemy_cockroachdb import run_transaction
 from typing import Dict, List, Optional, Set, Tuple
 from common.proto.context_pb2 import Device, DeviceId, DeviceIdList, DeviceList
-from common.rpc_method_wrapper.ServiceExceptions import InvalidArgumentException, NotFoundException
+from common.method_wrappers.ServiceExceptions import InvalidArgumentException, NotFoundException
 from common.tools.object_factory.Device import json_device_id
 from context.service.database.ConfigRule import compose_config_rules_data, upsert_config_rules
 from .models.DeviceModel import DeviceModel
diff --git a/src/context/service/database/Link.py b/src/context/service/database/Link.py
index a2b4e3035743f29332eebd920068d206ead1daca..c21dd6714a1e5f732757162987f84dd40a0ec5fe 100644
--- a/src/context/service/database/Link.py
+++ b/src/context/service/database/Link.py
@@ -18,7 +18,7 @@ from sqlalchemy.orm import Session, sessionmaker
 from sqlalchemy_cockroachdb import run_transaction
 from typing import Dict, List, Optional, Set, Tuple
 from common.proto.context_pb2 import Link, LinkId, LinkIdList, LinkList
-from common.rpc_method_wrapper.ServiceExceptions import NotFoundException
+from common.method_wrappers.ServiceExceptions import NotFoundException
 from common.tools.object_factory.Link import json_link_id
 from .models.LinkModel import LinkModel, LinkEndPointModel
 from .models.TopologyModel import TopologyLinkModel
diff --git a/src/context/service/database/PolicyRule.py b/src/context/service/database/PolicyRule.py
index da8356e04e17e0c71be2235e275bbfc5912aaa84..2371af88e12e6eb1fef65ee26f681bcf03f6f71c 100644
--- a/src/context/service/database/PolicyRule.py
+++ b/src/context/service/database/PolicyRule.py
@@ -19,7 +19,7 @@ from sqlalchemy.orm import Session, sessionmaker
 from sqlalchemy_cockroachdb import run_transaction
 from typing import Dict, List, Optional, Set, Tuple
 from common.proto.policy_pb2 import PolicyRule, PolicyRuleId, PolicyRuleIdList, PolicyRuleList
-from common.rpc_method_wrapper.ServiceExceptions import NotFoundException
+from common.method_wrappers.ServiceExceptions import NotFoundException
 from common.tools.grpc.Tools import grpc_message_to_json
 from common.tools.object_factory.PolicyRule import json_policyrule_id
 from context.service.database.uuids.Device import device_get_uuid
diff --git a/src/context/service/database/Service.py b/src/context/service/database/Service.py
index c926c25409fd6fea789228046c7cda40d4cd019d..247914d6518f6f3282c27ba3f77428f8c64140a5 100644
--- a/src/context/service/database/Service.py
+++ b/src/context/service/database/Service.py
@@ -18,7 +18,7 @@ from sqlalchemy.orm import Session, sessionmaker
 from sqlalchemy_cockroachdb import run_transaction
 from typing import Dict, List, Optional, Tuple
 from common.proto.context_pb2 import ContextId, Service, ServiceId, ServiceIdList, ServiceList
-from common.rpc_method_wrapper.ServiceExceptions import InvalidArgumentException, NotFoundException
+from common.method_wrappers.ServiceExceptions import InvalidArgumentException, NotFoundException
 from common.tools.object_factory.Context import json_context_id
 from common.tools.object_factory.Service import json_service_id
 from context.service.database.ConfigRule import compose_config_rules_data, upsert_config_rules
diff --git a/src/context/service/database/Slice.py b/src/context/service/database/Slice.py
index 6566f94c5c5ca567e7b0ac3b74a16e29dfa9b8de..e963fb7729ff1edba382e71d2d1573674d060a59 100644
--- a/src/context/service/database/Slice.py
+++ b/src/context/service/database/Slice.py
@@ -19,7 +19,7 @@ from sqlalchemy.orm import Session, sessionmaker
 from sqlalchemy_cockroachdb import run_transaction
 from typing import Dict, List, Optional, Set, Tuple
 from common.proto.context_pb2 import ContextId, Slice, SliceId, SliceIdList, SliceList
-from common.rpc_method_wrapper.ServiceExceptions import InvalidArgumentException, NotFoundException
+from common.method_wrappers.ServiceExceptions import InvalidArgumentException, NotFoundException
 from common.tools.object_factory.Context import json_context_id
 from common.tools.object_factory.Slice import json_slice_id
 from context.service.database.ConfigRule import compose_config_rules_data, upsert_config_rules
diff --git a/src/context/service/database/Topology.py b/src/context/service/database/Topology.py
index a7272713cd6c7bc91ae729699cb5c2a1c10004ff..40ecb6c39dd077db8407548d8751c67ced9d6891 100644
--- a/src/context/service/database/Topology.py
+++ b/src/context/service/database/Topology.py
@@ -19,7 +19,7 @@ from sqlalchemy.orm import Session, sessionmaker
 from sqlalchemy_cockroachdb import run_transaction
 from typing import Dict, List, Optional, Tuple
 from common.proto.context_pb2 import ContextId, Topology, TopologyId, TopologyIdList, TopologyList
-from common.rpc_method_wrapper.ServiceExceptions import NotFoundException
+from common.method_wrappers.ServiceExceptions import NotFoundException
 from common.tools.object_factory.Context import json_context_id
 from common.tools.object_factory.Topology import json_topology_id
 from .models.TopologyModel import TopologyModel
diff --git a/src/context/service/database/uuids/Connection.py b/src/context/service/database/uuids/Connection.py
index 24c2e99779ddf7bf8df14080cb9df1f2c1dbe4ed..eea3b7214874aeea8dbd7a22147b18f2c1d6367c 100644
--- a/src/context/service/database/uuids/Connection.py
+++ b/src/context/service/database/uuids/Connection.py
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 from common.proto.context_pb2 import ConnectionId
-from common.rpc_method_wrapper.ServiceExceptions import InvalidArgumentsException
+from common.method_wrappers.ServiceExceptions import InvalidArgumentsException
 from ._Builder import get_uuid_from_string, get_uuid_random
 
 def connection_get_uuid(
diff --git a/src/context/service/database/uuids/Context.py b/src/context/service/database/uuids/Context.py
index 753f80e9c73a3f03e15e23bc51bc85f4f09d6292..1b798123e08fbbbf5402cbde31e44a4729b7b0e9 100644
--- a/src/context/service/database/uuids/Context.py
+++ b/src/context/service/database/uuids/Context.py
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 from common.proto.context_pb2 import ContextId
-from common.rpc_method_wrapper.ServiceExceptions import InvalidArgumentsException
+from common.method_wrappers.ServiceExceptions import InvalidArgumentsException
 from ._Builder import get_uuid_from_string, get_uuid_random
 
 def context_get_uuid(
diff --git a/src/context/service/database/uuids/Device.py b/src/context/service/database/uuids/Device.py
index c1b66759bf69bef8dfb88ced0e5e9630f4fbe4e5..41391c8fa58468f7533ddaec4d357b3a350e25a6 100644
--- a/src/context/service/database/uuids/Device.py
+++ b/src/context/service/database/uuids/Device.py
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 from common.proto.context_pb2 import DeviceId
-from common.rpc_method_wrapper.ServiceExceptions import InvalidArgumentsException
+from common.method_wrappers.ServiceExceptions import InvalidArgumentsException
 from ._Builder import get_uuid_from_string, get_uuid_random
 
 def device_get_uuid(
diff --git a/src/context/service/database/uuids/EndPoint.py b/src/context/service/database/uuids/EndPoint.py
index 7afb87184f71499385365490f4ce29733f58f85c..f257d1b41caeec7f3f87443ada74cf06ffe1f39f 100644
--- a/src/context/service/database/uuids/EndPoint.py
+++ b/src/context/service/database/uuids/EndPoint.py
@@ -14,7 +14,7 @@
 
 from typing import Tuple
 from common.proto.context_pb2 import EndPointId
-from common.rpc_method_wrapper.ServiceExceptions import InvalidArgumentsException
+from common.method_wrappers.ServiceExceptions import InvalidArgumentsException
 from ._Builder import get_uuid_from_string, get_uuid_random
 from .Device import device_get_uuid
 from .Topology import topology_get_uuid
diff --git a/src/context/service/database/uuids/Link.py b/src/context/service/database/uuids/Link.py
index d1ae4c21fcb780babc6915a05b7e47c0ea2ed771..2d68ed76fd806644d5e21bbd0d46c4805f130eb8 100644
--- a/src/context/service/database/uuids/Link.py
+++ b/src/context/service/database/uuids/Link.py
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 from common.proto.context_pb2 import LinkId
-from common.rpc_method_wrapper.ServiceExceptions import InvalidArgumentsException
+from common.method_wrappers.ServiceExceptions import InvalidArgumentsException
 from ._Builder import get_uuid_from_string, get_uuid_random
 
 def link_get_uuid(
diff --git a/src/context/service/database/uuids/PolicuRule.py b/src/context/service/database/uuids/PolicuRule.py
index d5266ad11efbab876d1c05a4453e3eb8bc07769b..dbe691a2da79597b3b6364549ab7ba8f3f721f88 100644
--- a/src/context/service/database/uuids/PolicuRule.py
+++ b/src/context/service/database/uuids/PolicuRule.py
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 from common.proto.policy_pb2 import PolicyRuleId
-from common.rpc_method_wrapper.ServiceExceptions import InvalidArgumentException
+from common.method_wrappers.ServiceExceptions import InvalidArgumentException
 from ._Builder import get_uuid_from_string, get_uuid_random
 
 def policyrule_get_uuid(
diff --git a/src/context/service/database/uuids/Service.py b/src/context/service/database/uuids/Service.py
index 56a5d12a0965b0ac26cd9027ad39ecb3546a426b..f3d2059095de1f65efa2244cbc2614a05fea5508 100644
--- a/src/context/service/database/uuids/Service.py
+++ b/src/context/service/database/uuids/Service.py
@@ -14,7 +14,7 @@
 
 from typing import Tuple
 from common.proto.context_pb2 import ServiceId
-from common.rpc_method_wrapper.ServiceExceptions import InvalidArgumentsException
+from common.method_wrappers.ServiceExceptions import InvalidArgumentsException
 from ._Builder import get_uuid_from_string, get_uuid_random
 from .Context import context_get_uuid
 
diff --git a/src/context/service/database/uuids/Slice.py b/src/context/service/database/uuids/Slice.py
index 3b46e582e1b7c93ad81aeaa97a59fd1df8fe5869..b7d1465dd33ff2610609962cc2fba2b0d8fa9cc9 100644
--- a/src/context/service/database/uuids/Slice.py
+++ b/src/context/service/database/uuids/Slice.py
@@ -14,7 +14,7 @@
 
 from typing import Tuple
 from common.proto.context_pb2 import SliceId
-from common.rpc_method_wrapper.ServiceExceptions import InvalidArgumentsException
+from common.method_wrappers.ServiceExceptions import InvalidArgumentsException
 from ._Builder import get_uuid_from_string, get_uuid_random
 from .Context import context_get_uuid
 
diff --git a/src/context/service/database/uuids/Topology.py b/src/context/service/database/uuids/Topology.py
index c3c9175d808826ca6cfc0b722a97ddabfe5f9151..e23f95238724b0a68c8b2948e0fb8ce79107da51 100644
--- a/src/context/service/database/uuids/Topology.py
+++ b/src/context/service/database/uuids/Topology.py
@@ -14,7 +14,7 @@
 
 from typing import Tuple
 from common.proto.context_pb2 import TopologyId
-from common.rpc_method_wrapper.ServiceExceptions import InvalidArgumentsException
+from common.method_wrappers.ServiceExceptions import InvalidArgumentsException
 from ._Builder import get_uuid_from_string, get_uuid_random
 from .Context import context_get_uuid