diff --git a/application/controllers/PermissionsController.php b/application/controllers/PermissionsController.php
index 5648837f8..9161553a2 100644
--- a/application/controllers/PermissionsController.php
+++ b/application/controllers/PermissionsController.php
@@ -15,7 +15,7 @@ class SecurityController extends ActionController
         $this->view->roles = Config::app('roles', true);
     }
 
-    public function newRoleAction()
+    public function newAction()
     {
         $role = new RoleForm(array(
             'onSuccess' => function (RoleForm $role) {
@@ -42,7 +42,7 @@ class SecurityController extends ActionController
         $this->view->form = $role;
     }
 
-    public function updateRoleAction()
+    public function updateAction()
     {
         $name = $this->_request->getParam('role');
         if (empty($name)) {
@@ -86,7 +86,7 @@ class SecurityController extends ActionController
         $this->view->form = $role;
     }
 
-    public function removeRoleAction()
+    public function removeAction()
     {
         $name = $this->_request->getParam('role');
         if (empty($name)) {
diff --git a/application/views/scripts/permissions/index.phtml b/application/views/scripts/permissions/index.phtml
index 3dc571ce9..520f42d1a 100644
--- a/application/views/scripts/permissions/index.phtml
+++ b/application/views/scripts/permissions/index.phtml
@@ -19,14 +19,14 @@
                         <td>
                             <?= $this->escape($name) ?>
                             <div class="hidden">
-                                <a href="<?= $this->url('security/update-role', array('role' => $name)) ?>"></a>
+                                <a href="<?= $this->url('permissions/update', array('role' => $name)) ?>"></a>
                             </div>
                         </td>
                         <td><?= $this->escape($role->permissions) ?></td>
                         <td><?= $this->escape($role->users) ?></td>
                         <td><?= $this->escape($role->groups) ?></td>
                         <td>
-                            <a href="<?= $this->url('security/remove-role', array('role' => $name)) ?>">
+                            <a href="<?= $this->url('permissions/remove', array('role' => $name)) ?>">
                                 <?= $this->translate('Remove role') ?>
                             </a>
                         </td>
@@ -35,7 +35,7 @@
                 </tbody>
             </table>
         <?php endif ?>
-        <a data-base-target="_next" href="<?= $this->href('security/new-role') ?>">
+        <a data-base-target="_next" href="<?= $this->href('permissions/new') ?>">
             <?= $this->translate('New Role') ?>
         </a>
     </div>
diff --git a/application/views/scripts/permissions/new-role.phtml b/application/views/scripts/permissions/new.phtml
similarity index 100%
rename from application/views/scripts/permissions/new-role.phtml
rename to application/views/scripts/permissions/new.phtml
diff --git a/application/views/scripts/permissions/remove-role.phtml b/application/views/scripts/permissions/remove.phtml
similarity index 100%
rename from application/views/scripts/permissions/remove-role.phtml
rename to application/views/scripts/permissions/remove.phtml
diff --git a/application/views/scripts/permissions/update-role.phtml b/application/views/scripts/permissions/update.phtml
similarity index 100%
rename from application/views/scripts/permissions/update-role.phtml
rename to application/views/scripts/permissions/update.phtml