diff --git a/src/Sylius/Bundle/AddressingBundle/DependencyInjection/SyliusAddressingExtension.php b/src/Sylius/Bundle/AddressingBundle/DependencyInjection/SyliusAddressingExtension.php
index 36e380ad93..1b53c45763 100644
--- a/src/Sylius/Bundle/AddressingBundle/DependencyInjection/SyliusAddressingExtension.php
+++ b/src/Sylius/Bundle/AddressingBundle/DependencyInjection/SyliusAddressingExtension.php
@@ -11,11 +11,11 @@
 
 namespace Sylius\Bundle\AddressingBundle\DependencyInjection;
 
-use Symfony\Component\HttpKernel\DependencyInjection\Extension;
-use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\Config\Definition\Processor;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
+use Symfony\Component\HttpKernel\DependencyInjection\Extension;
 
 /**
  * Addressing system extension.
@@ -33,7 +33,7 @@ class SyliusAddressingExtension extends Extension
 
         $loader = new XmlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config/container'));
 
-        if (!in_array($config['driver'], array('ORM'))) {
+        if (!in_array($config['driver'], array('doctrine/orm'))) {
             throw new \InvalidArgumentException(sprintf('Driver "%s" is unsupported for this extension.', $config['driver']));
         }
 
@@ -49,8 +49,8 @@ class SyliusAddressingExtension extends Extension
 
         $configurations = array(
             'controllers',
-            'manipulators',
             'forms',
+            'manipulators'
         );
 
         foreach($configurations as $basename) {
@@ -58,8 +58,8 @@ class SyliusAddressingExtension extends Extension
         }
 
         $this->remapParametersNamespaces($config['classes'], $container, array(
-            'model'       => 'sylius_addressing.model.%s.class',
-            'manipulator' => 'sylius_addressing.manipulator.%s.class'
+            'manipulator' => 'sylius_addressing.manipulator.%s.class',
+            'model'       => 'sylius_addressing.model.%s.class'
         ));
 
         $this->remapParametersNamespaces($config['classes']['form'], $container, array(
@@ -72,7 +72,7 @@ class SyliusAddressingExtension extends Extension
         ));
     }
 
-  	/**
+    /**
      * Remap parameters.
      */
     protected function remapParameters(array $config, ContainerBuilder $container, array $map)
diff --git a/src/Sylius/Bundle/AddressingBundle/Form/Type/AddressFormType.php b/src/Sylius/Bundle/AddressingBundle/Form/Type/AddressType.php
similarity index 95%
rename from src/Sylius/Bundle/AddressingBundle/Form/Type/AddressFormType.php
rename to src/Sylius/Bundle/AddressingBundle/Form/Type/AddressType.php
index d47c44b53b..31a1a9fcbd 100644
--- a/src/Sylius/Bundle/AddressingBundle/Form/Type/AddressFormType.php
+++ b/src/Sylius/Bundle/AddressingBundle/Form/Type/AddressType.php
@@ -19,7 +19,7 @@ use Symfony\Component\Form\AbstractType;
  *
  * @author Paweł Jędrzejewski <pjedrzejewski@sylius.pl>
  */
-abstract class AddressFormType extends AbstractType
+abstract class AddressType extends AbstractType
 {
     /**
      * Data class.
diff --git a/src/Sylius/Bundle/AddressingBundle/Resources/config/container/driver/ORM.xml b/src/Sylius/Bundle/AddressingBundle/Resources/config/container/driver/doctrine/orm.xml
similarity index 100%
rename from src/Sylius/Bundle/AddressingBundle/Resources/config/container/driver/ORM.xml
rename to src/Sylius/Bundle/AddressingBundle/Resources/config/container/driver/doctrine/orm.xml
diff --git a/src/Sylius/Bundle/AddressingBundle/Resources/meta/LICENSE b/src/Sylius/Bundle/AddressingBundle/Resources/meta/LICENSE
index 9cc33db98c..e8bccd0d18 100644
--- a/src/Sylius/Bundle/AddressingBundle/Resources/meta/LICENSE
+++ b/src/Sylius/Bundle/AddressingBundle/Resources/meta/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2011 Paweł Jędrzejewski
+Copyright (c) 2011-2012 Paweł Jędrzejewski
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal