diff --git a/src/Symfony/Components/Yaml/Dumper.php b/src/Symfony/Components/Yaml/Dumper.php
index f50291a3ec..2db3f6cf1e 100644
--- a/src/Symfony/Components/Yaml/Dumper.php
+++ b/src/Symfony/Components/Yaml/Dumper.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Symfony\Components\YAML;
+namespace Symfony\Components\Yaml;
 
 /*
  * This file is part of the symfony package.
diff --git a/src/Symfony/Components/Yaml/Inline.php b/src/Symfony/Components/Yaml/Inline.php
index ccd0361597..c78a5f1e65 100644
--- a/src/Symfony/Components/Yaml/Inline.php
+++ b/src/Symfony/Components/Yaml/Inline.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Symfony\Components\YAML;
+namespace Symfony\Components\Yaml;
 
 /*
  * This file is part of the symfony package.
@@ -57,8 +57,8 @@ class Inline
    */
   static public function dump($value)
   {
-    $trueValues = '1.1' == YAML::getSpecVersion() ? array('true', 'on', '+', 'yes', 'y') : array('true');
-    $falseValues = '1.1' == YAML::getSpecVersion() ? array('false', 'off', '-', 'no', 'n') : array('false');
+    $trueValues = '1.1' == Yaml::getSpecVersion() ? array('true', 'on', '+', 'yes', 'y') : array('true');
+    $falseValues = '1.1' == Yaml::getSpecVersion() ? array('false', 'off', '-', 'no', 'n') : array('false');
 
     switch (true)
     {
@@ -351,8 +351,8 @@ class Inline
   {
     $scalar = trim($scalar);
 
-    $trueValues = '1.1' == YAML::getSpecVersion() ? array('true', 'on', '+', 'yes', 'y') : array('true');
-    $falseValues = '1.1' == YAML::getSpecVersion() ? array('false', 'off', '-', 'no', 'n') : array('false');
+    $trueValues = '1.1' == Yaml::getSpecVersion() ? array('true', 'on', '+', 'yes', 'y') : array('true');
+    $falseValues = '1.1' == Yaml::getSpecVersion() ? array('false', 'off', '-', 'no', 'n') : array('false');
 
     switch (true)
     {
diff --git a/src/Symfony/Components/Yaml/Parser.php b/src/Symfony/Components/Yaml/Parser.php
index aeb1f94a07..bd167db28c 100644
--- a/src/Symfony/Components/Yaml/Parser.php
+++ b/src/Symfony/Components/Yaml/Parser.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Symfony\Components\YAML;
+namespace Symfony\Components\Yaml;
 
 /*
  * This file is part of the symfony package.
diff --git a/src/Symfony/Components/Yaml/YAML.php b/src/Symfony/Components/Yaml/Yaml.php
similarity index 98%
rename from src/Symfony/Components/Yaml/YAML.php
rename to src/Symfony/Components/Yaml/Yaml.php
index f6e3416536..ff8671d5fe 100644
--- a/src/Symfony/Components/Yaml/YAML.php
+++ b/src/Symfony/Components/Yaml/Yaml.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Symfony\Components\YAML;
+namespace Symfony\Components\Yaml;
 
 /*
  * This file is part of the symfony package.
@@ -17,7 +17,7 @@ namespace Symfony\Components\YAML;
  * @subpackage yaml
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  */
-class YAML
+class Yaml
 {
   static protected $spec = '1.2';
 
diff --git a/tests/fixtures/Symfony/Components/YAML/YtsAnchorAlias.yml b/tests/fixtures/Symfony/Components/Yaml/YtsAnchorAlias.yml
similarity index 100%
rename from tests/fixtures/Symfony/Components/YAML/YtsAnchorAlias.yml
rename to tests/fixtures/Symfony/Components/Yaml/YtsAnchorAlias.yml
diff --git a/tests/fixtures/Symfony/Components/YAML/YtsBasicTests.yml b/tests/fixtures/Symfony/Components/Yaml/YtsBasicTests.yml
similarity index 100%
rename from tests/fixtures/Symfony/Components/YAML/YtsBasicTests.yml
rename to tests/fixtures/Symfony/Components/Yaml/YtsBasicTests.yml
diff --git a/tests/fixtures/Symfony/Components/YAML/YtsBlockMapping.yml b/tests/fixtures/Symfony/Components/Yaml/YtsBlockMapping.yml
similarity index 100%
rename from tests/fixtures/Symfony/Components/YAML/YtsBlockMapping.yml
rename to tests/fixtures/Symfony/Components/Yaml/YtsBlockMapping.yml
diff --git a/tests/fixtures/Symfony/Components/YAML/YtsDocumentSeparator.yml b/tests/fixtures/Symfony/Components/Yaml/YtsDocumentSeparator.yml
similarity index 100%
rename from tests/fixtures/Symfony/Components/YAML/YtsDocumentSeparator.yml
rename to tests/fixtures/Symfony/Components/Yaml/YtsDocumentSeparator.yml
diff --git a/tests/fixtures/Symfony/Components/YAML/YtsErrorTests.yml b/tests/fixtures/Symfony/Components/Yaml/YtsErrorTests.yml
similarity index 100%
rename from tests/fixtures/Symfony/Components/YAML/YtsErrorTests.yml
rename to tests/fixtures/Symfony/Components/Yaml/YtsErrorTests.yml
diff --git a/tests/fixtures/Symfony/Components/YAML/YtsFlowCollections.yml b/tests/fixtures/Symfony/Components/Yaml/YtsFlowCollections.yml
similarity index 100%
rename from tests/fixtures/Symfony/Components/YAML/YtsFlowCollections.yml
rename to tests/fixtures/Symfony/Components/Yaml/YtsFlowCollections.yml
diff --git a/tests/fixtures/Symfony/Components/YAML/YtsFoldedScalars.yml b/tests/fixtures/Symfony/Components/Yaml/YtsFoldedScalars.yml
similarity index 100%
rename from tests/fixtures/Symfony/Components/YAML/YtsFoldedScalars.yml
rename to tests/fixtures/Symfony/Components/Yaml/YtsFoldedScalars.yml
diff --git a/tests/fixtures/Symfony/Components/YAML/YtsNullsAndEmpties.yml b/tests/fixtures/Symfony/Components/Yaml/YtsNullsAndEmpties.yml
similarity index 100%
rename from tests/fixtures/Symfony/Components/YAML/YtsNullsAndEmpties.yml
rename to tests/fixtures/Symfony/Components/Yaml/YtsNullsAndEmpties.yml
diff --git a/tests/fixtures/Symfony/Components/YAML/YtsSpecificationExamples.yml b/tests/fixtures/Symfony/Components/Yaml/YtsSpecificationExamples.yml
similarity index 100%
rename from tests/fixtures/Symfony/Components/YAML/YtsSpecificationExamples.yml
rename to tests/fixtures/Symfony/Components/Yaml/YtsSpecificationExamples.yml
diff --git a/tests/fixtures/Symfony/Components/YAML/YtsTypeTransfers.yml b/tests/fixtures/Symfony/Components/Yaml/YtsTypeTransfers.yml
similarity index 100%
rename from tests/fixtures/Symfony/Components/YAML/YtsTypeTransfers.yml
rename to tests/fixtures/Symfony/Components/Yaml/YtsTypeTransfers.yml
diff --git a/tests/fixtures/Symfony/Components/YAML/index.yml b/tests/fixtures/Symfony/Components/Yaml/index.yml
similarity index 100%
rename from tests/fixtures/Symfony/Components/YAML/index.yml
rename to tests/fixtures/Symfony/Components/Yaml/index.yml
diff --git a/tests/fixtures/Symfony/Components/YAML/sfComments.yml b/tests/fixtures/Symfony/Components/Yaml/sfComments.yml
similarity index 100%
rename from tests/fixtures/Symfony/Components/YAML/sfComments.yml
rename to tests/fixtures/Symfony/Components/Yaml/sfComments.yml
diff --git a/tests/fixtures/Symfony/Components/YAML/sfMergeKey.yml b/tests/fixtures/Symfony/Components/Yaml/sfMergeKey.yml
similarity index 100%
rename from tests/fixtures/Symfony/Components/YAML/sfMergeKey.yml
rename to tests/fixtures/Symfony/Components/Yaml/sfMergeKey.yml
diff --git a/tests/fixtures/Symfony/Components/YAML/sfObjects.yml b/tests/fixtures/Symfony/Components/Yaml/sfObjects.yml
similarity index 100%
rename from tests/fixtures/Symfony/Components/YAML/sfObjects.yml
rename to tests/fixtures/Symfony/Components/Yaml/sfObjects.yml
diff --git a/tests/fixtures/Symfony/Components/YAML/sfQuotes.yml b/tests/fixtures/Symfony/Components/Yaml/sfQuotes.yml
similarity index 100%
rename from tests/fixtures/Symfony/Components/YAML/sfQuotes.yml
rename to tests/fixtures/Symfony/Components/Yaml/sfQuotes.yml
diff --git a/tests/fixtures/Symfony/Components/YAML/sfTests.yml b/tests/fixtures/Symfony/Components/Yaml/sfTests.yml
similarity index 100%
rename from tests/fixtures/Symfony/Components/YAML/sfTests.yml
rename to tests/fixtures/Symfony/Components/Yaml/sfTests.yml
diff --git a/tests/unit/Symfony/Components/YAML/DumperTest.php b/tests/unit/Symfony/Components/Yaml/DumperTest.php
similarity index 93%
rename from tests/unit/Symfony/Components/YAML/DumperTest.php
rename to tests/unit/Symfony/Components/Yaml/DumperTest.php
index dceaebdece..7e78a99d13 100644
--- a/tests/unit/Symfony/Components/YAML/DumperTest.php
+++ b/tests/unit/Symfony/Components/Yaml/DumperTest.php
@@ -10,18 +10,18 @@
 
 require_once __DIR__.'/../../../bootstrap.php';
 
-use Symfony\Components\YAML\YAML;
-use Symfony\Components\YAML\Parser;
-use Symfony\Components\YAML\Dumper;
+use Symfony\Components\Yaml\Yaml;
+use Symfony\Components\Yaml\Parser;
+use Symfony\Components\Yaml\Dumper;
 
-YAML::setSpecVersion('1.1');
+Yaml::setSpecVersion('1.1');
 
 $t = new LimeTest(148);
 
 $parser = new Parser();
 $dumper = new Dumper();
 
-$path = __DIR__.'/../../../../fixtures/Symfony/Components/YAML';
+$path = __DIR__.'/../../../../fixtures/Symfony/Components/Yaml';
 $files = $parser->parse(file_get_contents($path.'/index.yml'));
 foreach ($files as $file)
 {
diff --git a/tests/unit/Symfony/Components/YAML/InlineTest.php b/tests/unit/Symfony/Components/Yaml/InlineTest.php
similarity index 98%
rename from tests/unit/Symfony/Components/YAML/InlineTest.php
rename to tests/unit/Symfony/Components/Yaml/InlineTest.php
index 72842ee0c8..3a591c8f29 100644
--- a/tests/unit/Symfony/Components/YAML/InlineTest.php
+++ b/tests/unit/Symfony/Components/Yaml/InlineTest.php
@@ -10,10 +10,10 @@
 
 require_once __DIR__.'/../../../bootstrap.php';
 
-use Symfony\Components\YAML\YAML;
-use Symfony\Components\YAML\Inline;
+use Symfony\Components\Yaml\Yaml;
+use Symfony\Components\Yaml\Inline;
 
-YAML::setSpecVersion('1.1');
+Yaml::setSpecVersion('1.1');
 
 $t = new LimeTest(124);
 
diff --git a/tests/unit/Symfony/Components/YAML/ParserTest.php b/tests/unit/Symfony/Components/Yaml/ParserTest.php
similarity index 90%
rename from tests/unit/Symfony/Components/YAML/ParserTest.php
rename to tests/unit/Symfony/Components/Yaml/ParserTest.php
index 34ccc5bef6..200dd5c6d8 100644
--- a/tests/unit/Symfony/Components/YAML/ParserTest.php
+++ b/tests/unit/Symfony/Components/Yaml/ParserTest.php
@@ -10,16 +10,16 @@
 
 require_once __DIR__.'/../../../bootstrap.php';
 
-use Symfony\Components\YAML\YAML;
-use Symfony\Components\YAML\Parser;
+use Symfony\Components\Yaml\Yaml;
+use Symfony\Components\Yaml\Parser;
 
-YAML::setSpecVersion('1.1');
+Yaml::setSpecVersion('1.1');
 
 $t = new LimeTest(148);
 
 $parser = new Parser();
 
-$path = __DIR__.'/../../../../fixtures/Symfony/Components/YAML';
+$path = __DIR__.'/../../../../fixtures/Symfony/Components/Yaml';
 $files = $parser->parse(file_get_contents($path.'/index.yml'));
 foreach ($files as $file)
 {