diff --git a/Command/GenerateCommand.php b/Command/GenerateCommand.php
index dd0ef03..94eb0c7 100644
--- a/Command/GenerateCommand.php
+++ b/Command/GenerateCommand.php
@@ -67,7 +67,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
             return;
         }
 
-        $filter = $this->getContainer()->getParameter('braincrafted_bootstrap.less_filter');
+        $filter = $this->getContainer()->getParameter('braincrafted_bootstrap.css_preprocessor');
         if ('less' !== $filter && 'lessphp' !== $filter) {
             $output->writeln(
                 '<error>Bundle must be configured with "less" or "lessphp" to generated bootstrap.less</error>'
diff --git a/Command/InstallCommand.php b/Command/InstallCommand.php
index 659ee64..99f2e48 100644
--- a/Command/InstallCommand.php
+++ b/Command/InstallCommand.php
@@ -89,7 +89,7 @@ protected function getSrcDir()
             $this->getContainer()->getParameter('braincrafted_bootstrap.assets_dir'),
             (
                 // Sass version stores fonts in a different directory
-                in_array($this->getContainer()->getParameter('braincrafted_bootstrap.less_filter'), array('sass', 'scssphp')) ?
+                in_array($this->getContainer()->getParameter('braincrafted_bootstrap.css_preprocessor'), array('sass', 'scssphp')) ?
                 'fonts/bootstrap' :
                 'fonts'
             )
diff --git a/DependencyInjection/AsseticConfiguration.php b/DependencyInjection/AsseticConfiguration.php
index 44745a9..9722a59 100644
--- a/DependencyInjection/AsseticConfiguration.php
+++ b/DependencyInjection/AsseticConfiguration.php
@@ -35,9 +35,10 @@ public function build(array $config)
             $config['output_dir'] .= '/';
         }
 
-        if (in_array($config['less_filter'], array('sass', 'scssphp'))) {
+        // changed from css_preprocessor to css_preprocessor for 3.0
+        if (in_array($config['css_preprocessor'], array('sass', 'scssphp'))) {
             $output['bootstrap_css'] = $this->buildCssWithSass($config);
-        } elseif ('none' !== $config['less_filter']) {
+        } elseif ('none' !== $config['css_preprocessor']) {
             $output['bootstrap_css'] = $this->buildCssWithLess($config);
         } else {
             $output['bootstrap_css'] = $this->buildCssWithoutLess($config);
@@ -93,7 +94,7 @@ protected function buildCssWithLess(array $config)
 
         return array(
             'inputs'  => $inputs,
-            'filters' => array($config['less_filter']),
+            'filters' => array($config['css_preprocessor']),
             'output'  => $config['output_dir'].'css/bootstrap.css'
         );
     }
@@ -121,7 +122,7 @@ protected function buildCssWithSass(array $config)
 
         return array(
             'inputs'  => $inputs,
-            'filters' => array($config['less_filter']),
+            'filters' => array($config['css_preprocessor']),
             'output'  => $config['output_dir'].'css/bootstrap.css'
         );
     }
@@ -133,7 +134,7 @@ protected function buildCssWithSass(array $config)
      */
     protected function buildJs(array $config)
     {
-        $path = !in_array($config['less_filter'], array('sass', 'scssphp')) ? "/js" : "/javascripts/bootstrap";
+        $path = !in_array($config['css_preprocessor'], array('sass', 'scssphp')) ? "/js" : "/javascripts/bootstrap";
 
         return array(
             'inputs'  => array(
diff --git a/DependencyInjection/BraincraftedBootstrapExtension.php b/DependencyInjection/BraincraftedBootstrapExtension.php
index 479e6f4..5321842 100644
--- a/DependencyInjection/BraincraftedBootstrapExtension.php
+++ b/DependencyInjection/BraincraftedBootstrapExtension.php
@@ -61,7 +61,9 @@ public function load(array $configs, ContainerBuilder $container)
         $container->setParameter('braincrafted_bootstrap.fontawesome_dir', $config['fontawesome_dir']);
         $container->setParameter('braincrafted_bootstrap.fonts_dir', $config['fonts_dir']);
         $container->setParameter('braincrafted_bootstrap.output_dir', $config['output_dir']);
-        $container->setParameter('braincrafted_bootstrap.less_filter', $config['less_filter']);
+
+        // changed from css_preprocessor to css_preprocessor for 3.0
+        $container->setParameter('braincrafted_bootstrap.css_preprocessor', $config['css_preprocessor']);
         $container->setParameter('braincrafted_bootstrap.icon_prefix', $config['icon_prefix']);
         $container->setParameter('braincrafted_bootstrap.icon_tag', $config['icon_tag']);
     }
@@ -114,7 +116,8 @@ public function prepend(ContainerBuilder $container)
      */
     protected function processSassConfiguration(array $config)
     {
-        if (in_array($config['less_filter'], array('sass', 'scssphp'))) {
+        // changed from css_preprocessor to css_preprocessor for 3.0
+        if (in_array($config['css_preprocessor'], array('sass', 'scssphp'))) {
             if ($config['assets_dir'] === Configuration::DEFAULT_ASSETS_DIR) {
                 $config['assets_dir'] = Configuration::DEFAULT_ASSETS_DIR_SASS;
             }
diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
index 376cc11..2d8fd20 100644
--- a/DependencyInjection/Configuration.php
+++ b/DependencyInjection/Configuration.php
@@ -77,8 +77,9 @@ private function buildConfigTree()
                 ->scalarNode('fonts_dir')
                     ->defaultValue(self::DEFAULT_FONTS_DIR)
                 ->end()
-                // TODO for v3.0: Rename to css_preprocessor
-                ->scalarNode('less_filter')
+
+                // renamed from css_preprocessor to css_preprocessor
+                ->scalarNode('css_preprocessor')
                     ->defaultValue('less')
                     ->validate()
                         ->ifNotInArray(array('less', 'lessphp', 'sass', 'scssphp', 'none'))
diff --git a/Form/Extension/ButtonTypeExtension.php b/Form/Extension/ButtonTypeExtension.php
index 7f39755..177608d 100644
--- a/Form/Extension/ButtonTypeExtension.php
+++ b/Form/Extension/ButtonTypeExtension.php
@@ -7,6 +7,8 @@
 use Symfony\Component\Form\FormView;
 use Symfony\Component\Form\FormInterface;
 
+use Braincrafted\Bundle\BootstrapBundle\Util\LegacyFormHelper;
+
 /**
  * FormControlStaticType
  *
@@ -43,6 +45,7 @@ public function configureOptions(OptionsResolver $resolver)
      */
     public function getExtendedType()
     {
-        return 'button';
+        // map old class to new one using LegacyFormHelper
+        return LegacyFormHelper::getType('button');
     }
 }
\ No newline at end of file
diff --git a/Form/Extension/InputGroupButtonExtension.php b/Form/Extension/InputGroupButtonExtension.php
index ad231bf..51a7c20 100644
--- a/Form/Extension/InputGroupButtonExtension.php
+++ b/Form/Extension/InputGroupButtonExtension.php
@@ -8,6 +8,8 @@
 use Symfony\Component\Form\FormInterface;
 use Symfony\Component\Form\FormView;
 
+use Braincrafted\Bundle\BootstrapBundle\Util\LegacyFormHelper;
+
 /**
  * Class InputGroupButtonExtension
  *
@@ -34,7 +36,8 @@ class InputGroupButtonExtension extends AbstractTypeExtension
      */
     public function getExtendedType()
     {
-        return 'text';
+        // map old class to new one using LegacyFormHelper
+        return LegacyFormHelper::getType('text');
     }
 
     /**
@@ -100,6 +103,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
      */
     protected function addButton(FormBuilderInterface $builder, $config)
     {
+
         $options = (isset($config['options']))? $config['options'] : array();
 
         return $builder->create($config['name'], $config['type'], $options);
@@ -114,6 +118,7 @@ protected function addButton(FormBuilderInterface $builder, $config)
      */
     protected function storeButton(ButtonBuilder $buttonBuilder, FormBuilderInterface $form, $position)
     {
+
         if (!isset($this->buttons[$form->getName()])) {
             $this->buttons[$form->getName()] = array();
         }
diff --git a/Form/Extension/StaticControlExtension.php b/Form/Extension/StaticControlExtension.php
index 7f591b5..e82a3aa 100644
--- a/Form/Extension/StaticControlExtension.php
+++ b/Form/Extension/StaticControlExtension.php
@@ -8,6 +8,8 @@
 use Symfony\Component\Form\FormInterface;
 use Symfony\Component\Form\FormBuilderInterface;
 
+use Braincrafted\Bundle\BootstrapBundle\Util\LegacyFormHelper;
+
 /**
  * StaticControlExtension
  *
@@ -58,6 +60,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
      */
     public function getExtendedType()
     {
-        return 'form';
+        // map old class to new one using LegacyFormHelper
+        return LegacyFormHelper::getType('form');
     }
 }
diff --git a/Form/Extension/TypeSetterExtension.php b/Form/Extension/TypeSetterExtension.php
index 1746d4f..26a24c7 100644
--- a/Form/Extension/TypeSetterExtension.php
+++ b/Form/Extension/TypeSetterExtension.php
@@ -10,6 +10,8 @@
 use Symfony\Component\Form\FormView;
 use Symfony\Component\Form\FormInterface;
 
+use Braincrafted\Bundle\BootstrapBundle\Util\LegacyFormHelper;
+
 /**
  * TypeSetterExtension
  *
@@ -27,7 +29,7 @@ class TypeSetterExtension extends AbstractTypeExtension
      */
     public function buildView(FormView $view, FormInterface $form, array $options)
     {
-        $view->vars['original_type'] = $form->getConfig()->getType()->getName();
+        $view->vars['original_type'] = LegacyFormHelper::isLegacy() ? $form->getConfig()->getType()->getName() : $form->getConfig()->getType()->getBlockPrefix();
     }
 
     /**
@@ -35,6 +37,7 @@ public function buildView(FormView $view, FormInterface $form, array $options)
      */
     public function getExtendedType()
     {
-        return "form";
+        // map old class to new one using LegacyFormHelper
+        return LegacyFormHelper::getType('form');
     }
 }
diff --git a/Form/Type/BootstrapCollectionType.php b/Form/Type/BootstrapCollectionType.php
index e71215a..ef68c7e 100644
--- a/Form/Type/BootstrapCollectionType.php
+++ b/Form/Type/BootstrapCollectionType.php
@@ -12,6 +12,8 @@
 use Symfony\Component\OptionsResolver\Options;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
+use Braincrafted\Bundle\BootstrapBundle\Util\LegacyFormHelper;
+
 /**
  * BootstrapCollectionType
  *
@@ -64,18 +66,23 @@ public function configureOptions(OptionsResolver $resolver)
             // @codeCoverageIgnoreEnd
         };
 
-        $resolver->setDefaults(array(
+        $defaults =  array(
             'allow_add'          => false,
             'allow_delete'       => false,
             'prototype'          => true,
             'prototype_name'     => '__name__',
-            'type'               => 'text',
             'add_button_text'    => 'Add',
             'delete_button_text' => 'Delete',
             'sub_widget_col'     => 10,
             'button_col'         => 2,
             'options'            => array(),
-        ));
+        );
+
+
+        // map old class to new one using LegacyFormHelper
+        $defaults['type'] = LegacyFormHelper::getType('text');
+
+        $resolver->setDefaults($defaults);
 
         $resolver->setNormalizer('options', $optionsNormalizer);
     }
@@ -85,14 +92,24 @@ public function configureOptions(OptionsResolver $resolver)
      */
     public function getParent()
     {
-        return 'collection';
+        // map old class to new one using LegacyFormHelper
+        return LegacyFormHelper::getType('collection');
     }
 
     /**
      * {@inheritDoc}
      */
-    public function getName()
+    public function getBlockPrefix()
     {
         return 'bootstrap_collection';
     }
+
+    /**
+     * Backward compatibility for SF < 3.0
+     *
+     * @return null|string
+     */
+    public function getName() {
+        return $this->getBlockPrefix();
+    }
 }
diff --git a/Form/Type/FormActionsType.php b/Form/Type/FormActionsType.php
index 80821ec..1b27f07 100644
--- a/Form/Type/FormActionsType.php
+++ b/Form/Type/FormActionsType.php
@@ -92,8 +92,17 @@ public function configureOptions(OptionsResolver $resolver)
     /**
      * {@inheritdoc}
      */
-    public function getName()
+    public function getBlockPrefix()
     {
         return 'form_actions';
     }
+
+    /**
+     * Backward compatibility for SF < 3.0
+     *
+     * @return null|string
+     */
+    public function getName() {
+        return $this->getBlockPrefix();
+    }
 }
diff --git a/Form/Type/FormStaticControlType.php b/Form/Type/FormStaticControlType.php
index 0039b07..c838804 100644
--- a/Form/Type/FormStaticControlType.php
+++ b/Form/Type/FormStaticControlType.php
@@ -7,6 +7,7 @@
 
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\OptionsResolver\OptionsResolver;
+use Symfony\Component\Form\Extension\Core\Type\TextType;
 
 /**
  * FormStaticControlType
@@ -37,13 +38,23 @@ public function configureOptions(OptionsResolver $resolver)
      */
     public function getParent()
     {
-        return 'text';
+        // map old class to new one using LegacyFormHelper
+        return LegacyFormHelper::getType('text');
+    }
+
+    /**
+     * Backward compatibility for SF < 3.0
+     *
+     * @return null|string
+     */
+    public function getName() {
+        return $this->getBlockPrefix();
     }
 
     /**
      * {@inheritdoc}
      */
-    public function getName()
+    public function getBlockPrefix()
     {
         return 'bs_static';
     }
diff --git a/Form/Type/MoneyType.php b/Form/Type/MoneyType.php
index d2f5f45..4eaacd2 100644
--- a/Form/Type/MoneyType.php
+++ b/Form/Type/MoneyType.php
@@ -33,11 +33,20 @@ public function buildView(FormView $view, FormInterface $form, array $options)
     /**
      * {@inheritdoc}
      */
-    public function getName()
+    public function getBlockPrefix()
     {
         return 'money';
     }
 
+    /**
+     * Backward compatibility for SF < 3.0
+     *
+     * @return null|string
+     */
+    public function getName() {
+        return $this->getBlockPrefix();
+    }
+
     /**
      * Returns the pattern for this locale
      *
diff --git a/Resources/config/services/form.xml b/Resources/config/services/form.xml
index f0d94e3..31d085a 100644
--- a/Resources/config/services/form.xml
+++ b/Resources/config/services/form.xml
@@ -33,18 +33,18 @@
         </service>
 
         <service id="braincrafted_bootstrap.form.extension.typesetter_extension" class="%braincrafted_bootstrap.form.extension.typesetter_extension.class%">
-            <tag name="form.type_extension" alias="form" />
+            <tag name="form.type_extension" extended_type="Symfony\Component\Form\Extension\Core\Type\FormType" alias="form" />
         </service>
 
         <service id="braincrafted_bootstrap.form.extension.form_action_button" class="%braincrafted_bootstrap.form.extension.button_extension.class%">
-            <tag name="form.type_extension" alias="button" />
+            <tag name="form.type_extension" extended_type="Symfony\Component\Form\Extension\Core\Type\ButtonType" alias="button" />
         </service>
         <service id="braincrafted_bootstrap.form.extension.static_control" class="%braincrafted_bootstrap.form.extension.static_control.class%">
-            <tag name="form.type_extension" alias="form" />
+            <tag name="form.type_extension" extended_type="Symfony\Component\Form\Extension\Core\Type\FormType" alias="form" />
         </service>
 
         <service id="braincrafted_bootstrap.form.extension.input_group_button" class="%braincrafted_bootstrap.form.extension.input_group_button.class%">
-            <tag name="form.type_extension" alias="text" />
+            <tag name="form.type_extension" extended_type="Symfony\Component\Form\Extension\Core\Type\TextType" alias="text" />
         </service>
 
     </services>
diff --git a/Resources/views/Form/bootstrap.html.twig b/Resources/views/Form/bootstrap.html.twig
index c2f03a1..4787823 100644
--- a/Resources/views/Form/bootstrap.html.twig
+++ b/Resources/views/Form/bootstrap.html.twig
@@ -197,8 +197,8 @@
         {% set attr = attr|merge({ 'class': (attr.class|default('') ~ ' form-control')|trim }) %}
 
         <select {{ block('widget_attributes') }}{% if multiple %} multiple="multiple"{% endif %}>
-            {% if empty_value is not none %}
-                <option {% if required %} disabled="disabled"{% if value is empty %} selected="selected"{% endif %}{% endif %} value="">{{ empty_value|trans({}, translation_domain) }}</option>
+            {% if placeholder is not none %}
+                <option {% if required %} disabled="disabled"{% if value is empty %} selected="selected"{% endif %}{% endif %} value="">{{ placeholder|trans({}, translation_domain) }}</option>
             {% endif %}
             {% if preferred_choices|length > 0 %}
                 {% set options = preferred_choices %}
@@ -893,7 +893,7 @@
 
 {% block widget_attributes %}
     {% spaceless %}
-        id="{{ id }}" name="{{ full_name }}"{% if read_only %} readonly="readonly"{% endif %}{% if disabled %} disabled="disabled"{% endif %}{% if required %} required="required"{% endif %}{% if max_length %} maxlength="{{ max_length }}"{% endif %}{% if pattern %} pattern="{{ pattern }}"{% endif %}
+        id="{{ id }}" name="{{ full_name }}" {% if disabled %} disabled="disabled"{% endif %}{% if required %} required="required"{% endif %}
         {% for attrname, attrvalue in attr %}{% if attrname in ['placeholder', 'title'] %}{{ attrname }}="{{ attrvalue|trans({}, translation_domain) }}" {% elseif attrname in ['input_group'] %}{% else %}{{ attrname }}="{{ attrvalue }}" {% endif %}{% endfor %}
     {% endspaceless %}
 {% endblock widget_attributes %}
diff --git a/Tests/Command/GenerateCommandTest.php b/Tests/Command/GenerateCommandTest.php
index 2b44857..a2acb76 100644
--- a/Tests/Command/GenerateCommandTest.php
+++ b/Tests/Command/GenerateCommandTest.php
@@ -81,7 +81,7 @@ public function testExecute()
                 'bootstrap_output'   => __DIR__.'/bootstrap.less',
                 'bootstrap_template' => __DIR__.'/bootstrap.html.twig'
             ));
-        $this->container->shouldReceive('getParameter')->with('braincrafted_bootstrap.less_filter')->andReturn('less');
+        $this->container->shouldReceive('getParameter')->with('braincrafted_bootstrap.css_preprocessor')->andReturn('less');
         $this->container->shouldReceive('getParameter')->with('braincrafted_bootstrap.assets_dir')->andReturn(__DIR__);
 
         if (Kernel::VERSION_ID >= 20500) {
@@ -144,7 +144,7 @@ public function testExecuteNoLessFilter()
             ->shouldReceive('getParameter')
             ->with('braincrafted_bootstrap.customize')
             ->andReturn(array('variables_file' => __DIR__.'/x/variables.less'));
-        $this->container->shouldReceive('getParameter')->with('braincrafted_bootstrap.less_filter')->andReturn('none');
+        $this->container->shouldReceive('getParameter')->with('braincrafted_bootstrap.css_preprocessor')->andReturn('none');
 
         // mock the Kernel or create one depending on your needs
         $application = new Application($this->kernel);
diff --git a/Tests/Command/InstallCommandTest.php b/Tests/Command/InstallCommandTest.php
index 8da07f4..4636755 100644
--- a/Tests/Command/InstallCommandTest.php
+++ b/Tests/Command/InstallCommandTest.php
@@ -64,7 +64,7 @@ public function testExecute()
             ->andReturn('glyphicon');
         $this->container
             ->shouldReceive('getParameter')
-            ->with('braincrafted_bootstrap.less_filter')
+            ->with('braincrafted_bootstrap.css_preprocessor')
             ->andReturn('');
         $this->container
             ->shouldReceive('getParameter')
@@ -103,7 +103,7 @@ public function testExecuteFontAwesome()
             ->andReturn(__DIR__.'/fixtures/vendor/twbs/bootstrap');
         $this->container
             ->shouldReceive('getParameter')
-            ->with('braincrafted_bootstrap.less_filter')
+            ->with('braincrafted_bootstrap.css_preprocessor')
             ->andReturn('');
 
         // mock the Kernel or create one depending on your needs
@@ -138,7 +138,7 @@ public function testExecuteSrcNotExists()
             ->andReturn('glyphicon');
         $this->container
             ->shouldReceive('getParameter')
-            ->with('braincrafted_bootstrap.less_filter')
+            ->with('braincrafted_bootstrap.css_preprocessor')
             ->andReturn('');
 
         // mock the Kernel or create one depending on your needs
@@ -169,7 +169,15 @@ public function testExecuteInvalidDestDirectory()
             ->andReturn('glyphicon');
         $this->container
             ->shouldReceive('getParameter')
-            ->with('braincrafted_bootstrap.less_filter')
+            ->with('braincrafted_bootstrap.css_preprocessor')
+            ->andReturn('');
+        $this->container
+            ->shouldReceive('getParameter')
+            ->with('braincrafted_bootstrap.assets_dir')
+            ->andReturn('');
+        $this->container
+            ->shouldReceive('getParameter')
+            ->with('braincrafted_bootstrap.fontawesome_dir')
             ->andReturn('');
 
         // mock the Kernel or create one depending on your needs
diff --git a/Tests/DependencyInjection/AsseticConfigurationTest.php b/Tests/DependencyInjection/AsseticConfigurationTest.php
index fe9cbb4..5a8f08f 100644
--- a/Tests/DependencyInjection/AsseticConfigurationTest.php
+++ b/Tests/DependencyInjection/AsseticConfigurationTest.php
@@ -25,7 +25,7 @@ public function setUp()
     public function testBuild()
     {
         $this->asseticConfig->build(array(
-            'less_filter'   => 'less',
+            'css_preprocessor'   => 'less',
             'assets_dir'    => './assets',
             'output_dir'    => './web',
             'jquery_path'   => './assets/jquery.js',
@@ -46,7 +46,7 @@ public function testBuild()
     public function testBuildWithoutLess()
     {
         $this->asseticConfig->build(array(
-            'less_filter'   => 'none',
+            'css_preprocessor'   => 'none',
             'assets_dir'    => './assets',
             'output_dir'    => './web',
             'jquery_path'   => './assets/jquery.js',
diff --git a/Tests/Form/Extension/InputGroupButtonExtensionTest.php b/Tests/Form/Extension/InputGroupButtonExtensionTest.php
index 567ad1e..ea7da1e 100644
--- a/Tests/Form/Extension/InputGroupButtonExtensionTest.php
+++ b/Tests/Form/Extension/InputGroupButtonExtensionTest.php
@@ -3,6 +3,7 @@
 
 namespace Braincrafted\Bundle\BootstrapBundle\Tests\Form\Extension;
 
+use Braincrafted\Bundle\BootstrapBundle\Util\LegacyFormHelper;
 use \Mockery as m;
 use Braincrafted\Bundle\BootstrapBundle\Form\Extension\InputGroupButtonExtension;
 use Symfony\Component\Form\FormView;
@@ -24,15 +25,18 @@ public function setUp()
 
     public function testBuildView()
     {
+
+        // map old class to new one using LegacyFormHelper
         $optionsBoth = array(
             'attr' => array(
                 'input_group' => array(
-                    'button_prepend' => array('name' => 'prepend', 'type' => 'submit', 'options' => array()),
-                    'button_append' => array('name' => 'append', 'type' => 'submit', 'options' => array())
+                    'button_prepend' => array('name' => 'prepend', 'type' => LegacyFormHelper::getType('submit'), 'options' => array()),
+                    'button_append' => array('name' => 'append', 'type' => LegacyFormHelper::getType('submit'), 'options' => array())
                 )
             ),
         );
 
+
         $buttonPrepend = m::mock('Symfony\Component\Form\Button');
         $buttonPrepend->shouldReceive('createView')->andReturn('prepend');
 
@@ -75,12 +79,13 @@ public function testBuildForm($options)
         $builder = m::mock('Symfony\Component\Form\FormBuilderInterface');
         $builder->shouldReceive('getName')->andReturn('input_name');
 
+        // map old class to new one using LegacyFormHelper
         if (isset($options['attr']['input_group']['button_prepend'])) {
-            $builder->shouldReceive('create')->with('prepend', 'submit', array())->andReturn($button)->once();
+            $builder->shouldReceive('create')->with('prepend', LegacyFormHelper::getType('submit'), array())->andReturn($button)->once();
         }
 
         if (isset($options['attr']['input_group']['button_append'])) {
-            $builder->shouldReceive('create')->with('append', 'submit', array())->andReturn($button)->once();
+            $builder->shouldReceive('create')->with('append', LegacyFormHelper::getType('submit'), array())->andReturn($button)->once();
         }
 
         $this->extension->buildForm($builder, $options);
@@ -88,11 +93,12 @@ public function testBuildForm($options)
 
     public function provideForForm()
     {
+
         $optionsBoth = array(
             'attr' => array(
                 'input_group' => array(
-                    'button_prepend' => array('name' => 'prepend', 'type' => 'submit', 'options' => array()),
-                    'button_append' => array('name' => 'append', 'type' => 'submit', 'options' => array())
+                    'button_prepend' => array('name' => 'prepend', 'type' => LegacyFormHelper::getType('submit'), 'options' => array()),
+                    'button_append' => array('name' => 'append', 'type' => LegacyFormHelper::getType('submit'), 'options' => array())
                 )
             ),
         );
@@ -100,7 +106,7 @@ public function provideForForm()
         $optionsOne = array(
             'attr' => array(
                 'input_group' => array(
-                    'button_append' => array('name' => 'append', 'type' => 'submit', 'options' => array())
+                    'button_append' => array('name' => 'append', 'type' => LegacyFormHelper::getType('submit'), 'options' => array())
                 )
             ),
         );
@@ -125,6 +131,6 @@ public function provideForForm()
      */
     public function testGetExtendedType()
     {
-        $this->assertEquals('text', $this->extension->getExtendedType());
+        $this->assertEquals(LegacyFormHelper::getType('text'), $this->extension->getExtendedType());
     }
 }
diff --git a/Tests/Form/Extension/TypeSetterExtensionTest.php b/Tests/Form/Extension/TypeSetterExtensionTest.php
index e8a020d..eaab868 100644
--- a/Tests/Form/Extension/TypeSetterExtensionTest.php
+++ b/Tests/Form/Extension/TypeSetterExtensionTest.php
@@ -5,6 +5,7 @@
 use \Mockery as m;
 
 use Braincrafted\Bundle\BootstrapBundle\Form\Extension\TypeSetterExtension;
+use Braincrafted\Bundle\BootstrapBundle\Util\LegacyFormHelper;
 
 /**
  * TypeSetterExtensionTest
@@ -28,7 +29,11 @@ public function testBuildView()
     {
         $view = m::mock('Symfony\Component\Form\FormView');
         $type = m::mock('Symfony\Component\Form\ResolvedFormTypeInterface');
-        $type->shouldReceive('getName')->andReturn('type');
+        if(LegacyFormHelper::isLegacy()) {
+            $type->shouldReceive('getName')->andReturn('form');
+        } else {
+            $type->shouldReceive('getBlockPrefix')->andReturn(LegacyFormHelper::getType('form'));
+        }
         $config = m::mock('Symfony\Component\Form\FormConfigInterface');
         $config->shouldReceive('getType')->andReturn($type);
         $form = m::mock('Symfony\Component\Form\FormInterface');
@@ -42,6 +47,7 @@ public function testBuildView()
      */
     public function testGetExtendedType()
     {
-        $this->assertEquals('form', $this->extension->getExtendedType());
+        // map old class to new one using LegacyFormHelper
+        $this->assertEquals(LegacyFormHelper::getType('form'), $this->extension->getExtendedType());
     }
 }
diff --git a/Tests/Form/Type/BootstrapCollectionTypeTest.php b/Tests/Form/Type/BootstrapCollectionTypeTest.php
index 31d0134..ff27792 100644
--- a/Tests/Form/Type/BootstrapCollectionTypeTest.php
+++ b/Tests/Form/Type/BootstrapCollectionTypeTest.php
@@ -5,6 +5,7 @@
 use \Mockery as m;
 
 use Braincrafted\Bundle\BootstrapBundle\Form\Type\BootstrapCollectionType;
+use Braincrafted\Bundle\BootstrapBundle\Util\LegacyFormHelper;
 
 /**
  * BootstrapCollectionTypeTest
@@ -66,14 +67,14 @@ public function testConfigureOptions()
      */
     public function testGetParent()
     {
-        $this->assertEquals('collection', $this->type->getParent());
+        $this->assertEquals(LegacyFormHelper::getType('collection'), $this->type->getParent());
     }
 
     /**
-     * @covers Braincrafted\Bundle\BootstrapBundle\Form\Type\BootstrapCollectionType::getName()
+     * @covers Braincrafted\Bundle\BootstrapBundle\Form\Type\BootstrapCollectionType::getBlockPrefix()
      */
-    public function testGetName()
+    public function testGetBlockPrefix()
     {
-        $this->assertEquals('bootstrap_collection', $this->type->getName());
+        $this->assertEquals('bootstrap_collection', $this->type->getBlockPrefix());
     }
 }
diff --git a/Tests/Form/Type/FormActionsTypeTest.php b/Tests/Form/Type/FormActionsTypeTest.php
index 68758bf..e1f0246 100644
--- a/Tests/Form/Type/FormActionsTypeTest.php
+++ b/Tests/Form/Type/FormActionsTypeTest.php
@@ -8,6 +8,8 @@
 use Symfony\Component\Form\ButtonBuilder;
 use Symfony\Component\Form\FormBuilder;
 
+use Braincrafted\Bundle\BootstrapBundle\Util\LegacyFormHelper;
+
 /**
  * Class FormActionsTypeTest
  *
@@ -30,16 +32,18 @@ public function testBuildForm()
     {
         $builder = m::mock('Symfony\Component\Form\FormBuilderInterface');
 
-        $input  = array(
+        // map old class to new one using LegacyFormHelper
+        $input = array(
             'buttons' => array(
-                'save' => array('type' => 'submit', 'options' => array('label' => 'button.save')),
-                'cancel' => array('type' => 'button', 'options' => array('label' => 'button.cancel')),
+                'save' => array('type' => LegacyFormHelper::getType('submit'), 'options' => array('label' => 'button.save')),
+                'cancel' => array('type' => LegacyFormHelper::getType('button'), 'options' => array('label' => 'button.cancel')),
             )
         );
 
+
         $buttonBuilder = new ButtonBuilder('name');
         $builder->shouldReceive('add')
-            ->with(m::anyOf('save', 'cancel'), m::anyOf('submit', 'button'), m::hasKey('label'))
+            ->with(m::anyOf('save', 'cancel'), m::anyOf(LegacyFormHelper::getType('submit'), LegacyFormHelper::getType('button')), m::hasKey('label'))
             ->twice()
             ->andReturn($buttonBuilder);
 
@@ -90,6 +94,9 @@ public function testBuildViewWithBadField()
         $this->type->buildView($view, $form, $options);
     }
 
+    /**
+     * @covers Braincrafted\Bundle\BootstrapBundle\Form\Type\FormActionsType::configureOptions()
+     */
     public function testConfigureOptions()
     {
 
@@ -105,7 +112,10 @@ public function testConfigureOptions()
         $this->type->configureOptions($resolver);
     }
 
-    public function testGetName()
+    /**
+     * @covers Braincrafted\Bundle\BootstrapBundle\Form\Type\FormActionsType::getBlockPrefix()
+     */
+    public function testGetBlockPrefix()
     {
         $this->assertEquals('form_actions', $this->type->getName());
     }
diff --git a/Tests/Form/Type/MoneyTypeTest.php b/Tests/Form/Type/MoneyTypeTest.php
index b3f57d9..1e5189d 100644
--- a/Tests/Form/Type/MoneyTypeTest.php
+++ b/Tests/Form/Type/MoneyTypeTest.php
@@ -5,6 +5,7 @@
 use \Mockery as m;
 
 use Braincrafted\Bundle\BootstrapBundle\Form\Type\MoneyType;
+use Braincrafted\Bundle\BootstrapBundle\Util\LegacyFormHelper;
 
 /**
  * MoneyTypeTest
@@ -63,10 +64,10 @@ public function testGetPatternEmpty()
     }
 
     /**
-     * @covers Braincrafted\Bundle\BootstrapBundle\Form\Type\MoneyType::getName()
+     * @covers Braincrafted\Bundle\BootstrapBundle\Form\Type\MoneyType::getBlockPrefix()
      */
-    public function testGetName()
+    public function testGetBlockPrefix()
     {
-        $this->assertEquals('money', $this->type->getName());
+        $this->assertEquals('money', $this->type->getBlockPrefix());
     }
 }
diff --git a/Util/LegacyFormHelper.php b/Util/LegacyFormHelper.php
new file mode 100644
index 0000000..55ba93f
--- /dev/null
+++ b/Util/LegacyFormHelper.php
@@ -0,0 +1,47 @@
+<?php
+namespace Braincrafted\Bundle\BootstrapBundle\Util;
+
+/**
+ * Special thanks to the authors of FOSUserBundle on which this Util is based on.
+ *
+ * @internal
+ *
+ * @author Adrian Gorny <lashus@gmail.com>
+ */
+final class LegacyFormHelper
+{
+    private static $map = array(
+        'form' => 'Symfony\Component\Form\Extension\Core\Type\FormType',
+        'email' => 'Symfony\Component\Form\Extension\Core\Type\EmailType',
+        'text' => 'Symfony\Component\Form\Extension\Core\Type\TextType',
+        'submit' => 'Symfony\Component\Form\Extension\Core\Type\SubmitType',
+        'button' => 'Symfony\Component\Form\Extension\Core\Type\ButtonType',
+        'collection' => 'Symfony\Component\Form\Extension\Core\Type\CollectionType'
+    );
+
+    public static function getType($class)
+    {
+        if (self::isLegacy()) {
+            return $class;
+        }
+
+        if (!isset(self::$map[$class])) {
+            throw new \InvalidArgumentException(sprintf('Form type with class "%s" can not be found. Please check for typos or add it to the map in LegacyFormHelper', $class));
+        }
+
+        return self::$map[$class];
+    }
+
+    public static function isLegacy()
+    {
+        return !method_exists('Symfony\Component\Form\AbstractType', 'getBlockPrefix');
+    }
+
+    private function __construct()
+    {
+    }
+
+    private function __clone()
+    {
+    }
+}
diff --git a/composer.json b/composer.json
index 8a266f0..7a08220 100644
--- a/composer.json
+++ b/composer.json
@@ -1,5 +1,5 @@
 {
-    "name":         "braincrafted/bootstrap-bundle",
+    "name":         "lashus/bootstrap-bundle",
     "description":  "BraincraftedBootstrapBundle integrates Bootstrap into Symfony2 by providing templates, Twig extensions, services and commands.",
     "keywords":     ["bootstrap"],
     "type":         "symfony-bundle",
@@ -13,19 +13,20 @@
     ],
     "require":      {
         "php":                      ">=5.3.3",
-        "symfony/framework-bundle": "~2.6",
-        "symfony/twig-bundle":      "~2.6",
-        "symfony/form":             "~2.6",
-        "symfony/console":          "~2.6",
-        "symfony/finder":           "~2.6"
+        "symfony/framework-bundle": "~2.6|~3.0",
+        "symfony/twig-bundle":      "~2.6|~3.0",
+        "symfony/form":             "~2.6|~3.0",
+        "symfony/console":          "~2.6|~3.0",
+        "symfony/finder":           "~2.6|~3.0",
+        "twig/twig":                "~1.12|~2.0@dev"
     },
     "require-dev": {
-        "symfony/assetic-bundle":       "~2.6",
+        "symfony/assetic-bundle":       "~2.6|~3.0",
         "knplabs/knp-menu":             "~2.0@alpha",
         "knplabs/knp-menu-bundle":      "~2.0@alpha",
         "knplabs/knp-paginator-bundle": "dev-master",
-        "phpunit/phpunit":              "3.7.*",
-        "mockery/mockery":              "0.9.*"
+        "phpunit/phpunit":              "~3.7",
+        "mockery/mockery":              "~0.9"
     },
     "suggest":      {
         "knplabs/knp-paginator-bundle": "BraincraftedBootstrapBundle styles the pagination provided by KnpPaginatorBundle.",