diff --git a/public/manage/users.php b/public/manage/users.php
index 6a010c68..49319887 100644
--- a/public/manage/users.php
+++ b/public/manage/users.php
@@ -32,7 +32,6 @@ switch ($_GET['v'] ?? null) {
         $getManageUsers->bindValue('take', $usersTake);
         $manageUsers = $getManageUsers->execute() ? $getManageUsers->fetchAll() : [];
 
-        //$manage_users = UserV1::paginate(32, ['*'], 'p', $page_id);
         $templating->vars([
             'manage_users' => $manageUsers,
             'manage_users_count' => $manageUsersCount,
@@ -97,7 +96,6 @@ switch ($_GET['v'] ?? null) {
         $getManageRoles->bindValue('take', $rolesTake);
         $manageRoles = $getManageRoles->execute() ? $getManageRoles->fetchAll() : [];
 
-        //$manage_roles = Role::paginate(10, ['*'], 'p', $page_id);
         $templating->vars([
             'manage_roles' => $manageRoles,
             'manage_roles_count' => $manageRolesCount,
diff --git a/views/manage/macros.twig b/views/manage/macros.twig
index d437a281..f1b8a9bc 100644
--- a/views/manage/macros.twig
+++ b/views/manage/macros.twig
@@ -14,7 +14,7 @@
     {% endfor %}
 {% endmacro %}
 
-{% macro paginate(itemCount, itemRange, currentOffset, baseUrl, classPrefix, alwaysRender, useRanges, offsetParam, pageRange) %}
+{% macro pagination(itemCount, itemRange, currentOffset, baseUrl, classPrefix, alwaysRender, useRanges, offsetParam, pageRange) %}
     {% set alwaysRender = alwaysRender|default(false) %}
 
     {% if alwaysRender or itemCount > itemRange %}
diff --git a/views/manage/users/listing.twig b/views/manage/users/listing.twig
index e131e508..0594bd3b 100644
--- a/views/manage/users/listing.twig
+++ b/views/manage/users/listing.twig
@@ -1,5 +1,5 @@
 {% extends '@manage/users/master.twig' %}
-{% from '@manage/macros.twig' import paginate %}
+{% from '@manage/macros.twig' import pagination %}
 
 {% block content %}
     <div class="container listing user-listing">
@@ -16,6 +16,6 @@
     </div>
 
     <div class="container container--center">
-        {{ paginate(manage_users_count, manage_users_range, manage_users_offset, '?v=listing') }}
+        {{ pagination(manage_users_count, manage_users_range, manage_users_offset, '?v=listing') }}
     </div>
 {% endblock %}
diff --git a/views/manage/users/roles.twig b/views/manage/users/roles.twig
index 1909f318..4102ea8c 100644
--- a/views/manage/users/roles.twig
+++ b/views/manage/users/roles.twig
@@ -1,5 +1,5 @@
 {% extends '@manage/users/master.twig' %}
-{% from '@manage/macros.twig' import paginate %}
+{% from '@manage/macros.twig' import pagination %}
 
 {% block content %}
     <div class="container">
@@ -18,6 +18,6 @@
     </div>
 
     <div class="container container--center">
-        {{ paginate(manage_roles_count, manage_roles_range, manage_roles_offset, '?v=roles') }}
+        {{ pagination(manage_roles_count, manage_roles_range, manage_roles_offset, '?v=roles') }}
     </div>
 {% endblock %}
diff --git a/views/mio/forum/forum.twig b/views/mio/forum/forum.twig
index b388f242..eb74c174 100644
--- a/views/mio/forum/forum.twig
+++ b/views/mio/forum/forum.twig
@@ -1,5 +1,5 @@
 {% extends '@mio/forum/master.twig' %}
-{% from '@mio/macros.twig' import navigation, paginate %}
+{% from '@mio/macros.twig' import navigation, pagination %}
 {% from '@mio/forum/macros.twig' import forum_category_listing, forum_topic_listing, forum_category_buttons %}
 
 {% set title = forum_info.forum_name %}
@@ -14,7 +14,7 @@
 
     {% if forum_info.forum_type == 0 %}
         {% set fcbuttons = forum_category_buttons(forum_info) %}
-        {% set fcpagination = paginate(forum_topics|length, 20, 0, canonical_url) %}
+        {% set fcpagination = pagination(forum_topics|length, 20, 0, canonical_url) %}
 
         {{ fcbuttons }}
         {{ fcpagination }}
diff --git a/views/mio/forum/topic.twig b/views/mio/forum/topic.twig
index 7ff5bd14..fa786209 100644
--- a/views/mio/forum/topic.twig
+++ b/views/mio/forum/topic.twig
@@ -1,5 +1,5 @@
 {% extends '@mio/forum/master.twig' %}
-{% from '@mio/macros.twig' import navigation, paginate %}
+{% from '@mio/macros.twig' import navigation, pagination %}
 {% from '@mio/forum/macros.twig' import forum_post_listing %}
 
 {% set title = topic_info.topic_title %}
diff --git a/views/mio/macros.twig b/views/mio/macros.twig
index 7e21f21e..99191048 100644
--- a/views/mio/macros.twig
+++ b/views/mio/macros.twig
@@ -19,7 +19,7 @@
 
 {% macro pagination_class(className, classPrefix) %}{{ className }}{% if classPrefix|length > 0 %} {{ classPrefix ~ className }}{% endif %}{% endmacro %}
 
-{% macro paginate(itemCount, itemRange, currentOffset, baseUrl, classPrefix, alwaysRender, useRanges, offsetParam, pageRange) %}
+{% macro pagination(itemCount, itemRange, currentOffset, baseUrl, classPrefix, alwaysRender, useRanges, offsetParam, pageRange) %}
     {% set alwaysRender = alwaysRender|default(false) %}
 
     {% if alwaysRender or itemCount > itemRange %}
diff --git a/views/mio/news/category.twig b/views/mio/news/category.twig
index be011d32..1f7a5779 100644
--- a/views/mio/news/category.twig
+++ b/views/mio/news/category.twig
@@ -1,5 +1,5 @@
 {% extends '@mio/news/master.twig' %}
-{% from '@mio/macros.twig' import paginate %}
+{% from '@mio/macros.twig' import pagination %}
 {% from '@mio/news/macros.twig' import news_preview %}
 
 {% set title = category.category_name ~ ' :: News' %}
@@ -27,6 +27,7 @@
                         </div>
                     </div>
                 {% endif %}
+
                 {% if featured|length > 0 %}
                     <div class="container news__list">
                         <div class="container__title">
@@ -39,7 +40,8 @@
                         </div>
                     </div>
                 {% endif %}
-                {{ paginate(category.posts_count, posts_take, posts_offset, '/news.php?c=' ~ category.category_id) }}
+
+                {{ pagination(category.posts_count, posts_take, posts_offset, '/news.php?c=' ~ category.category_id) }}
             </div>
         </div>
     </div>
diff --git a/views/mio/news/index.twig b/views/mio/news/index.twig
index b7daea08..7ef8c840 100644
--- a/views/mio/news/index.twig
+++ b/views/mio/news/index.twig
@@ -1,5 +1,5 @@
 {% extends '@mio/news/master.twig' %}
-{% from '@mio/macros.twig' import paginate %}
+{% from '@mio/macros.twig' import pagination %}
 {% from '@mio/news/macros.twig' import news_preview %}
 
 {% set title = 'News' %}
@@ -34,7 +34,8 @@
                         {% endfor %}
                     </div>
                 </div>
-                {{ paginate(posts_count, posts_take, posts_offset, '/news.php') }}
+
+                {{ pagination(posts_count, posts_take, posts_offset, '/news.php') }}
             </div>
         </div>
     </div>
diff --git a/views/mio/settings/login-history.twig b/views/mio/settings/login-history.twig
index 1c85fb8a..a3c4c38e 100644
--- a/views/mio/settings/login-history.twig
+++ b/views/mio/settings/login-history.twig
@@ -1,5 +1,5 @@
 {% extends '@mio/settings/master.twig' %}
-{% from '@mio/macros.twig' import paginate %}
+{% from '@mio/macros.twig' import pagination %}
 
 {% block settings_content %}
     <div class="settings__description">
@@ -49,6 +49,6 @@
             </div>
         {% endfor %}
 
-        {{ paginate(login_attempts_count, login_attempts_take, login_attempts_offset, '?m=login-history', 'settings__') }}
+        {{ pagination(login_attempts_count, login_attempts_take, login_attempts_offset, '?m=login-history', 'settings__') }}
     </div>
 {% endblock %}
diff --git a/views/mio/settings/sessions.twig b/views/mio/settings/sessions.twig
index d637f0a0..0890769c 100644
--- a/views/mio/settings/sessions.twig
+++ b/views/mio/settings/sessions.twig
@@ -1,5 +1,5 @@
 {% extends '@mio/settings/master.twig' %}
-{% from '@mio/macros.twig' import paginate %}
+{% from '@mio/macros.twig' import pagination %}
 
 {% block settings_content %}
     <div class="settings__description">
@@ -60,6 +60,6 @@
             </div>
         {% endfor %}
 
-        {{ paginate(sessions_count, sessions_take, sessions_offset, '?m=sessions', 'settings__') }}
+        {{ pagination(sessions_count, sessions_take, sessions_offset, '?m=sessions', 'settings__') }}
     </div>
 {% endblock %}