diff --git a/src/Symfony/Bundle/TwigBundle/DependencyInjection/Compiler/RuntimeLoaderPass.php b/src/Symfony/Bundle/TwigBundle/DependencyInjection/Compiler/RuntimeLoaderPass.php
index 6a4c1f2690..7d0be74fad 100644
--- a/src/Symfony/Bundle/TwigBundle/DependencyInjection/Compiler/RuntimeLoaderPass.php
+++ b/src/Symfony/Bundle/TwigBundle/DependencyInjection/Compiler/RuntimeLoaderPass.php
@@ -13,6 +13,7 @@ namespace Symfony\Bundle\TwigBundle\DependencyInjection\Compiler;
 
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
+use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
 
 /**
  * Registers Twig runtime services.
diff --git a/src/Symfony/Bundle/TwigBundle/Resources/config/form.xml b/src/Symfony/Bundle/TwigBundle/Resources/config/form.xml
index 0703f0f577..f1603c1546 100644
--- a/src/Symfony/Bundle/TwigBundle/Resources/config/form.xml
+++ b/src/Symfony/Bundle/TwigBundle/Resources/config/form.xml
@@ -4,17 +4,22 @@
     xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
 
     <services>
-        <service id="twig.extension.form" class="%twig.extension.form.class%" public="false">
-            <argument type="service" id="twig.form.renderer" />
+        <service id="twig.extension.form" class="Symfony\Bridge\Twig\Extension\FormExtension" public="false">
+            <argument type="collection">
+                <argument type="service" id="service_container" />
+                <argument>twig.form.renderer</argument>
+            </argument>
         </service>
 
-        <service id="twig.form.engine" class="%twig.form.engine.class%" public="false">
+        <service id="twig.form.engine" class="Symfony\Bridge\Twig\Form\TwigRendererEngine" public="false">
             <argument>%twig.form.resources%</argument>
+            <argument type="service" id="twig" />
         </service>
 
-        <service id="twig.form.renderer" class="%twig.form.renderer.class%" public="false">
+        <service id="twig.form.renderer" class="Symfony\Bridge\Twig\Form\TwigRenderer">
             <argument type="service" id="twig.form.engine" />
             <argument type="service" id="security.csrf.token_manager" on-invalid="null" />
+            <tag name="twig.runtime" />
         </service>
     </services>
 </container>
diff --git a/src/Symfony/Bundle/TwigBundle/Resources/config/templating.xml b/src/Symfony/Bundle/TwigBundle/Resources/config/templating.xml
index 5a39c95018..abfe1b47b1 100644
--- a/src/Symfony/Bundle/TwigBundle/Resources/config/templating.xml
+++ b/src/Symfony/Bundle/TwigBundle/Resources/config/templating.xml
@@ -4,15 +4,16 @@
     xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
 
     <services>
-        <service id="twig.loader.filesystem" class="%twig.loader.filesystem.class%" public="false">
+        <service id="twig.loader.filesystem" class="Symfony\Bundle\TwigBundle\Loader\FilesystemLoader" public="false">
             <argument type="service" id="templating.locator" />
             <argument type="service" id="templating.name_parser" />
+            <argument /> <!-- project's root dir -->
             <tag name="twig.loader"/>
         </service>
 
         <service id="twig.loader" alias="twig.loader.filesystem" />
 
-        <service id="templating.engine.twig" class="%templating.engine.twig.class%" public="false">
+        <service id="templating.engine.twig" class="Symfony\Bundle\TwigBundle\TwigEngine" public="false">
             <argument type="service" id="twig" />
             <argument type="service" id="templating.name_parser" />
             <argument type="service" id="templating.locator" />
diff --git a/src/Symfony/Bundle/TwigBundle/Resources/config/twig.xml b/src/Symfony/Bundle/TwigBundle/Resources/config/twig.xml
index 29d2c4390a..e76949bc74 100644
--- a/src/Symfony/Bundle/TwigBundle/Resources/config/twig.xml
+++ b/src/Symfony/Bundle/TwigBundle/Resources/config/twig.xml
@@ -49,23 +49,8 @@
             <argument /> <!-- project's root dir -->
         </service>
 
-        <service id="twig.loader.filesystem" class="Symfony\Bundle\TwigBundle\Loader\FilesystemLoader" public="false">
-            <argument type="service" id="templating.locator" />
-            <argument type="service" id="templating.name_parser" />
-            <argument /> <!-- project's root dir -->
-            <tag name="twig.loader"/>
-        </service>
-
         <service id="twig.loader.chain" class="Twig_Loader_Chain" public="false"/>
 
-        <service id="twig.loader" alias="twig.loader.filesystem" />
-
-        <service id="templating.engine.twig" class="Symfony\Bundle\TwigBundle\TwigEngine" public="false">
-            <argument type="service" id="twig" />
-            <argument type="service" id="templating.name_parser" />
-            <argument type="service" id="templating.locator" />
-        </service>
-
         <service id="twig.extension.profiler" class="Symfony\Bridge\Twig\Extension\ProfilerExtension" public="false">
             <argument type="service" id="twig.profile" />
             <argument type="service" id="debug.stopwatch" on-invalid="null" />
@@ -118,26 +103,8 @@
             <argument type="service" id="router.request_context" on-invalid="ignore" />
         </service>
 
-        <service id="twig.extension.form" class="Symfony\Bridge\Twig\Extension\FormExtension" public="false">
-            <argument type="collection">
-                <argument type="service" id="service_container" />
-                <argument>twig.form.renderer</argument>
-            </argument>
-        </service>
-
         <service id="twig.extension.debug" class="Twig_Extension_Debug" public="false" />
 
-        <service id="twig.form.engine" class="Symfony\Bridge\Twig\Form\TwigRendererEngine" public="false">
-            <argument>%twig.form.resources%</argument>
-            <argument type="service" id="twig" />
-        </service>
-
-        <service id="twig.form.renderer" class="Symfony\Bridge\Twig\Form\TwigRenderer">
-            <argument type="service" id="twig.form.engine" />
-            <argument type="service" id="security.csrf.token_manager" on-invalid="null" />
-            <tag name="twig.runtime" />
-        </service>
-
         <service id="twig.translation.extractor" class="Symfony\Bridge\Twig\Translation\TwigExtractor">
             <argument type="service" id="twig" />
             <tag name="translation.extractor" alias="twig" />