diff --git a/modules/backlogs/app/models/queries/backlog_buckets.rb b/modules/backlogs/app/models/queries/backlog_buckets.rb
index 62cf00316f2..b01ee2bf216 100644
--- a/modules/backlogs/app/models/queries/backlog_buckets.rb
+++ b/modules/backlogs/app/models/queries/backlog_buckets.rb
@@ -29,7 +29,7 @@
 # ++
 
 module Queries::BacklogBuckets
-  ::Queries::Register.register(BacklogBucketQuery) do
+  ::Queries::Register.register(Query) do
     order Orders::DefaultOrder
   end
 end
diff --git a/modules/backlogs/app/models/queries/backlog_buckets/backlog_bucket_query.rb b/modules/backlogs/app/models/queries/backlog_buckets/query.rb
similarity index 98%
rename from modules/backlogs/app/models/queries/backlog_buckets/backlog_bucket_query.rb
rename to modules/backlogs/app/models/queries/backlog_buckets/query.rb
index 33e2f2289db..c134e744ac0 100644
--- a/modules/backlogs/app/models/queries/backlog_buckets/backlog_bucket_query.rb
+++ b/modules/backlogs/app/models/queries/backlog_buckets/query.rb
@@ -30,7 +30,7 @@
 
 module Queries
   module BacklogBuckets
-    class BacklogBucketQuery
+    class Query
       include ::Queries::BaseQuery
       include ::Queries::UnpersistedQuery
 
diff --git a/modules/backlogs/app/models/queries/sprints.rb b/modules/backlogs/app/models/queries/sprints.rb
index 28f66af0e2c..6da05a142ec 100644
--- a/modules/backlogs/app/models/queries/sprints.rb
+++ b/modules/backlogs/app/models/queries/sprints.rb
@@ -29,7 +29,7 @@
 # ++
 
 module Queries::Sprints
-  ::Queries::Register.register(SprintQuery) do
+  ::Queries::Register.register(Query) do
     filter Filters::NameFilter
     filter Filters::ProjectFilter
     filter Filters::StatusFilter
diff --git a/modules/backlogs/app/models/queries/sprints/sprint_query.rb b/modules/backlogs/app/models/queries/sprints/query.rb
similarity index 98%
rename from modules/backlogs/app/models/queries/sprints/sprint_query.rb
rename to modules/backlogs/app/models/queries/sprints/query.rb
index 8b81b35b78d..8a71e1a0bc9 100644
--- a/modules/backlogs/app/models/queries/sprints/sprint_query.rb
+++ b/modules/backlogs/app/models/queries/sprints/query.rb
@@ -30,7 +30,7 @@
 
 module Queries
   module Sprints
-    class SprintQuery
+    class Query
       include ::Queries::BaseQuery
       include ::Queries::UnpersistedQuery
 
diff --git a/modules/backlogs/spec/models/queries/sprints/sprint_query_integration_spec.rb b/modules/backlogs/spec/models/queries/sprints/query_integration_spec.rb
similarity index 98%
rename from modules/backlogs/spec/models/queries/sprints/sprint_query_integration_spec.rb
rename to modules/backlogs/spec/models/queries/sprints/query_integration_spec.rb
index 6e1de23c81a..9662dad83f3 100644
--- a/modules/backlogs/spec/models/queries/sprints/sprint_query_integration_spec.rb
+++ b/modules/backlogs/spec/models/queries/sprints/query_integration_spec.rb
@@ -30,7 +30,7 @@
 
 require "spec_helper"
 
-RSpec.describe Queries::Sprints::SprintQuery, "integration" do
+RSpec.describe Queries::Sprints::Query, "integration" do
   shared_let(:project) { create(:project, public: false) }
   shared_let(:other_project) { create(:project, public: false) }
   shared_let(:project_without_permission) { create(:project, public: false) }