diff --git a/src/wormhole/servers/relay.py b/src/wormhole/servers/relay.py
index ae79163..02ad986 100644
--- a/src/wormhole/servers/relay.py
+++ b/src/wormhole/servers/relay.py
@@ -4,7 +4,7 @@ from twisted.python import log
 from twisted.internet import reactor, protocol, endpoints
 from twisted.application import service, internet
 from twisted.web import server, static, resource, http
-from ..util.endpoint_service import EndpointServerService
+from ..util.endpoint_service import ServerEndpointService
 from .. import __version__
 from ..database import get_db
 
@@ -407,7 +407,7 @@ class RelayServer(service.MultiService):
         self.root = Root()
         site = server.Site(self.root)
         r = endpoints.serverFromString(reactor, relayport)
-        self.relayport_service = EndpointServerService(r, site)
+        self.relayport_service = ServerEndpointService(r, site)
         self.relayport_service.setServiceParent(self)
         self.relay = Relay(self.db, welcome) # accessible from tests
         self.root.putChild(b"wormhole-relay", self.relay)
@@ -418,5 +418,5 @@ class RelayServer(service.MultiService):
             self.transit = Transit()
             self.transit.setServiceParent(self) # for the timer
             t = endpoints.serverFromString(reactor, transitport)
-            self.transport_service = EndpointServerService(t, self.transit)
+            self.transport_service = ServerEndpointService(t, self.transit)
             self.transport_service.setServiceParent(self)
diff --git a/src/wormhole/util/endpoint_service.py b/src/wormhole/util/endpoint_service.py
index c2b3069..b191f9b 100644
--- a/src/wormhole/util/endpoint_service.py
+++ b/src/wormhole/util/endpoint_service.py
@@ -4,7 +4,7 @@ from twisted.application import service
 
 # this should probably live in Twisted
 
-class EndpointServerService(service.Service):
+class ServerEndpointService(service.Service):
     def __init__(self, endpoint, factory):
         self.endpoint = endpoint
         self.factory = factory