diff --git a/node-api/src/main/kotlin/net/corda/nodeapi/internal/ArtemisTcpTransport.kt b/node-api/src/main/kotlin/net/corda/nodeapi/internal/ArtemisTcpTransport.kt
index acf7922cae..f46202cc07 100644
--- a/node-api/src/main/kotlin/net/corda/nodeapi/internal/ArtemisTcpTransport.kt
+++ b/node-api/src/main/kotlin/net/corda/nodeapi/internal/ArtemisTcpTransport.kt
@@ -182,7 +182,7 @@ class ArtemisTcpTransport {
                                              threadPoolName: String,
                                              trace: Boolean): TransportConfiguration {
             return createTransport(
-                    "net.corda.node.services.messaging.NodeNettyConnectorFactory",
+                    NodeNettyConnectorFactory::class.java.name,
                     hostAndPort,
                     protocols,
                     options,
diff --git a/node/src/main/kotlin/net/corda/node/services/messaging/NodeNettyConnectorFactory.kt b/node-api/src/main/kotlin/net/corda/nodeapi/internal/NodeNettyConnectorFactory.kt
similarity index 96%
rename from node/src/main/kotlin/net/corda/node/services/messaging/NodeNettyConnectorFactory.kt
rename to node-api/src/main/kotlin/net/corda/nodeapi/internal/NodeNettyConnectorFactory.kt
index 1672031a11..47e046566e 100644
--- a/node/src/main/kotlin/net/corda/node/services/messaging/NodeNettyConnectorFactory.kt
+++ b/node-api/src/main/kotlin/net/corda/nodeapi/internal/NodeNettyConnectorFactory.kt
@@ -1,9 +1,8 @@
-package net.corda.node.services.messaging
+package net.corda.nodeapi.internal
 
 import io.netty.channel.ChannelPipeline
 import io.netty.handler.logging.LogLevel
 import io.netty.handler.logging.LoggingHandler
-import net.corda.nodeapi.internal.ArtemisTcpTransport
 import org.apache.activemq.artemis.core.protocol.core.impl.ActiveMQClientProtocolManager
 import org.apache.activemq.artemis.core.remoting.impl.netty.NettyConnector
 import org.apache.activemq.artemis.spi.core.remoting.BufferHandler
@@ -15,7 +14,6 @@ import org.apache.activemq.artemis.utils.ConfigurationHelper
 import java.util.concurrent.Executor
 import java.util.concurrent.ScheduledExecutorService
 
-@Suppress("unused")
 class NodeNettyConnectorFactory : ConnectorFactory {
     override fun createConnector(configuration: MutableMap<String, Any>?,
                                  handler: BufferHandler?,