diff --git a/ietf/templates/base/left_menu.html b/ietf/templates/base/left_menu.html
index ed5f4bce8..3cf94669a 100644
--- a/ietf/templates/base/left_menu.html
+++ b/ietf/templates/base/left_menu.html
@@ -37,30 +37,30 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 {% load ietf_filters community_tags %}
 <ul>
 <li class="sect first">Settings</li>
-  <li><a href="{% url account_index %}">{% if request.user.is_authenticated %}Manage Account{% else %}New Account{% endif %}</a></li>
+  <li><a href="{% url "account_index" %}">{% if request.user.is_authenticated %}Manage Account{% else %}New Account{% endif %}</a></li>
   <li><a href="{%url ietf.cookies.views.settings %}" rel="nofollow">Options</a></li>
 {% if user|has_role:"Area Director" %}
 <li class="sect">AD Dashboard</li>
-  <li><a href="{% url docs_for_ad name=user.get_profile.full_name_as_key %}">My Documents</a></li>
-  <li><a href="{% url ietf.iesg.views.agenda_documents %}">Next Telechat</a></li>
-  <li><a href="{% url ietf.iesg.views.discusses %}">Discusses</a></li>
-  <li><a href="{% url ietf.iesg.views.milestones_needing_review %}">Milestones</a></li>
+  <li><a href="{% url "docs_for_ad" name=user.get_profile.full_name_as_key %}">My Documents</a></li>
+  <li><a href="{% url "ietf.iesg.views.agenda_documents" %}">Next Telechat</a></li>
+  <li><a href="{% url "ietf.iesg.views.discusses" %}">Discusses</a></li>
+  <li><a href="{% url "ietf.iesg.views.milestones_needing_review" %}">Milestones</a></li>
 {% endif %}
 {% if user|has_role:"Secretariat" %}
 <li class="sect">Secretariat</li>
   <li><a href="/admin/iesg/telechatdate/">Telechat Dates</a></li>
   <li><a href="/admin/iesg/telechatagendaitem/">Management Items</a></li>
-  <li><a href="{% url ietf.iesg.views.milestones_needing_review %}">Milestones</a></li>
-  <li><a href="{% url ietf.sync.views.discrepancies %}">Sync discrepancies</a>
+  <li><a href="{% url "ietf.iesg.views.milestones_needing_review" %}">Milestones</a></li>
+  <li><a href="{% url "ietf.sync.views.discrepancies" %}">Sync discrepancies</a>
 {% endif %}
 {% streams_menu %}
 {% if user|has_role:"IANA" %}
 <li class="sect">IANA</li>
-  <li><a href="{% url ietf.sync.views.discrepancies %}">Sync discrepancies</a></li>
+  <li><a href="{% url "ietf.sync.views.discrepancies" %}">Sync discrepancies</a></li>
 {% endif %}
 {% if user|has_role:"RFC Editor" %}
 <li class="sect">RFC Editor</li>
-  <li><a href="{% url ietf.sync.views.discrepancies %}">Sync discrepancies</a></li>
+  <li><a href="{% url "ietf.sync.views.discrepancies" %}">Sync discrepancies</a></li>
 {% endif %}
 <li class="sect">Working Groups</li>
 
@@ -73,8 +73,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   </div></div></li>
   
   <li style="padding-top:0;"><a href="/wg/">Active WGs</a></li>
-  <li><a href="{% url ietf.wginfo.views.chartering_wgs %}">Chartering WGs</a></li>
-  <li><a href="{% url ietf.wginfo.views.bofs %}">BoFs</a></li>
+  <li><a href="{% url "ietf.wginfo.views.chartering_wgs" %}">Chartering WGs</a></li>
+  <li><a href="{% url "ietf.wginfo.views.bofs" %}">BoFs</a></li>
   <li><a href="http://tools.ietf.org/wg/concluded">Concluded WGs</a></li>
   <li><a href="http://www.ietf.org/list/nonwg.html">Non-WG Lists</a></li>
  
@@ -84,13 +84,13 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   <li><form action="/doc/search/" method="get" style="padding-bottom:0;margin-bottom:0;"><input type="text" style="margin-left:10px; width:100px; border:1px solid #89d;" name="name" /><input type="hidden" name="activedrafts" value="on"/><input type="hidden" name="rfcs" value="on"/></form></li>
   <li>
      <div style="padding: 0 0 0 10px;">Streams:</div>
-     <a style="padding: 0 0 0 20px;" href="{% url ietf.group.views_stream.streams %}iab/">IAB</a>
-     <a style="padding: 0;" href="{% url ietf.group.views_stream.streams %}irtf/">IRTF</a>
-     <a style="padding: 0;" href="{% url ietf.group.views_stream.streams %}ise/">ISE</a>
+     <a style="padding: 0 0 0 20px;" href="{% url "ietf.group.views_stream.streams" %}iab/">IAB</a>
+     <a style="padding: 0;" href="{% url "ietf.group.views_stream.streams" %}irtf/">IRTF</a>
+     <a style="padding: 0;" href="{% url "ietf.group.views_stream.streams" %}ise/">ISE</a>
   </li> 
-  <li><a href="{% url submit_upload_submission %}">Submit a draft</a></li> 
+  <li><a href="{% url "submit_upload_submission" %}">Submit a draft</a></li> 
 {% if user|has_role:"WG Chair" %}
-  <li><a href="{% url submit_approvals %}">Approve a draft</a></li> 
+  <li><a href="{% url "submit_approvals" %}">Approve a draft</a></li> 
 {% endif %}
 {% get_user_managed_lists user as community_lists %}
 {% if community_lists %}
@@ -102,7 +102,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    <li><a href="http://{{ request.get_host }}/accounts/login/?next={{request.get_full_path|urlencode}}" rel="nofollow">Sign in to track drafts</a></li>
 {% endif %}
 {% if user|has_role:"Area Director,Secretariat" %}
-  <li><a href="{% url rfc_status_changes %}">RFC status changes</a></li>
+  <li><a href="{% url "rfc_status_changes" %}">RFC status changes</a></li>
 {% endif %}
 
 
diff --git a/ietf/templates/base/streams_menu.html b/ietf/templates/base/streams_menu.html
index c25a5175b..b09875a2e 100644
--- a/ietf/templates/base/streams_menu.html
+++ b/ietf/templates/base/streams_menu.html
@@ -2,6 +2,6 @@
 {% if editable_streams %}
 <li class="sect">Streams</li>
   {% for stream in editable_streams %}
-  <li{% if forloop.last %} style="margin-bottom: 2px;"{% endif %}><a href="{% url ietf.group.views_stream.stream_edit stream.slug %}">{{ stream.name }} stream</a></li>
+  <li{% if forloop.last %} style="margin-bottom: 2px;"{% endif %}><a href="{% url "ietf.group.views_stream.stream_edit" stream.slug %}">{{ stream.name }} stream</a></li>
   {% endfor %}
 {% endif %}
diff --git a/ietf/templates/community/manage_clist.html b/ietf/templates/community/manage_clist.html
index 905298955..39303c9a1 100644
--- a/ietf/templates/community/manage_clist.html
+++ b/ietf/templates/community/manage_clist.html
@@ -47,7 +47,7 @@ In order to add some individual documents to your list you have to:
   <td>{{ doc.display_name }}</td>
   <td>{{ doc.get_state }}</td>
   <td><a href="{{ doc.get_absolute_url }}"</a>{{ doc.title }}</td>
-  <td><a href="{% url community_remove_document cl.pk doc.pk %}">Remove</a></td>
+  <td><a href="{% url "community_remove_document" cl.pk doc.pk %}">Remove</a></td>
 </tr>
 {% endfor %}
 </table>
@@ -63,7 +63,7 @@ In order to add some individual documents to your list you have to:
   <td>{{ callable.description }}</td>
   <td>{{ callable.show_value }}</td>
   <td>{% with rule.cached_ids.count as count %}{{ count }} document{{ count|pluralize }}{% endwith %}</td>
-  <td><a href="{% url community_remove_rule cl.pk rule.pk %}">Remove</a></td>
+  <td><a href="{% url "community_remove_rule" cl.pk rule.pk %}">Remove</a></td>
 </tr>
 {% endwith %}
 {% endfor %}
diff --git a/ietf/templates/community/public/subscribe_email.txt b/ietf/templates/community/public/subscribe_email.txt
index 8618dcaf4..cdcae5dad 100644
--- a/ietf/templates/community/public/subscribe_email.txt
+++ b/ietf/templates/community/public/subscribe_email.txt
@@ -3,7 +3,7 @@ Hello,
 
 In order to complete your subscription for {% if significant %}significant {% endif %}changes on {{ clist.long_name }}, please follow this link or copy it and paste it in your web browser:
 
-http://{{ domain }}{% if significant %}{% url confirm_significant_subscription clist.id to_email today auth %}{% else %}{% url confirm_subscription clist.id to_email today auth %}{% endif %}
+http://{{ domain }}{% if significant %}{% url "confirm_significant_subscription" clist.id to_email today auth %}{% else %}{% url "confirm_subscription" clist.id to_email today auth %}{% endif %}
 
 Best regards,
 
diff --git a/ietf/templates/community/public/subscription_confirm.html b/ietf/templates/community/public/subscription_confirm.html
index 9d6569be8..ae9bed32f 100644
--- a/ietf/templates/community/public/subscription_confirm.html
+++ b/ietf/templates/community/public/subscription_confirm.html
@@ -8,6 +8,6 @@
 You email address {{ email }} has been successfully subscribed to {{ cl.long_name }}
 </p>
 <p>
-<a href="{% url view_personal_list secret=cl.secret %}">Return to the list view</a>
+<a href="{% url "view_personal_list" secret=cl.secret %}">Return to the list view</a>
 </p>
 {% endblock %}
diff --git a/ietf/templates/community/public/unsubscribe_email.txt b/ietf/templates/community/public/unsubscribe_email.txt
index e0711a847..1acd569c9 100644
--- a/ietf/templates/community/public/unsubscribe_email.txt
+++ b/ietf/templates/community/public/unsubscribe_email.txt
@@ -3,7 +3,7 @@ Hello,
 
 In order to complete the cancelation of your subscription to {% if significant %}significant {% endif %}changes on {{ clist.long_name }}, please follow this link or copy it and paste it in your web browser:
 
-http://{{ domain }}{% if significant %}{% url confirm_significant_unsubscription clist.id to_email today auth %}{% else %}{% url confirm_unsubscription clist.id to_email today auth %}{% endif %}
+http://{{ domain }}{% if significant %}{% url "confirm_significant_unsubscription" clist.id to_email today auth %}{% else %}{% url "confirm_unsubscription" clist.id to_email today auth %}{% endif %}
 
 Best regards,
 
diff --git a/ietf/templates/doc/add_comment.html b/ietf/templates/doc/add_comment.html
index b67767d56..87fa8ddad 100644
--- a/ietf/templates/doc/add_comment.html
+++ b/ietf/templates/doc/add_comment.html
@@ -24,7 +24,7 @@ form.add-comment .actions {
   <tr>
     <td></td>
     <td class="actions">
-      <a href="{% url doc_history name=doc.name %}">Back</a>
+      <a href="{% url "doc_history" name=doc.name %}">Back</a>
       <input type="submit" value="Add comment"/>
     </td>
   </tr>
diff --git a/ietf/templates/doc/ballot/approvaltext.html b/ietf/templates/doc/ballot/approvaltext.html
index 80b8271f7..77c112f6a 100644
--- a/ietf/templates/doc/ballot/approvaltext.html
+++ b/ietf/templates/doc/ballot/approvaltext.html
@@ -29,7 +29,7 @@ form #id_approval_text {
 {% if user|has_role:"Secretariat" %}
 <p>
 {% if can_announce %}
-<a href="{% url doc_approve_ballot name=doc.name %}">Approve ballot</a>
+<a href="{% url "doc_approve_ballot" name=doc.name %}">Approve ballot</a>
 {% endif %}
 </p>
 {% endif %}
diff --git a/ietf/templates/doc/ballot/approve_ballot.html b/ietf/templates/doc/ballot/approve_ballot.html
index a451d2230..5b1dbbcd0 100644
--- a/ietf/templates/doc/ballot/approve_ballot.html
+++ b/ietf/templates/doc/ballot/approve_ballot.html
@@ -30,7 +30,7 @@ form.approve-ballot .announcement {
   </div>
 
   <div class="actions">
-    <a href="{% url doc_ballot_approvaltext name=doc.name %}">Back</a>
+    <a href="{% url "doc_ballot_approvaltext" name=doc.name %}">Back</a>
     {% ifequal action "to_announcement_list" %}
     <input type="submit" value="Notify the RFC Editor, send out the announcement and close ballot"/>
     {% endifequal %}
diff --git a/ietf/templates/doc/ballot/lastcalltext.html b/ietf/templates/doc/ballot/lastcalltext.html
index 574155daf..1c16f8eb0 100644
--- a/ietf/templates/doc/ballot/lastcalltext.html
+++ b/ietf/templates/doc/ballot/lastcalltext.html
@@ -38,7 +38,7 @@ form #id_last_call_text {
 {% if user|has_role:"Secretariat" %}
 <p>
 {% if can_make_last_call %}
-<a href="{% url doc_make_last_call name=doc.name %}">Make Last Call</a>
+<a href="{% url "doc_make_last_call" name=doc.name %}">Make Last Call</a>
 {% endif %}
 
 </p>
diff --git a/ietf/templates/doc/ballot_popup.html b/ietf/templates/doc/ballot_popup.html
index 71d5f4b4a..6b201aa73 100644
--- a/ietf/templates/doc/ballot_popup.html
+++ b/ietf/templates/doc/ballot_popup.html
@@ -6,7 +6,7 @@
   <div class="actions">
 
     {% if request.user|has_role:"Area Director" %}
-    <a href="{% url ietf.doc.views_ballot.edit_position name=doc.name ballot_id=ballot_id %}" class="button" style="margin-right: 1em;">Edit Position</a>
+    <a href="{% url "ietf.doc.views_ballot.edit_position" name=doc.name ballot_id=ballot_id %}" class="button" style="margin-right: 1em;">Edit Position</a>
     {% endif %}
 
     <a href="" class="button close">Close</a>
diff --git a/ietf/templates/doc/change_ad.html b/ietf/templates/doc/change_ad.html
index 8fab6800f..b1edd26cd 100644
--- a/ietf/templates/doc/change_ad.html
+++ b/ietf/templates/doc/change_ad.html
@@ -29,7 +29,7 @@ Change the shepherding AD for {{titletext}}
     <tr>
       <td></td>
       <td class="actions">
-        <a href="{% url doc_view name=doc.canonical_name %}">Back</a>
+        <a href="{% url "doc_view" name=doc.canonical_name %}">Back</a>
         <input type="submit" value="Submit"/>
       </td>
     </tr>
diff --git a/ietf/templates/doc/change_shepherd.html b/ietf/templates/doc/change_shepherd.html
index c30ed3fdb..c7d681e19 100644
--- a/ietf/templates/doc/change_shepherd.html
+++ b/ietf/templates/doc/change_shepherd.html
@@ -33,7 +33,7 @@ Change the document shepherd for {{ doc.name }}-{{ doc.rev }}
     <tr>
       <td></td>
       <td class="actions">
-        <a href="{% url doc_view name=doc.name %}">Back</a>
+        <a href="{% url "doc_view" name=doc.name %}">Back</a>
         <input type="submit" value="Submit"/>
       </td>
     </tr>
diff --git a/ietf/templates/doc/change_state.html b/ietf/templates/doc/change_state.html
index 424699d7a..ea4d9e3f7 100644
--- a/ietf/templates/doc/change_state.html
+++ b/ietf/templates/doc/change_state.html
@@ -36,7 +36,7 @@ form.change-state .actions {
     {% endfor %}
     <tr>
       <td colspan="2" class="actions">
-        <a href="{% url doc_view name=doc.name %}">Back</a>
+        <a href="{% url "doc_view" name=doc.name %}">Back</a>
         <input type="submit" value="Submit"/>
       </td>
     </tr>
diff --git a/ietf/templates/doc/conflict_review/approve.html b/ietf/templates/doc/conflict_review/approve.html
index edfcf741f..43f622c60 100644
--- a/ietf/templates/doc/conflict_review/approve.html
+++ b/ietf/templates/doc/conflict_review/approve.html
@@ -30,7 +30,7 @@ form #id_announcement_text {
     {% endfor %}
     <tr>
       <td class="actions">
-        <a href="{% url doc_view name=review.name %}">Back</a>
+        <a href="{% url "doc_view" name=review.name %}">Back</a>
         <input type="submit" value="Send out the announcement and close the ballot"/>
       </td>
     </tr>
diff --git a/ietf/templates/doc/conflict_review/start.html b/ietf/templates/doc/conflict_review/start.html
index c62f4a665..36dcabe3f 100644
--- a/ietf/templates/doc/conflict_review/start.html
+++ b/ietf/templates/doc/conflict_review/start.html
@@ -18,7 +18,7 @@ form.start-conflict-review .actions {
 {% block content %}
 <h1>Begin IETF conflict review for {{doc_to_review.canonical_name}}-{{doc_to_review.rev}}</h1>
 
-<p class="helptext">For help on the initial state choice, see the <a href="{% url state_help type="conflict-review" %}">state table</a>.</p>
+<p class="helptext">For help on the initial state choice, see the <a href="{% url "state_help" type="conflict-review" %}">state table</a>.</p>
 
 <form class="start-conflict-review" action="" method="post">
   <table>
@@ -34,7 +34,7 @@ form.start-conflict-review .actions {
     {% endfor %}
     <tr>
       <td colspan="2" class="actions">
-        <a href="{% url doc_view name=doc_to_review.name %}">Back</a>
+        <a href="{% url "doc_view" name=doc_to_review.name %}">Back</a>
         <input type="submit" value="Submit"/>
       </td>
     </tr>
diff --git a/ietf/templates/doc/conflict_review/submit.html b/ietf/templates/doc/conflict_review/submit.html
index 83b1b64cf..8b3256980 100644
--- a/ietf/templates/doc/conflict_review/submit.html
+++ b/ietf/templates/doc/conflict_review/submit.html
@@ -30,7 +30,7 @@ Edit conflict review for {{ conflictdoc.canonical_name }}-{{ conflictdoc.rev }}
     <tr>
       <td></td>
       <td class="actions">
-        <a href="{% url doc_view name=review.canonical_name %}">Back</a>
+        <a href="{% url "doc_view" name=review.canonical_name %}">Back</a>
         <input type="submit" name="reset_text" value="Reset to Template Text"/>
         <input type="submit" name="submit_response" value="Submit"/>
       </td>
diff --git a/ietf/templates/doc/document_ballot_content.html b/ietf/templates/doc/document_ballot_content.html
index a155ed13b..4065fe161 100644
--- a/ietf/templates/doc/document_ballot_content.html
+++ b/ietf/templates/doc/document_ballot_content.html
@@ -4,19 +4,19 @@
 {% if editable and user|has_role:"Area Director,Secretariat" %}
 <div class="ballot-actions">
 {% if user|has_role:"Area Director" %}
-<div class="action"><a href="{% url ietf.doc.views_ballot.edit_position name=doc.name,ballot_id=ballot.pk %}">Edit position</a></div>
+<div class="action"><a href="{% url "ietf.doc.views_ballot.edit_position" name=doc.name,ballot_id=ballot.pk %}">Edit position</a></div>
 {% endif %}
 
 {% if doc.type_id == "draft" or doc.type_id == "conflrev" %}
 <div class="action">
 {% if deferred %}
-  <div><a href="{% url doc_undefer_ballot name=doc.name %}">Undefer ballot</a></div>
+  <div><a href="{% url "doc_undefer_ballot" name=doc.name %}">Undefer ballot</a></div>
   <div>Ballot deferred by {{ deferred.by }} on {{ deferred.time|date:"Y-m-d" }}.</div>
 {% else %}
-  <div><a href="{% url doc_defer_ballot name=doc.name %}">Defer ballot</a></div>
+  <div><a href="{% url "doc_defer_ballot" name=doc.name %}">Defer ballot</a></div>
 {% endif %}
 {% if user|has_role:"Secretariat" %}
-  <div><a href="{% url doc_clear_ballot name=doc.name %}">Clear ballot</a></div>
+  <div><a href="{% url "doc_clear_ballot" name=doc.name %}">Clear ballot</a></div>
 {% endif %}
 </div>
 {% endif %}
@@ -28,7 +28,7 @@
 <div class="position-group">
   <div class="heading"><span class="square position-{{ n.slug }}"></span> {{ n.name }}</div>
   {% for p in positions %}
-  <div>{% if p.old_ad %}[{% endif %}<a{% if user|has_role:"Secretariat" %} href="{% url ietf.doc.views_ballot.edit_position name=doc.name,ballot_id=ballot.pk %}?ad={{ p.ad.pk }}" title="Click to edit the position of {{ p.ad.plain_name }}"{% endif %}>{{ p.ad.plain_name }}</a>{% if p.old_ad %}]{% endif %}{% if p.comment or p.discuss %}&nbsp;<a href="#{{ p.ad.plain_name|slugify }}"><img src="/images/comment.png" width="14" height="12" alt="*" border="0"/></a>{% endif %}</div>
+  <div>{% if p.old_ad %}[{% endif %}<a{% if user|has_role:"Secretariat" %} href="{% url "ietf.doc.views_ballot.edit_position" name=doc.name,ballot_id=ballot.pk %}?ad={{ p.ad.pk }}" title="Click to edit the position of {{ p.ad.plain_name }}"{% endif %}>{{ p.ad.plain_name }}</a>{% if p.old_ad %}]{% endif %}{% if p.comment or p.discuss %}&nbsp;<a href="#{{ p.ad.plain_name|slugify }}"><img src="/images/comment.png" width="14" height="12" alt="*" border="0"/></a>{% endif %}</div>
   {% if p.old_positions %}<div class="was">(was {{ p.old_positions|join:", " }})</div>{% endif %}
   {% empty %}
   <i>none</i>
@@ -44,7 +44,7 @@
 <div class="other-ballots">
   Available ballots:
 {% for b in all_ballots %}
-<a{% if b != ballot %} href="{% url doc_ballot name=doc.name,ballot_id=b.pk %}"{% endif %}>{{ b.ballot_type.name }} ({{ b.rev }})</a>
+<a{% if b != ballot %} href="{% url "doc_ballot" name=doc.name,ballot_id=b.pk %}"{% endif %}>{{ b.ballot_type.name }} ({{ b.rev }})</a>
 {% endfor %}
 </div>
 {% endif %}
diff --git a/ietf/templates/doc/document_charter.html b/ietf/templates/doc/document_charter.html
index 885d8a4a4..9221f6f48 100644
--- a/ietf/templates/doc/document_charter.html
+++ b/ietf/templates/doc/document_charter.html
@@ -15,7 +15,7 @@
   Snapshots:
   <span class="revisions">
     {% for rev in revisions %}
-    <a {% if rev != doc.rev %}href="{% url doc_view name=doc.name %}{% if not forloop.last %}{{ rev }}/{% endif %}"{% endif %}>{{ rev }}</a>
+    <a {% if rev != doc.rev %}href="{% url "doc_view" name=doc.name %}{% if not forloop.last %}{{ rev }}/{% endif %}"{% endif %}>{{ rev }}</a>
     {% endfor %}
   </span>
 </div>
@@ -25,7 +25,7 @@
     {% if snapshot %}Snapshot of{% endif %}
     {% if doc.get_state_slug != "approved" %}Proposed{% endif %}
     Charter for "{{ group.name }}"
-    (<a {% if group.type.slug == "wg" %}href="{% url ietf.wginfo.views.group_charter acronym=group.acronym %}"{% endif %}>{{ group.acronym }}</a>) {{ group.type.name }}
+    (<a {% if group.type.slug == "wg" %}href="{% url "ietf.wginfo.views.group_charter" acronym=group.acronym %}"{% endif %}>{{ group.acronym }}</a>) {{ group.type.name }}
   </div>
 
   <table id="metatable" width="100%">
@@ -39,7 +39,7 @@
         <div>
         <a title="{{ doc.get_state.desc }}"
             {% if not snapshot and user|has_role:"Area Director,Secretariat" %} 
-               class="editlink" href="{% url charter_change_state name=doc.name %}"
+               class="editlink" href="{% url "charter_change_state" name=doc.name %}"
             {% endif %}>
             {{ doc.get_state.name }}
         </a>
@@ -51,7 +51,7 @@
         <div class="telechat">
           <a 
             {% if user|has_role:"Area Director,Secretariat" %}
-              class="editlink" href="{% url charter_telechat_date name=doc.name %}"
+              class="editlink" href="{% url "charter_telechat_date" name=doc.name %}"
             {% endif %}>
             {% if not telechat %}Not on agenda of IESG telechat{% else %}On agenda of {{ telechat.telechat_date|date:"Y-m-d" }} IESG telechat{% endif %}
           </a>
@@ -77,7 +77,7 @@
 
    <tr>
     <td>Responsible AD:</td>
-    <td><a {% if request.user|has_role:"Area Director,Secretariat" %}class="editlink" href="{% url charter_edit_ad name=doc.name %}"{% endif %}>{{ doc.ad|default:"none" }}</a> </td>
+    <td><a {% if request.user|has_role:"Area Director,Secretariat" %}class="editlink" href="{% url "charter_edit_ad" name=doc.name %}"{% endif %}>{{ doc.ad|default:"none" }}</a> </td>
    </tr>
 
     <tr><td colspan='2'><hr size='1' noshade /></td></tr>
@@ -85,7 +85,7 @@
     <tr>
       <td>Send notices to:</td>
       <td><a {% if user|has_role:"Area Director,Secretariat" %} 
-                  class="editlink" href="{% url charter_edit_notify name=doc.name %}"
+                  class="editlink" href="{% url "charter_edit_notify" name=doc.name %}"
              {% endif %}>
              {{ doc.notify|default:"none" }}
           </a>
@@ -104,17 +104,17 @@
   <div class="actions">
     {% if not snapshot and user|has_role:"Area Director,Secretariat" %}
     {% if chartering  %}
-      {% url charter_startstop_process name=doc.name option='abandon' as abandon_url %}{% if abandon_url %}<a class="button" href="{{ abandon_url }}">Abandon Effort</a>{% endif %}
+      {% url "charter_startstop_process" name=doc.name option='abandon' as abandon_url %}{% if abandon_url %}<a class="button" href="{{ abandon_url }}">Abandon Effort</a>{% endif %}
 
     {% if request.user|has_role:"Secretariat" %}
-      {% url charter_approve name=doc.name as approve_url %}{% if approve_url %}<a class="button" href="{{ approve_url }}">Approve Charter</a>{% endif %}
+      {% url "charter_approve" name=doc.name as approve_url %}{% if approve_url %}<a class="button" href="{{ approve_url }}">Approve Charter</a>{% endif %}
     {% endif %}
 
     {% else %}
       {% if group.state_id == "proposed" or group.state_id == "bof" %}
-        {% url charter_submit name=doc.name option='initcharter' as start_url %}{% if start_url %}<a class="button" href="{{ start_url }}">Start Chartering</a>{% endif %}
+        {% url "charter_submit" name=doc.name option='initcharter' as start_url %}{% if start_url %}<a class="button" href="{{ start_url }}">Start Chartering</a>{% endif %}
       {% else %}
-        {% url charter_submit name=doc.name option='recharter' as recharter_url %}{% if recharter_url %}<a class="button" href="{{ recharter_url }}">Recharter</a>{% endif %}
+        {% url "charter_submit" name=doc.name option='recharter' as recharter_url %}{% if recharter_url %}<a class="button" href="{{ recharter_url }}">Recharter</a>{% endif %}
       {% endif %}
     {% endif %}
 
@@ -127,7 +127,7 @@
 <h3>Charter {{ doc.canonical_name }}-{{ doc.rev }}
 
 {% if not snapshot and user|has_role:"Area Director,Secretariat" and chartering and group.state_id != "conclude" %}
-<a class="edit" href="{% url charter_submit name=doc.name %}">Change charter text</a>
+<a class="edit" href="{% url "charter_submit" name=doc.name %}">Change charter text</a>
 {% endif %}
 </h3>
 
@@ -140,7 +140,7 @@
 {% if not snapshot and chartering %}
 <h3>Proposed Milestones
 {% if user|has_role:"Area Director,Secretariat" %}
-<a class="edit" href="{% url wg_edit_charter_milestones acronym=doc.group.acronym %}">Edit charter milestones</a>
+<a class="edit" href="{% url "wg_edit_charter_milestones" acronym=doc.group.acronym %}">Edit charter milestones</a>
 {% endif %}
 </h3>
 
diff --git a/ietf/templates/doc/document_conflict_review.html b/ietf/templates/doc/document_conflict_review.html
index c07954bdf..fe17f2810 100644
--- a/ietf/templates/doc/document_conflict_review.html
+++ b/ietf/templates/doc/document_conflict_review.html
@@ -15,7 +15,7 @@
   Versions:
   <span class="revisions">
     {% for rev in revisions %}
-    <a {% if rev != doc.rev %}href="{% url doc_view name=doc.name %}{% if not forloop.last %}{{ rev }}/{% endif %}"{% endif %}>{{ rev }}</a>
+    <a {% if rev != doc.rev %}href="{% url "doc_view" name=doc.name %}{% if not forloop.last %}{{ rev }}/{% endif %}"{% endif %}>{{ rev }}</a>
     {% endfor %}
   </span>
 </div>
@@ -24,7 +24,7 @@
   <div>
     {% if snapshot %}Snapshot of{% endif %}
     {% if doc.get_state_slug not in approved_states %}Proposed{% endif %}
-    IESG Conflict Review for the {{conflictdoc.stream}} document: <a href="{% url doc_view name=conflictdoc.canonical_name %}">{{ conflictdoc.canonical_name }}{% if conflictdoc.get_state_slug != 'rfc' %}-{{ conflictdoc.rev }}{% endif %}</a>
+    IESG Conflict Review for the {{conflictdoc.stream}} document: <a href="{% url "doc_view" name=conflictdoc.canonical_name %}">{{ conflictdoc.canonical_name }}{% if conflictdoc.get_state_slug != 'rfc' %}-{{ conflictdoc.rev }}{% endif %}</a>
   </div>
 
   <table id="metatable" width="100%">
@@ -32,12 +32,12 @@
       <td><a href="/doc/help/state/conflict-review/">Conflict Review State</a>:</td>
       <td>
         <div>
-        <a title="{{ doc.get_state.desc }}"{% if not snapshot and user|has_role:"Area Director,Secretariat" %} class="editlink" href="{% url conflict_review_change_state name=doc.name %}"{% endif %}>{{ doc.get_state.name }}</a>
+        <a title="{{ doc.get_state.desc }}"{% if not snapshot and user|has_role:"Area Director,Secretariat" %} class="editlink" href="{% url "conflict_review_change_state" name=doc.name %}"{% endif %}>{{ doc.get_state.name }}</a>
 
         {% if not snapshot and user|has_role:"Area Director,Secretariat" %}
 
           {% if request.user|has_role:"Secretariat" %}{% if doc.get_state_slug = 'appr-reqnopub-pend' or doc.get_state_slug = 'appr-noprob-pend' %}
-          - <a href="{% url conflict_review_approve name=doc.name %}">Approve conflict review</a>
+          - <a href="{% url "conflict_review_approve" name=doc.name %}">Approve conflict review</a>
           {% endif %}{% endif %}
 
         {% endif %}
@@ -49,7 +49,7 @@
       <td>Telechat Date:</td>
       <td>
           <a {% if not snapshot and user|has_role:"Area Director,Secretariat" and doc.get_state_slug not in approved_states %}
-                class="editlink" href="{% url conflict_review_telechat_date name=doc.name %}"
+                class="editlink" href="{% url "conflict_review_telechat_date" name=doc.name %}"
              {%endif%} >
           {% if not telechat %}Not on agenda of an IESG telechat{% else %}On agenda of {{ telechat.telechat_date|date:"Y-m-d" }} IESG telechat{% if doc.returning_item %} (returning item){% endif %}{% endif %}
           </a>
@@ -67,7 +67,7 @@
        <td>Shepherding AD:</td>
        <td>
            <a {% if not snapshot and user|has_role:"Area Director,Secretariat" and doc.get_state_slug not in approved_states %}
-               class="editlink" href="{% url conflict_review_ad name=doc.name %}"
+               class="editlink" href="{% url "conflict_review_ad" name=doc.name %}"
               {% endif %}
            >
            {{doc.ad}}
@@ -79,7 +79,7 @@
        <td>Send notices to:</td>
        <td>
            <a {% if not snapshot and user|has_role:"Area Director,Secretariat" and doc.get_state_slug not in approved_states %}
-               class="editlink" href="{% url conflict_review_notices name=doc.name %}"
+               class="editlink" href="{% url "conflict_review_notices" name=doc.name %}"
               {% endif %}
            >
            {{doc.notify}}
@@ -103,7 +103,7 @@
 <h3>Conflict Review for {{ conflictdoc.name }}-{{ conflictdoc.rev }}
 
 {% if not snapshot and user|has_role:"Area Director,Secretariat" and doc.get_state_slug != 'apprsent' %}
-<a class="edit" href="{% url conflict_review_submit name=doc.name %}">Change conflict review text</a>
+<a class="edit" href="{% url "conflict_review_submit" name=doc.name %}">Change conflict review text</a>
 {% endif %}
 </h3>
 
diff --git a/ietf/templates/doc/document_draft.html b/ietf/templates/doc/document_draft.html
index e7f5dcbd9..ec66f774a 100644
--- a/ietf/templates/doc/document_draft.html
+++ b/ietf/templates/doc/document_draft.html
@@ -37,7 +37,7 @@
 
         {% if replaces or can_edit_stream_info %}
         <div>
-          <a{% if can_edit_stream_info %} class="editlink" href="{% url doc_change_replaces name=doc.name %}"{% endif %}>
+          <a{% if can_edit_stream_info %} class="editlink" href="{% url "doc_change_replaces" name=doc.name %}"{% endif %}>
             Replaces: {{ replaces|join:", "|urlize_ietf_docs|default:"None" }}
           </a>
         </div>
@@ -49,7 +49,7 @@
     <tr>
       <td>Document stream:</td>
       <td>
-        <a {% if can_change_stream %} class="editlink" href="{% url doc_change_stream name=doc.name %}"{% endif %}>
+        <a {% if can_change_stream %} class="editlink" href="{% url "doc_change_stream" name=doc.name %}"{% endif %}>
         {{ doc.stream|default:"No stream defined" }}
         </a>
       </td>
@@ -69,7 +69,7 @@
     <tr>
       <td>Intended RFC status:</td>
       <td>
-        <a {% if can_edit or can_edit_stream_info %}class="editlink" href="{% url doc_change_intended_status name=doc.name %}"{% endif %}>
+        <a {% if can_edit or can_edit_stream_info %}class="editlink" href="{% url "doc_change_intended_status" name=doc.name %}"{% endif %}>
         {{ doc.intended_std_level|default:"Unknown" }}</a>
       </td>
     </tr>
@@ -100,7 +100,7 @@
        {% if doc.stream %}
            <td>{{ doc.stream }} State:</td>
            <td class="stream-state">
-               <a {% if doc.stream and can_edit_stream_info %}class="editlink" href="{% url doc_change_stream_state name=doc.name state_type=stream_state_type_slug %}"{% endif %}>
+               <a {% if doc.stream and can_edit_stream_info %}class="editlink" href="{% url "doc_change_stream_state" name=doc.name state_type=stream_state_type_slug %}"{% endif %}>
                {{ stream_state|default:"(None)" }}
              </a>
 
@@ -121,7 +121,7 @@
     <tr>
       <td>Consensus:</td>
       <td>
-        <a title="Whether the document is the result of a community consensus process as defined in RFC 5741" {% if can_edit or can_edit_stream_info %}class="editlink" href="{% url doc_edit_consensus name=doc.name %}"{% endif %}>
+        <a title="Whether the document is the result of a community consensus process as defined in RFC 5741" {% if can_edit or can_edit_stream_info %}class="editlink" href="{% url "doc_edit_consensus" name=doc.name %}"{% endif %}>
           {{ consensus }}
         </a>
       </td>
@@ -131,7 +131,7 @@
     <tr>
       <td>Document shepherd:</td>
       <td>
-        <a {% if can_edit_stream_info %}class="editlink" href="{% url doc_edit_shepherd name=doc.name %}"{% endif %}>
+        <a {% if can_edit_stream_info %}class="editlink" href="{% url "doc_edit_shepherd" name=doc.name %}"{% endif %}>
         {{ doc.shepherd|default:"No shepherd assigned" }}
         </a>
       </td>
@@ -141,7 +141,7 @@
     <tr>
       <td>Shepherd Write-Up:</td>
       <td>
-        <a {% if can_edit_shepherd_writeup %}class="editlink"{% endif %} href="{% url doc_shepherd_writeup name=doc.name %}">
+        <a {% if can_edit_shepherd_writeup %}class="editlink"{% endif %} href="{% url "doc_shepherd_writeup" name=doc.name %}">
         {% if shepherd_writeup %}Last changed {{ shepherd_writeup.time|date:"Y-m-d"}}{% else %}(None){% endif %}
         </a>
       </td>
@@ -157,20 +157,20 @@
     {% endif %}
 
     <tr>
-      <td><a href="{% url state_help "draft-iesg" %}">IESG State</a>:</td>
+      <td><a href="{% url "state_help" "draft-iesg" %}">IESG State</a>:</td>
       <td>
-        <a {% if iesg_state and can_edit %}class="editlink" href="{% url doc_change_state name=doc.name %}"{% endif %}>
+        <a {% if iesg_state and can_edit %}class="editlink" href="{% url "doc_change_state" name=doc.name %}"{% endif %}>
         {{ iesg_state_summary|default:"I-D Exists" }}</a>
 
         {% if iana_review_state %}
         <div>IANA Review State:
-          <a {% if can_edit_iana_state %}class="editlink" href="{% url doc_change_iana_state name=doc.name state_type="iana-review" %}"{% endif %}>{{ iana_review_state }}</a>
+          <a {% if can_edit_iana_state %}class="editlink" href="{% url "doc_change_iana_state" name=doc.name state_type="iana-review" %}"{% endif %}>{{ iana_review_state }}</a>
         </div>
         {% endif %}
 
         {% if iana_review_state %}
         <div>IANA Action State:
-          <a {% if can_edit_iana_state %}class="editlink" href="{% url doc_change_iana_state name=doc.name state_type="iana-action" %}"{% endif %}>{{ iana_action_state }}</a>
+          <a {% if can_edit_iana_state %}class="editlink" href="{% url "doc_change_iana_state" name=doc.name state_type="iana-action" %}"{% endif %}>{{ iana_action_state }}</a>
         </div>
         {% endif %}
 
@@ -181,7 +181,7 @@
         {% endif %}
 
         <div class="telechat">
-        <a {% if can_edit %}class="editlink" href="{% url doc_change_telechat_date name=doc.name %}"{% endif %}>
+        <a {% if can_edit %}class="editlink" href="{% url "doc_change_telechat_date" name=doc.name %}"{% endif %}>
 
           {% if telechat %}
             On agenda of {{ telechat.telechat_date }} IESG telechat {% if telechat.returning_item %} (returning item){% endif %}
@@ -198,7 +198,7 @@
     <tr>
       <td>Responsible AD:</td>
       <td>
-        <a {% if can_edit %}class="editlink" href="{% url doc_change_ad name=doc.name %}"{% endif %}>
+        <a {% if can_edit %}class="editlink" href="{% url "doc_change_ad" name=doc.name %}"{% endif %}>
           {{ doc.ad|default:"(None)" }}
         </a>
       </td>
@@ -209,7 +209,7 @@
     <tr>
       <td>IESG Note:</td>
       <td>
-        <a {% if can_edit %}class="editlink" href="{% url doc_change_iesg_note name=doc.name %}"{% endif %}>
+        <a {% if can_edit %}class="editlink" href="{% url "doc_change_iesg_note" name=doc.name %}"{% endif %}>
           {{ doc.note|default:"(None)"|linebreaksbr }}
         </a>
       </td>
@@ -220,7 +220,7 @@
     <tr>
       <td>Send notices to:</td>
       <td>
-        <a {% if can_edit %}class="editlink" href="{% url doc_change_notify name=doc.name %}"{% endif %}>
+        <a {% if can_edit %}class="editlink" href="{% url "doc_change_notify" name=doc.name %}"{% endif %}>
           {{ doc.notify|default:"No addresses provided"}}
         </a>
       </td>
@@ -231,7 +231,7 @@
 
   <div class="links">
     <a href="mailto:{{ doc.name }}@tools.ietf.org?subject=Mail%20regarding%20{{ doc.name }}" rel="nofollow">Email Authors</a>
-  | <a href="{% url ipr_search %}?option=document_search&amp;id={{ doc.name }}" rel="nofollow">IPR Disclosures{% if doc.related_ipr %} ({{doc.related_ipr|length}}){% endif %}</a>
+  | <a href="{% url "ipr_search" %}?option=document_search&amp;id={{ doc.name }}" rel="nofollow">IPR Disclosures{% if doc.related_ipr %} ({{doc.related_ipr|length}}){% endif %}</a>
   | <a href="http://www.fenron.net/~fenner/ietf/deps/index.cgi?dep={{ name }}" rel="nofollow">Dependencies to this document</a>
   | <a href="http://tools.ietf.org/idnits?url=http://tools.ietf.org/id/{{ doc.filename_with_rev }}" rel="nofollow" target="_blank">Check nits</a>
   | <a href="/feed/document-changes/{{ name }}/">History feed</a>
@@ -240,15 +240,15 @@
   | <a href="https://www.iesg.org/bin/c5i?mid=6&rid=77&target={{ doc.name }}" rel="nofollow" target="_blank">Search Mailing Lists (ARO)</a>
   {% endif %}
   {% if show_add_to_list and user.is_authenticated %}
-  | <span class="search-results"><span class="addtolist"><a href="{% url community_add_document doc.name %}" title="Add to your personal ID list"><img src="/images/add_to_list.png" alt="Add to your personal ID list"/>Track this document</a></span></span>
+  | <span class="search-results"><span class="addtolist"><a href="{% url "community_add_document" doc.name %}" title="Add to your personal ID list"><img src="/images/add_to_list.png" alt="Add to your personal ID list"/>Track this document</a></span></span>
   {% endif %}
   </div>
 
   {% if can_edit and iesg_state %}
   <div class="links">
-    <a href="{% url doc_ballot_lastcall name=doc.name %}">Last Call Text</a>
-  | <a href="{% url doc_ballot_writeupnotes name=doc.name %}">Ballot Text</a>
-  | <a href="{% url doc_ballot_approvaltext name=doc.name %}">Announcement Text</a>
+    <a href="{% url "doc_ballot_lastcall" name=doc.name %}">Last Call Text</a>
+  | <a href="{% url "doc_ballot_writeupnotes" name=doc.name %}">Ballot Text</a>
+  | <a href="{% url "doc_ballot_approvaltext" name=doc.name %}">Announcement Text</a>
   </div>
   {% endif %}
 
diff --git a/ietf/templates/doc/document_history.html b/ietf/templates/doc/document_history.html
index 3b49a2271..36d3a556b 100644
--- a/ietf/templates/doc/document_history.html
+++ b/ietf/templates/doc/document_history.html
@@ -56,7 +56,7 @@
 <h2>Document history</h2>
 {% if user|has_role:"Area Director,Secretariat,IANA,RFC Editor" %}
 <div class="history-actions">
-  <a class="button" href="{% url doc_add_comment name=doc.name %}">Add comment</a>
+  <a class="button" href="{% url "doc_add_comment" name=doc.name %}">Add comment</a>
 </div>
 {% endif %}
 
diff --git a/ietf/templates/doc/document_status_change.html b/ietf/templates/doc/document_status_change.html
index 152b5e4e4..6665d9502 100644
--- a/ietf/templates/doc/document_status_change.html
+++ b/ietf/templates/doc/document_status_change.html
@@ -15,7 +15,7 @@
   Versions:
   <span class="revisions">
     {% for rev in revisions %}
-    <a {% if rev != doc.rev %}href="{% url doc_view name=doc.name %}{% if not forloop.last %}{{ rev }}/{% endif %}"{% endif %}>{{ rev }}</a>
+    <a {% if rev != doc.rev %}href="{% url "doc_view" name=doc.name %}{% if not forloop.last %}{{ rev }}/{% endif %}"{% endif %}>{{ rev }}</a>
     {% endfor %}
   </span>
 </div>
@@ -36,15 +36,15 @@
     </tr>
     {% endfor %}
     <tr>
-      <td><a href="{% url state_help type="status-change" %}">Review State</a>:</td>
+      <td><a href="{% url "state_help" type="status-change" %}">Review State</a>:</td>
       <td>
         <div>
-        <a title="{{ doc.get_state.desc }}"{% if not snapshot and user|has_role:"Area Director,Secretariat" %} class="editlink" href="{% url status_change_change_state name=doc.name %}"{% endif %}>{{ doc.get_state.name }}</a>
+        <a title="{{ doc.get_state.desc }}"{% if not snapshot and user|has_role:"Area Director,Secretariat" %} class="editlink" href="{% url "status_change_change_state" name=doc.name %}"{% endif %}>{{ doc.get_state.name }}</a>
 
         {% if not snapshot and user|has_role:"Area Director,Secretariat" %}
 
           {% if request.user|has_role:"Secretariat" %}{% if doc.get_state_slug = 'appr-pend' %}
-          - <a href="{% url status_change_approve name=doc.name %}">Approve RFC status changes</a>
+          - <a href="{% url "status_change_approve" name=doc.name %}">Approve RFC status changes</a>
           {% endif %}{% endif %}
 
         {% endif %}
@@ -57,7 +57,7 @@
       <td>
         {% if not snapshot %}
           <a {% if not snapshot and user|has_role:"Area Director,Secretariat" and doc.get_state_slug not in approved_states %}
-                class="editlink" href="{% url status_change_telechat_date name=doc.name %}"
+                class="editlink" href="{% url "status_change_telechat_date" name=doc.name %}"
              {%endif%} >
           {% if not telechat %}Not on agenda of an IESG telechat{% else %}On agenda of {{ telechat.telechat_date|date:"Y-m-d" }} IESG telechat{% if doc.returning_item %} (returning item){% endif %}{% endif %}
           </a>
@@ -76,7 +76,7 @@
        <td>Shepherding AD:</td>
        <td>
            <a {% if not snapshot and user|has_role:"Area Director,Secretariat" and doc.get_state_slug not in approved_states %}
-               class="editlink" href="{% url status_change_ad name=doc.name %}"
+               class="editlink" href="{% url "status_change_ad" name=doc.name %}"
               {% endif %}
            >
            {{doc.ad}}
@@ -88,7 +88,7 @@
        <td>Send notices to:</td>
        <td>
            <a {% if not snapshot and user|has_role:"Area Director,Secretariat" and doc.get_state_slug not in approved_states %}
-               class="editlink" href="{% url status_change_notices name=doc.name %}"
+               class="editlink" href="{% url "status_change_notices" name=doc.name %}"
               {% endif %}
            >
            {{doc.notify}}
@@ -104,12 +104,12 @@
     <tr><td colspan="2">
        <span id="doc_edit_affected_rfc_list_button" class="yui-button yui-link-button" style="margin-left:2px;">
           <span class="first-child">
-            <a href="{% url status_change_relations name=doc.name %}">Edit Affected RFC List</a>
+            <a href="{% url "status_change_relations" name=doc.name %}">Edit Affected RFC List</a>
           </span>
        </span>
        <span id="doc_edit_last_call_text" class="yui-button yui-link-button" style="margin-left:2px;">
           <span class="first-child"> 
-            <a href="{% url status_change_last_call  name=doc.name %}">Edit Last Call Text</a>
+            <a href="{% url "status_change_last_call"  name=doc.name %}">Edit Last Call Text</a>
           </span>
        </span>
     </td><tr/>
@@ -126,7 +126,7 @@
 <h3>RFC Status Change : {{ doc.title }}
 
 {% if not snapshot and user|has_role:"Area Director,Secretariat" and doc.get_state_slug != 'apprsent' %}
-<a class="edit" href="{% url status_change_submit name=doc.name %}">Change status change text</a>
+<a class="edit" href="{% url "status_change_submit" name=doc.name %}">Change status change text</a>
 {% endif %}
 </h3>
 
diff --git a/ietf/templates/doc/draft/change_ad.html b/ietf/templates/doc/draft/change_ad.html
index d867b3206..c13b32570 100644
--- a/ietf/templates/doc/draft/change_ad.html
+++ b/ietf/templates/doc/draft/change_ad.html
@@ -29,7 +29,7 @@ Change the shepherding AD for {{ doc.name }}-{{ doc.rev }}
     <tr>
       <td></td>
       <td class="actions">
-        <a href="{% url doc_view name=doc.name %}">Back</a>
+        <a href="{% url "doc_view" name=doc.name %}">Back</a>
         <input type="submit" value="Submit"/>
       </td>
     </tr>
diff --git a/ietf/templates/doc/draft/change_consensus.html b/ietf/templates/doc/draft/change_consensus.html
index 782318cef..878f90a20 100644
--- a/ietf/templates/doc/draft/change_consensus.html
+++ b/ietf/templates/doc/draft/change_consensus.html
@@ -11,7 +11,7 @@
     <tr>
       <td></td>
       <td class="actions">
-        <a href="{% url doc_view name=doc.name %}">Back</a>
+        <a href="{% url "doc_view" name=doc.name %}">Back</a>
         <input type="submit" value="Submit"/>
       </td>
     </tr>
diff --git a/ietf/templates/doc/draft/change_notify.html b/ietf/templates/doc/draft/change_notify.html
index 9499778f6..81821ec37 100644
--- a/ietf/templates/doc/draft/change_notify.html
+++ b/ietf/templates/doc/draft/change_notify.html
@@ -32,7 +32,7 @@ Edit notification addresses for {{ doc.canonical_name }}-{{ doc.rev }}
     <tr>
       <td></td>
       <td class="actions">
-        <a href="{% url doc_view name=doc.canonical_name %}">Back</a>
+        <a href="{% url "doc_view" name=doc.canonical_name %}">Back</a>
         <input type="submit" name="save_addresses" value="Save" />
         <input type="submit" name="regenerate_addresses" value="Regenerate Address List" />
       </td>
diff --git a/ietf/templates/doc/draft/change_replaces.html b/ietf/templates/doc/draft/change_replaces.html
index d5a8567d1..f8610865f 100644
--- a/ietf/templates/doc/draft/change_replaces.html
+++ b/ietf/templates/doc/draft/change_replaces.html
@@ -55,7 +55,7 @@
       }
 
       setup_ajax($("#id_replaces"), $("#replaces_list"),
-       $("#id_replaces_search"), "{% url doc_ajax_internet_draft %}");
+       $("#id_replaces_search"), "{% url "doc_ajax_internet_draft" %}");
     });
   </script>
 {% endblock %}
diff --git a/ietf/templates/doc/draft/change_shepherd_writeup.html b/ietf/templates/doc/draft/change_shepherd_writeup.html
index bf804a2c6..1e988400e 100644
--- a/ietf/templates/doc/draft/change_shepherd_writeup.html
+++ b/ietf/templates/doc/draft/change_shepherd_writeup.html
@@ -29,7 +29,7 @@ Edit shepherd writeup for {{ doc.canonical_name }}-{{ doc.rev }}
     <tr>
       <td></td>
       <td class="actions">
-        <a href="{% url doc_view name=doc.canonical_name %}">Back</a>
+        <a href="{% url "doc_view" name=doc.canonical_name %}">Back</a>
         <input type="submit" name="reset_text" value="Reset to Template Text"/>
         <input type="submit" name="submit_response" value="Submit"/>
       </td>
diff --git a/ietf/templates/doc/draft/change_state.html b/ietf/templates/doc/draft/change_state.html
index 05dec79eb..2e1c2273c 100644
--- a/ietf/templates/doc/draft/change_state.html
+++ b/ietf/templates/doc/draft/change_state.html
@@ -24,7 +24,7 @@ form.change-state .actions {
 {% block content %}
 <h1>Change state of {{ doc }}</h1>
 
-<p class="helptext">For help on the states, see the <a href="{% url state_help type="draft-iesg" %}">state table</a>.</p>
+<p class="helptext">For help on the states, see the <a href="{% url "state_help" type="draft-iesg" %}">state table</a>.</p>
 
 <form class="change-state" action="" method="post">
   <table>
@@ -68,7 +68,7 @@ form.change-state .actions {
   </form>
   <p> 
      But the ballot for this document has not yet been issued. 
-     <a href="{% url doc_ballot_writeupnotes name=doc.name %}">Edit Ballot Text</a>
+     <a href="{% url "doc_ballot_writeupnotes" name=doc.name %}">Edit Ballot Text</a>
   </p>
 </div>
 {% endif %}
diff --git a/ietf/templates/doc/draft/change_stream_state.html b/ietf/templates/doc/draft/change_stream_state.html
index 1676aa1aa..8e8da1218 100644
--- a/ietf/templates/doc/draft/change_stream_state.html
+++ b/ietf/templates/doc/draft/change_stream_state.html
@@ -28,7 +28,7 @@ form.change-state ul li label { cursor: pointer; }
 {% block content %}
 <h1>Change {{ state_type.label }} of {{ doc }}</h1>
 
-<p class="intro">For help on the states, see the <a href="{% url state_help type=state_type.slug %}">state table</a>.</p>
+<p class="intro">For help on the states, see the <a href="{% url "state_help" type=state_type.slug %}">state table</a>.</p>
 
 {% if next_states %}
 <div class="next-states">
diff --git a/ietf/templates/doc/draft/edit_info.html b/ietf/templates/doc/draft/edit_info.html
index 68851832a..21dd98587 100644
--- a/ietf/templates/doc/draft/edit_info.html
+++ b/ietf/templates/doc/draft/edit_info.html
@@ -39,7 +39,7 @@ form.edit-info .actions {
       <td>{{ field }}
       {% ifequal field.name "telechat_date" %}
         {% if not ballot_issued %}
-         <span id="ballotwarn"> A ballot for this document has not been issued: <a href="{% url doc_ballot_writeupnotes name=doc.name %}">Edit Ballot Text</a></span>
+         <span id="ballotwarn"> A ballot for this document has not been issued: <a href="{% url "doc_ballot_writeupnotes" name=doc.name %}">Edit Ballot Text</a></span>
         {% endif %}
         {{ form.returning_item }} {{ form.returning_item.label_tag }} {{ form.returning_item.errors }}
       {% endifequal %}
diff --git a/ietf/templates/doc/draft/edit_telechat_date.html b/ietf/templates/doc/draft/edit_telechat_date.html
index 390a197b2..074e074da 100644
--- a/ietf/templates/doc/draft/edit_telechat_date.html
+++ b/ietf/templates/doc/draft/edit_telechat_date.html
@@ -20,7 +20,7 @@ form.telechat-date td.actions {
     <tr>
       <td></td>
       <td class="actions">
-        <a href="{% url doc_view name=doc.name %}">Back</a>
+        <a href="{% url "doc_view" name=doc.name %}">Back</a>
         <input type="submit" value="Save"/>
       </td>
     </tr>
diff --git a/ietf/templates/doc/draft/request_publication.html b/ietf/templates/doc/draft/request_publication.html
index c379aed36..808a2e6b0 100644
--- a/ietf/templates/doc/draft/request_publication.html
+++ b/ietf/templates/doc/draft/request_publication.html
@@ -27,7 +27,7 @@ href="http://www.rfc-editor.org/indsubs.html">guidelines</a>.</p>
   <tr><td style="vertical-align: top">Message:</td> <td>{{ form.body }} {{ form.body.errors }}</td></tr>
   <tr class="actions"><td></td>
     <td>
-      <a href="{% url doc_view name=doc.name %}">Back</a>
+      <a href="{% url "doc_view" name=doc.name %}">Back</a>
       <input name="reset" type="submit" value="Reset"/>
       <input type="submit" value="Send request to the RFC Editor"/>
     </td>
diff --git a/ietf/templates/doc/drafts_in_iesg_process.html b/ietf/templates/doc/drafts_in_iesg_process.html
index 5aef973c3..dc4a1b9de 100644
--- a/ietf/templates/doc/drafts_in_iesg_process.html
+++ b/ietf/templates/doc/drafts_in_iesg_process.html
@@ -43,7 +43,7 @@ th.date, td.date { text-align: left; padding-right: 0.5em; white-space: nowrap;
   <tr>
     <td></td>
     <td></td>
-    <td><a href="{% url doc_view doc.name %}">{{ doc.name }}</a></td>
+    <td><a href="{% url "doc_view" doc.name %}">{{ doc.name }}</a></td>
   </tr>
 
   <tr>
diff --git a/ietf/templates/doc/edit_telechat_date.html b/ietf/templates/doc/edit_telechat_date.html
index 390a197b2..074e074da 100644
--- a/ietf/templates/doc/edit_telechat_date.html
+++ b/ietf/templates/doc/edit_telechat_date.html
@@ -20,7 +20,7 @@ form.telechat-date td.actions {
     <tr>
       <td></td>
       <td class="actions">
-        <a href="{% url doc_view name=doc.name %}">Back</a>
+        <a href="{% url "doc_view" name=doc.name %}">Back</a>
         <input type="submit" value="Save"/>
       </td>
     </tr>
diff --git a/ietf/templates/doc/frontpage.html b/ietf/templates/doc/frontpage.html
index 616269950..545b935ef 100644
--- a/ietf/templates/doc/frontpage.html
+++ b/ietf/templates/doc/frontpage.html
@@ -61,7 +61,7 @@ td.ietf-main-intro { width:200px; background:#fff5df; padding:8px; border:1px so
 The IETF Datatracker is the IETF's web system for managing information
 about:
 <ul>
-<li><a href="{% url doc_search %}">Internet-Drafts and RFCs</a></li>
+<li><a href="{% url "doc_search" %}">Internet-Drafts and RFCs</a></li>
 <li><a href="/ipr/">IPR disclosures</a></li>
 <li><a href="/liaison/">Liaison statements</a></li>
 <li><a href="/meeting/agenda/">Meeting agenda</a> and <a href="/meeting/">session agendas/slides/minutes</a></li>
diff --git a/ietf/templates/doc/index_active_drafts.html b/ietf/templates/doc/index_active_drafts.html
index 3c65c2ffa..f8d55a83b 100644
--- a/ietf/templates/doc/index_active_drafts.html
+++ b/ietf/templates/doc/index_active_drafts.html
@@ -12,9 +12,9 @@
 
 <p>This page lists all active Internet-Drafts, grouped by responsible
 group. For normal use, it is recommended to use the
-<a href="{% url doc_search %}">search page</a>.</p>
+<a href="{% url "doc_search" %}">search page</a>.</p>
 
-<p>There is also an <a href="{% url index_all_drafts %}">index of all
+<p>There is also an <a href="{% url "index_all_drafts" %}">index of all
 Internet-Drafts</a> (that page also lists some machine-readable files
 for download).</p>
 
diff --git a/ietf/templates/doc/index_all_drafts.html b/ietf/templates/doc/index_all_drafts.html
index da8f8a7a0..66c7582b6 100644
--- a/ietf/templates/doc/index_all_drafts.html
+++ b/ietf/templates/doc/index_all_drafts.html
@@ -7,10 +7,10 @@
 
 <p>This page lists all Internet-Drafts and RFCs. The main purpose of
 this page is to ensure all pages can be found by search engines. For
-normal use, it is recommended to use the <a href="{% url doc_search %}">search
+normal use, it is recommended to use the <a href="{% url "doc_search" %}">search
 page</a>.</p>
 
-<p>There's also an <a href="{% url index_active_drafts %}">index of
+<p>There's also an <a href="{% url "index_active_drafts" %}">index of
 active Internet-Drafts</a> with more information.</p>
 
 <p>In addition, the following files are available for download:</p>
diff --git a/ietf/templates/doc/notify.html b/ietf/templates/doc/notify.html
index 0dc7d8d59..f8b16a9bb 100644
--- a/ietf/templates/doc/notify.html
+++ b/ietf/templates/doc/notify.html
@@ -32,7 +32,7 @@ Edit notification addresses for {{titletext}}
     <tr>
       <td></td>
       <td class="actions">
-        <a href="{% url doc_view name=doc.canonical_name %}">Back</a>
+        <a href="{% url "doc_view" name=doc.canonical_name %}">Back</a>
         <input type="submit" value="Submit"/>
       </td>
     </tr>
diff --git a/ietf/templates/doc/search/ipr_column_with_label.html b/ietf/templates/doc/search/ipr_column_with_label.html
index 3582ccd6a..e1e4eed27 100644
--- a/ietf/templates/doc/search/ipr_column_with_label.html
+++ b/ietf/templates/doc/search/ipr_column_with_label.html
@@ -1,5 +1,5 @@
 <td class="ipr">
   {% if doc.type_id == "draft" and doc.ipr %}
-  <a href="{% url ipr_search %}?option=document_search&id={{ doc.canonical_name }}" rel="nofollow">IPR: {{ doc.ipr|length }}</a>
+  <a href="{% url "ipr_search" %}?option=document_search&id={{ doc.canonical_name }}" rel="nofollow">IPR: {{ doc.ipr|length }}</a>
   {% endif %}
 </td>
diff --git a/ietf/templates/doc/search/search_form.html b/ietf/templates/doc/search/search_form.html
index b957894d3..277f4476e 100644
--- a/ietf/templates/doc/search/search_form.html
+++ b/ietf/templates/doc/search/search_form.html
@@ -32,7 +32,7 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 {% endcomment %}
 
-<form id="search_form" class="search_form" action="{% url doc_search %}" method="get">
+<form id="search_form" class="search_form" action="{% url "doc_search" %}" method="get">
 
 <div class="search_field">
 <label>Name/number/title:</label> {{ form.name }}
diff --git a/ietf/templates/doc/search/search_result_row.html b/ietf/templates/doc/search/search_result_row.html
index 6b6bcd173..8913115a2 100644
--- a/ietf/templates/doc/search/search_result_row.html
+++ b/ietf/templates/doc/search/search_result_row.html
@@ -36,7 +36,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 <tr class="{{ forloop.counter|divisibleby:2|yesno:"oddrow,evenrow" }}">
 {% if show_add_to_list and user.is_authenticated %}
 <td class="addtolist">
-  <a href="{% url community_add_document doc.name %}" title="Add to your personal ID list"><img src="/images/add_to_list.png" alt="Add to your personal ID list" /></a>
+  <a href="{% url "community_add_document" doc.name %}" title="Add to your personal ID list"><img src="/images/add_to_list.png" alt="Add to your personal ID list" /></a>
 </td>
 {% endif %}
 <td class="doc">
@@ -65,7 +65,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 <td class="ipr">
   {% if doc.iprs %}
-    <a href="{% url ipr_search %}?option=document_search&amp;id={{ doc.name }}">{{ doc.iprs|length }}</a>
+    <a href="{% url "ipr_search" %}?option=document_search&amp;id={{ doc.name }}">{{ doc.iprs|length }}</a>
   {% endif %}
 </td>
 
diff --git a/ietf/templates/doc/shepherd_writeup.html b/ietf/templates/doc/shepherd_writeup.html
index cd658e706..e62e4737b 100644
--- a/ietf/templates/doc/shepherd_writeup.html
+++ b/ietf/templates/doc/shepherd_writeup.html
@@ -16,10 +16,10 @@ Shepherd writeup for {{ doc.canonical_name }}-{{ doc.rev }}
 
 <pre style="border:1px solid black;padding:5px;">{{writeup}}</pre>
 
-<a href="{% url doc_view name=doc.name %}">Back</a>
+<a href="{% url "doc_view" name=doc.name %}">Back</a>
 
 {% if can_edit %}
-<span id="doc_edit_shepherd_writeup" class="yui-button yui-link-button" style="margin-left:2px;">{% url doc_edit_shepherd_writeup name=doc.name as doc_edit_url %}{% if doc_edit_url %}<span class="first-child"><a href="{{doc_edit_url}}">Edit</a></span>{% endif %}</span>
+<span id="doc_edit_shepherd_writeup" class="yui-button yui-link-button" style="margin-left:2px;">{% url "doc_edit_shepherd_writeup" name=doc.name as doc_edit_url %}{% if doc_edit_url %}<span class="first-child"><a href="{{doc_edit_url}}">Edit</a></span>{% endif %}</span>
 {% endif %}
 
 {% endblock %}
diff --git a/ietf/templates/doc/status_change/approve.html b/ietf/templates/doc/status_change/approve.html
index 5c4e97ead..adebef5fb 100644
--- a/ietf/templates/doc/status_change/approve.html
+++ b/ietf/templates/doc/status_change/approve.html
@@ -32,7 +32,7 @@ textarea[id^="id_form-"][id$="-announcement_text"] {
    {% endfor %}
     <tr>
       <td class="actions">
-        <a href="{% url doc_view name=doc.name %}">Back</a>
+        <a href="{% url "doc_view" name=doc.name %}">Back</a>
         <input type="submit" value="Send out the announcement and close the ballot"/>
       </td>
     </tr>
diff --git a/ietf/templates/doc/status_change/last_call.html b/ietf/templates/doc/status_change/last_call.html
index 58e156c73..443847bf8 100644
--- a/ietf/templates/doc/status_change/last_call.html
+++ b/ietf/templates/doc/status_change/last_call.html
@@ -35,7 +35,7 @@ form #id_last_call_text {
 {% load ietf_filters %}
 {% if user|has_role:"Secretariat" %}
 <p>
-<a href="{% url doc_make_last_call name=doc.name %}">Make Last Call</a>
+<a href="{% url "doc_make_last_call" name=doc.name %}">Make Last Call</a>
 </p>
 {% endif %}
 
diff --git a/ietf/templates/doc/status_change/last_call_announcement.txt b/ietf/templates/doc/status_change/last_call_announcement.txt
index 52f63a2db..186fe849d 100644
--- a/ietf/templates/doc/status_change/last_call_announcement.txt
+++ b/ietf/templates/doc/status_change/last_call_announcement.txt
@@ -20,6 +20,6 @@ The affected document{{ urls|pluralize }} can be obtained via
 {% for u in urls %}{{ settings.IDTRACKER_BASE_URL}}{{ u }}
 {% endfor %}
 IESG discussion of this request can be tracked via
-{{ settings.IDTRACKER_BASE_URL }}{% url doc_ballot name=doc %}
+{{ settings.IDTRACKER_BASE_URL }}{% url "doc_ballot" name=doc %}
 
 {% endautoescape %}
diff --git a/ietf/templates/doc/status_change/start.html b/ietf/templates/doc/status_change/start.html
index d028ff1b2..aecdbee50 100644
--- a/ietf/templates/doc/status_change/start.html
+++ b/ietf/templates/doc/status_change/start.html
@@ -28,7 +28,7 @@ form.start-rfc-status-change-review .actions {
 {% block content %}
 <h1>Begin RFC status change review</h1>
 
-<p class="helptext">For help on the initial state choice, see the <a href="{% url state_help type="status-change"  %}">state table</a>.</p>
+<p class="helptext">For help on the initial state choice, see the <a href="{% url "state_help" type="status-change"  %}">state table</a>.</p>
 
 <form class="start-rfc-status-change-review" action="" method="post">
   <table>
diff --git a/ietf/templates/doc/status_change/status_changes.html b/ietf/templates/doc/status_change/status_changes.html
index 02536d1f3..33827f5c2 100644
--- a/ietf/templates/doc/status_change/status_changes.html
+++ b/ietf/templates/doc/status_change/status_changes.html
@@ -5,7 +5,7 @@
 <h1>RFC Status Changes</h1>
 
 {% if user|has_role:"Area Director,Secretariat" %}
-<p><a href="{% url start_rfc_status_change name='' %}">Start new RFC status change document</a></p>
+<p><a href="{% url "start_rfc_status_change" name='' %}">Start new RFC status change document</a></p>
 {% endif %}
 {% regroup docs by get_state as state_groups %}
 <table class="ietf-table ietf-doctable">
diff --git a/ietf/templates/doc/status_change/submit.html b/ietf/templates/doc/status_change/submit.html
index f2e77b128..7f548b741 100644
--- a/ietf/templates/doc/status_change/submit.html
+++ b/ietf/templates/doc/status_change/submit.html
@@ -30,7 +30,7 @@ Edit status change text for {{doc.title}}
     <tr>
       <td></td>
       <td class="actions">
-        <a href="{% url doc_view name=doc.canonical_name %}">Back</a>
+        <a href="{% url "doc_view" name=doc.canonical_name %}">Back</a>
         <input type="submit" name="reset_text" value="Reset to Template Text"/>
         <input type="submit" name="submit_response" value="Submit"/>
       </td>
diff --git a/ietf/templates/group/stream_edit.html b/ietf/templates/group/stream_edit.html
index 7893bffee..43fb5b069 100644
--- a/ietf/templates/group/stream_edit.html
+++ b/ietf/templates/group/stream_edit.html
@@ -24,7 +24,7 @@ form.edit td { padding-bottom: .5em; }
 <p>Delegates can be assigned with permission to do the tasks of the
 chair{{ chairs|pluralize }}. Note that in order to actually do so, the delegates need a
 Datatracker account. New accounts can be
-<a href="{% url create_account %}">created here</a>.</p>
+<a href="{% url "create_account" %}">created here</a>.</p>
 
 <form class="edit" action="" method="POST">
   <table>
@@ -40,7 +40,7 @@ Datatracker account. New accounts can be
     <tr>
       <td></td>
       <td class="actions">
-        <a class="button" href="{% url ietf.group.views_stream.streams %}">Cancel</a>
+        <a class="button" href="{% url "ietf.group.views_stream.streams" %}">Cancel</a>
         <input class="button" type="submit" value="Save"/>
       </td>
     </tr>
diff --git a/ietf/templates/iesg/agenda_conflict_doc.html b/ietf/templates/iesg/agenda_conflict_doc.html
index 0953039b5..20278ae2f 100644
--- a/ietf/templates/iesg/agenda_conflict_doc.html
+++ b/ietf/templates/iesg/agenda_conflict_doc.html
@@ -5,7 +5,7 @@
   </div>
 
   <div>
-    <a href="{% url doc_view name=doc.name %}">{{doc.name}}-{{doc.rev}}</a>
+    <a href="{% url "doc_view" name=doc.name %}">{{doc.name}}-{{doc.rev}}</a>
     <a href="http://www.ietf.org/id/{{doc.name}}-{{doc.rev}}.txt">[txt]</a>
 
     <br/>{{ doc.title|escape }}
@@ -13,7 +13,7 @@
     {% with doc.conflictdoc as conflictdoc %}
 
     <div style="padding-left:30px;">
-    <a href="{% url doc_view name=conflictdoc.name %}">{{ conflictdoc.name }}-{{ conflictdoc.rev }}</a>
+    <a href="{% url "doc_view" name=conflictdoc.name %}">{{ conflictdoc.name }}-{{ conflictdoc.rev }}</a>
     <a href="http://www.ietf.org/id/{{ conflictdoc.name }}-{{ conflictdoc.rev }}.txt">[txt]</a>
     <br/>{{ conflictdoc.title|escape }} ({{ conflictdoc.stream }}: {{ conflictdoc.intended_std_level }})
     {% if conflictdoc.note %}
diff --git a/ietf/templates/iesg/agenda_doc.html b/ietf/templates/iesg/agenda_doc.html
index 9bc4f3143..73eebec3a 100644
--- a/ietf/templates/iesg/agenda_doc.html
+++ b/ietf/templates/iesg/agenda_doc.html
@@ -5,7 +5,7 @@
   </div>
 
   <div>
-    <a href="{% url doc_view name=doc.canonical_name %}">{{ doc.canonical_name }}</a>
+    <a href="{% url "doc_view" name=doc.canonical_name %}">{{ doc.canonical_name }}</a>
     {% with doc.rfc_number as rfc_number %}
     {% if rfc_number %}
     <a href="http://www.rfc-editor.org/rfc/rfc{{rfc_number}}/">[txt]</a>
diff --git a/ietf/templates/iesg/milestones_needing_review.html b/ietf/templates/iesg/milestones_needing_review.html
index f4c0b47d0..7dcd1a21d 100644
--- a/ietf/templates/iesg/milestones_needing_review.html
+++ b/ietf/templates/iesg/milestones_needing_review.html
@@ -15,7 +15,7 @@ div.milestones-for-group { margin: 0.5em 0; }
 
 {% for g in ad.groups_needing_review %}
 
-<div class="milestones-for-group">{{ g.name }} ({{ g.acronym }}) <a href="{% url wg_edit_milestones acronym=g.acronym %}">has new milestones</a>:</div>
+<div class="milestones-for-group">{{ g.name }} ({{ g.acronym }}) <a href="{% url "wg_edit_milestones" acronym=g.acronym %}">has new milestones</a>:</div>
 
 {% with g.milestones_needing_review as milestones %}
 {% include "wginfo/milestones.html" %}
diff --git a/ietf/templates/iesg/review_decisions.html b/ietf/templates/iesg/review_decisions.html
index e67f966b9..439cd1ae9 100644
--- a/ietf/templates/iesg/review_decisions.html
+++ b/ietf/templates/iesg/review_decisions.html
@@ -13,13 +13,13 @@ div.decisions div { padding-left: 1em; text-indent: -1em; }
 <p>Showing review decisions announced in {{ timeframe }}.</p>
 
 <p>Announcements in:
-  {% for y in years %}<a {% if y != year %}href="{% url ietf.iesg.views.review_decisions year=y %}"{% endif %}>{{ y }}</a>{% if not forloop.last %}, {% endif %}{% endfor %}
+  {% for y in years %}<a {% if y != year %}href="{% url "ietf.iesg.views.review_decisions" year=y %}"{% endif %}>{{ y }}</a>{% if not forloop.last %}, {% endif %}{% endfor %}
 </p>
 
 <div class="decisions">
 {% for e in events %}
   {% ifchanged %}<h3>{{ e.time|date:"F j, Y" }}</h3>{% endifchanged %}
-  <div>{{ e.desc }}: <a href="{% url doc_view e.doc.name %}">{{ e.doc.name }}</a> {% if e.doc.intended_std_level %}({{ e.doc.intended_std_level }}){% endif %} - {{ e.doc.title }}</div>
+  <div>{{ e.desc }}: <a href="{% url "doc_view" e.doc.name %}">{{ e.doc.name }}</a> {% if e.doc.intended_std_level %}({{ e.doc.intended_std_level }}){% endif %} - {{ e.doc.title }}</div>
 {% endfor %}
 </div>
 
diff --git a/ietf/templates/iesg/scribe_conflict_doc.html b/ietf/templates/iesg/scribe_conflict_doc.html
index 8508438d4..6492ee121 100644
--- a/ietf/templates/iesg/scribe_conflict_doc.html
+++ b/ietf/templates/iesg/scribe_conflict_doc.html
@@ -1,12 +1,12 @@
     <li>
       {{ doc.title }}
 
-      <br><a href="{% url doc_view name=doc.canonical_name %}">{{doc.canonical_name}}</a>
+      <br><a href="{% url "doc_view" name=doc.canonical_name %}">{{doc.canonical_name}}</a>
               <a href="http://www.ietf.org/id/{{doc.canonical_name}}-{{doc.rev}}.txt">[txt]</a>
 
       <div style="padding-left:20px">
           {{ doc.conflictdoc.title }} ({{ doc.conflictdoc.stream }}: {{ doc.conflictdoc.intended_std_level }})
-          <br><a href="{% url doc_view name=doc.conflictdoc.canonical_name %}">{{ doc.conflictdoc.canonical_name }}</a>
+          <br><a href="{% url "doc_view" name=doc.conflictdoc.canonical_name %}">{{ doc.conflictdoc.canonical_name }}</a>
                   <a href="http://www.ietf.org/id/{{ doc.conflictdoc.canonical_name }}-{{ doc.conflictdoc.rev }}.txt">[txt]</a>
           {% if doc.conflictdoc.note %}
           <br>Note: {{ doc.conflictdoc.note|linebreaksbr }}
diff --git a/ietf/templates/iesg/scribe_doc.html b/ietf/templates/iesg/scribe_doc.html
index 29b76a018..ef285f0c6 100644
--- a/ietf/templates/iesg/scribe_doc.html
+++ b/ietf/templates/iesg/scribe_doc.html
@@ -1,6 +1,6 @@
     <li>
       {{ doc.title }} ({{ doc.intended_std_level }})
-      <br><a href="{% url doc_view name=doc.canonical_name %}">{{ doc.canonical_name }}</a>
+      <br><a href="{% url "doc_view" name=doc.canonical_name %}">{{ doc.canonical_name }}</a>
       {% with doc.rfc_number as rfc_number %}
           {% if rfc_number %}
               <a href="http://www.rfc-editor.org/rfc/rfc{{ rfc_number }}/">[txt]</a>
diff --git a/ietf/templates/ipr/details.html b/ietf/templates/ipr/details.html
index c657da35f..13229004c 100644
--- a/ietf/templates/ipr/details.html
+++ b/ietf/templates/ipr/details.html
@@ -62,10 +62,10 @@ Template for {{ section_list.disclosure_type }}" where the submitter provided
 	 {% for item in ipr.updates.all %}
 	     <p>This IPR disclosure updates IPR disclosure ID #{{ item.updated.ipr_id }},
              {% if item.updated.status == 0 %}
-                "<a href="{% url ietf.ipr.views.show item.updated.ipr_id %}">{{ item.updated.title }}</a>".
+                "<a href="{% url "ietf.ipr.views.show" item.updated.ipr_id %}">{{ item.updated.title }}</a>".
 	     {% else %}
                 {% if item.updated.status == 1 %}
-                   "<a href="{% url ietf.ipr.views.show item.updated.ipr_id %}">{{ item.updated.title }}</a>".
+                   "<a href="{% url "ietf.ipr.views.show" item.updated.ipr_id %}">{{ item.updated.title }}</a>".
 		{% else %}
                    "{{ item.updated.title }}", which was removed at the request of the submitter.
                 {% endif %}
@@ -78,7 +78,7 @@ Template for {{ section_list.disclosure_type }}" where the submitter provided
 	     <p>
 	     This IPR disclosure has been updated by IPR disclosure ID #{{ item.ipr.ipr_id }},
              {% if item.status_to_be == 1 %}
-                "<a href="{% url ietf.ipr.views.show item.ipr.ipr_id %}">{{ item.ipr.title }}</a>".
+                "<a href="{% url "ietf.ipr.views.show" item.ipr.ipr_id %}">{{ item.ipr.title }}</a>".
 	     {% else %}
                 "{{ item.ipr.title }}", which was removed at the request of the submitter.
              {% endif %}
@@ -86,7 +86,7 @@ Template for {{ section_list.disclosure_type }}" where the submitter provided
 	 {% endif %}
 	 {% endfor %}
 
-	 <p><a href="{% url ietf.ipr.new.update ipr.ipr_id %}" rel="nofollow">Update this IPR disclosure</a>. Note: Updates to IPR disclosures must only be made by authorized
+	 <p><a href="{% url "ietf.ipr.new.update" ipr.ipr_id %}" rel="nofollow">Update this IPR disclosure</a>. Note: Updates to IPR disclosures must only be made by authorized
    representatives of the original submitters. Updates will automatically
    be forwarded to the current Patent Holder's Contact and to the Submitter
    of the original IPR disclosure.</p>
diff --git a/ietf/templates/ipr/disclosure.html b/ietf/templates/ipr/disclosure.html
index e4c042b4d..c9c606305 100644
--- a/ietf/templates/ipr/disclosure.html
+++ b/ietf/templates/ipr/disclosure.html
@@ -20,12 +20,12 @@
 
    <hr />
 <ul>
-<li><a href="{% url ietf.ipr.new.new "specific" %}">File a disclosure about your IPR related to a specific IETF contribution</a></li>
-<li><a href="{% url ietf.ipr.new.new "generic" %}">File an IPR disclosure that is not related to a specific IETF contribution</a></li>
-<li><a href="{% url ietf.ipr.new.new "third-party" %}">Notify the IETF of IPR other than your own</a></li>
+<li><a href="{% url "ietf.ipr.new.new" "specific" %}">File a disclosure about your IPR related to a specific IETF contribution</a></li>
+<li><a href="{% url "ietf.ipr.new.new" "generic" %}">File an IPR disclosure that is not related to a specific IETF contribution</a></li>
+<li><a href="{% url "ietf.ipr.new.new" "third-party" %}">Notify the IETF of IPR other than your own</a></li>
 <li>To update an existing IPR disclosure, find the original disclosure and select "update this IPR disclosure".</li>
-<li><a href="{% url ietf.ipr.search.search %}">Search the IPR disclosures</a></li>
-<li><a href="{% url ietf.ipr.views.showlist %}">List of IPR disclosures</a></li>
+<li><a href="{% url "ietf.ipr.search.search" %}">Search the IPR disclosures</a></li>
+<li><a href="{% url "ietf.ipr.views.showlist" %}">List of IPR disclosures</a></li>
 </ul>
 
 <p>To remove an IPR disclosure from the list, please contact the IETF Secretariat at <a href="mailto:ietf-ipr@ietf.org">ietf-ipr@ietf.org</a>.</p>
diff --git a/ietf/templates/ipr/list.html b/ietf/templates/ipr/list.html
index a96f2bfa7..6a8a9698a 100644
--- a/ietf/templates/ipr/list.html
+++ b/ietf/templates/ipr/list.html
@@ -12,9 +12,9 @@ The IETF takes no position regarding the validity or scope of any
 intellectual property rights or other rights that might be claimed to
 pertain to the implementation or use of the technology described in any IETF documents or the extent to
 which any license under such rights might or might not be available; nor does it represent that it has made any independent effort to identify any such rights.</p>
-<p><a href="{% url ietf.ipr.views.about %}">Click here to submit an IPR disclosure</a></p>
+<p><a href="{% url "ietf.ipr.views.about" %}">Click here to submit an IPR disclosure</a></p>
 
-<a href="{% url ietf.ipr.search.search %}">Search the IPR Disclosures</a>
+<a href="{% url "ietf.ipr.search.search" %}">Search the IPR Disclosures</a>
 
 <a name="generic"></a>
 <h2>Generic IPR Disclosures</h2>
diff --git a/ietf/templates/ipr/list_item.html b/ietf/templates/ipr/list_item.html
index 4f916ff68..2fc67ef57 100644
--- a/ietf/templates/ipr/list_item.html
+++ b/ietf/templates/ipr/list_item.html
@@ -4,7 +4,7 @@
       <td>{{ ipr.ipr_id }}</td>
       <td>
          {% if ipr.status == 1 %}
-	    <a href="{% url ietf.ipr.views.show ipr.ipr_id %}">{{ ipr.title|escape }}</a>
+	    <a href="{% url "ietf.ipr.views.show" ipr.ipr_id %}">{{ ipr.title|escape }}</a>
 	 {% else %}
 	    {{ ipr.title|escape }}
 	    <br/>This IPR disclosure was removed at the request of the submitter.
@@ -12,12 +12,12 @@
 	 <br />
 	 {% for item in ipr.updates.all %}
          {% if item.updated.status == 1 %}
-	    Updates ID <a href="{% url ietf.ipr.views.show item.updated.ipr_id %}">#{{ item.updated.ipr_id }}</a>.<br/>
+	    Updates ID <a href="{% url "ietf.ipr.views.show" item.updated.ipr_id %}">#{{ item.updated.ipr_id }}</a>.<br/>
          {% endif %}
 	 {% endfor %}
 	 {% for item in ipr.updated_by.all %}
 	       {% if item.processed == 1 and item.ipr.status != 2 %}
-	    Updated by ID <a href="{% url ietf.ipr.views.show item.ipr.ipr_id %}">#{{ item.ipr.ipr_id }}</a>.<br/> 
+	    Updated by ID <a href="{% url "ietf.ipr.views.show" item.ipr.ipr_id %}">#{{ item.ipr.ipr_id }}</a>.<br/> 
 	       {% endif %}
 	 {% endfor %}
       </td>
diff --git a/ietf/templates/ipr/search.html b/ietf/templates/ipr/search.html
index 29fdff2a1..275d2f3f9 100644
--- a/ietf/templates/ipr/search.html
+++ b/ietf/templates/ipr/search.html
@@ -99,5 +99,5 @@ label { float:left; width: 200px; }
   </form>
 </div>
 
-<p><a href="{% url ietf.ipr.views.showlist %}">Back to IPR Disclosure Page</a></p>
+<p><a href="{% url "ietf.ipr.views.showlist" %}">Back to IPR Disclosure Page</a></p>
 {% endblock %}
diff --git a/ietf/templates/ipr/search_doc_result.html b/ietf/templates/ipr/search_doc_result.html
index 8e636289e..d80feebe9 100644
--- a/ietf/templates/ipr/search_doc_result.html
+++ b/ietf/templates/ipr/search_doc_result.html
@@ -9,7 +9,7 @@
 		  <tr valign="top" bgcolor="#dadada">
 		     <td width="100">{{ ipr.submitted_date }}</td>
 		     <td width="90"><li>ID # {{ ipr.ipr_id }}</li></td>
-		     <td><a href="{% url ietf.ipr.views.show ipr_id=ipr.ipr_id %}">"{{ ipr.title|escape }}"</a></td>
+		     <td><a href="{% url "ietf.ipr.views.show" ipr_id=ipr.ipr_id %}">"{{ ipr.title|escape }}"</a></td>
 		  </tr>
 		  {% endfor %}
 
@@ -27,7 +27,7 @@
 			   <tr valign="top">
 			      <td width="100">{{ ipr.submitted_date }}</td>
 			      <td width="90"><li>ID # {{ ipr.ipr_id }}</li></td>
-			      <td><a href="{% url ietf.ipr.views.show ipr_id=ipr.ipr_id %}">"{{ ipr.title|escape }}"</a></td>
+			      <td><a href="{% url "ietf.ipr.views.show" ipr_id=ipr.ipr_id %}">"{{ ipr.title|escape }}"</a></td>
 			   </tr>
 			{% endfor %}
 		     {% else %}
diff --git a/ietf/templates/ipr/search_doctitle_result.html b/ietf/templates/ipr/search_doctitle_result.html
index 988545d17..6fba0252f 100644
--- a/ietf/templates/ipr/search_doctitle_result.html
+++ b/ietf/templates/ipr/search_doctitle_result.html
@@ -31,10 +31,10 @@
 				 <td>
 				    {% for item in ipr.updated_by.all %}
 				       {% if item.processed == 1 and item.ipr.status != 2 %}
-					  IPR disclosure ID# {{ item.ipr.ipr_id }} "<a href="{% url ietf.ipr.views.show item.ipr.ipr_id %}">{{ item.ipr.title }}</a>" Updates
+					  IPR disclosure ID# {{ item.ipr.ipr_id }} "<a href="{% url "ietf.ipr.views.show" item.ipr.ipr_id %}">{{ item.ipr.title }}</a>" Updates
 				       {% endif %}
 				    {% endfor %}
-				    <a href="{% url ietf.ipr.views.show ipr.ipr_id %}">"{{ ipr.title }}"</a>
+				    <a href="{% url "ietf.ipr.views.show" ipr.ipr_id %}">"{{ ipr.title }}"</a>
 				 </td>
 			      </tr>
 			   {% endfor %}
diff --git a/ietf/templates/ipr/search_result.html b/ietf/templates/ipr/search_result.html
index 9345e2e5b..91994c55e 100644
--- a/ietf/templates/ipr/search_result.html
+++ b/ietf/templates/ipr/search_result.html
@@ -43,7 +43,7 @@
 			<tr valign="top">
 			   <td width="100">{{ ipr.submitted_date }}</td>
 			   <td width="90"><li>ID # {{ ipr.ipr_id }}</li></td>
-			   <td><a href="{% url ietf.ipr.views.show ipr_id=ipr.ipr_id %}">"{{ ipr.title }}"</a></td>
+			   <td><a href="{% url "ietf.ipr.views.show" ipr_id=ipr.ipr_id %}">"{{ ipr.title }}"</a></td>
 			</tr>
 			{% for item in ipr.updates.all %}
                         {% if item != ipr %}
@@ -51,8 +51,8 @@
 			   <td width="100">{{ item.updated.submitted_date }}</td>
 			   <td width="90"><li>ID # {{ item.updated.ipr_id }}</li></td>
 			   <td>
-			      IPR disclosure ID# {{ ipr.ipr_id }} <a href="{% url ietf.ipr.views.show ipr_id=ipr.ipr_id %}">"{{ ipr.title }}"</a>
-			      Updates <a href="{% url ietf.ipr.views.show ipr_id=item.ipr_id %}">{{ item.updated.title }}</a>
+			      IPR disclosure ID# {{ ipr.ipr_id }} <a href="{% url "ietf.ipr.views.show" ipr_id=ipr.ipr_id %}">"{{ ipr.title }}"</a>
+			      Updates <a href="{% url "ietf.ipr.views.show" ipr_id=item.ipr_id %}">{{ item.updated.title }}</a>
 			   </td>
 			</tr>
                         {% endif %}
@@ -65,8 +65,8 @@
 	    {% endblock %}
 	    <hr><br>
 
-	    <a href="{% url ietf.ipr.search.search %}">IPR Search Main Page</a><br>
-	    <a href="{% url ietf.ipr.views.showlist %}">IPR Disclosure Page</a>
+	    <a href="{% url "ietf.ipr.search.search" %}">IPR Search Main Page</a><br>
+	    <a href="{% url "ietf.ipr.views.showlist" %}">IPR Disclosure Page</a>
 	    <br>
 {% endblock %}
 
diff --git a/ietf/templates/ipr/search_wg_result.html b/ietf/templates/ipr/search_wg_result.html
index a49f86313..30faa86f3 100644
--- a/ietf/templates/ipr/search_wg_result.html
+++ b/ietf/templates/ipr/search_wg_result.html
@@ -32,10 +32,10 @@
 				 <td>
 				    {% for item in ipr.updates.all %}
                                        {% if item.updated.status == 1 %}
-					  IPR disclosure ID# {{ item.updated.ipr_id }}, "<a href="{% url ietf.ipr.views.show item.updated.ipr_id %}">{{ item.updated.title|escape }}</a>" Updated by
+					  IPR disclosure ID# {{ item.updated.ipr_id }}, "<a href="{% url "ietf.ipr.views.show" item.updated.ipr_id %}">{{ item.updated.title|escape }}</a>" Updated by
                                        {% endif %}
 				    {% endfor %}
-				    <a href="{% url ietf.ipr.views.show ipr.ipr_id %}">"{{ ipr.title|escape }}"</a>
+				    <a href="{% url "ietf.ipr.views.show" ipr.ipr_id %}">"{{ ipr.title|escape }}"</a>
 				 </td>
 			      </tr>
 			   {% endfor %}
diff --git a/ietf/templates/ipr/submitted.html b/ietf/templates/ipr/submitted.html
index 979e1dc22..680f0750d 100644
--- a/ietf/templates/ipr/submitted.html
+++ b/ietf/templates/ipr/submitted.html
@@ -8,5 +8,5 @@
 <h3>Please note that it may take one business day for your IPR disclosure to be posted
 on the IETF Page of Intellectual Property Rights Notices.</h3>
 
-<p><a href="{% url ietf.ipr.views.showlist %}">Back to IPR Disclosure Page</a></p>
+<p><a href="{% url "ietf.ipr.views.showlist" %}">Back to IPR Disclosure Page</a></p>
 {% endblock %}
diff --git a/ietf/templates/liaisons/approval_list.html b/ietf/templates/liaisons/approval_list.html
index 0e5dba6d7..6d91e4713 100644
--- a/ietf/templates/liaisons/approval_list.html
+++ b/ietf/templates/liaisons/approval_list.html
@@ -8,6 +8,6 @@
 
 {% block management-links %}
 <ul>
-<li><a href="{% url liaison_list %}">Return to liaison list</a></li>
+<li><a href="{% url "liaison_list" %}">Return to liaison list</a></li>
 </ul>
 {% endblock %}
diff --git a/ietf/templates/liaisons/detail.html b/ietf/templates/liaisons/detail.html
index 007006e6f..547185f0c 100644
--- a/ietf/templates/liaisons/detail.html
+++ b/ietf/templates/liaisons/detail.html
@@ -79,7 +79,7 @@
   <td>Liaisons referring to this one:</td>
   <td>
     {% for rel in relations %}
-      <a href="{% url liaison_detail rel.pk %}">{% if rel.title %}{{ rel.title }}{% else %}Liaison #{{ rel.pk }}{% endif %}</a><br />
+      <a href="{% url "liaison_detail" rel.pk %}">{% if rel.title %}{{ rel.title }}{% else %}Liaison #{{ rel.pk }}{% endif %}</a><br />
     {% endfor %}
   </td>
 </tr>
@@ -90,7 +90,7 @@
 <tr>
   <td>Referenced liaison:</td>
   <td>
-    <a href="{% url liaison_detail liaison.related_to.pk %}">{% if liaison.related_to.title %}{{ liaison.related_to.title }}{% else %}Liaison #{{ liaison.related_to.pk }}{% endif %}</a>
+    <a href="{% url "liaison_detail" liaison.related_to.pk %}">{% if liaison.related_to.title %}{{ liaison.related_to.title }}{% else %}Liaison #{{ liaison.related_to.pk }}{% endif %}</a>
   </td>
 </tr>
 {% endif %}
@@ -116,7 +116,7 @@
 </table>
 
 {% if can_edit %}
-  <p><a href="{% url liaison_edit object_id=liaison.pk %}">Edit Liaison</a></p>
+  <p><a href="{% url "liaison_edit" object_id=liaison.pk %}">Edit Liaison</a></p>
 {% endif %}
 
 {% endblock %}
diff --git a/ietf/templates/liaisons/liaison_table.html b/ietf/templates/liaisons/liaison_table.html
index 60fc22f9a..fdc18f5a7 100644
--- a/ietf/templates/liaisons/liaison_table.html
+++ b/ietf/templates/liaisons/liaison_table.html
@@ -29,7 +29,7 @@
         <a href="https://datatracker.ietf.org/documents/LIAISON/{{ doc.external_url }}">{{ doc.title }}</a><br/>
       {% endfor %}
     {% else %}
-      <a href="{% if liaison.approved %}{% url liaison_detail object_id=liaison.pk %}{% else %}{% url liaison_approval_detail object_id=liaison.pk %}{% endif %}">{{ liaison.title }}</a>
+      <a href="{% if liaison.approved %}{% url "liaison_detail" object_id=liaison.pk %}{% else %}{% url "liaison_approval_detail" object_id=liaison.pk %}{% endif %}">{{ liaison.title }}</a>
     {% endif %}
     <span style="display: none" class="liaisonPK">{{ liaison.pk }}</span>
   </td>
diff --git a/ietf/templates/liaisons/liaisonform.html b/ietf/templates/liaisons/liaisonform.html
index 7e5961051..f50e41596 100644
--- a/ietf/templates/liaisons/liaisonform.html
+++ b/ietf/templates/liaisons/liaisonform.html
@@ -2,7 +2,7 @@
 
 <div class="formconfig" style="display: none;">
 {% block formconfig %}
-  <span class="info_update_url">{% url get_info %}</span>
+  <span class="info_update_url">{% url "ietf.liaisons.views.get_info" %}</span>
 {% endblock %}
 </div>
 
diff --git a/ietf/templates/liaisons/overview.html b/ietf/templates/liaisons/overview.html
index 16c1d510c..60eaae641 100644
--- a/ietf/templates/liaisons/overview.html
+++ b/ietf/templates/liaisons/overview.html
@@ -16,9 +16,9 @@
 {% block management-links %}
 {% if can_manage %}
 <ul>
-  {% if can_send_incoming %}<li><a href="{% url add_liaison %}?incoming">Add new incoming liaison</a></li>{% endif %}
-  {% if can_send_outgoing %}<li><a href="{% url add_liaison %}">Add new outgoing liaison</a></li>{% endif %}
-  {% if approvable %}<li><a href="{% url liaison_approval_list %}">You have {{ approvable }} pending liaison statement{{ approvable|pluralize }} that need{{ approvable|pluralize:"s," }} your approval</a></li>{% endif %}
+  {% if can_send_incoming %}<li><a href="{% url "add_liaison" %}?incoming">Add new incoming liaison</a></li>{% endif %}
+  {% if can_send_outgoing %}<li><a href="{% url "add_liaison" %}">Add new outgoing liaison</a></li>{% endif %}
+  {% if approvable %}<li><a href="{% url "liaison_approval_list" %}">You have {{ approvable }} pending liaison statement{{ approvable|pluralize }} that need{{ approvable|pluralize:"s," }} your approval</a></li>{% endif %}
 </ul>
 {% endif %}
 {% endblock %}
diff --git a/ietf/templates/meeting/agenda-utc.html b/ietf/templates/meeting/agenda-utc.html
index 8cd8dcd07..5fc653da9 100644
--- a/ietf/templates/meeting/agenda-utc.html
+++ b/ietf/templates/meeting/agenda-utc.html
@@ -137,16 +137,16 @@ You can customize the agenda below to show only selected working group sessions.
   <br/><i>Groups displayed in italics are BOFs</i></td></tr>
 </table>
 
-<div id="ical-link" class="hidden"><span style="font-size:150%">Week View</span><br/><a id="ical-href" href="{% url ietf.meeting.views.ical_agenda num=schedule.meeting.number %}"><em>Download as an .ics file</em></a></div>
+<div id="ical-link" class="hidden"><span style="font-size:150%">Week View</span><br/><a id="ical-href" href="{% url "ietf.meeting.views.ical_agenda" num=schedule.meeting.number %}"><em>Download as an .ics file</em></a></div>
 
 <iframe id="weekview" class="hidden" width="100%" height="600px" src="about:blank" scrolling="no"></iframe>
 
 <table width="100%" id="ics-preconfig"><tr><td align="center">
   Preconfigured .ics links:
   {% for area in schedule.area_list %}
-    <a href="{% url ietf.meeting.views.ical_agenda num=schedule.meeting.number %}?{{area|upper}},-~Other,-~Plenary">{{area|upper}}</a> &#8226;
+    <a href="{% url "ietf.meeting.views.ical_agenda" num=schedule.meeting.number %}?{{area|upper}},-~Other,-~Plenary">{{area|upper}}</a> &#8226;
   {% endfor %}
-  <a href="{% url ietf.meeting.views.ical_agenda num=schedule.meeting.number %}">Non-Area Events</a>
+  <a href="{% url "ietf.meeting.views.ical_agenda" num=schedule.meeting.number %}">Non-Area Events</a>
 </td></tr></table>
 
 {% if schedule.meeting.agenda_note %}<h2 class="ietf-divider" style="background-color: #C00; margin-top: 2em; margin-bottom: 0;">{{ schedule.meeting.agenda_note|safe }}</h2>{% endif %}
diff --git a/ietf/templates/meeting/agenda.html b/ietf/templates/meeting/agenda.html
index 49f876a8d..4c56bf0e1 100644
--- a/ietf/templates/meeting/agenda.html
+++ b/ietf/templates/meeting/agenda.html
@@ -127,16 +127,16 @@ You can customize the agenda below to show only selected working group sessions.
   <br/><i>Groups displayed in italics are BOFs</i></td></tr>
 </table>
 
-<div id="ical-link" class="hidden"><span style="font-size:150%">Week View</span><br/><a id="ical-href" href="{% url ietf.meeting.views.ical_agenda num=schedule.meeting.number %}"><em>Download as an .ics file</em></a></div>
+<div id="ical-link" class="hidden"><span style="font-size:150%">Week View</span><br/><a id="ical-href" href="{% url "ietf.meeting.views.ical_agenda" num=schedule.meeting.number %}"><em>Download as an .ics file</em></a></div>
 
 <iframe id="weekview" class="hidden" width="100%" height="600px" src="about:blank" scrolling="no"></iframe>
 
 <table width="100%" id="ics-preconfig"><tr><td align="center">
   Preconfigured .ics links:
   {% for area in schedule.area_list %}
-    <a href="{% url ietf.meeting.views.ical_agenda num=schedule.meeting.number %}?{{area|upper}},-~Other,-~Plenary">{{area|upper}}</a> &#8226;
+    <a href="{% url "ietf.meeting.views.ical_agenda" num=schedule.meeting.number %}?{{area|upper}},-~Other,-~Plenary">{{area|upper}}</a> &#8226;
   {% endfor %}
-  <a href="{% url ietf.meeting.views.ical_agenda num=schedule.meeting.number %}">Non-Area Events</a>
+  <a href="{% url "ietf.meeting.views.ical_agenda" num=schedule.meeting.number %}">Non-Area Events</a>
 </td></tr></table>
 
 {% if schedule.meeting.agenda_note %}<h2 class="ietf-divider" style="background-color: #C00; margin-top: 2em; margin-bottom: 0;">{{ schedule.meeting.agenda_note|safe }}</h2>{% endif %}
diff --git a/ietf/templates/meeting/agenda_list.html b/ietf/templates/meeting/agenda_list.html
index 023516690..d6a86b918 100644
--- a/ietf/templates/meeting/agenda_list.html
+++ b/ietf/templates/meeting/agenda_list.html
@@ -44,7 +44,7 @@
 </div>
 
 <div class="agenda_list_edit">
-<p><a href="{% url ietf.meeting.views.edit_timeslots meeting.number %}">Edit Timeslots</a></p>
+<p><a href="{% url "ietf.meeting.views.edit_timeslots" meeting.number %}">Edit Timeslots</a></p>
 </div>
 
 <div id="class_list" class="agenda_list">
@@ -61,11 +61,11 @@
       <td class="agenda_mark agenda_data"> <span class="styled_button agenda_official_mark {{agenda.official_class}}">{{ agenda.official_token }}</span></td>
       <td class="agenda_data"> <span class="agenda_owner">{{ agenda.owner }}</span> </td>
       <td class="agenda_data">
-        <a href="{% url ietf.meeting.views.edit_agenda agenda.meeting.number agenda.name %}"><span class="agenda_name">{{ agenda.name }}</span></a>
+        <a href="{% url "ietf.meeting.views.edit_agenda" agenda.meeting.number agenda.name %}"><span class="agenda_name">{{ agenda.name }}</span></a>
       </td>
       <td class="agenda_data"> <span class="agenda_visible {{agenda.visible_class}}">{{ agenda.visible_token }}</span></a></td>
       <td class="agenda_data"> <span class="agenda_public {{agenda.public_class}}">{{ agenda.public_token }}</span></td>
-      <td class="agenda_mark agenda_data"> <a href="{% url ietf.meeting.views.edit_agenda_properties agenda.meeting.number agenda.name %}"><span class="styled_button agenda_edit">EDIT</span></a> </td>
+      <td class="agenda_mark agenda_data"> <a href="{% url "ietf.meeting.views.edit_agenda_properties" agenda.meeting.number agenda.name %}"><span class="styled_button agenda_edit">EDIT</span></a> </td>
       <td class="agenda_mark agenda_data"> <span class="styled_button agenda_delete">DEL</span> </td>
     </tr>
   {% endfor %}
diff --git a/ietf/templates/meeting/landscape_edit.html b/ietf/templates/meeting/landscape_edit.html
index ea2a42cbf..e2c296c29 100644
--- a/ietf/templates/meeting/landscape_edit.html
+++ b/ietf/templates/meeting/landscape_edit.html
@@ -129,7 +129,7 @@ area_directors["{{ad.group.acronym}}"].push(find_person_by_href("{{ad.person.def
 
 <div id="unassigned-items">
   <div id="all_agendas" class="events_bar_buttons">
-    <a href="{% url ietf.meeting.views.edit_agendas meeting.number %}">
+    <a href="{% url "ietf.meeting.views.edit_agendas" meeting.number %}">
       <button class="styled_button">all agendas</button>
     </a>
   </div>
diff --git a/ietf/templates/meeting/private_agenda.html b/ietf/templates/meeting/private_agenda.html
index 01e1da476..873d4f66f 100644
--- a/ietf/templates/meeting/private_agenda.html
+++ b/ietf/templates/meeting/private_agenda.html
@@ -24,7 +24,7 @@
 You can not have access this agenda. It belongs to {{ schedule.owner }}.
 </p>
 <p>
-<a href="{% url ietf.meeting.views.edit_agendas meeting.number %}">List your meetings</a>.
+<a href="{% url "ietf.meeting.views.edit_agendas" meeting.number %}">List your meetings</a>.
 </p>
 <div class="wrapper custom_text_stuff">
 </div>
diff --git a/ietf/templates/meeting/properties_edit.html b/ietf/templates/meeting/properties_edit.html
index e921565f0..3516fe7dd 100644
--- a/ietf/templates/meeting/properties_edit.html
+++ b/ietf/templates/meeting/properties_edit.html
@@ -60,7 +60,7 @@
      <tr>
        <td></td>
        <td colspan=2><input type="button" name="save" value="save" onClick="save_agenda(this.form)" class="styled_button">
-       <a id="agenda_cancel_url" href="{% url ietf.meeting.views.edit_agendas meeting.number %}"><span class="styled_button agenda_cancel">Cancel</span></a></td>
+       <a id="agenda_cancel_url" href="{% url "ietf.meeting.views.edit_agendas" meeting.number %}"><span class="styled_button agenda_cancel">Cancel</span></a></td>
        <td><span class="styled_button agenda_delete">DEL</span></td>
      </tr>
      </table>
diff --git a/ietf/templates/nomcom/announcements.html b/ietf/templates/nomcom/announcements.html
index 8e973dedf..fab7722d7 100644
--- a/ietf/templates/nomcom/announcements.html
+++ b/ietf/templates/nomcom/announcements.html
@@ -23,7 +23,7 @@
   {% for m in regime.announcements %}
     <tr>
       <td>{{ m.time|date:"Y-M-d" }}</td>
-      <td style="max-width:50%"><a href="{% url nomcom_announcement message_id=m.id %}">{{ m.subject|escape }}</a></td>
+      <td style="max-width:50%"><a href="{% url "nomcom_announcement" message_id=m.id %}">{{ m.subject|escape }}</a></td>
       <td>{{ m.to_name }}</td>
     <tr>
   {% endfor %}
diff --git a/ietf/templates/nomcom/edit_nomcom.html b/ietf/templates/nomcom/edit_nomcom.html
index 691507716..94c56181b 100644
--- a/ietf/templates/nomcom/edit_nomcom.html
+++ b/ietf/templates/nomcom/edit_nomcom.html
@@ -56,6 +56,6 @@
 
 <h2>Delete Nomcom</h2>
 
-<p>To delete all data about {{ nomcom.group.name }}, <a href="{% url nomcom_delete_nomcom year %}" class="deletelink">click here</a></p>
+<p>To delete all data about {{ nomcom.group.name }}, <a href="{% url "nomcom_delete_nomcom" year %}" class="deletelink">click here</a></p>
 
 {% endblock %}
diff --git a/ietf/templates/nomcom/edit_nominee.html b/ietf/templates/nomcom/edit_nominee.html
index 3301d3eed..e57f75d25 100644
--- a/ietf/templates/nomcom/edit_nominee.html
+++ b/ietf/templates/nomcom/edit_nominee.html
@@ -13,7 +13,7 @@
 
 {% block nomcom_content %}
 
-<p>Back to list of <a href="{% url nomcom_private_index year %}">nominees</a></p>
+<p>Back to list of <a href="{% url "nomcom_private_index" year %}">nominees</a></p>
 
 <h2>Edit email of {{ nominee }} </h2>
 
diff --git a/ietf/templates/nomcom/list_positions.html b/ietf/templates/nomcom/list_positions.html
index 84da025e0..398a57fe7 100644
--- a/ietf/templates/nomcom/list_positions.html
+++ b/ietf/templates/nomcom/list_positions.html
@@ -3,10 +3,10 @@
 {% block nomcom_content %}
 
 <h2>Positions in {{ nomcom.group }}</h2>
-<a href="{% url nomcom_add_position year %}">Add a new position</a>
+<a href="{% url "nomcom_add_position" year %}">Add a new position</a>
 {% if positions %}
   {% for position in positions %}
-      <h3>{{ position.name }} <a href="{% url nomcom_edit_position year position.id %}">[Edit]</a> <a href="{% url nomcom_remove_position year position.id %}">[Remove]</a></h3>
+      <h3>{{ position.name }} <a href="{% url "nomcom_edit_position" year position.id %}">[Edit]</a> <a href="{% url "nomcom_remove_position" year position.id %}">[Remove]</a></h3>
       <dl>
         <dt>Description:</dt>
         <dd>{{ position.description }}</dd>
@@ -18,7 +18,7 @@
         <dd>
     <ul>
     {% for template in position.get_templates %}
-      <li><a href="{% url nomcom_edit_template year template.id %}">{{ template }}</a></li>
+      <li><a href="{% url "nomcom_edit_template" year template.id %}">{{ template }}</a></li>
     {% endfor %}
     </ul>
         </dd>
diff --git a/ietf/templates/nomcom/list_templates.html b/ietf/templates/nomcom/list_templates.html
index 6a925687b..6a02c3737 100644
--- a/ietf/templates/nomcom/list_templates.html
+++ b/ietf/templates/nomcom/list_templates.html
@@ -6,7 +6,7 @@
 {% if template_list %}
 <ul>
 {% for template in template_list %}
-  <li><a href="{% url nomcom_edit_template year template.id %}">{{ template }}</a></li>
+  <li><a href="{% url "nomcom_edit_template" year template.id %}">{{ template }}</a></li>
 {% endfor %}
 </ul>
 {% else %}
@@ -19,7 +19,7 @@
   <h3>{{ position.name }}</h3>
     <ul>
     {% for template in position.get_templates %}
-      <li><a href="{% url nomcom_edit_template year template.id %}">{{ template }}</a></li>
+      <li><a href="{% url "nomcom_edit_template" year template.id %}">{{ template }}</a></li>
     {% endfor %}
     </ul>
   {% endfor %}
diff --git a/ietf/templates/nomcom/nomcom_private_base.html b/ietf/templates/nomcom/nomcom_private_base.html
index 6b5a20451..f09b556c7 100644
--- a/ietf/templates/nomcom/nomcom_private_base.html
+++ b/ietf/templates/nomcom/nomcom_private_base.html
@@ -8,28 +8,28 @@
 
   <div class="ietf-navset nomcom-menu" >
      <div>
-    {% if selected == "index" %}<span class="selected">Nominees</span>{% else %}<a href="{% url nomcom_private_index year %}">Nominees</a>{% endif %} |
+    {% if selected == "index" %}<span class="selected">Nominees</span>{% else %}<a href="{% url "nomcom_private_index" year %}">Nominees</a>{% endif %} |
     {% if nomcom|has_publickey %}
-      {% if selected == "nominate" %}<span class="selected">Nominate</span>{% else %}<a href="{% url nomcom_private_nominate year %}">Nominate</a>{% endif %} |
-      {% if selected == "feedback" %}<span class="selected">Enter Comments</span>{% else %}<a href="{% url nomcom_private_feedback year %}">Enter Comments</a>{% endif %} |
-      {% if selected == "questionnaire" %}<span class="selected">Questionnaire response</span>{% else %}<a href="{% url nomcom_private_questionnaire year %}">Questionnaire response</a>{% endif %} |
+      {% if selected == "nominate" %}<span class="selected">Nominate</span>{% else %}<a href="{% url "nomcom_private_nominate" year %}">Nominate</a>{% endif %} |
+      {% if selected == "feedback" %}<span class="selected">Enter Comments</span>{% else %}<a href="{% url "nomcom_private_feedback" year %}">Enter Comments</a>{% endif %} |
+      {% if selected == "questionnaire" %}<span class="selected">Questionnaire response</span>{% else %}<a href="{% url "nomcom_private_questionnaire" year %}">Questionnaire response</a>{% endif %} |
     {% endif %}
-    {% if selected == "view_feedback" %}<span class="selected">View Comments</span>{% else %}<a href="{% url nomcom_view_feedback year %}">View Comments</a>{% endif %} |
-    {% if selected == "private_key" %}<span class="selected">Private Key</span>{% else %}<a href="{% url nomcom_private_key year %}">Private Key</a>{% endif %}
+    {% if selected == "view_feedback" %}<span class="selected">View Comments</span>{% else %}<a href="{% url "nomcom_view_feedback" year %}">View Comments</a>{% endif %} |
+    {% if selected == "private_key" %}<span class="selected">Private Key</span>{% else %}<a href="{% url "nomcom_private_key" year %}">Private Key</a>{% endif %}
     {% if user|is_chair:year %} |
-      {% if selected == "feedback_pending" %}<span class="selected">Pending Feedback</span>{% else %}<a href="{% url nomcom_view_feedback_pending year %}">Pending Feedback</a>{% endif %} |
-      {% if selected == "feedback_email" %}<span class="selected">Enter Email Feedback</span>{% else %}<a href="{% url nomcom_private_feedback_email year %}">Enter Email Feedback</a>{% endif %} |
-      {% if selected == "send_accept_reminder" %}<span class="selected">Send Accept Reminder</span>{% else %}<a href="{% url nomcom_send_reminder_mail year "accept" %}">Send Accept Reminder</a>{% endif %} |
-      {% if selected == "send_questionnaire_reminder" %}<span class="selected">Send Questionnaire Reminder</span>{% else %}<a href="{% url nomcom_send_reminder_mail year "questionnaire" %}">Send Questionnaire Reminder</a>{% endif %} 
+      {% if selected == "feedback_pending" %}<span class="selected">Pending Feedback</span>{% else %}<a href="{% url "nomcom_view_feedback_pending" year %}">Pending Feedback</a>{% endif %} |
+      {% if selected == "feedback_email" %}<span class="selected">Enter Email Feedback</span>{% else %}<a href="{% url "nomcom_private_feedback_email" year %}">Enter Email Feedback</a>{% endif %} |
+      {% if selected == "send_accept_reminder" %}<span class="selected">Send Accept Reminder</span>{% else %}<a href="{% url "nomcom_send_reminder_mail" year "accept" %}">Send Accept Reminder</a>{% endif %} |
+      {% if selected == "send_questionnaire_reminder" %}<span class="selected">Send Questionnaire Reminder</span>{% else %}<a href="{% url "nomcom_send_reminder_mail" year "questionnaire" %}">Send Questionnaire Reminder</a>{% endif %} 
     {% endif %}
     </div>
     {% if user|is_chair:year %}
     <div class="nomcom-edit">
-      {% if selected == "edit_nomcom" %}<span class="selected">Edit Settings</span>{% else %}<a href="{% url nomcom_edit_nomcom year %}">Edit Settings</a>{% endif %} |
-      {% if selected == "edit_templates" %}<span class="selected">Edit Pages</span>{% else %}<a href="{% url nomcom_list_templates year %}">Edit Pages</a>{% endif %} |
-      {% if selected == "edit_positions" %}<span class="selected">Edit Positions</span>{% else %}<a href="{% url nomcom_list_positions year %}">Edit Positions</a>{% endif %} |
-      {% if selected == "merge" %}<span class="selected">Merge Email Addresses</span>{% else %}<a href="{% url nomcom_private_merge year %}">Merge Email Addresses</a>{% endif %} |
-      {% if selected == "edit_members" %}<span class="selected">Edit Nomcom Members</span>{% else %}<a href="{% url nomcom_edit_members year %}">Edit Nomcom Members</a>{% endif %}
+      {% if selected == "edit_nomcom" %}<span class="selected">Edit Settings</span>{% else %}<a href="{% url "nomcom_edit_nomcom" year %}">Edit Settings</a>{% endif %} |
+      {% if selected == "edit_templates" %}<span class="selected">Edit Pages</span>{% else %}<a href="{% url "nomcom_list_templates" year %}">Edit Pages</a>{% endif %} |
+      {% if selected == "edit_positions" %}<span class="selected">Edit Positions</span>{% else %}<a href="{% url "nomcom_list_positions" year %}">Edit Positions</a>{% endif %} |
+      {% if selected == "merge" %}<span class="selected">Merge Email Addresses</span>{% else %}<a href="{% url "nomcom_private_merge" year %}">Merge Email Addresses</a>{% endif %} |
+      {% if selected == "edit_members" %}<span class="selected">Edit Nomcom Members</span>{% else %}<a href="{% url "nomcom_edit_members" year %}">Edit Nomcom Members</a>{% endif %}
     </div>
     {% endif %}
   </div>
diff --git a/ietf/templates/nomcom/nomcom_public_base.html b/ietf/templates/nomcom/nomcom_public_base.html
index a6abcc567..1eb2ab1f1 100644
--- a/ietf/templates/nomcom/nomcom_public_base.html
+++ b/ietf/templates/nomcom/nomcom_public_base.html
@@ -7,13 +7,13 @@
   <h1>Nomcom {{ year }} Pages</h1>
 
   <div class="ietf-navset">
-    {% if selected == "index" %}<span class="selected">Home</span>{% else %}<a href="{% url nomcom_year_index year %}">Home</a>{% endif %} |
+    {% if selected == "index" %}<span class="selected">Home</span>{% else %}<a href="{% url "nomcom_year_index" year %}">Home</a>{% endif %} |
     {% if nomcom|has_publickey %}
-      {% if selected == "nominate" %}<span class="selected">Nominate</span>{% else %}<a href="{% url nomcom_public_nominate year %}">Nominate</a>{% endif %} |
-      {% if selected == "feedback" %}<span class="selected">Provide Comments</span>{% else %}<a href="{% url nomcom_public_feedback year %}">Provide Comments</a>{% endif %} |
+      {% if selected == "nominate" %}<span class="selected">Nominate</span>{% else %}<a href="{% url "nomcom_public_nominate" year %}">Nominate</a>{% endif %} |
+      {% if selected == "feedback" %}<span class="selected">Provide Comments</span>{% else %}<a href="{% url "nomcom_public_feedback" year %}">Provide Comments</a>{% endif %} |
     {% endif %}
-    {% if selected == "requirements" %}<span class="selected">Desired Expertise</span>{% else %}<a href="{% url nomcom_requirements year %}">Desired Expertise</a>{% endif %} |
-    {% if selected == "questionnaires" %}<span class="selected">Questionnaires</span>{% else %}<a href="{% url nomcom_questionnaires year %}">Questionnaires</a>{% endif %} |
+    {% if selected == "requirements" %}<span class="selected">Desired Expertise</span>{% else %}<a href="{% url "nomcom_requirements" year %}">Desired Expertise</a>{% endif %} |
+    {% if selected == "questionnaires" %}<span class="selected">Questionnaires</span>{% else %}<a href="{% url "nomcom_questionnaires" year %}">Questionnaires</a>{% endif %} |
   </div>
 
   {% block nomcom_content %}
diff --git a/ietf/templates/nomcom/private_feedback.html b/ietf/templates/nomcom/private_feedback.html
index a9a2c8a4b..880868519 100644
--- a/ietf/templates/nomcom/private_feedback.html
+++ b/ietf/templates/nomcom/private_feedback.html
@@ -68,7 +68,7 @@ table.nominees tr td {
           <tr><th>{{ p.name }}:</th></tr>
             {% for np in p.nomineeposition_set.accepted.not_duplicated %}
               <tr>
-                <td><a href="{% url nomcom_private_feedback year %}?nominee={{np.nominee.id}}&position={{ np.position.id}}">{{ np.nominee }}</td>
+                <td><a href="{% url "nomcom_private_feedback" year %}?nominee={{np.nominee.id}}&position={{ np.position.id}}">{{ np.nominee }}</td>
               </tr>
             {% endfor %}
           {% endif %}
diff --git a/ietf/templates/nomcom/private_index.html b/ietf/templates/nomcom/private_index.html
index 331778a2c..ff93a3f9a 100644
--- a/ietf/templates/nomcom/private_index.html
+++ b/ietf/templates/nomcom/private_index.html
@@ -106,7 +106,7 @@
           {% if is_chair %}
             <td><input class="batch-select" type="checkbox" value="{{ np.id }}" name="selected"/></td>
           {% endif %}
-          <td><a href="{% url ietf.nomcom.views.view_feedback_nominee year=year nominee_id=np.nominee.id %}#comment">{{ np.nominee }}</a>{% if is_chair %} <a href="{% url nomcom_edit_nominee year np.nominee.id %}">(edit)</a>{% endif %}</td>
+          <td><a href="{% url "ietf.nomcom.views.view_feedback_nominee" year=year nominee_id=np.nominee.id %}#comment">{{ np.nominee }}</a>{% if is_chair %} <a href="{% url "nomcom_edit_nominee" year np.nominee.id %}">(edit)</a>{% endif %}</td>
           <td>{{ np.position.name }}</td>
           <td>{{ np.state }}</td>
           <td>{{ np.questionnaires|yesno:"Yes,No,No" }}
diff --git a/ietf/templates/nomcom/public_feedback.html b/ietf/templates/nomcom/public_feedback.html
index 724d78522..5e1af0231 100644
--- a/ietf/templates/nomcom/public_feedback.html
+++ b/ietf/templates/nomcom/public_feedback.html
@@ -70,7 +70,7 @@ table.nominees tr td {
             <th>{{ p.name }}:</th></tr>
             {% for np in p.nomineeposition_set.accepted.not_duplicated %}
               <tr>
-                <td>{% add_num_nominations user np.position np.nominee %}<a href="{% url nomcom_public_feedback year %}?nominee={{np.nominee.id}}&position={{ np.position.id}}">{{ np.nominee }}</td>
+                <td>{% add_num_nominations user np.position np.nominee %}<a href="{% url "nomcom_public_feedback" year %}?nominee={{np.nominee.id}}&position={{ np.position.id}}">{{ np.nominee }}</td>
               </tr>
             {% endfor %}
           {% endif %}
diff --git a/ietf/templates/nomcom/send_reminder_mail.html b/ietf/templates/nomcom/send_reminder_mail.html
index eea18e111..48aeabe16 100644
--- a/ietf/templates/nomcom/send_reminder_mail.html
+++ b/ietf/templates/nomcom/send_reminder_mail.html
@@ -41,7 +41,7 @@
 
 </form>
 
-<p>The message that will be sent is as follows: {% if mail_template %}<a href="{% url nomcom_edit_template year mail_template.id %}">(Edit the message)</a>{% endif %}</p>
+<p>The message that will be sent is as follows: {% if mail_template %}<a href="{% url "nomcom_edit_template" year mail_template.id %}">(Edit the message)</a>{% endif %}</p>
 
 <pre>{{ mail_template.content|wrap_text:80|escape }}</pre>
 
diff --git a/ietf/templates/nomcom/view_feedback.html b/ietf/templates/nomcom/view_feedback.html
index 7cafdcb4a..4060c9916 100644
--- a/ietf/templates/nomcom/view_feedback.html
+++ b/ietf/templates/nomcom/view_feedback.html
@@ -17,7 +17,7 @@
 </tr>
 {% for nominee, feedback in nominees_feedback.items %}
 <tr class="{{ forloop.counter|divisibleby:2|yesno:"oddrow,evenrow" }}">
-  <td><a href="{% url nomcom_view_feedback_nominee year nominee.id %}#comment">{{ nominee }}</td>
+  <td><a href="{% url "nomcom_view_feedback_nominee" year nominee.id %}#comment">{{ nominee }}</td>
   {% for f in feedback %}
     <td>{{ f.1 }}</td>
   {% endfor %}
@@ -35,7 +35,7 @@
   {% endfor %}
 </tr>
 <tr class="evenrow">
-  <td><a href="{% url nomcom_view_feedback_unrelated year %}">View feedback not related to nominees</td>
+  <td><a href="{% url "nomcom_view_feedback_unrelated" year %}">View feedback not related to nominees</td>
   {% for count in independent_feedback %}
     <td>{{ count }}</td>
   {% endfor %}
diff --git a/ietf/templates/nomcom/view_feedback_nominee.html b/ietf/templates/nomcom/view_feedback_nominee.html
index dd0d58ec8..3afc42317 100644
--- a/ietf/templates/nomcom/view_feedback_nominee.html
+++ b/ietf/templates/nomcom/view_feedback_nominee.html
@@ -13,7 +13,7 @@
 
 {% block nomcom_content %}
 
-<p>Back to list of <a href="{% url nomcom_view_feedback year %}">nominees</a></p>
+<p>Back to list of <a href="{% url "nomcom_view_feedback" year %}">nominees</a></p>
 
 <h2>Feedback of {{ nominee }} </h2>
 
diff --git a/ietf/templates/nomcom/view_feedback_pending.html b/ietf/templates/nomcom/view_feedback_pending.html
index f692356a4..f6be1e70d 100644
--- a/ietf/templates/nomcom/view_feedback_pending.html
+++ b/ietf/templates/nomcom/view_feedback_pending.html
@@ -50,7 +50,7 @@
     <div class="sumit-row">
     {% if extra_step %}
     <input type="submit" value="Save feedback" name="end" />
-    <a href="{% url nomcom_view_feedback_pending year %}">Cancel and leave the following feedback unclassified</a>
+    <a href="{% url "nomcom_view_feedback_pending" year %}">Cancel and leave the following feedback unclassified</a>
     {% else %}
     <input type="submit" value="Classify" />
     {% if default_type %}<input type="submit" name="move_to_default" value="Move all unclassified feedback to {{ default_type }}" />{% endif %}
@@ -118,7 +118,7 @@
     <div class="sumit-row">
     {% if extra_step %}
     <input type="submit" value="Save feedback" name="end" />
-    <a href="{% url nomcom_view_feedback_pending year %}">Cancel and leave the following feedback unclassified</a>
+    <a href="{% url "nomcom_view_feedback_pending" year %}">Cancel and leave the following feedback unclassified</a>
     {% else %}
     <input type="submit" value="Classify" />
     {% if default_type %}<input type="submit" name="move_to_default" value="Move all unclassified feedback to {{ default_type }}" />{% endif %}
diff --git a/ietf/templates/nomcom/view_feedback_unrelated.html b/ietf/templates/nomcom/view_feedback_unrelated.html
index 2b4f44937..6d437291f 100644
--- a/ietf/templates/nomcom/view_feedback_unrelated.html
+++ b/ietf/templates/nomcom/view_feedback_unrelated.html
@@ -13,7 +13,7 @@
 
 {% block nomcom_content %}
 
-<p>Back to list of <a href="{% url nomcom_view_feedback year %}">feedback</a></p>
+<p>Back to list of <a href="{% url "nomcom_view_feedback" year %}">feedback</a></p>
 
 <h2>Feedback not related to nominees</h2>
 
diff --git a/ietf/templates/registration/add_email_email.txt b/ietf/templates/registration/add_email_email.txt
index 538630e65..cc5e3d84e 100644
--- a/ietf/templates/registration/add_email_email.txt
+++ b/ietf/templates/registration/add_email_email.txt
@@ -6,7 +6,7 @@ to the user account '{{ user }}' at '{{ domain }}'.
 If you requested this change, please confirm that this is your email
 address by clicking on following link:
 
-   http://{{ domain }}{% url confirm_new_email user today email auth %}
+   http://{{ domain }}{% url "confirm_new_email" user today email auth %}
 
 This link will expire in {{ expire }} days.
 
diff --git a/ietf/templates/registration/change_password.html b/ietf/templates/registration/change_password.html
index ac792645a..31b846e51 100644
--- a/ietf/templates/registration/change_password.html
+++ b/ietf/templates/registration/change_password.html
@@ -7,7 +7,7 @@
 <h1>Change password</h1>
 {% if success %}
 <p>Your password has been updated.</p>
-<p>Now you can <a href="{% url ietfauth.views.ietf_login %}">sign in</a></p>
+<p>Now you can <a href="{% url "ietfauth.views.ietf_login" %}">sign in</a></p>
 {% else %}
 <p>Hello, you can select a new password below for your user {{ username }}.</p>
 <form action="" method="POST">
diff --git a/ietf/templates/registration/confirm.html b/ietf/templates/registration/confirm.html
index c2092cc76..c42490e79 100644
--- a/ietf/templates/registration/confirm.html
+++ b/ietf/templates/registration/confirm.html
@@ -7,7 +7,7 @@
 <h1>Confirm account creation</h1>
 {% if success %}
 <p>Your account with login name '{{ email }}' has been created, using the password you have selected.</p>
-<p>Now you can <a href="{% url ietfauth.views.ietf_login %}">sign in</a></p>
+<p>Now you can <a href="{% url "ietfauth.views.ietf_login" %}">sign in</a></p>
 {% else %}
 <p>In order to complete the setup of your account with login name  '{{ email }}', please set a password:</p>
 <form action="" method="POST">
diff --git a/ietf/templates/registration/confirm_new_email.html b/ietf/templates/registration/confirm_new_email.html
index 7cd0e43d9..ddd31425f 100644
--- a/ietf/templates/registration/confirm_new_email.html
+++ b/ietf/templates/registration/confirm_new_email.html
@@ -7,7 +7,7 @@
 <h1>Confirm new email address</h1>
 {% if success %}
 <p>Your account with login name '{{ username }}' has been updated to include the email address '{{ email }}'.</p>
-<p>You may now wish to <a href="{% url ietfauth.views.profile %}">edit your profile</a>.</p>
+<p>You may now wish to <a href="{% url "ietfauth.views.profile" %}">edit your profile</a>.</p>
 {% else %}
 <p>An error has occured when attempting to add the email address '{{ email }}' to your account '{{ username }}'.<p>
 <ul>
diff --git a/ietf/templates/registration/confirm_profile_update.html b/ietf/templates/registration/confirm_profile_update.html
index 17d8ac03f..0b5d6c545 100644
--- a/ietf/templates/registration/confirm_profile_update.html
+++ b/ietf/templates/registration/confirm_profile_update.html
@@ -10,7 +10,7 @@
 {% for email in new_emails %}
 <p><b>A confirmation email has been sent to {{email}}. It will be added to your account after you click on the link it contains.</b></p>
 {% endfor %}
-<p>You may <a href="{% url ietfauth.views.profile %}">continue editing your profile</a>.</p>
+<p>You may <a href="{% url "ietfauth.views.profile" %}">continue editing your profile</a>.</p>
 {% else %}
 <p>An error has occured when attempting to update your account.<p>
 {% if error %}<p>{{ error }}</p>{% endif %}
diff --git a/ietf/templates/registration/create.html b/ietf/templates/registration/create.html
index 325ab8ed5..ce3c1548b 100644
--- a/ietf/templates/registration/create.html
+++ b/ietf/templates/registration/create.html
@@ -51,13 +51,13 @@
 <form action="" method="POST">
   <p>
      If you already have an account, and want to use a new email address,<br/>
-     please go to your <a href="{% url ietf.ietfauth.views.profile %}">account profile page</a> and
+     please go to your <a href="{% url "ietf.ietfauth.views.profile" %}">account profile page</a> and
      add the new email<br/>
      address there.
   </p>
 
   <p style="width: 35em">
-     If you already have an account, but forgot your password,<br/> <a href="{% url password_reset %}">please use the password reset form.</a>
+     If you already have an account, but forgot your password,<br/> <a href="{% url "password_reset" %}">please use the password reset form.</a>
   </p>
 
 
@@ -69,7 +69,7 @@
   {{ form }}
   </table>
   <div class="submit_row">
-    <input type="hidden" id="check_user_name_url" value="{% url ajax_check_username %}" />
+    <input type="hidden" id="check_user_name_url" value="{% url "ajax_check_username" %}" />
     <input type="submit" value="Submit" />
   </div>
 </form>
diff --git a/ietf/templates/registration/creation_email.txt b/ietf/templates/registration/creation_email.txt
index e95dd2c28..48a8819de 100644
--- a/ietf/templates/registration/creation_email.txt
+++ b/ietf/templates/registration/creation_email.txt
@@ -6,7 +6,7 @@ at {{ domain }}.  In order to set a new password for the
 {{ username }} account, please go to the following link and
 follow the instructions there:
 
-   http://{{ domain }}{% url confirm_account username today realm auth %}
+   http://{{ domain }}{% url "confirm_account" username today realm auth %}
 
 This link will expire in {{ expire }} days.
 
diff --git a/ietf/templates/registration/password_reset_email.txt b/ietf/templates/registration/password_reset_email.txt
index b0e750f65..baea1b952 100644
--- a/ietf/templates/registration/password_reset_email.txt
+++ b/ietf/templates/registration/password_reset_email.txt
@@ -6,7 +6,7 @@ at {{ domain }}.  In order to set a new password for the
 {{ username }} account, please go to the following link and
 follow the instructions there:
 
-   https://{{ domain }}{% url confirm_password_reset username today realm auth %}
+   https://{{ domain }}{% url "confirm_password_reset" username today realm auth %}
 
 This link will expire in {{ expire }} days.
 
diff --git a/ietf/templates/submit/add_preapproval.html b/ietf/templates/submit/add_preapproval.html
index ec4f7c32f..a41639b5c 100644
--- a/ietf/templates/submit/add_preapproval.html
+++ b/ietf/templates/submit/add_preapproval.html
@@ -56,7 +56,7 @@ like <code>.txt</code> in the name.</p>
 
     <tr>
       <td class="actions" colspan="2">
-      <a href="{% url submit_approvals %}#preapprovals">Back</a>
+      <a href="{% url "submit_approvals" %}#preapprovals">Back</a>
       <input type="submit" value="Add pre-approval" />
       </td>
     </tr>
diff --git a/ietf/templates/submit/approval_request.txt b/ietf/templates/submit/approval_request.txt
index 3eaa989fe..191376ad0 100644
--- a/ietf/templates/submit/approval_request.txt
+++ b/ietf/templates/submit/approval_request.txt
@@ -4,7 +4,7 @@ Hi,
 Chair approval is needed for posting of {{ submission.name }}-{{ submission.rev }}.
 
 To approve the draft, go to this URL (note: you need to login to be able to approve):
-  https://{{ domain }}{% url submit_submission_status_by_hash submission_id=submission.pk access_token=submission.access_token %}
+  https://{{ domain }}{% url "submit_submission_status_by_hash" submission_id=submission.pk access_token=submission.access_token %}
 
   File name       : {{ submission.name }}
   Revision        : {{ submission.rev }}
diff --git a/ietf/templates/submit/approvals.html b/ietf/templates/submit/approvals.html
index 960eaa61b..9f3f2bc68 100644
--- a/ietf/templates/submit/approvals.html
+++ b/ietf/templates/submit/approvals.html
@@ -28,7 +28,7 @@ table.preapprovals tr:hover td a.cancel { visibility: visible; }
   </tr>
   {% for s in approvals %}
   <tr>
-    <td><a href="{% url submit_submission_status_by_hash submission_id=s.pk access_token=s.access_token %}">{{ s.name }}-{{ s.rev }}</a></td>
+    <td><a href="{% url "submit_submission_status_by_hash" submission_id=s.pk access_token=s.access_token %}">{{ s.name }}-{{ s.rev }}</a></td>
     <td>{{ s.submission_date }}</td>
   </tr>
   {% endfor %}
@@ -38,7 +38,7 @@ table.preapprovals tr:hover td a.cancel { visibility: visible; }
 <h2 id="preapprovals">Pre-approved drafts not yet submitted</h2>
 
 {% if user|has_role:"Secretariat,WG Chair" %}
-<p>You can <a href="{% url submit_add_preapproval %}">add a pre-approval</a>.</p>
+<p>You can <a href="{% url "submit_add_preapproval" %}">add a pre-approval</a>.</p>
 {% endif %}
 
 {% if not preapprovals %}
@@ -56,7 +56,7 @@ table.preapprovals tr:hover td a.cancel { visibility: visible; }
     <td>{{ p.name }}</td>
     <td>{{ p.time|date:"Y-m-d" }}</td>
     <td>{{ p.by }}</td>
-    <td><a class="cancel" href="{% url submit_cancel_preapproval preapproval_id=p.id %}">cancel pre-approval</a></td>
+    <td><a class="cancel" href="{% url "submit_cancel_preapproval" preapproval_id=p.id %}">cancel pre-approval</a></td>
   </tr>
   {% endfor %}
 </table>
@@ -75,7 +75,7 @@ table.preapprovals tr:hover td a.cancel { visibility: visible; }
    </tr>
    {% for d in recently_approved %}
    <tr>
-     <td><a href="{% url doc_view d.name %}">{{ d.name }}</a></td>
+     <td><a href="{% url "doc_view" d.name %}">{{ d.name }}</a></td>
      <td>{{ d.submission_date }}</td>
    </tr>
    {% endfor %}
diff --git a/ietf/templates/submit/cancel_preapproval.html b/ietf/templates/submit/cancel_preapproval.html
index 15394d282..1cd939536 100644
--- a/ietf/templates/submit/cancel_preapproval.html
+++ b/ietf/templates/submit/cancel_preapproval.html
@@ -15,7 +15,7 @@ Pre-approval of <b>{{ preapproval.name }}</b> by {{ preapproval.by }}
 on {{ preapproval.time }}.
 
 <form class="actions" action="" method="post">
-  <a href="{% url submit_approvals %}#preapprovals">Back</a>
+  <a href="{% url "submit_approvals" %}#preapprovals">Back</a>
   <input type="hidden" name="action" value="cancel" />
   <input type="submit" value="Cancel pre-approval" />
 </form>
diff --git a/ietf/templates/submit/confirm_submission.html b/ietf/templates/submit/confirm_submission.html
index ecc10973f..b58ac5484 100644
--- a/ietf/templates/submit/confirm_submission.html
+++ b/ietf/templates/submit/confirm_submission.html
@@ -14,11 +14,11 @@ p.error { color: red; font-weight: bold; font-size: 1.5em; }
 
 {% if submission.state_id != "auth" and submission.state_id != "aut-appr" %}
   {% if submission.state_id == "posted" %}
-    <p>The submission has already been posted. See the <a href="{% url doc_view name=submission.name %}">draft here</a>.</p>
+    <p>The submission has already been posted. See the <a href="{% url "doc_view" name=submission.name %}">draft here</a>.</p>
   {% else %}
     <p>The submission is not in a state where it can be confirmed.</p>
 
-    <p>Go to the <a href="{% url submit_submission_status submission_id=submission.pk %}">status page</a>
+    <p>Go to the <a href="{% url "submit_submission_status" submission_id=submission.pk %}">status page</a>
       to see what has happened to it.</p>
   {% endif %}
 {% else %}
@@ -27,7 +27,7 @@ p.error { color: red; font-weight: bold; font-size: 1.5em; }
     <p class="error">Incorrect authorization key.</p>
 
     <p>Double-check the link you followed. If everything fails, you can go to
-      the <a href="{% url submit_submission_status submission_id=submission.pk %}">status page</a>,
+      the <a href="{% url "submit_submission_status" submission_id=submission.pk %}">status page</a>,
       cancel the submission and try again.</p>
   {% else %}
     <p>Authorization key accepted.</p>
diff --git a/ietf/templates/submit/submit_base.html b/ietf/templates/submit/submit_base.html
index dc2cd05f2..81f74961a 100644
--- a/ietf/templates/submit/submit_base.html
+++ b/ietf/templates/submit/submit_base.html
@@ -10,11 +10,11 @@
 <h1>IETF Internet-Draft Submission </h1>
 
 <div class="ietf-navset">
-{% if selected == "index" %}<span class="selected">Upload</span>{% else %}<a href="{% url submit_upload_submission %}">Upload</a>{% endif %} |
-{% if selected == "status" %}<span class="selected">Status</span>{% else %}<a href="{% url submit_search_submission %}">Status</a>{% endif %} |
-{% if selected == "instructions" %}<span class="selected">Tool Instructions</span>{% else %}<a href="{% url submit_tool_instructions %}">Tool Instructions</a>{% endif %} |
-{% if selected == "notewell" %}<span class="selected">NOTE WELL</span>{% else %}<a href="{% url submit_note_well %}">NOTE WELL</a>{% endif %} |
-{% if selected == "approvals" %}<span class="selected">Approvals</span>{% else %}<a href="{% url submit_approvals %}">Approvals</a>{% endif %}
+{% if selected == "index" %}<span class="selected">Upload</span>{% else %}<a href="{% url "submit_upload_submission" %}">Upload</a>{% endif %} |
+{% if selected == "status" %}<span class="selected">Status</span>{% else %}<a href="{% url "submit_search_submission" %}">Status</a>{% endif %} |
+{% if selected == "instructions" %}<span class="selected">Tool Instructions</span>{% else %}<a href="{% url "submit_tool_instructions" %}">Tool Instructions</a>{% endif %} |
+{% if selected == "notewell" %}<span class="selected">NOTE WELL</span>{% else %}<a href="{% url "submit_note_well" %}">NOTE WELL</a>{% endif %} |
+{% if selected == "approvals" %}<span class="selected">Approvals</span>{% else %}<a href="{% url "submit_approvals" %}">Approvals</a>{% endif %}
 </div>
 
 {% block submit_content %}
diff --git a/ietf/templates/submit/tool_instructions.html b/ietf/templates/submit/tool_instructions.html
index fd32800ce..d1a868484 100644
--- a/ietf/templates/submit/tool_instructions.html
+++ b/ietf/templates/submit/tool_instructions.html
@@ -3,7 +3,7 @@
 
 {% block submit_content %}
 <h2>I-D Submission Tool Instructions</h2>
-<h3>Tool URL: <a href="{% url submit_upload_submission %}">https://datatracker.ietf.org{% url submit_upload_submission %}</a></h3>
+<h3>Tool URL: <a href="{% url "submit_upload_submission" %}">https://datatracker.ietf.org{% url "submit_upload_submission" %}</a></h3>
 This page will explain the purpose and content of each screen in the I-D Submission Tool, and the actions that result by clicking the form buttons on each screen.<br>
 
 The specification for this tool can be found in <a href="http://www.ietf.org/rfc/rfc4228.txt?number=4228">RFC 4228</a>.
diff --git a/ietf/templates/sync/rfceditor_undo.html b/ietf/templates/sync/rfceditor_undo.html
index e34e94f48..dc1e9ac3c 100644
--- a/ietf/templates/sync/rfceditor_undo.html
+++ b/ietf/templates/sync/rfceditor_undo.html
@@ -15,7 +15,7 @@
   {% for e in events %}
   <tr class="{% if forloop.counter|divisibleby:2 %}evenrow{% else %}oddrow{% endif %}">
     <td>{{ e.time|date:"Y-m-d H:i:s"}}</td>
-    <td><a href="{% url doc_history e.doc_id %}">{{ e.doc_id }}</a></td>
+    <td><a href="{% url "doc_history" e.doc_id %}">{{ e.doc_id }}</a></td>
     <td>{{ e.desc|safe }}</td>
     <td>
       <form method="post">
diff --git a/ietf/templates/wgcharter/announcement_text.html b/ietf/templates/wgcharter/announcement_text.html
index 38113ef51..69625b927 100644
--- a/ietf/templates/wgcharter/announcement_text.html
+++ b/ietf/templates/wgcharter/announcement_text.html
@@ -28,7 +28,7 @@ form #id_announcement_text {
 
   <div class="actions">
     {% if announcement == "action" %}
-    <a href="{% url charter_approve name=charter.canonical_name %}">Go to charter approval page</a>
+    <a href="{% url "charter_approve" name=charter.canonical_name %}">Go to charter approval page</a>
     {% else %}
     <input type="submit" name="send_text" value="Send WG {{ announcement }} announcement" />
     {% endif %}
diff --git a/ietf/templates/wgcharter/approve.html b/ietf/templates/wgcharter/approve.html
index 5287aec47..7209d9fc9 100644
--- a/ietf/templates/wgcharter/approve.html
+++ b/ietf/templates/wgcharter/approve.html
@@ -30,8 +30,8 @@ form.approve .announcement {
   </div>
 
   <div class="actions">
-    <a href="{% url doc_view name=charter.name %}">Back</a>
-    <a href="{% url charter_edit_announcement name=charter.canonical_name,ann="action" %}?next=approve">Go to edit/regenerate announcement page</a>
+    <a href="{% url "doc_view" name=charter.name %}">Back</a>
+    <a href="{% url "charter_edit_announcement" name=charter.canonical_name,ann="action" %}?next=approve">Go to edit/regenerate announcement page</a>
     <input type="submit" value="Send out the announcement, close ballot and update revision"/>
   </div>
 </form>
diff --git a/ietf/templates/wgcharter/ballot_issued.html b/ietf/templates/wgcharter/ballot_issued.html
index bf96c832c..b02a29311 100644
--- a/ietf/templates/wgcharter/ballot_issued.html
+++ b/ietf/templates/wgcharter/ballot_issued.html
@@ -8,6 +8,6 @@
 <p>Ballot has been sent out.</p>
 
 <div class="actions">
-  <a href="{% url doc_writeup name=doc.name %}">Back to writeups</a>
+  <a href="{% url "doc_writeup" name=doc.name %}">Back to writeups</a>
 </div>
 {% endblock %}
diff --git a/ietf/templates/wgcharter/ballot_writeupnotes.html b/ietf/templates/wgcharter/ballot_writeupnotes.html
index 1eae25d98..1afd207e1 100644
--- a/ietf/templates/wgcharter/ballot_writeupnotes.html
+++ b/ietf/templates/wgcharter/ballot_writeupnotes.html
@@ -20,7 +20,7 @@ form #id_ballot_writeup {
   {{ ballot_writeup_form.ballot_writeup }}
   
   <div class="actions">
-    <a href="{% url doc_writeup name=charter.name %}">Back</a>
+    <a href="{% url "doc_writeup" name=charter.name %}">Back</a>
     <input type="submit" name="save_ballot_writeup" value="Save Ballot Writeup" />
     <input style="margin-left: 8px" type="submit" name="send_ballot" value="Save and {% if reissue %}Re-{% endif %}Send Ballot to the IESG" />
   </div>
diff --git a/ietf/templates/wgcharter/change_ad.html b/ietf/templates/wgcharter/change_ad.html
index 15146710a..7125dd971 100644
--- a/ietf/templates/wgcharter/change_ad.html
+++ b/ietf/templates/wgcharter/change_ad.html
@@ -29,7 +29,7 @@ Change the responsible AD for {{ charter.canonical_name }}-{{ charter.rev }}
     <tr>
       <td></td>
       <td class="actions">
-        <a href="{% url doc_view name=charter.canonical_name %}">Back</a>
+        <a href="{% url "doc_view" name=charter.canonical_name %}">Back</a>
         <input type="submit" value="Submit"/>
       </td>
     </tr>
diff --git a/ietf/templates/wgcharter/change_state.html b/ietf/templates/wgcharter/change_state.html
index 44518317e..4f5de5c20 100644
--- a/ietf/templates/wgcharter/change_state.html
+++ b/ietf/templates/wgcharter/change_state.html
@@ -21,7 +21,7 @@ form.change-state .actions {
 <h1>{{ title }}</h1>
 
 {% if not option %}
-<p class="helptext">For help on the states, see the <a href="{% url state_help type="charter" %}">state table</a>.</p>
+<p class="helptext">For help on the states, see the <a href="{% url "state_help" type="charter" %}">state table</a>.</p>
 {% endif %}
 
 <form class="change-state" action="" method="post">
@@ -66,7 +66,7 @@ form.change-state .actions {
         <input type="submit" value="Initiate chartering"/>
         {% endif %}
         {% if not option or option == "abandon" %}
-        <a href="{% url doc_view name=doc.name %}">Back</a>
+        <a href="{% url "doc_view" name=doc.name %}">Back</a>
         <input type="submit" value="Save and (possibly) notify Secretariat"/>
         {% endif %}
       </td>
diff --git a/ietf/templates/wgcharter/edit_notify.html b/ietf/templates/wgcharter/edit_notify.html
index 632e0aec8..251deb11d 100644
--- a/ietf/templates/wgcharter/edit_notify.html
+++ b/ietf/templates/wgcharter/edit_notify.html
@@ -23,7 +23,7 @@ form.edit-notify td.actions { padding-top: 1em; }
     <tr>
       <td></td>
       <td class="actions">
-        <a href="{% url doc_view name=doc.name %}">Back</a>
+        <a href="{% url "doc_view" name=doc.name %}">Back</a>
         <input type="submit" value="Save"/>
       </td>
     </tr>
diff --git a/ietf/templates/wgcharter/edit_telechat_date.html b/ietf/templates/wgcharter/edit_telechat_date.html
index 1dcc11566..b7a4cc586 100644
--- a/ietf/templates/wgcharter/edit_telechat_date.html
+++ b/ietf/templates/wgcharter/edit_telechat_date.html
@@ -33,7 +33,7 @@ Are you sure you want to put it on a telechat agenda?
     <tr>
       <td></td>
       <td class="actions">
-        <a href="{% url doc_view name=doc.name %}">Back</a>
+        <a href="{% url "doc_view" name=doc.name %}">Back</a>
         <input type="submit" value="Save"/>
       </td>
     </tr>
diff --git a/ietf/templates/wgcharter/submit.html b/ietf/templates/wgcharter/submit.html
index 8cae45f6b..10f97bb49 100644
--- a/ietf/templates/wgcharter/submit.html
+++ b/ietf/templates/wgcharter/submit.html
@@ -30,7 +30,7 @@ Charter submission for {{ group.acronym }} {{ group.type.name }}
     <tr>
       <td></td>
       <td class="actions">
-        <a href="{% url doc_view name=group.charter.name %}">Back</a>
+        <a href="{% url "doc_view" name=group.charter.name %}">Back</a>
         <input type="submit" value="Submit"/>
       </td>
     </tr>
diff --git a/ietf/templates/wginfo/bofs.html b/ietf/templates/wginfo/bofs.html
index 3d2d5134a..8123cc6bd 100644
--- a/ietf/templates/wginfo/bofs.html
+++ b/ietf/templates/wginfo/bofs.html
@@ -10,7 +10,7 @@
 <p>Groups in the BoF state</p>
 
 {% if user|has_role:"Area Director,Secretariat" %}
-<p><a href="{% url bof_create %}">Create a new BoF</a></p>
+<p><a href="{% url "bof_create" %}">Create a new BoF</a></p>
 {% endif %}
 
 {% if not groups %}
@@ -25,10 +25,10 @@
 {% for g in groups %}
 <tr class="{{ forloop.counter|divisibleby:2|yesno:"oddrow,evenrow" }}">
   <td class="acronym">
-    <a href="{% url group_charter acronym=g.acronym %}">{{ g.acronym }}</a>
+    <a href="{% url "group_charter" acronym=g.acronym %}">{{ g.acronym }}</a>
   </td>
   <td class="title">
-    <a {%comment%}href="{% url doc_view name=g.charter.name %}"{%endcomment%}>{{ g.name }}</a>
+    <a {%comment%}href="{% url "doc_view" name=g.charter.name %}"{%endcomment%}>{{ g.name }}</a>
   </td>
   <td class="date">{{ g.time|date:"Y-m-d" }}</td>
 </tr>
diff --git a/ietf/templates/wginfo/chartering_wgs.html b/ietf/templates/wginfo/chartering_wgs.html
index 67255ca0b..00daeb90f 100644
--- a/ietf/templates/wginfo/chartering_wgs.html
+++ b/ietf/templates/wginfo/chartering_wgs.html
@@ -12,7 +12,7 @@
 {% for s in charter_states %}{% if not forloop.first %}, {% if forloop.last %}or {% endif %}{% endif %}<i>{{ s.name }}</i>{% endfor %}.</p>
 
 {% if user|has_role:"Area Director,Secretariat" %}
-<p><a href="{% url wg_create %}">Start chartering new WG</a></p>
+<p><a href="{% url "wg_create" %}">Start chartering new WG</a></p>
 {% endif %}
 
 {% if not groups %}
@@ -28,10 +28,10 @@
 {% for g in groups %}
 <tr class="{{ forloop.counter|divisibleby:2|yesno:"oddrow,evenrow" }}">
   <td class="acronym">
-    <a href="{% url group_charter acronym=g.acronym %}">{{ g.acronym }}</a>
+    <a href="{% url "group_charter" acronym=g.acronym %}">{{ g.acronym }}</a>
   </td>
   <td class="title">
-    <a href="{% url doc_view name=g.charter.name %}">{{ g.name }}</a>
+    <a href="{% url "doc_view" name=g.charter.name %}">{{ g.name }}</a>
   </td>
   <td class="date">{{ g.charter.time|date:"Y-m-d" }}</td>
   <td class="status">
diff --git a/ietf/templates/wginfo/conclude.html b/ietf/templates/wginfo/conclude.html
index 76f0ad03c..59fcd5b4d 100644
--- a/ietf/templates/wginfo/conclude.html
+++ b/ietf/templates/wginfo/conclude.html
@@ -29,7 +29,7 @@ form.conclude .actions {
     {{ form.as_table }}
     <tr>
       <td colspan="2" class="actions">
-        <a class="button" href="{% url group_charter acronym=wg.acronym %}">Cancel</a>
+        <a class="button" href="{% url "group_charter" acronym=wg.acronym %}">Cancel</a>
         <input class="button" type="submit" value="Send request"/>
       </td>
     </tr>
diff --git a/ietf/templates/wginfo/customize_workflow.html b/ietf/templates/wginfo/customize_workflow.html
index 147267aaf..3989f02ca 100644
--- a/ietf/templates/wginfo/customize_workflow.html
+++ b/ietf/templates/wginfo/customize_workflow.html
@@ -34,7 +34,7 @@
 <h1>Customize Workflow for {{ group.acronym }} {{ group.type.name }}</h1>
 
 <p>Below you can customize the draft states and tags used in the
-<a href="{% url group_charter group.acronym %}">{{ group.acronym }} {{ group.type.name }}</a>. Note that some states are
+<a href="{% url "group_charter" group.acronym %}">{{ group.acronym }} {{ group.type.name }}</a>. Note that some states are
 mandatory for group operation and cannot be deactivated.</p>
 
 <p>You can see the default Working Group I-D State Diagram
diff --git a/ietf/templates/wginfo/edit.html b/ietf/templates/wginfo/edit.html
index 8af9917b8..2c636f47f 100644
--- a/ietf/templates/wginfo/edit.html
+++ b/ietf/templates/wginfo/edit.html
@@ -40,7 +40,7 @@ Create new WG or BoF
 
 <p>Note that persons with authorization to manage information, e.g.
 chairs and delegates, need a Datatracker account to actually do
-so. New accounts can be <a href="{% url create_account %}">created here</a>.</p>
+so. New accounts can be <a href="{% url "create_account" %}">created here</a>.</p>
 
 <form class="edit" action="" method="POST">
   <table>
@@ -68,7 +68,7 @@ so. New accounts can be <a href="{% url create_account %}">created here</a>.</p>
       <td></td>
       <td class="actions">
 	{% if action == "edit" %}
-          <a class="button" href="{% url group_charter acronym=wg.acronym %}">Cancel</a>
+          <a class="button" href="{% url "group_charter" acronym=wg.acronym %}">Cancel</a>
           <input class="button" type="submit" value="Save"/>
         {% else %} 
            {% if action == "charter" %}
diff --git a/ietf/templates/wginfo/edit_milestones.html b/ietf/templates/wginfo/edit_milestones.html
index e3a3a8a12..f8953ddfc 100644
--- a/ietf/templates/wginfo/edit_milestones.html
+++ b/ietf/templates/wginfo/edit_milestones.html
@@ -42,8 +42,8 @@ tr.milestone.add { font-style: italic; }
 <noscript>This page depends on Javascript being enabled to work properly.</noscript>
 
 <p>Links:
-  <a href="{% url group_charter acronym=group.acronym %}">{{ group.acronym }} {{ group.type.name }}</a>
-  - <a href="{% url doc_view name=group.charter.canonical_name %}">{{ group.charter.canonical_name }}</a>
+  <a href="{% url "group_charter" acronym=group.acronym %}">{{ group.acronym }} {{ group.type.name }}</a>
+  - <a href="{% url "doc_view" name=group.charter.canonical_name %}">{{ group.charter.canonical_name }}</a>
 </p>
 
 
@@ -58,7 +58,7 @@ Director.
 
 {% if can_reset %}
 <p>
-You can <a href="{% url wg_reset_charter_milestones acronym=group.acronym %}">reset
+You can <a href="{% url "wg_reset_charter_milestones" acronym=group.acronym %}">reset
 this list</a> to the milestones currently in use for the {{ group.acronym }} {{ group.type.name }}.
 </p>
 {% endif %}
@@ -91,7 +91,7 @@ this list</a> to the milestones currently in use for the {{ group.acronym }} {{
 </table>
 
 <div class="actions">
-  <a class="button" href="{% if milestone_set == "charter" %}{% url doc_view name=group.charter.canonical_name %}{% else %}{% url group_charter acronym=group.acronym %}{% endif %}">Cancel</a>
+  <a class="button" href="{% if milestone_set == "charter" %}{% url "doc_view" name=group.charter.canonical_name %}{% else %}{% url "group_charter" acronym=group.acronym %}{% endif %}">Cancel</a>
   <input class="button" type="submit" data-labelsave="Save" data-labelreview="Review changes" value="Save" style="display:none"/>
   <input type="hidden" name="action" value="save">
 </div>
diff --git a/ietf/templates/wginfo/group_base.html b/ietf/templates/wginfo/group_base.html
index a229f60cc..33ee759a7 100644
--- a/ietf/templates/wginfo/group_base.html
+++ b/ietf/templates/wginfo/group_base.html
@@ -65,9 +65,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 <div class="ietf-navset">
   <div>
-  <a {% if selected == "documents" %}class="selected"{% else %}href="{% url ietf.wginfo.views.group_documents acronym=group.acronym %}"{% endif %}>Documents</a> |
-  <a {% if selected == "charter" %}class="selected"{% else %}href="{% url ietf.wginfo.views.group_charter acronym=group.acronym %}"{% endif %}>Charter</a> |
-  <a {% if selected == "history" %}class="selected"{% else %}href="{% url ietf.wginfo.views.history acronym=group.acronym %}"{% endif %}>History</a> |
+  <a {% if selected == "documents" %}class="selected"{% else %}href="{% url "ietf.wginfo.views.group_documents" acronym=group.acronym %}"{% endif %}>Documents</a> |
+  <a {% if selected == "charter" %}class="selected"{% else %}href="{% url "ietf.wginfo.views.group_charter" acronym=group.acronym %}"{% endif %}>Charter</a> |
+  <a {% if selected == "history" %}class="selected"{% else %}href="{% url "ietf.wginfo.views.history" acronym=group.acronym %}"{% endif %}>History</a> |
   {% if group.list_archive|startswith:"http:" or group.list_archive|startswith:"https:" or group.list_archive|startswith:"ftp:" %}
   <a href="{{ group.list_archive }}">List Archive &raquo;</a> |
   {% endif %}
diff --git a/ietf/templates/wginfo/group_charter.html b/ietf/templates/wginfo/group_charter.html
index 1f39ac850..a2d740ccc 100644
--- a/ietf/templates/wginfo/group_charter.html
+++ b/ietf/templates/wginfo/group_charter.html
@@ -43,11 +43,11 @@ is occasionally incorrect.</span>
     <td>Charter:</td>
     <td>
       {% if group.charter %}
-      <a href="{% url doc_view name=group.charter.name %}">{{ group.charter.name }}-{{ group.charter.rev }}</a> ({{ group.charter.get_state.name }})
+      <a href="{% url "doc_view" name=group.charter.name %}">{{ group.charter.name }}-{{ group.charter.rev }}</a> ({{ group.charter.get_state.name }})
       {% else %}
       none
       {% if user|has_role:"Area Director,Secretariat" %}
-      - <a href="{% url ietf.wginfo.edit.submit_initial_charter acronym=group.acronym %}">Submit Charter</a>
+      - <a href="{% url "ietf.wginfo.edit.submit_initial_charter" acronym=group.acronym %}">Submit Charter</a>
       {% endif %}
       {% endif %}
     </td>
diff --git a/ietf/templates/wginfo/milestone_form.html b/ietf/templates/wginfo/milestone_form.html
index c0cb386e8..cde9d51f9 100644
--- a/ietf/templates/wginfo/milestone_form.html
+++ b/ietf/templates/wginfo/milestone_form.html
@@ -26,7 +26,7 @@
   </tr>
   <tr class="docs">
     <td>Drafts:</td>
-    <td><input name="{{ form.docs.html_name }}" class="tokenized-field" data-ajax-url="{% url wg_ajax_search_docs group.acronym %}" data-pre="{{ form.docs_prepopulate }}"/>
+    <td><input name="{{ form.docs.html_name }}" class="tokenized-field" data-ajax-url="{% url "wg_ajax_search_docs" group.acronym %}" data-pre="{{ form.docs_prepopulate }}"/>
     {{ form.docs.errors }}
     </td>
   </tr>
diff --git a/ietf/templates/wginfo/milestones.html b/ietf/templates/wginfo/milestones.html
index ee811c291..7951811a2 100644
--- a/ietf/templates/wginfo/milestones.html
+++ b/ietf/templates/wginfo/milestones.html
@@ -9,7 +9,7 @@
     <td>
       <div>{{ milestone.desc|escape }}</div>
       {% for d in milestone.docs.all %}
-      <a class="doc" href="{% url doc_view name=d.name %}">{{ d.name }}</a>
+      <a class="doc" href="{% url "doc_view" name=d.name %}">{{ d.name }}</a>
       {% endfor %}
     </td>
   </tr>
diff --git a/ietf/templates/wginfo/reset_charter_milestones.html b/ietf/templates/wginfo/reset_charter_milestones.html
index eb7b08212..154ec44ab 100644
--- a/ietf/templates/wginfo/reset_charter_milestones.html
+++ b/ietf/templates/wginfo/reset_charter_milestones.html
@@ -29,7 +29,7 @@
 {% endfor %}
 
 <div class="actions">
-  <a href="{% url wg_edit_charter_milestones acronym=group.acronym %}">Back</a>
+  <a href="{% url "wg_edit_charter_milestones" acronym=group.acronym %}">Back</a>
   <input type="submit" value="Reset charter milestones"/>
 </div>
 </form>