diff --git a/core/core.api.php b/core/core.api.php
index 3725ccb464796ce97257f70261a0b6b39e3d2c54..4bf6310259398bdeb13570f29f36b038a40b8a7c 100644
--- a/core/core.api.php
+++ b/core/core.api.php
@@ -477,7 +477,7 @@
  *   class: Drupal\Core\Cache\CacheBackendInterface
  *   tags:
  *     - { name: cache.bin }
- *   factory: cache_factory:get
+ *   factory: ['@cache_factory', 'get']
  *   arguments: [nameofbin]
  * @endcode
  * See the @link container Services topic @endlink for more on defining
@@ -772,7 +772,7 @@
  *     class: Drupal\Core\Cache\CacheBackendInterface
  *     tags:
  *       - { name: cache.bin }
- *     factory: cache_factory:get
+ *     factory: ['@cache_factory', 'get']
  *     arguments: [entity]
  * @endcode
  *
diff --git a/core/core.services.yml b/core/core.services.yml
index d587c55d9c780f0fc560f3080ede2fd16cd933c9..cde2ebaac6b03826ce432696a40ab0239456b65f 100644
--- a/core/core.services.yml
+++ b/core/core.services.yml
@@ -212,55 +212,55 @@ services:
     class: Drupal\Core\Cache\CacheBackendInterface
     tags:
       - { name: cache.bin, default_backend: cache.backend.memory }
-    factory: cache_factory:get
+    factory: ['@cache_factory', 'get']
     arguments: [static]
   cache.bootstrap:
     class: Drupal\Core\Cache\CacheBackendInterface
     tags:
       - { name: cache.bin, default_backend: cache.backend.chainedfast }
-    factory: cache_factory:get
+    factory: ['@cache_factory', 'get']
     arguments: [bootstrap]
   cache.config:
     class: Drupal\Core\Cache\CacheBackendInterface
     tags:
       - { name: cache.bin, default_backend: cache.backend.chainedfast }
-    factory: cache_factory:get
+    factory: ['@cache_factory', 'get']
     arguments: [config]
   cache.default:
     class: Drupal\Core\Cache\CacheBackendInterface
     tags:
       - { name: cache.bin }
-    factory: cache_factory:get
+    factory: ['@cache_factory', 'get']
     arguments: [default]
   cache.entity:
     class: Drupal\Core\Cache\CacheBackendInterface
     tags:
       - { name: cache.bin }
-    factory: cache_factory:get
+    factory: ['@cache_factory', 'get']
     arguments: [entity]
   cache.menu:
     class: Drupal\Core\Cache\CacheBackendInterface
     tags:
       - { name: cache.bin }
-    factory: cache_factory:get
+    factory: ['@cache_factory', 'get']
     arguments: [menu]
   cache.render:
     class: Drupal\Core\Cache\CacheBackendInterface
     tags:
       - { name: cache.bin }
-    factory: cache_factory:get
+    factory: ['@cache_factory', 'get']
     arguments: [render]
   cache.data:
     class: Drupal\Core\Cache\CacheBackendInterface
     tags:
       - { name: cache.bin }
-    factory: cache_factory:get
+    factory: ['@cache_factory', 'get']
     arguments: [data]
   cache.discovery:
     class: Drupal\Core\Cache\CacheBackendInterface
     tags:
       - { name: cache.bin, default_backend: cache.backend.chainedfast }
-    factory: cache_factory:get
+    factory: ['@cache_factory', 'get']
     arguments: [discovery]
   cache_router_rebuild_subscriber:
     class: Drupal\Core\EventSubscriber\CacheRouterRebuildSubscriber
@@ -419,7 +419,7 @@ services:
   logger.channel_base:
     abstract: true
     class: Drupal\Core\Logger\LoggerChannel
-    factory: logger.factory:get
+    factory: ['@logger.factory', 'get']
   logger.channel.default:
     parent: logger.channel_base
     arguments: ['system']
@@ -434,7 +434,7 @@ services:
     arguments: ['cron']
   logger.channel.file:
     class: Drupal\Core\Logger\LoggerChannel
-    factory: logger.factory:get
+    factory: ['@logger.factory', 'get']
     arguments: ['file']
   logger.channel.form:
     parent: logger.channel_base
@@ -480,7 +480,7 @@ services:
     arguments: ['@service_container']
   http_client:
     class: GuzzleHttp\Client
-    factory: http_client_factory:fromOptions
+    factory: ['@http_client_factory', 'fromOptions']
   http_client_factory:
     class: Drupal\Core\Http\ClientFactory
     arguments: ['@http_handler_stack']
@@ -698,7 +698,7 @@ services:
     arguments: ['@service_container']
   app.root:
     class: SplString
-    factory: app.root.factory:get
+    factory: ['@app.root.factory', 'get']
     tags:
       - { name: parameter_service }
   app.root.factory:
@@ -707,7 +707,7 @@ services:
     public: false
   site.path:
     class: SplString
-    factory: site.path.factory:get
+    factory: ['@site.path.factory', 'get']
     tags:
       - { name: parameter_service }
   site.path.factory:
diff --git a/core/modules/contact/contact.services.yml b/core/modules/contact/contact.services.yml
index cec2c57e05dfe659a77c7b2276e11a02294784b1..fef18ce78ca04f745aba9b56612c9c1a2e6b34dd 100644
--- a/core/modules/contact/contact.services.yml
+++ b/core/modules/contact/contact.services.yml
@@ -9,5 +9,5 @@ services:
     arguments: ['@plugin.manager.mail', '@language_manager', '@logger.channel.contact', '@string_translation', '@entity_type.manager']
   logger.channel.contact:
     class: Drupal\Core\Logger\LoggerChannel
-    factory: logger.factory:get
+    factory: ['@logger.factory', 'get']
     arguments: ['contact']
diff --git a/core/modules/dynamic_page_cache/dynamic_page_cache.services.yml b/core/modules/dynamic_page_cache/dynamic_page_cache.services.yml
index 241999233dbeb05df7185b6c3eaed35c2b3dfd1e..2d1aea97c6c1a578b229cba980bcf4ffe0fc4c3b 100644
--- a/core/modules/dynamic_page_cache/dynamic_page_cache.services.yml
+++ b/core/modules/dynamic_page_cache/dynamic_page_cache.services.yml
@@ -3,7 +3,7 @@ services:
     class: Drupal\Core\Cache\CacheBackendInterface
     tags:
       - { name: cache.bin }
-    factory: cache_factory:get
+    factory: ['@cache_factory', 'get']
     arguments: [dynamic_page_cache]
   dynamic_page_cache_subscriber:
     class: Drupal\dynamic_page_cache\EventSubscriber\DynamicPageCacheSubscriber
diff --git a/core/modules/jsonapi/jsonapi.services.yml b/core/modules/jsonapi/jsonapi.services.yml
index ab41e429df4ac89d7119c5b834521aff086fb49b..0894d3dc4de359e8a59ef4bcf6c76de7d8e9765e 100644
--- a/core/modules/jsonapi/jsonapi.services.yml
+++ b/core/modules/jsonapi/jsonapi.services.yml
@@ -138,7 +138,7 @@ services:
     class: Drupal\Core\Cache\CacheBackendInterface
     tags:
       - { name: cache.bin }
-    factory: cache_factory:get
+    factory: ['@cache_factory', 'get']
     arguments: [jsonapi_normalizations]
 
   # Route filter.
diff --git a/core/modules/migrate/migrate.services.yml b/core/modules/migrate/migrate.services.yml
index 5ada988d1bcf7cc8a3e6c83d65b5bc7b3c03a470..f18a22babf28d525ec52aa7e52bbd881d28bb281 100644
--- a/core/modules/migrate/migrate.services.yml
+++ b/core/modules/migrate/migrate.services.yml
@@ -7,7 +7,7 @@ services:
     class: Drupal\Core\Cache\CacheBackendInterface
     tags:
       - { name: cache.bin }
-    factory: cache_factory:get
+    factory: ['@cache_factory', 'get']
     arguments: [migrate]
   plugin.manager.migrate.source:
     class: Drupal\migrate\Plugin\MigrateSourcePluginManager
@@ -25,7 +25,7 @@ services:
     class: Drupal\Core\Cache\CacheBackendInterface
     tags:
       - { name: cache.bin }
-    factory: cache_factory:get
+    factory: ['@cache_factory', 'get']
     arguments: [discovery_migration]
   plugin.manager.migration:
     class: Drupal\migrate\Plugin\MigrationPluginManager
diff --git a/core/modules/page_cache/page_cache.services.yml b/core/modules/page_cache/page_cache.services.yml
index 35b899a1e3462efc0412e1176994c2d42687c535..308eb454e5f1f2e122fe8358d0b3b302a41be68e 100644
--- a/core/modules/page_cache/page_cache.services.yml
+++ b/core/modules/page_cache/page_cache.services.yml
@@ -9,5 +9,5 @@ services:
     class: Drupal\Core\Cache\CacheBackendInterface
     tags:
       - { name: cache.bin }
-    factory: cache_factory:get
+    factory: ['@cache_factory', 'get']
     arguments: [page]
diff --git a/core/modules/rest/rest.services.yml b/core/modules/rest/rest.services.yml
index 5ffb8ded9652f4e79756fc2a69d0a1a0cf70ddfa..868a048f9205ef8d6cb2847eb9cba9115dc27641 100644
--- a/core/modules/rest/rest.services.yml
+++ b/core/modules/rest/rest.services.yml
@@ -6,7 +6,7 @@ services:
     class: Drupal\Core\Cache\CacheBackendInterface
     tags:
       - { name: cache.bin }
-    factory: cache_factory:get
+    factory: ['@cache_factory', 'get']
     arguments: [rest]
   rest.resource_routes:
     class: Drupal\rest\Routing\ResourceRoutes
diff --git a/core/modules/system/tests/modules/module_cachebin/module_cachebin.services.yml b/core/modules/system/tests/modules/module_cachebin/module_cachebin.services.yml
index 8e1427463bfe9f348f514c75ca1fa9a21167c36a..efecad1683d68d653f11c986ba71db77e78e6b14 100644
--- a/core/modules/system/tests/modules/module_cachebin/module_cachebin.services.yml
+++ b/core/modules/system/tests/modules/module_cachebin/module_cachebin.services.yml
@@ -3,5 +3,5 @@ services:
     class: Drupal\Core\Cache\CacheBackendInterface
     tags:
       - { name: cache.bin }
-    factory: cache.backend.database:get
+    factory: ['@cache.backend.database', 'get']
     arguments: [module_cachebin]
diff --git a/core/modules/toolbar/toolbar.services.yml b/core/modules/toolbar/toolbar.services.yml
index 44ef6e25433485c00aed8ceb203c89916cd61744..a2cceff403d7cc34f1cb905e23c28bc2a774fbc2 100644
--- a/core/modules/toolbar/toolbar.services.yml
+++ b/core/modules/toolbar/toolbar.services.yml
@@ -3,7 +3,7 @@ services:
     class: Drupal\Core\Cache\CacheBackendInterface
     tags:
       - { name: cache.bin }
-    factory: cache_factory:get
+    factory: ['@cache_factory', 'get']
     arguments: [toolbar]
   toolbar.page_cache_request_policy.allow_toolbar_path:
     class: Drupal\toolbar\PageCache\AllowToolbarPath
diff --git a/core/modules/update/update.services.yml b/core/modules/update/update.services.yml
index 767a1d1f3018344f6a39b51d8f53a456cd29483b..197e3d5f1d39eea4d3c2599d248f5153b837544d 100644
--- a/core/modules/update/update.services.yml
+++ b/core/modules/update/update.services.yml
@@ -15,7 +15,7 @@ services:
     arguments: ['@config.factory', '@http_client']
   update.root:
     class: SplString
-    factory: update.root.factory:get
+    factory: ['@update.root.factory', 'get']
     tags:
       - { name: parameter_service }
   update.root.factory: