diff --git a/templates/manage/users/roles.twig b/templates/manage/users/roles.twig
index a87b3e14..cfc02abd 100644
--- a/templates/manage/users/roles.twig
+++ b/templates/manage/users/roles.twig
@@ -4,16 +4,16 @@
 {% set roles_pagination = pagination(manage_roles_pagination, '/manage/users.php', null, {'v': 'roles'}) %}
 
 {% block manage_content %}
-    <div class="container manage__role-items">
+    <div class="container manage__roles">
         {{ container_title('<i class="fas fa-user-check fa-fw"></i> Roles') }}
 
         {% if roles_pagination|trim|length > 0 %}
-            <div class="manage__role-items__pagination">
+            <div class="manage__roles__pagination">
                 {{ roles_pagination }}
             </div>
         {% endif %}
 
-        <div class="manage__role-items__collection">
+        <div class="manage__roles__collection">
             {% if can_manage_roles %}
                 <div class="manage__role-item manage__role-item--create">
                     <a href="{{ url('manage-role-create') }}" class="manage__role-item__background"></a>
@@ -72,7 +72,7 @@
         </div>
 
         {% if roles_pagination|trim|length > 0 %}
-            <div class="manage__role-items__pagination">
+            <div class="manage__roles__pagination">
                 {{ roles_pagination }}
             </div>
         {% endif %}
diff --git a/templates/manage/users/users.twig b/templates/manage/users/users.twig
index 2871e072..3caff19b 100644
--- a/templates/manage/users/users.twig
+++ b/templates/manage/users/users.twig
@@ -4,16 +4,16 @@
 {% set users_pagination = pagination(manage_users_pagination, '/manage/users.php', null, {'v': 'listing'}) %}
 
 {% block manage_content %}
-    <div class="container manage__user-items">
+    <div class="container manage__users">
         {{ container_title('<i class="fas fa-users fa-fw"></i> Users') }}
 
         {% if users_pagination|trim|length > 0 %}
-            <div class="manage__user-items__pagination">
+            <div class="manage__users__pagination">
                 {{ users_pagination }}
             </div>
         {% endif %}
 
-        <div class="manage__user-items__collection">
+        <div class="manage__users__collection">
             {% for user in manage_users %}
                 <div class="manage__user-item{% if user.user_deleted is not null %} manage__user-item--deleted{% endif %}" style="{{ user.user_colour|html_colour('--accent-colour') }}">
                     <a href="{{ url('manage-user-edit', {'user': user.user_id}) }}" class="manage__user-item__background"></a>
@@ -54,7 +54,7 @@
         </div>
 
         {% if users_pagination|trim|length > 0 %}
-            <div class="manage__user-items__pagination">
+            <div class="manage__users__pagination">
                 {{ users_pagination }}
             </div>
         {% endif %}