diff --git a/modules/backlogs/lib/open_project/backlogs/engine.rb b/modules/backlogs/lib/open_project/backlogs/engine.rb
index 24a081d5f7c..100350c11e2 100644
--- a/modules/backlogs/lib/open_project/backlogs/engine.rb
+++ b/modules/backlogs/lib/open_project/backlogs/engine.rb
@@ -248,7 +248,7 @@ module OpenProject::Backlogs
 
         select OpenProject::Backlogs::QueryBacklogsSelect
         select OpenProject::Backlogs::WorkPackageSprintSelect
-        select OpenProject::Backlogs::WorkPackageBacklogBucketSelect
+        select OpenProject::Backlogs::WorkPackageBucketSelect
       end
     end
   end
diff --git a/modules/backlogs/lib/open_project/backlogs/work_package_backlog_bucket_select.rb b/modules/backlogs/lib/open_project/backlogs/work_package_bucket_select.rb
similarity index 97%
rename from modules/backlogs/lib/open_project/backlogs/work_package_backlog_bucket_select.rb
rename to modules/backlogs/lib/open_project/backlogs/work_package_bucket_select.rb
index 8267d5cc71a..c74ca9d190f 100644
--- a/modules/backlogs/lib/open_project/backlogs/work_package_backlog_bucket_select.rb
+++ b/modules/backlogs/lib/open_project/backlogs/work_package_bucket_select.rb
@@ -29,7 +29,7 @@
 #++
 
 module OpenProject::Backlogs
-  class WorkPackageBacklogBucketSelect < Queries::WorkPackages::Selects::WorkPackageSelect
+  class WorkPackageBucketSelect < Queries::WorkPackages::Selects::WorkPackageSelect
     attr_reader :project
 
     def self.instances(context = nil)
diff --git a/modules/backlogs/spec/models/queries/backlog_buckets/selects/work_package_backlog_bucket_select_spec.rb b/modules/backlogs/spec/models/queries/backlog_buckets/selects/work_package_bucket_select_spec.rb
similarity index 96%
rename from modules/backlogs/spec/models/queries/backlog_buckets/selects/work_package_backlog_bucket_select_spec.rb
rename to modules/backlogs/spec/models/queries/backlog_buckets/selects/work_package_bucket_select_spec.rb
index 82dd00c6166..b2ba2726802 100644
--- a/modules/backlogs/spec/models/queries/backlog_buckets/selects/work_package_backlog_bucket_select_spec.rb
+++ b/modules/backlogs/spec/models/queries/backlog_buckets/selects/work_package_bucket_select_spec.rb
@@ -30,7 +30,7 @@
 
 require "spec_helper"
 
-RSpec.describe OpenProject::Backlogs::WorkPackageBacklogBucketSelect do # rubocop:disable RSpec/SpecFilePathFormat
+RSpec.describe OpenProject::Backlogs::WorkPackageBucketSelect do # rubocop:disable RSpec/SpecFilePathFormat
   describe ".instances" do
     context "when user has permission to view sprints in a project" do
       let(:project) { build_stubbed(:project, enabled_module_names: %w[backlogs]) }