diff --git a/reviewboard/hostingsvcs/beanstalk.py b/reviewboard/hostingsvcs/beanstalk.py
index a5f81dbf3b8891a686716b960c8a077cc30221a4..f82729c135fc74fcb3e00ba6fc2e4b9453b468bf 100644
--- a/reviewboard/hostingsvcs/beanstalk.py
+++ b/reviewboard/hostingsvcs/beanstalk.py
@@ -8,7 +8,8 @@ from django.utils.translation import ugettext_lazy as _
 
 from reviewboard.hostingsvcs.forms import HostingServiceForm
 from reviewboard.hostingsvcs.service import HostingService
-from reviewboard.scmtools.crypto import decrypt_password, encrypt_password
+from reviewboard.scmtools.crypto_utils import (decrypt_password,
+                                               encrypt_password)
 from reviewboard.scmtools.errors import FileNotFoundError
 
 
diff --git a/reviewboard/hostingsvcs/bitbucket.py b/reviewboard/hostingsvcs/bitbucket.py
index 641fe6d3e578c8348fce64c5e256bcb0296f3cf0..e24651e74a9e0876746d29310164e1cf5b98dfda 100644
--- a/reviewboard/hostingsvcs/bitbucket.py
+++ b/reviewboard/hostingsvcs/bitbucket.py
@@ -7,7 +7,8 @@ from django.utils.translation import ugettext_lazy as _
 
 from reviewboard.hostingsvcs.forms import HostingServiceForm
 from reviewboard.hostingsvcs.service import HostingService
-from reviewboard.scmtools.crypto import decrypt_password, encrypt_password
+from reviewboard.scmtools.crypto_utils import (decrypt_password,
+                                               encrypt_password)
 from reviewboard.scmtools.errors import FileNotFoundError
 
 
diff --git a/reviewboard/scmtools/crypto.py b/reviewboard/scmtools/crypto_utils.py
similarity index 100%
rename from reviewboard/scmtools/crypto.py
rename to reviewboard/scmtools/crypto_utils.py