diff --git a/letsencrypt/client/client.py b/letsencrypt/client/client.py
index d415403f3..25a1cc1f6 100644
--- a/letsencrypt/client/client.py
+++ b/letsencrypt/client/client.py
@@ -10,7 +10,7 @@ from letsencrypt.acme import messages
 from letsencrypt.acme import util as acme_util
 
 from letsencrypt.client import auth_handler
-from letsencrypt.client import client_authenticator
+from letsencrypt.client import continuity_authenticator
 from letsencrypt.client import crypto_util
 from letsencrypt.client import errors
 from letsencrypt.client import le_util
@@ -33,7 +33,7 @@ class Client(object):
     :type authkey: :class:`letsencrypt.client.le_util.Key`
 
     :ivar auth_handler: Object that supports the IAuthenticator interface.
-        auth_handler contains both a dv_authenticator and a client_authenticator
+        auth_handler contains both a dv_authenticator and a continuity_authenticator
     :type auth_handler: :class:`letsencrypt.client.auth_handler.AuthHandler`
 
     :ivar installer: Object supporting the IInstaller interface.
@@ -60,7 +60,7 @@ class Client(object):
         self.config = config
 
         if dv_auth is not None:
-            client_auth = client_authenticator.ClientAuthenticator(config)
+            client_auth = continuity_authenticator.ContinuityAuthenticator(config)
             self.auth_handler = auth_handler.AuthHandler(
                 dv_auth, client_auth, self.network)
         else:
diff --git a/letsencrypt/client/client_authenticator.py b/letsencrypt/client/continuity_authenticator.py
similarity index 97%
rename from letsencrypt/client/client_authenticator.py
rename to letsencrypt/client/continuity_authenticator.py
index 3cef97355..af979a7c2 100644
--- a/letsencrypt/client/client_authenticator.py
+++ b/letsencrypt/client/continuity_authenticator.py
@@ -9,7 +9,7 @@ from letsencrypt.client import interfaces
 from letsencrypt.client import recovery_token
 
 
-class ClientAuthenticator(object):
+class ContinuityAuthenticator(object):
     """IAuthenticator for
     :const:`~letsencrypt.client.constants.CLIENT_CHALLENGES`.
 
diff --git a/letsencrypt/client/tests/auth_handler_test.py b/letsencrypt/client/tests/auth_handler_test.py
index 91874dc0c..3349ebdf9 100644
--- a/letsencrypt/client/tests/auth_handler_test.py
+++ b/letsencrypt/client/tests/auth_handler_test.py
@@ -30,7 +30,7 @@ class SatisfyChallengesTest(unittest.TestCase):
         from letsencrypt.client.auth_handler import AuthHandler
 
         self.mock_dv_auth = mock.MagicMock(name="ApacheConfigurator")
-        self.mock_client_auth = mock.MagicMock(name="ClientAuthenticator")
+        self.mock_client_auth = mock.MagicMock(name="ContinuityAuthenticator")
 
         self.mock_dv_auth.get_chall_pref.return_value = [challenges.DVSNI]
         self.mock_client_auth.get_chall_pref.return_value = [
@@ -346,7 +346,7 @@ class GetAuthorizationsTest(unittest.TestCase):
         from letsencrypt.client.auth_handler import AuthHandler
 
         self.mock_dv_auth = mock.MagicMock(name="ApacheConfigurator")
-        self.mock_client_auth = mock.MagicMock(name="ClientAuthenticator")
+        self.mock_client_auth = mock.MagicMock(name="ContinuityAuthenticator")
 
         self.mock_sat_chall = mock.MagicMock(name="_satisfy_challenges")
         self.mock_acme_auth = mock.MagicMock(name="acme_authorization")
diff --git a/letsencrypt/client/tests/client_authenticator_test.py b/letsencrypt/client/tests/client_authenticator_test.py
index 7db1956d5..1f1d8f3f8 100644
--- a/letsencrypt/client/tests/client_authenticator_test.py
+++ b/letsencrypt/client/tests/client_authenticator_test.py
@@ -1,4 +1,4 @@
-"""Test the ClientAuthenticator dispatcher."""
+"""Test the ContinuityAuthenticator dispatcher."""
 import unittest
 
 import mock
@@ -13,9 +13,9 @@ class PerformTest(unittest.TestCase):
     """Test client perform function."""
 
     def setUp(self):
-        from letsencrypt.client.client_authenticator import ClientAuthenticator
+        from letsencrypt.client.continuity_authenticator import ContinuityAuthenticator
 
-        self.auth = ClientAuthenticator(
+        self.auth = ContinuityAuthenticator(
             mock.MagicMock(server="demo_server.org"))
         self.auth.rec_token.perform = mock.MagicMock(
             name="rec_token_perform", side_effect=gen_client_resp)
@@ -50,9 +50,9 @@ class CleanupTest(unittest.TestCase):
     """Test the Authenticator cleanup function."""
 
     def setUp(self):
-        from letsencrypt.client.client_authenticator import ClientAuthenticator
+        from letsencrypt.client.continuity_authenticator import ContinuityAuthenticator
 
-        self.auth = ClientAuthenticator(
+        self.auth = ContinuityAuthenticator(
             mock.MagicMock(server="demo_server.org"))
         self.mock_cleanup = mock.MagicMock(name="rec_token_cleanup")
         self.auth.rec_token.cleanup = self.mock_cleanup