diff --git a/core/lib/Drupal/Core/DrupalKernel.php b/core/lib/Drupal/Core/DrupalKernel.php
index d5e6059..121abb2 100644
--- a/core/lib/Drupal/Core/DrupalKernel.php
+++ b/core/lib/Drupal/Core/DrupalKernel.php
@@ -1002,8 +1002,10 @@ protected function attachSynthetic(ContainerInterface $container) {
     $this->classLoaderAddMultiplePsr4($container->getParameter('container.namespaces'));
 
     $container->set('kernel', $this);
+    $this->_serviceId = 'kernel';
 
     // Set the class loader which was registered as a synthetic service.
+    $this->classLoader->_serviceId = 'class_loader';
     $container->set('class_loader', $this->classLoader);
     return $container;
   }