diff --git a/app/graphql/types/ci/group_environment_scope_type.rb b/app/graphql/types/ci/group_environment_scope_type.rb
index 3a3a5a3f59feb30e4e38afff3a68300e37554231..0dd0ad963acd5c860b1ddb0230526d92aa6d7c28 100644
--- a/app/graphql/types/ci/group_environment_scope_type.rb
+++ b/app/graphql/types/ci/group_environment_scope_type.rb
@@ -7,7 +7,7 @@ class GroupEnvironmentScopeType < BaseObject
       graphql_name 'CiGroupEnvironmentScope'
       description 'Ci/CD environment scope for a group.'
 
-      connection_type_class(Types::Ci::GroupEnvironmentScopeConnectionType)
+      connection_type_class Types::Ci::GroupEnvironmentScopeConnectionType
 
       field :name, GraphQL::Types::String,
         null: true,
diff --git a/app/graphql/types/ci/group_variable_type.rb b/app/graphql/types/ci/group_variable_type.rb
index 7e2afba0d53c16d52c7be7d785036e8bd5713581..acb003b597741cc795590192ec5c0f123bdb578f 100644
--- a/app/graphql/types/ci/group_variable_type.rb
+++ b/app/graphql/types/ci/group_variable_type.rb
@@ -7,7 +7,7 @@ class GroupVariableType < BaseObject
       graphql_name 'CiGroupVariable'
       description 'CI/CD variables for a group.'
 
-      connection_type_class(Types::Ci::GroupVariableConnectionType)
+      connection_type_class Types::Ci::GroupVariableConnectionType
       implements(VariableInterface)
 
       field :environment_scope, GraphQL::Types::String,
diff --git a/app/graphql/types/ci/job_type.rb b/app/graphql/types/ci/job_type.rb
index 02b10f3e4bd6f42a0a3c2aafe5414e001c2303f4..22eb32993c5c2d166587d231d2cdb1f212029d16 100644
--- a/app/graphql/types/ci/job_type.rb
+++ b/app/graphql/types/ci/job_type.rb
@@ -9,7 +9,7 @@ class JobType < BaseObject
 
       present_using ::Ci::BuildPresenter
 
-      connection_type_class(Types::LimitedCountableConnectionType)
+      connection_type_class Types::LimitedCountableConnectionType
 
       expose_permissions Types::PermissionTypes::Ci::Job
 
diff --git a/app/graphql/types/ci/pipeline_schedule_type.rb b/app/graphql/types/ci/pipeline_schedule_type.rb
index 904fa3f1c72bb80bb4810303241b133b48d50128..71a1f28ea38c4c8989021ea9040e8ab711b0c0c0 100644
--- a/app/graphql/types/ci/pipeline_schedule_type.rb
+++ b/app/graphql/types/ci/pipeline_schedule_type.rb
@@ -7,7 +7,7 @@ class PipelineScheduleType < BaseObject
 
       description 'Represents a pipeline schedule'
 
-      connection_type_class(Types::CountableConnectionType)
+      connection_type_class Types::CountableConnectionType
 
       expose_permissions Types::PermissionTypes::Ci::PipelineSchedules
 
diff --git a/app/graphql/types/ci/pipeline_type.rb b/app/graphql/types/ci/pipeline_type.rb
index 19d261853a78c1ce614971dd5759214936ec16d5..ba638d4bc47fb846935f2c79bf9a2c97ffa810d1 100644
--- a/app/graphql/types/ci/pipeline_type.rb
+++ b/app/graphql/types/ci/pipeline_type.rb
@@ -5,7 +5,7 @@ module Ci
     class PipelineType < BaseObject
       graphql_name 'Pipeline'
 
-      connection_type_class(Types::CountableConnectionType)
+      connection_type_class Types::CountableConnectionType
 
       authorize :read_pipeline
       present_using ::Ci::PipelinePresenter
diff --git a/app/graphql/types/ci/project_variable_type.rb b/app/graphql/types/ci/project_variable_type.rb
index a9679000511286cffef9f8b02d9c65fe8913db50..8c1eb481774cc16beedd315a559d2a39ca37a294 100644
--- a/app/graphql/types/ci/project_variable_type.rb
+++ b/app/graphql/types/ci/project_variable_type.rb
@@ -7,7 +7,7 @@ class ProjectVariableType < BaseObject
       graphql_name 'CiProjectVariable'
       description 'CI/CD variables for a project.'
 
-      connection_type_class(Types::Ci::ProjectVariableConnectionType)
+      connection_type_class Types::Ci::ProjectVariableConnectionType
       implements(VariableInterface)
 
       field :environment_scope, GraphQL::Types::String,
diff --git a/app/graphql/types/ci/recent_failures_type.rb b/app/graphql/types/ci/recent_failures_type.rb
index 0892cb2735cd1c7ce39511a7d2ba3e64b03d0f72..37850c626586af58ab618fd4acb3e25a7fae1e94 100644
--- a/app/graphql/types/ci/recent_failures_type.rb
+++ b/app/graphql/types/ci/recent_failures_type.rb
@@ -7,7 +7,7 @@ class RecentFailuresType < BaseObject
       graphql_name 'RecentFailures'
       description 'Recent failure history of a test case.'
 
-      connection_type_class(Types::CountableConnectionType)
+      connection_type_class Types::CountableConnectionType
 
       field :count, GraphQL::Types::Int, null: true,
                                          description: 'Number of times the test case has failed in the past 14 days.'
diff --git a/app/graphql/types/ci/runner_manager_type.rb b/app/graphql/types/ci/runner_manager_type.rb
index 9c89b6537ea2745e41f63d44d49537458158fa28..b36c8f4286289a8b8d869e73d5b768ba63d9ff33 100644
--- a/app/graphql/types/ci/runner_manager_type.rb
+++ b/app/graphql/types/ci/runner_manager_type.rb
@@ -5,7 +5,7 @@ module Ci
     class RunnerManagerType < BaseObject
       graphql_name 'CiRunnerManager'
 
-      connection_type_class(::Types::CountableConnectionType)
+      connection_type_class ::Types::CountableConnectionType
 
       authorize :read_runner_manager
 
diff --git a/app/graphql/types/ci/runner_type.rb b/app/graphql/types/ci/runner_type.rb
index 2baf64ca6636a814ae264a32bec7e89b185c9fa2..cb340675b72131bf1bc8afb9f4018bc005a6a931 100644
--- a/app/graphql/types/ci/runner_type.rb
+++ b/app/graphql/types/ci/runner_type.rb
@@ -6,7 +6,7 @@ class RunnerType < BaseObject
       graphql_name 'CiRunner'
 
       edge_type_class(RunnerWebUrlEdge)
-      connection_type_class(RunnerCountableConnectionType)
+      connection_type_class RunnerCountableConnectionType
 
       authorize :read_runner
       present_using ::Ci::RunnerPresenter
diff --git a/app/graphql/types/ci/test_case_type.rb b/app/graphql/types/ci/test_case_type.rb
index f88923215eb0b0a5f4838d890405a2c08d878036..78c70fbcc7c1991bd0a1a3ce412696eb8a9e5fc9 100644
--- a/app/graphql/types/ci/test_case_type.rb
+++ b/app/graphql/types/ci/test_case_type.rb
@@ -7,7 +7,7 @@ class TestCaseType < BaseObject
       graphql_name 'TestCase'
       description 'Test case in pipeline test report.'
 
-      connection_type_class(Types::CountableConnectionType)
+      connection_type_class Types::CountableConnectionType
 
       field :status,
             Types::Ci::TestCaseStatusEnum,
diff --git a/app/graphql/types/ci/test_suite_summary_type.rb b/app/graphql/types/ci/test_suite_summary_type.rb
index 8801501c8d4efe825555d280b31c60ffa6f534b3..a98c47c6a301616142ca0401ffbd8f8583aa130e 100644
--- a/app/graphql/types/ci/test_suite_summary_type.rb
+++ b/app/graphql/types/ci/test_suite_summary_type.rb
@@ -7,7 +7,7 @@ class TestSuiteSummaryType < BaseObject
       graphql_name 'TestSuiteSummary'
       description 'Test suite summary in a pipeline test report.'
 
-      connection_type_class(Types::CountableConnectionType)
+      connection_type_class Types::CountableConnectionType
 
       field :name, GraphQL::Types::String, null: true,
                                            description: 'Name of the test suite.'
diff --git a/app/graphql/types/ci/test_suite_type.rb b/app/graphql/types/ci/test_suite_type.rb
index 8845338ed6db147ee5356fa80cef9f91b895332b..a5cc6282abc7e627b9c39c3e11285f8ab0b84e6b 100644
--- a/app/graphql/types/ci/test_suite_type.rb
+++ b/app/graphql/types/ci/test_suite_type.rb
@@ -7,7 +7,7 @@ class TestSuiteType < BaseObject
       graphql_name 'TestSuite'
       description 'Test suite in a pipeline test report.'
 
-      connection_type_class(Types::CountableConnectionType)
+      connection_type_class Types::CountableConnectionType
 
       field :name, GraphQL::Types::String, null: true,
                                            description: 'Name of the test suite.'
diff --git a/app/graphql/types/clusters/agent_activity_event_type.rb b/app/graphql/types/clusters/agent_activity_event_type.rb
index 1d0ec7c4959b8855ffe141fc5315a52e40ee7754..8c7dfa9c10af9dd8dab454cc60fe3ff91221a9db 100644
--- a/app/graphql/types/clusters/agent_activity_event_type.rb
+++ b/app/graphql/types/clusters/agent_activity_event_type.rb
@@ -7,7 +7,7 @@ class AgentActivityEventType < BaseObject
 
       authorize :read_cluster_agent
 
-      connection_type_class(Types::CountableConnectionType)
+      connection_type_class Types::CountableConnectionType
 
       field :recorded_at,
             Types::TimeType,
diff --git a/app/graphql/types/clusters/agent_token_type.rb b/app/graphql/types/clusters/agent_token_type.rb
index 720ee2f685bcaf28f9a670da7b23b128dc2bc362..260c634e12ec7b8bb545b78b938dad1e245921a4 100644
--- a/app/graphql/types/clusters/agent_token_type.rb
+++ b/app/graphql/types/clusters/agent_token_type.rb
@@ -7,7 +7,7 @@ class AgentTokenType < BaseObject
 
       authorize :read_cluster_agent
 
-      connection_type_class(Types::CountableConnectionType)
+      connection_type_class Types::CountableConnectionType
 
       field :cluster_agent,
             Types::Clusters::AgentType,
diff --git a/app/graphql/types/clusters/agent_type.rb b/app/graphql/types/clusters/agent_type.rb
index 317a1aab6289923821339bfcf9f6ecb2ea4b6d5c..c09897961419578aa195889164e54cb4547c6b78 100644
--- a/app/graphql/types/clusters/agent_type.rb
+++ b/app/graphql/types/clusters/agent_type.rb
@@ -7,7 +7,7 @@ class AgentType < BaseObject
 
       authorize :read_cluster_agent
 
-      connection_type_class(Types::CountableConnectionType)
+      connection_type_class Types::CountableConnectionType
 
       field :created_at,
             Types::TimeType,
diff --git a/app/graphql/types/issue_type.rb b/app/graphql/types/issue_type.rb
index 488e4d10cbcb0f11de878c59d6f17f25e2671665..8577d2b8dc5ea8707ff98cae00aefeb9460b8281 100644
--- a/app/graphql/types/issue_type.rb
+++ b/app/graphql/types/issue_type.rb
@@ -4,7 +4,7 @@ module Types
   class IssueType < BaseObject
     graphql_name 'Issue'
 
-    connection_type_class(Types::IssueConnectionType)
+    connection_type_class Types::IssueConnectionType
 
     implements(Types::Notes::NoteableInterface)
     implements(Types::CurrentUserTodos)
diff --git a/app/graphql/types/label_type.rb b/app/graphql/types/label_type.rb
index 05b703e60af6ead9b03268d1fedb7615a05040f3..4848ee30950b0ea16bd855515f7d22a2e3cc0063 100644
--- a/app/graphql/types/label_type.rb
+++ b/app/graphql/types/label_type.rb
@@ -4,7 +4,7 @@ module Types
   class LabelType < BaseObject
     graphql_name 'Label'
 
-    connection_type_class(Types::CountableConnectionType)
+    connection_type_class Types::CountableConnectionType
 
     authorize :read_label
 
diff --git a/app/graphql/types/merge_request_type.rb b/app/graphql/types/merge_request_type.rb
index a142d8f215d9f06fe5fcce0cf28b7c2dec69c53f..30878c17c6badc3aaa069d6a51bfda746ebc2154 100644
--- a/app/graphql/types/merge_request_type.rb
+++ b/app/graphql/types/merge_request_type.rb
@@ -4,7 +4,7 @@ module Types
   class MergeRequestType < BaseObject
     graphql_name 'MergeRequest'
 
-    connection_type_class(Types::MergeRequestConnectionType)
+    connection_type_class Types::MergeRequestConnectionType
 
     implements(Types::Notes::NoteableInterface)
     implements(Types::CurrentUserTodos)
diff --git a/app/graphql/types/packages/package_base_type.rb b/app/graphql/types/packages/package_base_type.rb
index 8dd2a4467d6cb72e79be6d98ecb9e386b11901a4..cc41169bcda41f68cce7b62c903e66aea3a0a958 100644
--- a/app/graphql/types/packages/package_base_type.rb
+++ b/app/graphql/types/packages/package_base_type.rb
@@ -6,7 +6,7 @@ class PackageBaseType < ::Types::BaseObject
       graphql_name 'PackageBase'
       description 'Represents a package in the Package Registry'
 
-      connection_type_class(Types::CountableConnectionType)
+      connection_type_class Types::CountableConnectionType
 
       authorize :read_package
 
diff --git a/app/graphql/types/project_type.rb b/app/graphql/types/project_type.rb
index 9d2a57388c716a026997f4e8870a1fc1f7511626..9e27594bed6d311047c189eb173f6f5bbc8f909f 100644
--- a/app/graphql/types/project_type.rb
+++ b/app/graphql/types/project_type.rb
@@ -4,7 +4,7 @@ module Types
   class ProjectType < BaseObject
     graphql_name 'Project'
 
-    connection_type_class(Types::CountableConnectionType)
+    connection_type_class Types::CountableConnectionType
 
     authorize :read_project
 
diff --git a/app/graphql/types/release_type.rb b/app/graphql/types/release_type.rb
index 8516256b433d7ca4466cd729b2113953ed916087..0bf723bcb1bbc39ddba1902bad886e3b6a4864ea 100644
--- a/app/graphql/types/release_type.rb
+++ b/app/graphql/types/release_type.rb
@@ -5,7 +5,7 @@ class ReleaseType < BaseObject
     graphql_name 'Release'
     description 'Represents a release'
 
-    connection_type_class(Types::CountableConnectionType)
+    connection_type_class Types::CountableConnectionType
 
     authorize :read_release
 
diff --git a/app/graphql/types/saved_reply_type.rb b/app/graphql/types/saved_reply_type.rb
index 8c9f3d198109b0a6535e07632699c5523b8f308d..74b3796ef8a3b14b5ed58a2e17b64534d9100d50 100644
--- a/app/graphql/types/saved_reply_type.rb
+++ b/app/graphql/types/saved_reply_type.rb
@@ -4,7 +4,7 @@ module Types
   class SavedReplyType < BaseObject
     graphql_name 'SavedReply'
 
-    connection_type_class(Types::CountableConnectionType)
+    connection_type_class Types::CountableConnectionType
 
     authorize :read_saved_replies
 
diff --git a/app/graphql/types/snippets/blob_type.rb b/app/graphql/types/snippets/blob_type.rb
index bb4a0a64de84f5577a277e15aa1b80deaf5b3cfc..2d1993225d141352cd7912aef29cbd2a85f6e82f 100644
--- a/app/graphql/types/snippets/blob_type.rb
+++ b/app/graphql/types/snippets/blob_type.rb
@@ -8,7 +8,7 @@ class BlobType < BaseObject
       description 'Represents the snippet blob'
       present_using SnippetBlobPresenter
 
-      connection_type_class(Types::Snippets::BlobConnectionType)
+      connection_type_class Types::Snippets::BlobConnectionType
 
       field :rich_data, GraphQL::Types::String,
             description: 'Blob highlighted data.',
diff --git a/app/graphql/types/terraform/state_type.rb b/app/graphql/types/terraform/state_type.rb
index be17fc41c2c1d1d4d9df9a57a1795dd11d8388cc..0870194a934d6951f08aea3ba9da74828ffa734c 100644
--- a/app/graphql/types/terraform/state_type.rb
+++ b/app/graphql/types/terraform/state_type.rb
@@ -7,7 +7,7 @@ class StateType < BaseObject
 
       authorize :read_terraform_state
 
-      connection_type_class(Types::CountableConnectionType)
+      connection_type_class Types::CountableConnectionType
 
       field :id, GraphQL::Types::ID,
             null: false,
diff --git a/app/graphql/types/timelog_type.rb b/app/graphql/types/timelog_type.rb
index 88baca028efc3f7f79e47fd5a460b9904a876dfa..2adf2847221af9a4e3dbeceef0ba741c6a08730e 100644
--- a/app/graphql/types/timelog_type.rb
+++ b/app/graphql/types/timelog_type.rb
@@ -4,7 +4,7 @@ module Types
   class TimelogType < BaseObject
     graphql_name 'Timelog'
 
-    connection_type_class(Types::TimeTracking::TimelogConnectionType)
+    connection_type_class Types::TimeTracking::TimelogConnectionType
 
     authorize :read_issuable
 
diff --git a/ee/app/graphql/types/ci/catalog/resource_type.rb b/ee/app/graphql/types/ci/catalog/resource_type.rb
index 773dbf7677d78d1c9763a6392bbb367e42e55271..ffff5d72275be8d0b5dcfb06a6c6b0f0d064064c 100644
--- a/ee/app/graphql/types/ci/catalog/resource_type.rb
+++ b/ee/app/graphql/types/ci/catalog/resource_type.rb
@@ -7,7 +7,7 @@ module Catalog
       class ResourceType < BaseObject
         graphql_name 'CiCatalogResource'
 
-        connection_type_class(Types::CountableConnectionType)
+        connection_type_class Types::CountableConnectionType
 
         field :id, GraphQL::Types::ID, null: false, description: 'ID of the catalog resource.',
           alpha: { milestone: '15.11' }
diff --git a/ee/app/graphql/types/ci/code_quality_degradation_type.rb b/ee/app/graphql/types/ci/code_quality_degradation_type.rb
index 24a65a4ada7140134de06dd1f9e5a661242d0671..6c998cb82da4b06ca75d440161ad3a40fb5f2333 100644
--- a/ee/app/graphql/types/ci/code_quality_degradation_type.rb
+++ b/ee/app/graphql/types/ci/code_quality_degradation_type.rb
@@ -7,7 +7,7 @@ class CodeQualityDegradationType < BaseObject
       graphql_name 'CodeQualityDegradation'
       description 'Represents a code quality degradation on the pipeline.'
 
-      connection_type_class(Types::CountableConnectionType)
+      connection_type_class Types::CountableConnectionType
 
       alias_method :degradation, :object
 
diff --git a/ee/app/graphql/types/dast/profile_type.rb b/ee/app/graphql/types/dast/profile_type.rb
index 648f6ac679d63604be62ea94b1ce5d3307798e60..2d4d372e65ef4283463f79432370fa5adb3d2caf 100644
--- a/ee/app/graphql/types/dast/profile_type.rb
+++ b/ee/app/graphql/types/dast/profile_type.rb
@@ -6,7 +6,7 @@ class ProfileType < BaseObject
       graphql_name 'DastProfile'
       description 'Represents a DAST Profile'
 
-      connection_type_class(Types::CountableConnectionType)
+      connection_type_class Types::CountableConnectionType
 
       authorize :read_on_demand_dast_scan
 
diff --git a/ee/app/graphql/types/epic_type.rb b/ee/app/graphql/types/epic_type.rb
index 3fcd39476ccbea8b9ec852f03c522ff63956df7a..5b5a2dc2b82f019af3ff35e746b6e6dba0521381 100644
--- a/ee/app/graphql/types/epic_type.rb
+++ b/ee/app/graphql/types/epic_type.rb
@@ -5,7 +5,7 @@ class EpicType < BaseObject
     graphql_name 'Epic'
     description 'Represents an epic'
 
-    connection_type_class(Types::CountableConnectionType)
+    connection_type_class Types::CountableConnectionType
 
     include ::Gitlab::Graphql::Aggregations::Epics::Constants