diff --git a/src/qkd_app/client/QKDAppClient.py b/src/qkd_app/client/QKDAppClient.py
index b8c09329f9511868a1013ea41a0d8890da499218..1a174df6adc69ab9ce88b0d8878c92b9b9e7820e 100644
--- a/src/qkd_app/client/QKDAppClient.py
+++ b/src/qkd_app/client/QKDAppClient.py
@@ -28,8 +28,8 @@ RETRY_DECORATOR = retry(max_retries=MAX_RETRIES, delay_function=DELAY_FUNCTION,
 
 class QKDAppClient:
     def __init__(self, host=None, port=None):
-        if not host: host = get_service_host(ServiceNameEnum.APP)
-        if not port: port = get_service_port_grpc(ServiceNameEnum.APP)
+        if not host: host = get_service_host(ServiceNameEnum.QKD_APP)
+        if not port: port = get_service_port_grpc(ServiceNameEnum.QKD_APP)
         self.endpoint = '{:s}:{:s}'.format(str(host), str(port))
         LOGGER.debug('Creating channel to {:s}...'.format(self.endpoint))
         self.channel = None
diff --git a/src/qkd_app/service/QKDAppService.py b/src/qkd_app/service/QKDAppService.py
index fcf63efba3b390e0cb58e82430b2a2ce9feeef8d..a6c93cd811a72594804fe8e8e86a9586533a1317 100644
--- a/src/qkd_app/service/QKDAppService.py
+++ b/src/qkd_app/service/QKDAppService.py
@@ -29,7 +29,7 @@ class AppService(GenericGrpcService):
     def __init__(
         self, db_engine : sqlalchemy.engine.Engine, messagebroker : MessageBroker, cls_name: str = __name__
     ) -> None:
-        port = get_service_port_grpc(ServiceNameEnum.APP)
+        port = get_service_port_grpc(ServiceNameEnum.QKD_APP)
         super().__init__(port, max_workers=GRPC_MAX_WORKERS, cls_name=cls_name)
         self.app_servicer = AppServiceServicerImpl(db_engine, messagebroker)
 
diff --git a/src/qkd_app/service/rest_server/RestServer.py b/src/qkd_app/service/rest_server/RestServer.py
index 4302a0562337ad9af8c28ef037d4fb64ec1e53bf..e21531c5bcf0e1cf15a8f08952d6325a8349f398 100644
--- a/src/qkd_app/service/rest_server/RestServer.py
+++ b/src/qkd_app/service/rest_server/RestServer.py
@@ -18,6 +18,6 @@ from common.tools.service.GenericRestServer import GenericRestServer
 
 class RestServer(GenericRestServer):
     def __init__(self, cls_name: str = __name__) -> None:
-        bind_port = get_service_port_http(ServiceNameEnum.APP)
-        base_url = get_service_baseurl_http(ServiceNameEnum.APP)
+        bind_port = get_service_port_http(ServiceNameEnum.QKD_APP)
+        base_url = get_service_baseurl_http(ServiceNameEnum.QKD_APP)
         super().__init__(bind_port, base_url, cls_name=cls_name)
diff --git a/src/webui/service/__main__.py b/src/webui/service/__main__.py
index 8cb577d7149f08fa05c11961945f2b8d98beaa00..8ec8dcb64d55c7a4c4d699601fe97a7d6432ce05 100644
--- a/src/webui/service/__main__.py
+++ b/src/webui/service/__main__.py
@@ -43,8 +43,8 @@ def main():
         get_env_var_name(ServiceNameEnum.SERVICE, ENVVAR_SUFIX_SERVICE_PORT_GRPC),
         get_env_var_name(ServiceNameEnum.SLICE,   ENVVAR_SUFIX_SERVICE_HOST     ),
         get_env_var_name(ServiceNameEnum.SLICE,   ENVVAR_SUFIX_SERVICE_PORT_GRPC),
-        get_env_var_name(ServiceNameEnum.APP,   ENVVAR_SUFIX_SERVICE_HOST     ),
-        get_env_var_name(ServiceNameEnum.APP,   ENVVAR_SUFIX_SERVICE_PORT_GRPC),
+        get_env_var_name(ServiceNameEnum.QKD_APP, ENVVAR_SUFIX_SERVICE_HOST     ),
+        get_env_var_name(ServiceNameEnum.QKD_APP, ENVVAR_SUFIX_SERVICE_PORT_GRPC),
     ])
 
     logger.info('Starting...')