diff --git a/r2/r2/templates/comment.html b/r2/r2/templates/comment.html
index bc07a44c6..f1745aece 100644
--- a/r2/r2/templates/comment.html
+++ b/r2/r2/templates/comment.html
@@ -39,8 +39,8 @@ ${parent.midcol(cls = cls)}
 </%def>
 
 <%def name="subreddit()" buffered="True">
-  ${plain_link(thing.subreddit.name, thing.subreddit_path, sr_path=False,
-               cname=False, _class="subreddit hover")}
+  ${plain_link(thing.subreddit.name, thing.subreddit_path, _sr_path=False,
+               nocname=True, _class="subreddit hover")}
 </%def>
 
 <%def name="link()" buffered="True">
diff --git a/r2/r2/templates/link.html b/r2/r2/templates/link.html
index 5ba79a5c9..131117ca6 100644
--- a/r2/r2/templates/link.html
+++ b/r2/r2/templates/link.html
@@ -163,8 +163,8 @@
 </%def>
 
 <%def name="subreddit()" buffered="True">
-  ${plain_link('/r/' + thing.subreddit.name, thing.subreddit_path, sr_path = False,
-               cname = False, _class = "subreddit hover may-blank")}
+  ${plain_link('/r/' + thing.subreddit.name, thing.subreddit_path, _sr_path=False,
+               nocname=True, _class="subreddit hover may-blank")}
 </%def>
 
 <%def name="midcol(display=True, cls = '')">
diff --git a/r2/r2/templates/modaction.html b/r2/r2/templates/modaction.html
index acb0497b6..e5bfe51a7 100644
--- a/r2/r2/templates/modaction.html
+++ b/r2/r2/templates/modaction.html
@@ -53,7 +53,7 @@
       }
       permalink = thing.target.make_permalink(thing.parent_link, thing.subreddit)
     %>
-    ${plain_link(text, permalink, title=title, sr_path=False, cname=False, _class="may-blank")}&#32;
+    ${plain_link(text, permalink, title=title, _sr_path=False, nocname=True, _class="may-blank")}&#32;
   %elif hasattr(thing, "target") and isinstance(thing.target, Link):
     <%
       title = _force_unicode(thing.target.title)
@@ -68,7 +68,7 @@
       }
       permalink = thing.target.make_permalink(thing.subreddit)
     %>
-    ${plain_link(text, permalink, title=title, sr_path=False, cname=False, _class="may-blank")}&#32;
+    ${plain_link(text, permalink, title=title, _sr_path=False, nocname=True, _class="may-blank")}&#32;
   %elif hasattr(thing, "wrapped_user_target"):
     ${thing.wrapped_user_target}&#32;
   %endif
diff --git a/r2/r2/templates/searchresultlink.html b/r2/r2/templates/searchresultlink.html
index 8bc1a46f7..3839bdfc5 100644
--- a/r2/r2/templates/searchresultlink.html
+++ b/r2/r2/templates/searchresultlink.html
@@ -63,8 +63,8 @@
     ${plain_link(
         thing.title,
         thing.permalink,
-        sr_path=False,
-        cname=False,
+        _sr_path=False,
+        nocname=True,
         _class='search-title may-blank',
       )}
     %if c.site.link_flair_position == 'right':
@@ -94,8 +94,8 @@
     ${plain_link(
         '%s %s' % (format_number(thing.num_comments), ungettext('comment', 'comments', thing.num_comments)),
         thing.permalink,
-        sr_path=False,
-        cname=False,
+        _sr_path=False,
+        nocname=True,
         _class="search-comments may-blank",
       )}&#32;
     <span class="search-time">${_("submitted")}&#32;${thing_timestamp(thing, thing.timesince, include_tense=True)}</span>&#32;
diff --git a/r2/r2/templates/searchresultsubreddit.html b/r2/r2/templates/searchresultsubreddit.html
index c56817bae..f945da85c 100644
--- a/r2/r2/templates/searchresultsubreddit.html
+++ b/r2/r2/templates/searchresultsubreddit.html
@@ -39,8 +39,8 @@
     ${plain_link(
         thing.title,
         thing.search_path,
-        sr_path=False,
-        cname=False,
+        _sr_path=False,
+        nocname=True,
         _class='search-title may-blank',
       )}
   </%parent:search_result_header>
@@ -56,8 +56,8 @@
     ${plain_link(
         thing.path.rstrip('/'),
         thing.search_path,
-        sr_path=False,
-        cname=False,
+        _sr_path=False,
+        nocname=True,
         _class='search-subreddit-link may-blank',
       )}&#32;
     %if not thing.score_hidden:
@@ -82,8 +82,8 @@
     ${plain_link(
         _("search within %(subreddit)s") % dict(subreddit=pretty_name),
         search_url(thing.prev_search, thing.name, restrict_sr='on', sort=thing.sort, recent=thing.recent),
-        sr_path=False,
-        cname=False,
+        _sr_path=False,
+        nocname=True,
         _class='search-link',
         title=_('search in %(subreddit)s' % dict(subreddit=pretty_name)),
       )}