diff --git a/pinry/templates/user/login.html b/pinry/templates/users/login.html
similarity index 100%
rename from pinry/templates/user/login.html
rename to pinry/templates/users/login.html
diff --git a/pinry/templates/user/private.html b/pinry/templates/users/private.html
similarity index 100%
rename from pinry/templates/user/private.html
rename to pinry/templates/users/private.html
diff --git a/pinry/templates/user/register.html b/pinry/templates/users/register.html
similarity index 100%
rename from pinry/templates/user/register.html
rename to pinry/templates/users/register.html
diff --git a/pinry/users/urls.py b/pinry/users/urls.py
index 2b3f506..70afc9a 100644
--- a/pinry/users/urls.py
+++ b/pinry/users/urls.py
@@ -4,7 +4,7 @@ from .views import CreateUser
 
 urlpatterns = patterns('',
     url(r'^login/$', 'django.contrib.auth.views.login',
-        {'template_name': 'user/login.html'}, name='login'),
+        {'template_name': 'users/login.html'}, name='login'),
     url(r'^logout/$', 'pinry.users.views.logout_user', name='logout'),
     url(r'^register/$', CreateUser.as_view(), name='register'),
-)
\ No newline at end of file
+)
diff --git a/pinry/users/views.py b/pinry/users/views.py
index e546984..bc00154 100644
--- a/pinry/users/views.py
+++ b/pinry/users/views.py
@@ -16,7 +16,7 @@ reverse_lazy = lambda name=None, *args: lazy(reverse, str)(name, args=args)
 
 
 class CreateUser(CreateView):
-    template_name = 'user/register.html'
+    template_name = 'users/register.html'
     model = User
     form_class = UserCreationForm
     success_url = reverse_lazy('core:recent-pins')
@@ -41,4 +41,4 @@ class CreateUser(CreateView):
 def logout_user(request):
     logout(request)
     messages.success(request, 'You have successfully logged out.')
-    return HttpResponseRedirect(reverse('core:recent-pins'))
\ No newline at end of file
+    return HttpResponseRedirect(reverse('core:recent-pins'))