6 files changed, 7 insertions, 7 deletions
diff --git a/templates/web/zurich/admin/problem_row.html b/templates/web/zurich/admin/problem_row.html
index 973d9f651..502a7bc39 100644
--- a/templates/web/zurich/admin/problem_row.html
+++ b/templates/web/zurich/admin/problem_row.html
@@ -46,7 +46,7 @@
         </td>
 
         [% IF NOT no_edit %]
-            <td><a href="[% c.uri_for( 'report_edit', problem.id ) %]">[% loc('Edit') %]</a></td>
+            <td><a href="[% c.uri_for_action( 'admin/reports/edit', [ problem.id ] ) %]">[% loc('Edit') %]</a></td>
         [% END %]
     </tr>
 [%- END -%]
diff --git a/templates/web/zurich/admin/report_edit-sdm.html b/templates/web/zurich/admin/report_edit-sdm.html
index d8e6c2625..8d25ab40a 100644
--- a/templates/web/zurich/admin/report_edit-sdm.html
+++ b/templates/web/zurich/admin/report_edit-sdm.html
@@ -12,7 +12,7 @@
 
 <div id="map_sidebar">
 
-<form method="post" action="[% c.uri_for( 'report_edit', problem.id ) %]" enctype="application/x-www-form-urlencoded" accept-charset="utf-8">
+<form method="post" action="[% c.uri_for_action( 'admin/reports/edit', [ problem.id ] ) %]" enctype="application/x-www-form-urlencoded" accept-charset="utf-8">
     <input type="hidden" name="token" value="[% csrf_token %]" >
     <input type="hidden" name="submit" value="1" >
 
diff --git a/templates/web/zurich/admin/report_edit.html b/templates/web/zurich/admin/reports/edit.html
index 6f69161fe..4b0490b4a 100644
--- a/templates/web/zurich/admin/report_edit.html
+++ b/templates/web/zurich/admin/reports/edit.html
@@ -14,7 +14,7 @@
 
 [% pstate = problem.get_extra_metadata('closure_status') || problem.state %]
 
-<form id="report_edit" method="post" action="[% c.uri_for( 'report_edit', problem.id ) %]" enctype="application/x-www-form-urlencoded" accept-charset="utf-8">
+<form id="report_edit" method="post" action="[% c.uri_for_action( 'admin/reports/edit', [ problem.id ] ) %]" enctype="application/x-www-form-urlencoded" accept-charset="utf-8">
     <input type="hidden" name="token" value="[% csrf_token %]" >
     <input type="hidden" name="submit" value="1" >
 
diff --git a/templates/web/zurich/admin/reports.html b/templates/web/zurich/admin/reports/index.html
index 7e425c8ec..481dfb49d 100644
--- a/templates/web/zurich/admin/reports.html
+++ b/templates/web/zurich/admin/reports/index.html
@@ -1,7 +1,7 @@
 [% PROCESS 'admin/header.html' title=loc('Search Reports') %]
 [% PROCESS 'admin/report_blocks.html' %]
 
-<form method="get" action="[% c.uri_for('reports') %]" enctype="application/x-www-form-urlencoded" accept-charset="utf-8">
+<form method="get" action="[% c.uri_for_action('admin/reports/index') %]" enctype="application/x-www-form-urlencoded" accept-charset="utf-8">
     <p><label for="search">[% loc('Search:') %]</label> <input type="text" name="search"  size="30" id="search" value="[% searched | html %]">
 </form>
 
diff --git a/templates/web/zurich/admin/template_edit.html b/templates/web/zurich/admin/templates/edit.html
index b6f68106c..8a95f2a04 100644
--- a/templates/web/zurich/admin/template_edit.html
+++ b/templates/web/zurich/admin/templates/edit.html
@@ -11,7 +11,7 @@
 </h3>
 
 <form method="post"
-    action="[% c.uri_for('templates', body.id, rt.id || 'new' ) %]"
+    action="[% c.uri_for_action('/admin/templates/edit', body.id, rt.id || 'new' ) %]"
     enctype="application/x-www-form-urlencoded"
     accept-charset="utf-8"
     class="validate">
diff --git a/templates/web/zurich/admin/templates.html b/templates/web/zurich/admin/templates/view.html
index 2db9e2e34..7b95c8a99 100644
--- a/templates/web/zurich/admin/templates.html
+++ b/templates/web/zurich/admin/templates/view.html
@@ -17,12 +17,12 @@
         <td>  [% t.title %] </td>
         <td> [% t.text %] </td>
         <td> [% t.created %] </td>
-        <td> <a href="[% c.uri_for('templates', body.id, t.id) %]" class="btn">[% loc('Edit') %]</a> </td>
+        <td> <a href="[% c.uri_for_action('/admin/templates/edit', body.id, t.id) %]" class="btn">[% loc('Edit') %]</a> </td>
     </tr>
 [% END %]
     </tbody>
 </table>
 
-<a href="[% c.uri_for('templates', body.id, 'new') %]" class="btn">[% loc('New template') %]</a>
+<a href="[% c.uri_for_action('/admin/templates/edit', body.id, 'new') %]" class="btn">[% loc('New template') %]</a>
 
 [% INCLUDE 'admin/footer.html' %]