diff --git a/src/Symfony/Bundle/DoctrineBundle/Command/ConvertDoctrine1SchemaDoctrineCommand.php b/src/Symfony/Bundle/DoctrineBundle/Command/ConvertDoctrine1SchemaDoctrineCommand.php
index f36d219c35..daf298e310 100644
--- a/src/Symfony/Bundle/DoctrineBundle/Command/ConvertDoctrine1SchemaDoctrineCommand.php
+++ b/src/Symfony/Bundle/DoctrineBundle/Command/ConvertDoctrine1SchemaDoctrineCommand.php
@@ -75,7 +75,7 @@ EOT
         if ($type === 'annotation') {
             $destPath .= '/Entity';
         } else {
-            $destPath .= '/Resources/config/doctrine/metadata';
+            $destPath .= '/Resources/config/doctrine/metadata/orm';
         }
 
         // adjust so file naming works
diff --git a/src/Symfony/Bundle/DoctrineBundle/Command/GenerateEntityDoctrineCommand.php b/src/Symfony/Bundle/DoctrineBundle/Command/GenerateEntityDoctrineCommand.php
index dc155e66af..02b7345e48 100644
--- a/src/Symfony/Bundle/DoctrineBundle/Command/GenerateEntityDoctrineCommand.php
+++ b/src/Symfony/Bundle/DoctrineBundle/Command/GenerateEntityDoctrineCommand.php
@@ -113,7 +113,7 @@ EOT
             $exporter->setEntityGenerator($this->getEntityGenerator());
         } else {
             $mappingType = $mappingType == 'yaml' ? 'yml' : $mappingType;
-            $path = $dirs[$namespace].'/'.$bundle.'/Resources/config/doctrine/metadata/'.str_replace('\\', '.', $fullEntityClassName).'.dcm.'.$mappingType;
+            $path = $dirs[$namespace].'/'.$bundle.'/Resources/config/doctrine/metadata/orm/'.str_replace('\\', '.', $fullEntityClassName).'.dcm.'.$mappingType;
         }
 
         $code = $exporter->exportClassMetadata($class);
@@ -126,4 +126,4 @@ EOT
         $output->writeln(sprintf('  > generating <comment>%s</comment>', $fullEntityClassName));
         file_put_contents($path, $code);
     }
-}
\ No newline at end of file
+}
diff --git a/src/Symfony/Bundle/DoctrineBundle/Command/ImportMappingDoctrineCommand.php b/src/Symfony/Bundle/DoctrineBundle/Command/ImportMappingDoctrineCommand.php
index 016871a2c4..5e2e8cb0e1 100644
--- a/src/Symfony/Bundle/DoctrineBundle/Command/ImportMappingDoctrineCommand.php
+++ b/src/Symfony/Bundle/DoctrineBundle/Command/ImportMappingDoctrineCommand.php
@@ -73,7 +73,7 @@ EOT
         if ($type === 'annotation') {
             $destPath .= '/Entity';
         } else {
-            $destPath .= '/Resources/config/doctrine/metadata';
+            $destPath .= '/Resources/config/doctrine/metadata/orm';
         }
         if ($type === 'yaml') {
             $type = 'yml';
@@ -116,4 +116,4 @@ EOT
             $output->writeln('Database does not have any mapping information.'.PHP_EOL, 'ERROR');
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Symfony/Bundle/DoctrineBundle/DependencyInjection/DoctrineExtension.php b/src/Symfony/Bundle/DoctrineBundle/DependencyInjection/DoctrineExtension.php
index 337f8be0d1..3cf4d8ecb5 100644
--- a/src/Symfony/Bundle/DoctrineBundle/DependencyInjection/DoctrineExtension.php
+++ b/src/Symfony/Bundle/DoctrineBundle/DependencyInjection/DoctrineExtension.php
@@ -481,7 +481,7 @@ class DoctrineExtension extends Extension
     static protected function detectMetadataDriver($dir, ContainerBuilder $container)
     {
         // add the closest existing directory as a resource
-        $resource = $dir.'/Resources/config/doctrine/metadata';
+        $resource = $dir.'/Resources/config/doctrine/metadata/orm';
         while (!is_dir($resource)) {
             $resource = dirname($resource);
         }
diff --git a/src/Symfony/Bundle/DoctrineBundle/Tests/DependencyInjection/AbstractDoctrineExtensionTest.php b/src/Symfony/Bundle/DoctrineBundle/Tests/DependencyInjection/AbstractDoctrineExtensionTest.php
index 00217095be..99894957c5 100644
--- a/src/Symfony/Bundle/DoctrineBundle/Tests/DependencyInjection/AbstractDoctrineExtensionTest.php
+++ b/src/Symfony/Bundle/DoctrineBundle/Tests/DependencyInjection/AbstractDoctrineExtensionTest.php
@@ -339,7 +339,7 @@ abstract class AbstractDoctrineExtensionTest extends TestCase
         $loader->dbalLoad(array(), $container);
         $loader->ormLoad(array(), $container);
 
-        $this->assertEquals(array(__DIR__.'/Fixtures/Bundles/YamlBundle/Resources/config/doctrine/metadata'), $container->getParameter('doctrine.orm.metadata_driver.mapping_dirs'));
+        $this->assertEquals(array(__DIR__.'/Fixtures/Bundles/YamlBundle/Resources/config/doctrine/metadata/orm'), $container->getParameter('doctrine.orm.metadata_driver.mapping_dirs'));
         $this->assertEquals('%doctrine.orm.metadata_driver.mapping_dirs%', $container->getParameter('doctrine.orm.xml_mapping_dirs'));
         $this->assertEquals('%doctrine.orm.metadata_driver.mapping_dirs%', $container->getParameter('doctrine.orm.yml_mapping_dirs'));
         $this->assertEquals(array(__DIR__.'/Fixtures/Bundles/YamlBundle/Entity'), $container->getParameter('doctrine.orm.metadata_driver.entity_dirs'));
@@ -357,7 +357,7 @@ abstract class AbstractDoctrineExtensionTest extends TestCase
         $loader->dbalLoad(array(), $container);
         $loader->ormLoad(array(), $container);
 
-        $this->assertEquals(array(__DIR__.'/Fixtures/Bundles/XmlBundle/Resources/config/doctrine/metadata'), $container->getParameter('doctrine.orm.metadata_driver.mapping_dirs'));
+        $this->assertEquals(array(__DIR__.'/Fixtures/Bundles/XmlBundle/Resources/config/doctrine/metadata/orm'), $container->getParameter('doctrine.orm.metadata_driver.mapping_dirs'));
         $this->assertEquals('%doctrine.orm.metadata_driver.mapping_dirs%', $container->getParameter('doctrine.orm.xml_mapping_dirs'));
         $this->assertEquals('%doctrine.orm.metadata_driver.mapping_dirs%', $container->getParameter('doctrine.orm.yml_mapping_dirs'));
         $this->assertEquals(array(__DIR__.'/Fixtures/Bundles/XmlBundle/Entity'), $container->getParameter('doctrine.orm.metadata_driver.entity_dirs'));