diff --git a/core/core.services.yml b/core/core.services.yml
index 1c45cb7..a47aea3 100644
--- a/core/core.services.yml
+++ b/core/core.services.yml
@@ -1087,13 +1087,14 @@ services:
       - { name: twig.extension }
   twig.loader.chain:
     class: Twig_Loader_Chain
+    public: false
   twig.loader.filesystem:
-    class: Drupal\Core\Template\Loader\Filesystem
+    class: Drupal\Core\Template\Loader\FilesystemLoader
     arguments: ['@app.root', '@module_handler', '@theme_handler']
     tags:
       - { name: twig.loader, priority: 100 }
   twig.loader.theme_registry:
-    class: Drupal\Core\Template\Loader\ThemeRegistry
+    class: Drupal\Core\Template\Loader\ThemeRegistryLoader
     arguments: ['@theme.registry']
     tags:
       - { name: twig.loader, priority: 0 }
diff --git a/core/lib/Drupal/Core/Template/Loader/Filesystem.php b/core/lib/Drupal/Core/Template/Loader/FilesystemLoader.php
similarity index 89%
rename from core/lib/Drupal/Core/Template/Loader/Filesystem.php
rename to core/lib/Drupal/Core/Template/Loader/FilesystemLoader.php
index 2316e06..f909809 100644
--- a/core/lib/Drupal/Core/Template/Loader/Filesystem.php
+++ b/core/lib/Drupal/Core/Template/Loader/FilesystemLoader.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\Core\Template\Loader\Filesystem.
+ * Contains \Drupal\Core\Template\Loader\FilesystemLoader.
  */
 
 namespace Drupal\Core\Template\Loader;
@@ -17,10 +17,10 @@
  * filesystem loader so that templates can be referenced by namespace, like
  * @block/block.html.twig or @mytheme/page.html.twig.
  */
-class Filesystem extends \Twig_Loader_Filesystem {
+class FilesystemLoader extends \Twig_Loader_Filesystem {
 
   /**
-   * Constructs a new Filesystem loader object.
+   * Constructs a new FilesystemLoader object.
    *
    * @param string|array $paths
    *   A path or an array of paths to check for templates.
diff --git a/core/lib/Drupal/Core/Template/Loader/ThemeRegistry.php b/core/lib/Drupal/Core/Template/Loader/ThemeRegistryLoader.php
similarity index 88%
rename from core/lib/Drupal/Core/Template/Loader/ThemeRegistry.php
rename to core/lib/Drupal/Core/Template/Loader/ThemeRegistryLoader.php
index 346964f..fe1ae25 100644
--- a/core/lib/Drupal/Core/Template/Loader/ThemeRegistry.php
+++ b/core/lib/Drupal/Core/Template/Loader/ThemeRegistryLoader.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\Core\Template\Loader\ThemeRegistry.
+ * Contains \Drupal\Core\Template\Loader\ThemeRegistryLoader.
  */
 
 namespace Drupal\Core\Template\Loader;
@@ -14,7 +14,7 @@
  *
  * Allows for template inheritance based on the currently active template.
  */
-class ThemeRegistry extends \Twig_Loader_Filesystem {
+class ThemeRegistryLoader extends \Twig_Loader_Filesystem {
 
   /**
    * The theme registry used to determine which template to use.
@@ -24,7 +24,7 @@ class ThemeRegistry extends \Twig_Loader_Filesystem {
   protected $themeRegistry;
 
   /**
-   * Constructs a new ThemeRegistry loader object.
+   * Constructs a new ThemeRegistryLoader object.
    *
    * @param \Drupal\Core\Theme\Registry $theme_registry
    *   The theme registry.
@@ -42,7 +42,7 @@ public function __construct(Registry $theme_registry) {
    * @return string
    *   The path to the template.
    *
-   * @throws Twig_Error_Loader
+   * @throws \Twig_Error_Loader
    *   Thrown if a template matching $name cannot be found.
    */
   protected function findTemplate($name) {
diff --git a/core/modules/text/templates/field--text-long.html.twig b/core/modules/text/templates/field--text-long.html.twig
index 5f201f0..07ce721 100644
--- a/core/modules/text/templates/field--text-long.html.twig
+++ b/core/modules/text/templates/field--text-long.html.twig
@@ -1 +1 @@
-{% extends "@text/field--text.html.twig" %}
+{% extends "field--text.html.twig" %}
diff --git a/core/modules/text/templates/field--text-with-summary.html.twig b/core/modules/text/templates/field--text-with-summary.html.twig
index 5f201f0..07ce721 100644
--- a/core/modules/text/templates/field--text-with-summary.html.twig
+++ b/core/modules/text/templates/field--text-with-summary.html.twig
@@ -1 +1 @@
-{% extends "@text/field--text.html.twig" %}
+{% extends "field--text.html.twig" %}
diff --git a/core/modules/text/templates/field--text.html.twig b/core/modules/text/templates/field--text.html.twig
index 6a63a0c..9cd1ab9 100644
--- a/core/modules/text/templates/field--text.html.twig
+++ b/core/modules/text/templates/field--text.html.twig
@@ -1,4 +1,4 @@
-{% extends "@system/field.html.twig" %}
+{% extends "field.html.twig" %}
 {#
 /**
  * @file