diff --git a/core/urls.py b/core/urls.py
index d3f7ea4..002d353 100644
--- a/core/urls.py
+++ b/core/urls.py
@@ -17,9 +17,9 @@ urlpatterns = [
     url(r'^pins/pin-form/$', TemplateView.as_view(template_name='core/pin_form.html'),
         name='pin-form'),
 
-    url(r'^pins/tag/(?P<tag>(\w|-)+)/$', TemplateView.as_view(template_name='core/pins.html'),
+    url(r'^pins/tags/(?P<tag>(\w|-)+)/$', TemplateView.as_view(template_name='core/pins.html'),
         name='tag-pins'),
-    url(r'^pins/user/(?P<user>(\w|-)+)/$', TemplateView.as_view(template_name='core/pins.html'),
+    url(r'^pins/users/(?P<user>(\w|-)+)/$', TemplateView.as_view(template_name='core/pins.html'),
         name='user-pins'),
     url(r'^(?P<pin>[0-9]+)/$', TemplateView.as_view(template_name='core/pins.html'),
         name='recent-pins'),
diff --git a/pinry/templates/includes/pins.html b/pinry/templates/includes/pins.html
index 861e560..e9d03b0 100644
--- a/pinry/templates/includes/pins.html
+++ b/pinry/templates/includes/pins.html
@@ -26,11 +26,11 @@
                 </div>
                 <div class="text pull-right">
                     <span class="dim">pinned by</span>
-                    <a href="/pins/user/{{submitter.username}}/">{{submitter.username}}</a>
+                    <a href="/pins/users/{{submitter.username}}/">{{submitter.username}}</a>
                     {{#if tags}}
                         <span class="dim">in</span>
                     {{#each tags}}
-                        <span class="tag"><a href="/pins/tag/{{this}}/">{{this}}</a></span>
+                        <span class="tag"><a href="/pins/tags/{{this}}/">{{this}}</a></span>
                     {{/each}}
                     {{/if}}
                 </div>