diff --git a/.doctor-rst.yaml b/.doctor-rst.yaml
index e926a3cc77d..50a78ed21fb 100644
--- a/.doctor-rst.yaml
+++ b/.doctor-rst.yaml
@@ -2,7 +2,6 @@ rules:
     american_english: ~
     argument_variable_must_match_type:
         arguments:
-            - { type: 'ContainerBuilder', name: 'container' }
             - { type: 'ContainerConfigurator', name: 'container' }
     avoid_repetetive_words: ~
     blank_line_after_anchor: ~
diff --git a/bundles/configuration.rst b/bundles/configuration.rst
index c155fe8a56a..8f182f113b7 100644
--- a/bundles/configuration.rst
+++ b/bundles/configuration.rst
@@ -353,11 +353,11 @@ logic to the bundle class directly::
             ;
         }
 
-        public function loadExtension(array $config, ContainerConfigurator $containerConfigurator, ContainerBuilder $containerBuilder): void
+        public function loadExtension(array $config, ContainerConfigurator $container, ContainerBuilder $builder): void
         {
             // Contrary to the Extension class, the "$config" variable is already merged
             // and processed. You can use it directly to configure the service container.
-            $containerConfigurator->services()
+            $container->services()
                 ->get('acme.social.twitter_client')
                 ->arg(0, $config['twitter']['client_id'])
                 ->arg(1, $config['twitter']['client_secret'])
diff --git a/bundles/extension.rst b/bundles/extension.rst
index 8b2928358ad..861c7b60807 100644
--- a/bundles/extension.rst
+++ b/bundles/extension.rst
@@ -127,18 +127,18 @@ method::
 
     class AcmeHelloBundle extends AbstractBundle
     {
-        public function loadExtension(array $config, ContainerConfigurator $containerConfigurator, ContainerBuilder $containerBuilder): void
+        public function loadExtension(array $config, ContainerConfigurator $container, ContainerBuilder $builder): void
         {
             // load an XML, PHP or Yaml file
-            $containerConfigurator->import('../config/services.xml');
+            $container->import('../config/services.xml');
 
             // you can also add or replace parameters and services
-            $containerConfigurator->parameters()
+            $container->parameters()
                 ->set('acme_hello.phrase', $config['phrase'])
             ;
 
             if ($config['scream']) {
-                $containerConfigurator->services()
+                $container->services()
                     ->get('acme_hello.printer')
                         ->class(ScreamingPrinter::class)
                 ;
diff --git a/configuration/micro_kernel_trait.rst b/configuration/micro_kernel_trait.rst
index 4b538f1b6e4..9617d837673 100644
--- a/configuration/micro_kernel_trait.rst
+++ b/configuration/micro_kernel_trait.rst
@@ -330,10 +330,10 @@ add a service conditionally based on the ``foo`` value::
                 ->end();
         }
 
-        public function loadExtension(array $config, ContainerConfigurator $containerConfigurator, ContainerBuilder $containerBuilder): void
+        public function loadExtension(array $config, ContainerConfigurator $container, ContainerBuilder $builder): void
         {
             if ($config['foo']) {
-                $containerBuilder->register('foo_service', \stdClass::class);
+                $builder->register('foo_service', \stdClass::class);
             }
         }
     }