diff --git a/build/gobind-pinecone/monolith.go b/build/gobind-pinecone/monolith.go
index 62b03ffcb..dc14b3ef7 100644
--- a/build/gobind-pinecone/monolith.go
+++ b/build/gobind-pinecone/monolith.go
@@ -517,9 +517,9 @@ type RelayServerRetriever struct {
 }
 
 func (m *RelayServerRetriever) InitializeRelayServers(eLog *logrus.Entry) {
-	request := api.QueryRelayServersRequest{Server: gomatrixserverlib.ServerName(m.ServerName)}
-	response := api.QueryRelayServersResponse{}
-	err := m.FederationAPI.QueryRelayServers(m.Context, &request, &response)
+	request := api.P2PQueryRelayServersRequest{Server: gomatrixserverlib.ServerName(m.ServerName)}
+	response := api.P2PQueryRelayServersResponse{}
+	err := m.FederationAPI.P2PQueryRelayServers(m.Context, &request, &response)
 	if err != nil {
 		eLog.Warnf("Failed obtaining list of this node's relay servers: %s", err.Error())
 	}
diff --git a/build/gobind-pinecone/monolith_test.go b/build/gobind-pinecone/monolith_test.go
index 1312dde98..f2796d2a1 100644
--- a/build/gobind-pinecone/monolith_test.go
+++ b/build/gobind-pinecone/monolith_test.go
@@ -133,7 +133,7 @@ type FakeFedAPI struct {
 	api.FederationInternalAPI
 }
 
-func (f *FakeFedAPI) QueryRelayServers(ctx context.Context, req *api.QueryRelayServersRequest, res *api.QueryRelayServersResponse) error {
+func (f *FakeFedAPI) P2PQueryRelayServers(ctx context.Context, req *api.P2PQueryRelayServersRequest, res *api.P2PQueryRelayServersResponse) error {
 	res.RelayServers = testRelayServers
 	return nil
 }
diff --git a/cmd/dendrite-demo-pinecone/main.go b/cmd/dendrite-demo-pinecone/main.go
index 023320ac1..e9b0f7360 100644
--- a/cmd/dendrite-demo-pinecone/main.go
+++ b/cmd/dendrite-demo-pinecone/main.go
@@ -377,9 +377,9 @@ type RelayServerRetriever struct {
 }
 
 func (m *RelayServerRetriever) InitializeRelayServers(eLog *logrus.Entry) {
-	request := api.QueryRelayServersRequest{Server: gomatrixserverlib.ServerName(m.ServerName)}
-	response := api.QueryRelayServersResponse{}
-	err := m.FederationAPI.QueryRelayServers(m.Context, &request, &response)
+	request := api.P2PQueryRelayServersRequest{Server: gomatrixserverlib.ServerName(m.ServerName)}
+	response := api.P2PQueryRelayServersResponse{}
+	err := m.FederationAPI.P2PQueryRelayServers(m.Context, &request, &response)
 	if err != nil {
 		eLog.Warnf("Failed obtaining list of this node's relay servers: %s", err.Error())
 	}
diff --git a/federationapi/api/api.go b/federationapi/api/api.go
index af3d0820f..6c1e9812c 100644
--- a/federationapi/api/api.go
+++ b/federationapi/api/api.go
@@ -37,10 +37,10 @@ type FederationInternalAPI interface {
 	) error
 
 	// Relay Server sync api used in the pinecone demos.
-	QueryRelayServers(
+	P2PQueryRelayServers(
 		ctx context.Context,
-		request *QueryRelayServersRequest,
-		response *QueryRelayServersResponse,
+		request *P2PQueryRelayServersRequest,
+		response *P2PQueryRelayServersResponse,
 	) error
 }
 
@@ -243,27 +243,27 @@ type InputPublicKeysRequest struct {
 type InputPublicKeysResponse struct {
 }
 
-type QueryRelayServersRequest struct {
+type P2PQueryRelayServersRequest struct {
 	Server gomatrixserverlib.ServerName
 }
 
-type QueryRelayServersResponse struct {
+type P2PQueryRelayServersResponse struct {
 	RelayServers []gomatrixserverlib.ServerName
 }
 
-type PerformStoreAsyncRequest struct {
-	Txn    gomatrixserverlib.Transaction `json:"transaction"`
-	UserID gomatrixserverlib.UserID      `json:"user_id"`
+type P2PPerformStoreAsyncRequest struct {
+	Transaction gomatrixserverlib.Transaction `json:"transaction"`
+	UserID      gomatrixserverlib.UserID      `json:"user_id"`
 }
 
-type PerformStoreAsyncResponse struct {
+type P2PPerformStoreAsyncResponse struct {
 }
 
-type QueryAsyncTransactionsRequest struct {
+type P2PQueryAsyncTransactionsRequest struct {
 	UserID gomatrixserverlib.UserID `json:"user_id"`
 }
 
-type QueryAsyncTransactionsResponse struct {
-	Txn            gomatrixserverlib.Transaction `json:"transaction"`
+type P2PQueryAsyncTransactionsResponse struct {
+	Transaction    gomatrixserverlib.Transaction `json:"transaction"`
 	RemainingCount uint32                        `json:"remaining"`
 }
diff --git a/federationapi/internal/perform.go b/federationapi/internal/perform.go
index 20591a3cd..6ddbacbef 100644
--- a/federationapi/internal/perform.go
+++ b/federationapi/internal/perform.go
@@ -831,11 +831,11 @@ func federatedAuthProvider(
 	}
 }
 
-// QueryRelayServers implements api.FederationInternalAPI
-func (r *FederationInternalAPI) QueryRelayServers(
+// P2PQueryRelayServers implements api.FederationInternalAPI
+func (r *FederationInternalAPI) P2PQueryRelayServers(
 	ctx context.Context,
-	request *api.QueryRelayServersRequest,
-	response *api.QueryRelayServersResponse,
+	request *api.P2PQueryRelayServersRequest,
+	response *api.P2PQueryRelayServersResponse,
 ) error {
 	logrus.Infof("Getting relay servers for: %s", request.Server)
 	relayServers, err := r.db.GetRelayServersForServer(request.Server)
diff --git a/federationapi/internal/perform_test.go b/federationapi/internal/perform_test.go
index b4de7e6d2..d66ec64c0 100644
--- a/federationapi/internal/perform_test.go
+++ b/federationapi/internal/perform_test.go
@@ -113,11 +113,11 @@ func TestQueryRelayServers(t *testing.T) {
 		testDB, &cfg, nil, fedClient, &stats, nil, queues, nil,
 	)
 
-	req := api.QueryRelayServersRequest{
+	req := api.P2PQueryRelayServersRequest{
 		Server: server,
 	}
-	res := api.QueryRelayServersResponse{}
-	err = fedAPI.QueryRelayServers(context.Background(), &req, &res)
+	res := api.P2PQueryRelayServersResponse{}
+	err = fedAPI.P2PQueryRelayServers(context.Background(), &req, &res)
 	assert.NoError(t, err)
 
 	assert.Equal(t, len(relayServers), len(res.RelayServers))
diff --git a/federationapi/inthttp/client.go b/federationapi/inthttp/client.go
index de384335d..6130a567d 100644
--- a/federationapi/inthttp/client.go
+++ b/federationapi/inthttp/client.go
@@ -512,10 +512,10 @@ func (h *httpFederationInternalAPI) QueryPublicKeys(
 	)
 }
 
-func (h *httpFederationInternalAPI) QueryRelayServers(
+func (h *httpFederationInternalAPI) P2PQueryRelayServers(
 	ctx context.Context,
-	request *api.QueryRelayServersRequest,
-	response *api.QueryRelayServersResponse,
+	request *api.P2PQueryRelayServersRequest,
+	response *api.P2PQueryRelayServersResponse,
 ) error {
 	return httputil.CallInternalRPCAPI(
 		"QueryRelayServers", h.federationAPIURL+FederationAPIQueryRelayServers,