diff --git a/guides/bundles/configuration.rst b/guides/bundles/configuration.rst
index d962c46a341..00cfa220842 100644
--- a/guides/bundles/configuration.rst
+++ b/guides/bundles/configuration.rst
@@ -239,7 +239,7 @@ When creating an extension, follow these simple conventions:
 
 If you follow these simple conventions, you extensions will be registered
 automatically by Symfony. If not, override the Bundle
-:method:`Symfony\\Framework\\Bundle\\Bundle::registerExtensions` method::
+:method:`Symfony\\Component\\HttpKernel\\Bundle\\Bundle::registerExtensions` method::
 
     class HelloBundle extends Bundle
     {
@@ -262,7 +262,7 @@ Default Configuration
 As stated before, the user of the bundle should include the ``hello.config``
 namespace in a configuration file for your extension code to be called. But
 you can automatically register a default configuration by overriding the
-Bundle :method:`Symfony\\Framework\\Bundle\\Bundle::registerExtensions`
+Bundle :method:`Symfony\\Component\\HttpKernel\\Bundle\\Bundle::registerExtensions`
 method::
 
     class HelloBundle extends Bundle
diff --git a/guides/emails.rst b/guides/emails.rst
index 793563201e3..1b4fb6ec795 100644
--- a/guides/emails.rst
+++ b/guides/emails.rst
@@ -15,7 +15,7 @@ Enable ``SwiftmailerBundle`` in your kernel::
     {
         $bundles = array(
             // ...
-            new Symfony\Framework\SwiftmailerBundle\Bundle(),
+            new Symfony\Bundle\SwiftmailerBundle\SwiftmailerBundle(),
         );
 
         // ...
diff --git a/guides/internals/overview.rst b/guides/internals/overview.rst
index 7e5bd1275d0..5fe23985316 100644
--- a/guides/internals/overview.rst
+++ b/guides/internals/overview.rst
@@ -18,7 +18,7 @@ on top of the previous one.
 .. tip::
    Autoloading is not managed by the framework directly; it's done
    independently with the help of the
-   :class:`Symfony\\Framework\\UniversalClassLoader` class and the
+   :class:`Symfony\\Component\\HttpFoundation\\UniversalClassLoader` class and the
    ``src/autoload.php`` file. Read the :doc:`dedicated chapter
    </guides/tools/autoloader>` for more information.
 
diff --git a/guides/templating/Twig.rst b/guides/templating/Twig.rst
index 08092e81bf0..3700a3b7a56 100644
--- a/guides/templating/Twig.rst
+++ b/guides/templating/Twig.rst
@@ -23,7 +23,7 @@ Enable the ``TwigBundle`` in your kernel::
     {
         $bundles = array(
             // ...
-            new Symfony\Framework\TwigBundle\Bundle(),
+            new Symfony\Bundle\TwigBundle\TwigBundle(),
         );
 
         // ...
diff --git a/guides/tools/autoloader.rst b/guides/tools/autoloader.rst
index 333db4d5526..73c1b5653ce 100644
--- a/guides/tools/autoloader.rst
+++ b/guides/tools/autoloader.rst
@@ -21,12 +21,12 @@ need.
 Usage
 -----
 
-Registering the :class:`Symfony\\Framework\\UniversalClassLoader` autoloader
+Registering the :class:`Symfony\\Component\\HttpFoundation\\UniversalClassLoader` autoloader
 is straightforward::
 
-    require_once '/path/to/src/Symfony/Framework/UniversalClassLoader.php';
+    require_once '/path/to/src/Symfony/Component/HttpFoundation/UniversalClassLoader.php';
 
-    use Symfony\Framework\UniversalClassLoader;
+    use Symfony\Component\HttpFoundation\UniversalClassLoader;
 
     $loader = new UniversalClassLoader();
     $loader->register();
@@ -38,8 +38,8 @@ The autoloader is useful only if you add some libraries to autoload.
    ``src/autoload.php``).
 
 If the classes to autoload use namespaces, use the
-:method:`Symfony\\Framework\\UniversalClassLoader::registerNamespace` or
-:method:`Symfony\\Framework\\UniversalClassLoader::registerNamespaces`
+:method:`Symfony\\Component\\HttpFoundation\\UniversalClassLoader::registerNamespace` or
+:method:`Symfony\\Component\\HttpFoundation\\UniversalClassLoader::registerNamespaces`
 methods::
 
     $loader->registerNamespace('Symfony', __DIR__.'/vendor/symfony/src');
@@ -50,8 +50,8 @@ methods::
     ));
 
 For classes that follow the PEAR naming convention, use the
-:method:`Symfony\\Framework\\UniversalClassLoader::registerPrefix` or
-:method:`Symfony\\Framework\\UniversalClassLoader::registerPrefixes`
+:method:`Symfony\\Component\\HttpFoundation\\UniversalClassLoader::registerPrefix` or
+:method:`Symfony\\Component\\HttpFoundation\\UniversalClassLoader::registerPrefixes`
 methods::
 
     $loader->registerPrefix('Twig_', __DIR__.'/vendor/twig/lib');