diff --git a/passbook/admin/views/factors.py b/passbook/admin/views/factors.py
index 6cae923af..82409816d 100644
--- a/passbook/admin/views/factors.py
+++ b/passbook/admin/views/factors.py
@@ -5,7 +5,7 @@ from django.utils.translation import ugettext as _
 from django.views.generic import CreateView, DeleteView, ListView, UpdateView
 
 from passbook.admin.mixins import AdminRequiredMixin
-from passbook.core.forms.factor import FactorForm
+from passbook.core.forms.factors import FactorForm
 from passbook.core.models import Factor
 
 
diff --git a/passbook/admin/views/users.py b/passbook/admin/views/users.py
index 615cdaa80..e0d610eba 100644
--- a/passbook/admin/views/users.py
+++ b/passbook/admin/views/users.py
@@ -5,7 +5,7 @@ from django.utils.translation import ugettext as _
 from django.views.generic import DeleteView, ListView, UpdateView
 
 from passbook.admin.mixins import AdminRequiredMixin
-from passbook.core.forms.user import UserDetailForm
+from passbook.core.forms.users import UserDetailForm
 from passbook.core.models import User
 
 
diff --git a/passbook/core/forms/factor.py b/passbook/core/forms/factors.py
similarity index 100%
rename from passbook/core/forms/factor.py
rename to passbook/core/forms/factors.py
diff --git a/passbook/core/forms/user.py b/passbook/core/forms/users.py
similarity index 100%
rename from passbook/core/forms/user.py
rename to passbook/core/forms/users.py
diff --git a/passbook/core/views/user.py b/passbook/core/views/user.py
index 3ca787293..d051f7a05 100644
--- a/passbook/core/views/user.py
+++ b/passbook/core/views/user.py
@@ -5,7 +5,7 @@ from django.urls import reverse
 from django.utils.translation import gettext as _
 from django.views.generic import DeleteView, UpdateView
 
-from passbook.core.forms.user import UserDetailForm
+from passbook.core.forms.users import UserDetailForm
 
 
 class UserSettingsView(UpdateView):