diff --git a/exasol/analytics/udf/communication/discovery/multi_node/communicator.py b/exasol/analytics/udf/communication/discovery/multi_node/communicator.py
index f871879d..c1d3812c 100644
--- a/exasol/analytics/udf/communication/discovery/multi_node/communicator.py
+++ b/exasol/analytics/udf/communication/discovery/multi_node/communicator.py
@@ -1,4 +1,5 @@
-from exasol.analytics.udf.communication.discovery import multi_node
+from exasol.analytics.udf.communication.discovery.multi_node.discovery_socket import DiscoverySocketFactory
+from exasol.analytics.udf.communication.discovery.multi_node.discovery_strategy import DiscoveryStrategy
 from exasol.analytics.udf.communication.ip_address import IPAddress, Port
 from exasol.analytics.udf.communication.peer_communicator import PeerCommunicator
 from exasol.analytics.udf.communication.peer_communicator.forward_register_peer_config import (
@@ -22,7 +23,7 @@ def create(
         discovery_ip: IPAddress,
         discovery_port: Port,
         socket_factory: SocketFactory,
-        discovery_socket_factory: multi_node.DiscoverySocketFactory,
+        discovery_socket_factory: DiscoverySocketFactory,
     ) -> PeerCommunicator:
         peer_communicator = PeerCommunicator(
             name=name,
@@ -37,7 +38,7 @@ def create(
             ),
             socket_factory=socket_factory,
         )
-        discovery = multi_node.DiscoveryStrategy(
+        discovery = DiscoveryStrategy(
             ip_address=discovery_ip,
             port=discovery_port,
             timeout_in_seconds=120,
diff --git a/exasol/analytics/udf/communication/discovery/multi_node/discovery_strategy.py b/exasol/analytics/udf/communication/discovery/multi_node/discovery_strategy.py
index 12c97dc5..895811eb 100644
--- a/exasol/analytics/udf/communication/discovery/multi_node/discovery_strategy.py
+++ b/exasol/analytics/udf/communication/discovery/multi_node/discovery_strategy.py
@@ -3,7 +3,7 @@
 from typing import Optional, cast
 
 from exasol.analytics.udf.communication import messages
-from exasol.analytics.udf.communication.discovery.multi_node import (
+from exasol.analytics.udf.communication.discovery.multi_node.discovery_socket import (
     DiscoverySocketFactory,
 )
 from exasol.analytics.udf.communication.ip_address import IPAddress, Port