diff --git a/configuration/front_controllers_and_kernel.rst b/configuration/front_controllers_and_kernel.rst
index f1e7b8ef1e0..dd34576dc15 100644
--- a/configuration/front_controllers_and_kernel.rst
+++ b/configuration/front_controllers_and_kernel.rst
@@ -1,5 +1,5 @@
 .. index::
-    single: How the front controller, ``AppKernel`` and environments
+    single: How the front controller, ``Kernel`` and environments
     work together
 
 Understanding how the Front Controller, Kernel and Environments Work together
diff --git a/configuration/multiple_kernels.rst b/configuration/multiple_kernels.rst
index cfdf5c0cf2f..3ac4812fca9 100644
--- a/configuration/multiple_kernels.rst
+++ b/configuration/multiple_kernels.rst
@@ -77,9 +77,9 @@ Now you need to define the ``ApiKernel`` class used by the new front controller.
 The easiest way to do this is by duplicating the existing  ``src/Kernel.php``
 file and make the needed changes.
 
-In this example, the ``ApiKernel`` will load less bundles than AppKernel. Be
-sure to also change the location of the cache, logs and configuration files so
-they don't collide with the files from ``AppKernel``::
+In this example, the ``ApiKernel`` will load less bundles than the default
+Kernel. Be sure to also change the location of the cache, logs and configuration
+files so they don't collide with the files from ``src/Kernel.php``::
 
     // src/ApiKernel.php
     use Symfony\Component\HttpKernel\Kernel;
diff --git a/configuration/override_dir_structure.rst b/configuration/override_dir_structure.rst
index 60565559355..fcf896c59e1 100644
--- a/configuration/override_dir_structure.rst
+++ b/configuration/override_dir_structure.rst
@@ -39,7 +39,7 @@ method in the ``Kernel`` class of your application::
     // src/Kernel.php
 
     // ...
-    class AppKernel extends BaseKernel
+    class Kernel extends BaseKernel
     {
         // ...
 
@@ -72,7 +72,7 @@ method::
     // src/Kernel.php
 
     // ...
-    class AppKernel extends Kernel
+    class Kernel extends Kernel
     {
         // ...
 
diff --git a/configuration/using_parameters_in_dic.rst b/configuration/using_parameters_in_dic.rst
index 1f3ed6e38f5..ef090440322 100644
--- a/configuration/using_parameters_in_dic.rst
+++ b/configuration/using_parameters_in_dic.rst
@@ -57,7 +57,7 @@ Now, examine the results to see this closely:
             <!-- true, as expected -->
 
             <my-bundle:config logging="%kernel.debug%" />
-            <!-- true/false (depends on 2nd parameter of AppKernel),
+            <!-- true/false (depends on 2nd parameter of Kernel),
                  as expected, because %kernel.debug% inside configuration
                  gets evaluated before being passed to the extension -->
 
@@ -78,7 +78,7 @@ Now, examine the results to see this closely:
 
         $container->loadFromExtension('my_bundle', array(
                 'logging' => "%kernel.debug%",
-                // true/false (depends on 2nd parameter of AppKernel),
+                // true/false (depends on 2nd parameter of Kernel),
                 // as expected, because %kernel.debug% inside configuration
                 // gets evaluated before being passed to the extension
             )
diff --git a/deployment.rst b/deployment.rst
index bfaf3a8532d..5e4774f95cd 100644
--- a/deployment.rst
+++ b/deployment.rst
@@ -225,9 +225,9 @@ If your deployment method doesn't use Composer, you may have removed the
 The solution is to override the ``getProjectDir()`` method in the application
 kernel and return your project's root directory::
 
-    // app/AppKernel.php
+    // src/Kernel.php
     // ...
-    class AppKernel extends Kernel
+    class Kernel extends BaseKernel
     {
         // ...
 
diff --git a/reference/map.rst.inc b/reference/map.rst.inc
index 76a4c26e554..6c14dcc2215 100644
--- a/reference/map.rst.inc
+++ b/reference/map.rst.inc
@@ -14,7 +14,7 @@
   * :doc:`web_profiler </reference/configuration/web_profiler>`
   * :doc:`debug </reference/configuration/debug>`
 
-* :doc:`Configuring the Kernel (e.g. AppKernel) </reference/configuration/kernel>`
+* :doc:`Configuring the Kernel </reference/configuration/kernel>`
 
 * **Forms and Validation**