diff --git a/core/lib/Drupal/Core/DrupalKernel.php b/core/lib/Drupal/Core/DrupalKernel.php
index 9f8aaaa..e1842fc 100644
--- a/core/lib/Drupal/Core/DrupalKernel.php
+++ b/core/lib/Drupal/Core/DrupalKernel.php
@@ -246,15 +246,16 @@ public static function createFromRequest(Request $request, $class_loader, $envir
       $response->prepare($request)->send();
     }
 
-    // If the class loader is still the same, possibly upgrade to the APCu class
+    // If the class loader is still the same, possibly upgrade to the APC class
     // loader.
     if ($class_loader_class == get_class($class_loader)
         && Settings::get('class_loader_auto_detect', TRUE)
         && function_exists('apc_fetch')) {
-      $prefix = 'drupal' . hash('sha-256', 'drupal.' . Settings::getHashSalt());
+      $prefix = 'drupal.' . hash('sha-256', 'drupal.' . Settings::getHashSalt());
       $apc_loader = new \Symfony\Component\ClassLoader\ApcClassLoader($prefix, $class_loader);
       $class_loader->unregister();
       $apc_loader->register();
+      $class_loader = $apc_loader;
     }
 
     return $kernel;
diff --git a/core/rebuild.php b/core/rebuild.php
index e89486f..78d4fce 100644
--- a/core/rebuild.php
+++ b/core/rebuild.php
@@ -20,7 +20,7 @@
 // Change the directory to the Drupal root.
 chdir('..');
 
-// Clear the APCu cache to ensure APCu classloader is reset.
+// APC user cache to ensure APC classloader is reset.
 if (function_exists('apc_fetch')) {
   apc_clear_cache('user');
 }
diff --git a/sites/default/default.settings.php b/sites/default/default.settings.php
index 152e3a9..65d6990 100644
--- a/sites/default/default.settings.php
+++ b/sites/default/default.settings.php
@@ -383,18 +383,18 @@
 /**
  * Class Loader.
  *
- * If the APCu extension is detected, the Symfony APC class loader is used for
+ * If the APC extension is detected, the Symfony APC class loader is used for
  * performance reasons. Detection can be prevented by setting
  * class_loader_auto_detect to false, as in the example below.
  */
 # $settings['class_loader_auto_detect'] = FALSE;
 
 /*
- * If the APCu extension is not detected, either because APCu is missing or
+ * If the APC extension is not detected, either because APCu is missing or
  * because auto-detection has been disabled, auto-loading falls back to
  * Composer's ClassLoader, which is good for development as it does not break
  * when code is moved in the file system. You can also decorate the base class
- * loader with another cached solution than the Symfony APCu class loader, as
+ * loader with another cached solution than the Symfony APC class loader, as
  * all production sites should have a cached class loader of some sort enabled.
  *
  * To do so, you may decorate and replace the local $class_loader variable. For