diff --git a/app/controllers/application_controller/renders_models.rb b/app/controllers/application_controller/renders_models.rb
index 622384a14..50d3d9372 100644
--- a/app/controllers/application_controller/renders_models.rb
+++ b/app/controllers/application_controller/renders_models.rb
@@ -3,7 +3,7 @@
 module ApplicationController::RendersModels
   extend ActiveSupport::Concern
 
-  include ApplicationController::Paginates
+  include CanPaginate
 
   private
 
diff --git a/app/controllers/application_controller/paginates.rb b/app/controllers/concerns/can_paginate.rb
similarity index 60%
rename from app/controllers/application_controller/paginates.rb
rename to app/controllers/concerns/can_paginate.rb
index f0928c016..6fe5ceeaa 100644
--- a/app/controllers/application_controller/paginates.rb
+++ b/app/controllers/concerns/can_paginate.rb
@@ -1,6 +1,6 @@
 # Copyright (C) 2012-2021 Zammad Foundation, http://zammad-foundation.org/
 
-module ApplicationController::Paginates
+module CanPaginate
   extend ActiveSupport::Concern
 
   def paginate_with(max: nil, default: nil)
@@ -11,6 +11,6 @@ module ApplicationController::Paginates
   private
 
   def pagination
-    @pagination ||= ::ApplicationController::Paginates::Pagination.new(params, max: @paginate_max, default: @paginate_default)
+    @pagination ||= CanPaginate::Pagination.new(params, max: @paginate_max, default: @paginate_default)
   end
 end
diff --git a/app/controllers/application_controller/paginates/pagination.rb b/app/controllers/concerns/can_paginate/pagination.rb
similarity index 89%
rename from app/controllers/application_controller/paginates/pagination.rb
rename to app/controllers/concerns/can_paginate/pagination.rb
index 73a31d34d..030bd4932 100644
--- a/app/controllers/application_controller/paginates/pagination.rb
+++ b/app/controllers/concerns/can_paginate/pagination.rb
@@ -1,6 +1,6 @@
 # Copyright (C) 2012-2021 Zammad Foundation, http://zammad-foundation.org/
 
-class ApplicationController::Paginates::Pagination
+class CanPaginate::Pagination
 
   def initialize(params, default: nil, max: nil)
     @params  = params
diff --git a/app/controllers/knowledge_base/search_controller.rb b/app/controllers/knowledge_base/search_controller.rb
index 71b86da56..010107171 100644
--- a/app/controllers/knowledge_base/search_controller.rb
+++ b/app/controllers/knowledge_base/search_controller.rb
@@ -6,7 +6,7 @@ class KnowledgeBase::SearchController < ApplicationController
 
   include KnowledgeBaseHelper
   include ActionView::Helpers::SanitizeHelper
-  include ApplicationController::Paginates
+  include CanPaginate
 
   # POST /api/v1/knowledge_bases/search
   # knowledge_base_id, locale, flavor, index, page, per_page, limit, include_locale
diff --git a/app/controllers/organizations_controller.rb b/app/controllers/organizations_controller.rb
index e6bf14734..594e23e64 100644
--- a/app/controllers/organizations_controller.rb
+++ b/app/controllers/organizations_controller.rb
@@ -4,7 +4,7 @@ class OrganizationsController < ApplicationController
   prepend_before_action -> { authorize! }, except: %i[index show]
   prepend_before_action { authentication_check }
 
-  include ApplicationController::Paginates
+  include CanPaginate
 
 =begin
 
diff --git a/app/controllers/tickets_controller.rb b/app/controllers/tickets_controller.rb
index 1f90c57ae..3f08713f2 100644
--- a/app/controllers/tickets_controller.rb
+++ b/app/controllers/tickets_controller.rb
@@ -5,7 +5,7 @@ class TicketsController < ApplicationController
   include ClonesTicketArticleAttachments
   include ChecksUserAttributesByCurrentUserPermission
   include TicketStats
-  include ApplicationController::Paginates
+  include CanPaginate
 
   prepend_before_action -> { authorize! }, only: %i[create selector import_example import_start ticket_customer ticket_history ticket_related ticket_recent ticket_merge ticket_split]
   prepend_before_action :authentication_check
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 5ab176c9a..d69bea299 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -2,7 +2,7 @@
 
 class UsersController < ApplicationController
   include ChecksUserAttributesByCurrentUserPermission
-  include ApplicationController::Paginates
+  include CanPaginate
 
   prepend_before_action -> { authorize! }, only: %i[import_example import_start search history unlock]
   prepend_before_action :authentication_check, except: %i[create password_reset_send password_reset_verify image email_verify email_verify_send]
diff --git a/spec/controllers/application_controller/paginates/pagination_spec.rb b/spec/controllers/can_paginate/pagination_spec.rb
similarity index 97%
rename from spec/controllers/application_controller/paginates/pagination_spec.rb
rename to spec/controllers/can_paginate/pagination_spec.rb
index 3fd1bd5a3..83b7c7a99 100644
--- a/spec/controllers/application_controller/paginates/pagination_spec.rb
+++ b/spec/controllers/can_paginate/pagination_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-RSpec.describe ApplicationController::Paginates::Pagination do
+RSpec.describe CanPaginate::Pagination do
   describe '#limit' do
     it 'returns as set in params' do
       instance = described_class.new({ per_page: 123 })
diff --git a/spec/factories/controllers/application_controller/paginates/pagination.rb b/spec/factories/controllers/application_controller/paginates/pagination.rb
index 781dae616..5b69d4d0c 100644
--- a/spec/factories/controllers/application_controller/paginates/pagination.rb
+++ b/spec/factories/controllers/application_controller/paginates/pagination.rb
@@ -1,7 +1,7 @@
 # Copyright (C) 2012-2021 Zammad Foundation, http://zammad-foundation.org/
 
 FactoryBot.define do
-  factory :'application_controller/paginates/pagination', aliases: %i[pagination] do
+  factory :'can_paginate/pagination', aliases: %i[pagination] do
 
     params  { {} }
     default { nil }