diff --git a/core/core.services.yml b/core/core.services.yml
index cffc677..77d1066 100644
--- a/core/core.services.yml
+++ b/core/core.services.yml
@@ -443,7 +443,7 @@ services:
     factory_service: 'app.root.factory'
     factory_method: 'get'
     tags:
-      - { name: non_class }
+      - { name: parameter_service }
   app.root.factory:
     class: Drupal\Core\AppRootFactory
     arguments: ['@kernel']
diff --git a/core/lib/Drupal/Core/DependencyInjection/Compiler/DependencySerializationTraitPass.php b/core/lib/Drupal/Core/DependencyInjection/Compiler/DependencySerializationTraitPass.php
index 47e4746..2bb0b70 100644
--- a/core/lib/Drupal/Core/DependencyInjection/Compiler/DependencySerializationTraitPass.php
+++ b/core/lib/Drupal/Core/DependencyInjection/Compiler/DependencySerializationTraitPass.php
@@ -24,7 +24,7 @@ public function process(ContainerBuilder $container) {
     foreach ($container->getDefinitions() as $service_id => $definition) {
       // Only add the property to services that are public (as private services
       // can not be reloaded through Container::get()) and are objects.
-      if (!$definition->hasTag('non_class') && $definition->isPublic()) {
+      if (!$definition->hasTag('parameter_service') && $definition->isPublic()) {
         $definition->setProperty('_serviceId', $service_id);
       }
     }