diff --git a/appservice/appservice.go b/appservice/appservice.go
index d94a483e0..a179c8b10 100644
--- a/appservice/appservice.go
+++ b/appservice/appservice.go
@@ -79,7 +79,7 @@ func NewInternalAPI(
 	return appserviceQueryAPI
 }
 
-// generateAppServiceAccounts creates a dummy account based off the
+// generateAppServiceAccount creates a dummy account based off the
 // `sender_localpart` field of each application service if it doesn't
 // exist already
 func generateAppServiceAccount(
diff --git a/federationapi/internal/perform.go b/federationapi/internal/perform.go
index 0200cf69b..406e3d3e5 100644
--- a/federationapi/internal/perform.go
+++ b/federationapi/internal/perform.go
@@ -649,7 +649,7 @@ func (r *FederationInternalAPI) SendInviteV3(
 	return inviteEvent, nil
 }
 
-// PerformServersAlive implements api.FederationInternalAPI
+// PerformBroadcastEDU implements api.FederationInternalAPI
 func (r *FederationInternalAPI) PerformBroadcastEDU(
 	ctx context.Context,
 	request *api.PerformBroadcastEDURequest,
diff --git a/federationapi/storage/shared/storage_edus.go b/federationapi/storage/shared/storage_edus.go
index e8d1d3733..102bd4b13 100644
--- a/federationapi/storage/shared/storage_edus.go
+++ b/federationapi/storage/shared/storage_edus.go
@@ -76,7 +76,7 @@ func (d *Database) AssociateEDUWithDestinations(
 	})
 }
 
-// GetNextTransactionEDUs retrieves events from the database for
+// GetPendingEDUs retrieves events from the database for
 // the next pending transaction, up to the limit specified.
 func (d *Database) GetPendingEDUs(
 	ctx context.Context,
@@ -166,7 +166,7 @@ func (d *Database) CleanEDUs(
 	})
 }
 
-// GetPendingServerNames returns the server names that have EDUs
+// GetPendingEDUServerNames returns the server names that have EDUs
 // waiting to be sent.
 func (d *Database) GetPendingEDUServerNames(
 	ctx context.Context,
diff --git a/federationapi/storage/shared/storage_pdus.go b/federationapi/storage/shared/storage_pdus.go
index 5fabfbf20..6ccf1b721 100644
--- a/federationapi/storage/shared/storage_pdus.go
+++ b/federationapi/storage/shared/storage_pdus.go
@@ -145,7 +145,7 @@ func (d *Database) CleanPDUs(
 	})
 }
 
-// GetPendingServerNames returns the server names that have PDUs
+// GetPendingPDUServerNames returns the server names that have PDUs
 // waiting to be sent.
 func (d *Database) GetPendingPDUServerNames(
 	ctx context.Context,