diff --git a/src/Sylius/Bundle/AttributeBundle/Resources/config/attribute_types.xml b/src/Sylius/Bundle/AttributeBundle/Resources/config/attribute_types.xml
index e5a620e591f..2bfa6b46811 100644
--- a/src/Sylius/Bundle/AttributeBundle/Resources/config/attribute_types.xml
+++ b/src/Sylius/Bundle/AttributeBundle/Resources/config/attribute_types.xml
@@ -11,95 +11,64 @@
 
 -->
 
-<container xmlns="http://symfony.com/schema/dic/services"
-           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-           xsi:schemaLocation="http://symfony.com/schema/dic/services
-                               http://symfony.com/schema/dic/services/services-1.0.xsd">
-
-    <parameters>
-        <parameter key="sylius.attribute_type.text.class">Sylius\Component\Attribute\AttributeType\TextAttributeType</parameter>
-        <parameter key="sylius.form.type.attribute_type.text.class">Sylius\Bundle\AttributeBundle\Form\Type\AttributeType\TextAttributeType</parameter>
-        <parameter key="sylius.form.type.attribute_type.configuration.text.class">Sylius\Bundle\AttributeBundle\Form\Type\AttributeType\Configuration\TextAttributeConfigurationType</parameter>
-
-        <parameter key="sylius.attribute_type.textarea.class">Sylius\Component\Attribute\AttributeType\TextareaAttributeType</parameter>
-        <parameter key="sylius.form.type.attribute_type.textarea.class">Sylius\Bundle\AttributeBundle\Form\Type\AttributeType\TextareaAttributeType</parameter>
-
-        <parameter key="sylius.attribute_type.checkbox.class">Sylius\Component\Attribute\AttributeType\CheckboxAttributeType</parameter>
-        <parameter key="sylius.form.type.attribute_type.checkbox.class">Sylius\Bundle\AttributeBundle\Form\Type\AttributeType\CheckboxAttributeType</parameter>
-
-        <parameter key="sylius.attribute_type.integer.class">Sylius\Component\Attribute\AttributeType\IntegerAttributeType</parameter>
-        <parameter key="sylius.form.type.attribute_type.integer.class">Sylius\Bundle\AttributeBundle\Form\Type\AttributeType\IntegerAttributeType</parameter>
-
-        <parameter key="sylius.attribute_type.percent.class">Sylius\Component\Attribute\AttributeType\PercentAttributeType</parameter>
-        <parameter key="sylius.form.type.attribute_type.percent.class">Sylius\Bundle\AttributeBundle\Form\Type\AttributeType\PercentAttributeType</parameter>
-
-        <parameter key="sylius.attribute_type.datetime.class">Sylius\Component\Attribute\AttributeType\DatetimeAttributeType</parameter>
-        <parameter key="sylius.form.type.attribute_type.datetime.class">Sylius\Bundle\AttributeBundle\Form\Type\AttributeType\DatetimeAttributeType</parameter>
-        <parameter key="sylius.form.type.attribute_type.configuration.datetime.class">Sylius\Bundle\AttributeBundle\Form\Type\AttributeType\Configuration\DatetimeAttributeConfigurationType</parameter>
-
-        <parameter key="sylius.attribute_type.date.class">Sylius\Component\Attribute\AttributeType\DateAttributeType</parameter>
-        <parameter key="sylius.form.type.attribute_type.date.class">Sylius\Bundle\AttributeBundle\Form\Type\AttributeType\DateAttributeType</parameter>
-        <parameter key="sylius.form.type.attribute_type.configuration.date.class">Sylius\Bundle\AttributeBundle\Form\Type\AttributeType\Configuration\DateAttributeConfigurationType</parameter>
-    </parameters>
-
+<container xmlns="http://symfony.com/schema/dic/services" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
     <services>
-        <service id="sylius.attribute_type.text" class="%sylius.attribute_type.text.class%">
+        <service id="sylius.attribute_type.text" class="Sylius\Component\Attribute\AttributeType\TextAttributeType">
             <tag name="sylius.attribute.type" attribute-type="text" label="Text" />
         </service>
-        <service id="sylius.form.type.attribute_type.text" class="%sylius.form.type.attribute_type.text.class%">
+        <service id="sylius.form.type.attribute_type.text" class="Sylius\Bundle\AttributeBundle\Form\Type\AttributeType\TextAttributeType">
             <tag name="form.type" alias="sylius_attribute_type_text" />
         </service>
-        <service id="sylius.form.type.attribute_type.configuration.text" class="%sylius.form.type.attribute_type.configuration.text.class%">
+        <service id="sylius.form.type.attribute_type.configuration.text" class="Sylius\Bundle\AttributeBundle\Form\Type\AttributeType\Configuration\TextAttributeConfigurationType">
             <tag name="form.type" alias="sylius_attribute_type_configuration_text" />
         </service>
 
-        <service id="sylius.attribute_type.textarea" class="%sylius.attribute_type.textarea.class%">
+        <service id="sylius.attribute_type.textarea" class="Sylius\Component\Attribute\AttributeType\TextareaAttributeType">
             <tag name="sylius.attribute.type" attribute-type="textarea" label="Textarea" />
         </service>
-        <service id="sylius.form.type.attribute_type.textarea" class="%sylius.form.type.attribute_type.textarea.class%">
+        <service id="sylius.form.type.attribute_type.textarea" class="Sylius\Bundle\AttributeBundle\Form\Type\AttributeType\TextareaAttributeType">
             <tag name="form.type" alias="sylius_attribute_type_textarea" />
         </service>
 
-        <service id="sylius.attribute_type.checkbox" class="%sylius.attribute_type.checkbox.class%">
+        <service id="sylius.attribute_type.checkbox" class="Sylius\Component\Attribute\AttributeType\CheckboxAttributeType">
             <tag name="sylius.attribute.type" attribute-type="checkbox" label="Checkbox" />
         </service>
-        <service id="sylius.form.type.attribute_type.checkbox" class="%sylius.form.type.attribute_type.checkbox.class%">
+        <service id="sylius.form.type.attribute_type.checkbox" class="Sylius\Bundle\AttributeBundle\Form\Type\AttributeType\CheckboxAttributeType">
             <tag name="form.type" alias="sylius_attribute_type_checkbox" />
         </service>
 
-        <service id="sylius.attribute_type.integer" class="%sylius.attribute_type.integer.class%">
+        <service id="sylius.attribute_type.integer" class="Sylius\Component\Attribute\AttributeType\IntegerAttributeType">
             <tag name="sylius.attribute.type" attribute-type="integer" label="Integer" />
         </service>
-        <service id="sylius.form.type.attribute_type.integer" class="%sylius.form.type.attribute_type.integer.class%">
+        <service id="sylius.form.type.attribute_type.integer" class="Sylius\Bundle\AttributeBundle\Form\Type\AttributeType\IntegerAttributeType">
             <tag name="form.type" alias="sylius_attribute_type_integer" />
         </service>
 
-        <service id="sylius.attribute_type.percent" class="%sylius.attribute_type.percent.class%">
+        <service id="sylius.attribute_type.percent" class="Sylius\Component\Attribute\AttributeType\PercentAttributeType">
             <tag name="sylius.attribute.type" attribute-type="percent" label="Percent" />
         </service>
-        <service id="sylius.form.type.attribute_type.percent" class="%sylius.form.type.attribute_type.percent.class%">
+        <service id="sylius.form.type.attribute_type.percent" class="Sylius\Bundle\AttributeBundle\Form\Type\AttributeType\PercentAttributeType">
             <tag name="form.type" alias="sylius_attribute_type_percent" />
         </service>
 
-        <service id="sylius.attribute_type.datetime" class="%sylius.attribute_type.datetime.class%">
+        <service id="sylius.attribute_type.datetime" class="Sylius\Component\Attribute\AttributeType\DatetimeAttributeType">
             <tag name="sylius.attribute.type" attribute-type="datetime" label="Datetime" />
         </service>
-        <service id="sylius.form.type.attribute_type.datetime" class="%sylius.form.type.attribute_type.datetime.class%">
+        <service id="sylius.form.type.attribute_type.datetime" class="Sylius\Bundle\AttributeBundle\Form\Type\AttributeType\DatetimeAttributeType">
             <tag name="form.type" alias="sylius_attribute_type_datetime" />
         </service>
-        <service id="sylius.form.type.attribute_type.configuration.datetime" class="%sylius.form.type.attribute_type.configuration.datetime.class%">
+        <service id="sylius.form.type.attribute_type.configuration.datetime" class="Sylius\Bundle\AttributeBundle\Form\Type\AttributeType\Configuration\DatetimeAttributeConfigurationType">
             <tag name="form.type" alias="sylius_attribute_type_configuration_datetime" />
         </service>
 
-        <service id="sylius.attribute_type.date" class="%sylius.attribute_type.date.class%">
+        <service id="sylius.attribute_type.date" class="Sylius\Component\Attribute\AttributeType\DateAttributeType">
             <tag name="sylius.attribute.type" attribute-type="date" label="Date" />
         </service>
-        <service id="sylius.form.type.attribute_type.date" class="%sylius.form.type.attribute_type.date.class%">
+        <service id="sylius.form.type.attribute_type.date" class="Sylius\Bundle\AttributeBundle\Form\Type\AttributeType\DateAttributeType">
             <tag name="form.type" alias="sylius_attribute_type_date" />
         </service>
-        <service id="sylius.form.type.attribute_type.configuration.date" class="%sylius.form.type.attribute_type.configuration.date.class%">
+        <service id="sylius.form.type.attribute_type.configuration.date" class="Sylius\Bundle\AttributeBundle\Form\Type\AttributeType\Configuration\DateAttributeConfigurationType">
             <tag name="form.type" alias="sylius_attribute_type_configuration_date" />
         </service>
     </services>
-
 </container>
diff --git a/src/Sylius/Bundle/AttributeBundle/Resources/config/services.xml b/src/Sylius/Bundle/AttributeBundle/Resources/config/services.xml
index 5192f9d0489..5db4c693ba0 100644
--- a/src/Sylius/Bundle/AttributeBundle/Resources/config/services.xml
+++ b/src/Sylius/Bundle/AttributeBundle/Resources/config/services.xml
@@ -11,41 +11,29 @@
 
 -->
 
-<container xmlns="http://symfony.com/schema/dic/services"
-           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-           xsi:schemaLocation="http://symfony.com/schema/dic/services
-                               http://symfony.com/schema/dic/services/services-1.0.xsd">
-
+<container xmlns="http://symfony.com/schema/dic/services" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
     <parameters>
         <parameter key="sylius.model.attribute.interface">Sylius\Component\Attribute\AttributeType\AttributeTypeInterface</parameter>
-
-        <parameter key="sylius.event_subscriber.attribute.load_metadata.class">Sylius\Bundle\AttributeBundle\EventListener\LoadMetadataSubscriber</parameter>
-
-        <parameter key="sylius.form.type.attribute_type_choice.class">Sylius\Bundle\AttributeBundle\Form\Type\AttributeTypeChoiceType</parameter>
-        <parameter key="sylius.registry.attribute_type.class">Sylius\Component\Registry\ServiceRegistry</parameter>
-
-        <parameter key="sylius.validator.valid_attribute_value.class">Sylius\Bundle\AttributeBundle\Validator\Constraints\ValidAttributeValueValidator</parameter>
     </parameters>
 
     <services>
-        <service id="sylius.event_subscriber.attribute.load_metadata" class="%sylius.event_subscriber.attribute.load_metadata.class%">
+        <service id="sylius.event_subscriber.attribute.load_metadata" class="Sylius\Bundle\AttributeBundle\EventListener\LoadMetadataSubscriber">
             <tag name="doctrine.event_subscriber" />
             <argument>%sylius.attribute.subjects%</argument>
         </service>
 
-        <service id="sylius.registry.attribute_type" class="%sylius.registry.attribute_type.class%">
+        <service id="sylius.registry.attribute_type" class="Sylius\Component\Registry\ServiceRegistry">
             <argument>%sylius.model.attribute.interface%</argument>
             <argument>attribute type</argument>
         </service>
-        <service id="sylius.form.type.attribute_type_choice" class="%sylius.form.type.attribute_type_choice.class%">
+        <service id="sylius.form.type.attribute_type_choice" class="Sylius\Bundle\AttributeBundle\Form\Type\AttributeTypeChoiceType">
             <argument>%sylius.attribute.attribute_types%</argument>
             <tag name="form.type" alias="sylius_attribute_type_choice" />
         </service>
 
-        <service id="sylius.validator.valid_attribute_value" class="%sylius.validator.valid_attribute_value.class%">
+        <service id="sylius.validator.valid_attribute_value" class="Sylius\Bundle\AttributeBundle\Validator\Constraints\ValidAttributeValueValidator">
             <argument type="service" id="sylius.registry.attribute_type" />
             <tag name="validator.constraint_validator" alias="sylius_valid_attribute_value_validator" />
         </service>
     </services>
-
 </container>