diff --git a/synapse/federation/transport/server.py b/synapse/federation/transport/server.py
index 04b83e691a..a66a6b0692 100644
--- a/synapse/federation/transport/server.py
+++ b/synapse/federation/transport/server.py
@@ -1190,7 +1190,7 @@ GROUP_ATTESTATION_SERVLET_CLASSES = (
 def register_servlets(hs, resource, authenticator, ratelimiter):
     for servletclass in FEDERATION_SERVLET_CLASSES:
         servletclass(
-            handler=hs.get_replication_server(),
+            handler=hs.get_federation_server(),
             authenticator=authenticator,
             ratelimiter=ratelimiter,
             server_name=hs.hostname,
diff --git a/synapse/server.py b/synapse/server.py
index 894e9c2acf..802a793848 100644
--- a/synapse/server.py
+++ b/synapse/server.py
@@ -102,7 +102,7 @@ class HomeServer(object):
         'http_client',
         'db_pool',
         'replication_client',
-        'replication_server',
+        'federation_server',
         'handlers',
         'v1auth',
         'auth',
@@ -202,7 +202,7 @@ class HomeServer(object):
     def build_replication_client(self):
         return FederationClient(self)
 
-    def build_replication_server(self):
+    def build_federation_server(self):
         return FederationServer(self)
 
     def build_handlers(self):
diff --git a/tests/handlers/test_profile.py b/tests/handlers/test_profile.py
index c690437682..f9f828471a 100644
--- a/tests/handlers/test_profile.py
+++ b/tests/handlers/test_profile.py
@@ -52,7 +52,7 @@ class ProfileTestCase(unittest.TestCase):
             handlers=None,
             resource_for_federation=Mock(),
             replication_client=self.mock_federation,
-            replication_server=Mock(),
+            federation_server=Mock(),
             federation_registry=self.mock_registry,
             ratelimiter=NonCallableMock(spec_set=[
                 "send_message",