diff --git a/src/Symfony/Components/DependencyInjection/Dumper/YamlDumper.php b/src/Symfony/Components/DependencyInjection/Dumper/YamlDumper.php
index c02b28a482..7836586496 100644
--- a/src/Symfony/Components/DependencyInjection/Dumper/YamlDumper.php
+++ b/src/Symfony/Components/DependencyInjection/Dumper/YamlDumper.php
@@ -2,7 +2,7 @@
 
 namespace Symfony\Components\DependencyInjection\Dumper;
 
-use Symfony\Components\YAML\YAML;
+use Symfony\Components\Yaml\Yaml;
 use Symfony\Components\DependencyInjection\Container;
 use Symfony\Components\DependencyInjection\Parameter;
 use Symfony\Components\DependencyInjection\Reference;
@@ -50,11 +50,11 @@ class YamlDumper extends Dumper
         $att = array();
         foreach ($attributes as $key => $value)
         {
-          $att[] = sprintf('%s: %s', YAML::dump($key), YAML::dump($value));
+          $att[] = sprintf('%s: %s', Yaml::dump($key), Yaml::dump($value));
         }
         $att = $att ? ', '.implode(' ', $att) : '';
 
-        $annotationsCode .= sprintf("      - { name: %s%s }\n", YAML::dump($name), $att);
+        $annotationsCode .= sprintf("      - { name: %s%s }\n", Yaml::dump($name), $att);
       }
     }
     if ($annotationsCode)
@@ -74,12 +74,12 @@ class YamlDumper extends Dumper
 
     if ($definition->getArguments())
     {
-      $code .= sprintf("    arguments: %s\n", YAML::dump($this->dumpValue($definition->getArguments()), 0));
+      $code .= sprintf("    arguments: %s\n", Yaml::dump($this->dumpValue($definition->getArguments()), 0));
     }
 
     if ($definition->getMethodCalls())
     {
-      $code .= sprintf("    calls:\n      %s\n", str_replace("\n", "\n      ", YAML::dump($this->dumpValue($definition->getMethodCalls()), 1)));
+      $code .= sprintf("    calls:\n      %s\n", str_replace("\n", "\n      ", Yaml::dump($this->dumpValue($definition->getMethodCalls()), 1)));
     }
 
     if (!$definition->isShared())
@@ -101,7 +101,7 @@ class YamlDumper extends Dumper
         }
       }
 
-      $code .= sprintf("    configurator: %s\n", YAML::dump($callable, 0));
+      $code .= sprintf("    configurator: %s\n", Yaml::dump($callable, 0));
     }
 
     return $code;
@@ -140,7 +140,7 @@ class YamlDumper extends Dumper
       return '';
     }
 
-    return YAML::dump(array('parameters' => $this->prepareParameters($this->container->getParameters())), 2);
+    return Yaml::dump(array('parameters' => $this->prepareParameters($this->container->getParameters())), 2);
   }
 
   protected function dumpValue($value)
diff --git a/src/Symfony/Components/DependencyInjection/Loader/YamlFileLoader.php b/src/Symfony/Components/DependencyInjection/Loader/YamlFileLoader.php
index 96b94600b7..4c27ece77b 100644
--- a/src/Symfony/Components/DependencyInjection/Loader/YamlFileLoader.php
+++ b/src/Symfony/Components/DependencyInjection/Loader/YamlFileLoader.php
@@ -7,7 +7,7 @@ use Symfony\Components\DependencyInjection\Definition;
 use Symfony\Components\DependencyInjection\Reference;
 use Symfony\Components\DependencyInjection\BuilderConfiguration;
 use Symfony\Components\DependencyInjection\FileResource;
-use Symfony\Components\YAML\YAML;
+use Symfony\Components\Yaml\Yaml;
 
 /*
  * This file is part of the symfony framework.
@@ -193,7 +193,7 @@ class YamlFileLoader extends FileLoader
 
   protected function loadFile($file)
   {
-    return $this->validate(YAML::load($file), $file);
+    return $this->validate(Yaml::load($file), $file);
   }
 
   protected function validate($content, $file)
diff --git a/src/Symfony/Components/YAML/Dumper.php b/src/Symfony/Components/Yaml/Dumper.php
similarity index 100%
rename from src/Symfony/Components/YAML/Dumper.php
rename to src/Symfony/Components/Yaml/Dumper.php
diff --git a/src/Symfony/Components/YAML/Inline.php b/src/Symfony/Components/Yaml/Inline.php
similarity index 100%
rename from src/Symfony/Components/YAML/Inline.php
rename to src/Symfony/Components/Yaml/Inline.php
diff --git a/src/Symfony/Components/YAML/Parser.php b/src/Symfony/Components/Yaml/Parser.php
similarity index 100%
rename from src/Symfony/Components/YAML/Parser.php
rename to src/Symfony/Components/Yaml/Parser.php
diff --git a/src/Symfony/Components/YAML/YAML.php b/src/Symfony/Components/Yaml/YAML.php
similarity index 100%
rename from src/Symfony/Components/YAML/YAML.php
rename to src/Symfony/Components/Yaml/YAML.php