diff --git a/synapse/rest/client/v2_alpha/account.py b/synapse/rest/client/v2_alpha/account.py
index 657afb495a..8f046c4263 100644
--- a/synapse/rest/client/v2_alpha/account.py
+++ b/synapse/rest/client/v2_alpha/account.py
@@ -227,7 +227,7 @@ class MsisdnPasswordRequestTokenRestServlet(RestServlet):
         defer.returnValue((200, ret))
 
 
-class ThreepidSubmitTokenServlet(RestServlet):
+class PasswordResetSubmitTokenServlet(RestServlet):
     """Handles 3PID validation token submission"""
     PATTERNS = [
         re.compile("^/_synapse/password_reset/(email|msisdn)/submit_token/*$"),
@@ -238,7 +238,7 @@ class ThreepidSubmitTokenServlet(RestServlet):
         Args:
             hs (synapse.server.HomeServer): server
         """
-        super(ThreepidSubmitTokenServlet, self).__init__()
+        super(PasswordResetSubmitTokenServlet, self).__init__()
         self.hs = hs
         self.auth = hs.get_auth()
         self.config = hs.config
@@ -638,7 +638,7 @@ class WhoamiRestServlet(RestServlet):
 def register_servlets(hs, http_server):
     EmailPasswordRequestTokenRestServlet(hs).register(http_server)
     MsisdnPasswordRequestTokenRestServlet(hs).register(http_server)
-    ThreepidSubmitTokenServlet(hs).register(http_server)
+    PasswordResetSubmitTokenServlet(hs).register(http_server)
     PasswordRestServlet(hs).register(http_server)
     DeactivateAccountRestServlet(hs).register(http_server)
     EmailThreepidRequestTokenRestServlet(hs).register(http_server)