diff --git a/src/Symfony/Bundle/TwigBundle/Controller/ExceptionController.php b/src/Symfony/Bundle/TwigBundle/Controller/ExceptionController.php
index b0c172c1e9..237fda48ec 100644
--- a/src/Symfony/Bundle/TwigBundle/Controller/ExceptionController.php
+++ b/src/Symfony/Bundle/TwigBundle/Controller/ExceptionController.php
@@ -11,12 +11,10 @@
 
 namespace Symfony\Bundle\TwigBundle\Controller;
 
-use Symfony\Bundle\FrameworkBundle\Templating\TemplateReference;
 use Symfony\Component\HttpKernel\Exception\FlattenException;
 use Symfony\Component\HttpKernel\Log\DebugLoggerInterface;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\Templating\TemplateReferenceInterface;
 
 /**
  * ExceptionController renders error or exception pages for a given
@@ -96,7 +94,7 @@ class ExceptionController
      * @param int     $code          An HTTP response status code
      * @param bool    $showException
      *
-     * @return TemplateReferenceInterface
+     * @return string
      */
     protected function findTemplate(Request $request, $format, $code, $showException)
     {
@@ -107,14 +105,14 @@ class ExceptionController
 
         // For error pages, try to find a template for the specific HTTP status code and format
         if (!$showException) {
-            $template = new TemplateReference('TwigBundle', 'Exception', $name.$code, $format, 'twig');
+            $template = sprintf('@Twig/Exception/%s%s.%s.twig', $name, $code, $format);
             if ($this->templateExists($template)) {
                 return $template;
             }
         }
 
         // try to find a template for the given format
-        $template = new TemplateReference('TwigBundle', 'Exception', $name, $format, 'twig');
+        $template = sprintf('@Twig/Exception/%s.%s.twig', $name, $format);
         if ($this->templateExists($template)) {
             return $template;
         }
@@ -122,7 +120,7 @@ class ExceptionController
         // default to a generic HTML exception
         $request->setRequestFormat('html');
 
-        return new TemplateReference('TwigBundle', 'Exception', $showException ? 'exception_full' : $name, 'html', 'twig');
+        return sprintf('@Twig/Exception/%s.html.twig', $showException ? 'exception_full' : $name);
     }
 
     // to be removed when the minimum required version of Twig is >= 3.0
diff --git a/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/error.atom.twig b/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/error.atom.twig
index 074389ce91..c27cc56e6a 100644
--- a/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/error.atom.twig
+++ b/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/error.atom.twig
@@ -1 +1 @@
-{% include 'TwigBundle:Exception:error.xml.twig' %}
+{% include '@Twig/Exception/error.xml.twig' %}
diff --git a/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/error.rdf.twig b/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/error.rdf.twig
index 074389ce91..c27cc56e6a 100644
--- a/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/error.rdf.twig
+++ b/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/error.rdf.twig
@@ -1 +1 @@
-{% include 'TwigBundle:Exception:error.xml.twig' %}
+{% include '@Twig/Exception/error.xml.twig' %}
diff --git a/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/exception.atom.twig b/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/exception.atom.twig
index 989740fdd0..d507ce46f6 100644
--- a/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/exception.atom.twig
+++ b/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/exception.atom.twig
@@ -1 +1 @@
-{% include 'TwigBundle:Exception:exception.xml.twig' with { 'exception': exception } %}
+{% include '@Twig/Exception/exception.xml.twig' with { 'exception': exception } %}
diff --git a/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/exception.css.twig b/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/exception.css.twig
index 870d4a0fd2..bdf242b7f1 100644
--- a/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/exception.css.twig
+++ b/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/exception.css.twig
@@ -1,3 +1,3 @@
 /*
-{% include 'TwigBundle:Exception:exception.txt.twig' with { 'exception': exception } %}
+{% include '@Twig/Exception/exception.txt.twig' with { 'exception': exception } %}
 */
diff --git a/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/exception.html.twig b/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/exception.html.twig
index f09ffb3c65..947df65583 100644
--- a/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/exception.html.twig
+++ b/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/exception.html.twig
@@ -37,7 +37,7 @@
 </div>
 
 {% for position, e in exception.toarray %}
-    {% include 'TwigBundle:Exception:traces.html.twig' with { 'exception': e, 'position': position, 'count': previous_count } only %}
+    {% include '@Twig/Exception/traces.html.twig' with { 'exception': e, 'position': position, 'count': previous_count } only %}
 {% endfor %}
 
 {% if logger %}
@@ -63,7 +63,7 @@
         </div>
 
         <div id="logs">
-            {% include 'TwigBundle:Exception:logs.html.twig' with { 'logs': logger.logs } only %}
+            {% include '@Twig/Exception/logs.html.twig' with { 'logs': logger.logs } only %}
         </div>
     </div>
 {% endif %}
@@ -88,7 +88,7 @@
     </div>
 {% endif %}
 
-{% include 'TwigBundle:Exception:traces_text.html.twig' with { 'exception': exception } only %}
+{% include '@Twig/Exception/traces_text.html.twig' with { 'exception': exception } only %}
 
 <script type="text/javascript">//<![CDATA[
     function toggle(id, clazz) {
diff --git a/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/exception.js.twig b/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/exception.js.twig
index 870d4a0fd2..bdf242b7f1 100644
--- a/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/exception.js.twig
+++ b/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/exception.js.twig
@@ -1,3 +1,3 @@
 /*
-{% include 'TwigBundle:Exception:exception.txt.twig' with { 'exception': exception } %}
+{% include '@Twig/Exception/exception.txt.twig' with { 'exception': exception } %}
 */
diff --git a/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/exception.rdf.twig b/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/exception.rdf.twig
index 989740fdd0..d507ce46f6 100644
--- a/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/exception.rdf.twig
+++ b/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/exception.rdf.twig
@@ -1 +1 @@
-{% include 'TwigBundle:Exception:exception.xml.twig' with { 'exception': exception } %}
+{% include '@Twig/Exception/exception.xml.twig' with { 'exception': exception } %}
diff --git a/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/exception.txt.twig b/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/exception.txt.twig
index 3c7a91299b..ae297c5745 100644
--- a/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/exception.txt.twig
+++ b/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/exception.txt.twig
@@ -2,6 +2,6 @@
 [message] {{ exception.message }}
 {% for i, e in exception.toarray %}
 [{{ i + 1 }}] {{ e.class }}: {{ e.message }}
-{% include 'TwigBundle:Exception:traces.txt.twig' with { 'exception': e } only %}
+{% include '@Twig/Exception/traces.txt.twig' with { 'exception': e } only %}
 
 {% endfor %}
diff --git a/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/exception.xml.twig b/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/exception.xml.twig
index fa99d447f7..2e3f30a10a 100644
--- a/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/exception.xml.twig
+++ b/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/exception.xml.twig
@@ -3,7 +3,7 @@
 <error code="{{ status_code }}" message="{{ status_text }}">
 {% for e in exception.toarray %}
     <exception class="{{ e.class }}" message="{{ e.message }}">
-{% include 'TwigBundle:Exception:traces.xml.twig' with { 'exception': e } only %}
+{% include '@Twig/Exception/traces.xml.twig' with { 'exception': e } only %}
     </exception>
 {% endfor %}
 </error>
diff --git a/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/exception_full.html.twig b/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/exception_full.html.twig
index 24d437d45e..fa6f321b83 100644
--- a/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/exception_full.html.twig
+++ b/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/exception_full.html.twig
@@ -1,4 +1,4 @@
-{% extends 'TwigBundle::layout.html.twig' %}
+{% extends '@Twig/layout.html.twig' %}
 
 {% block head %}
     <link href="{{ absolute_url(asset('bundles/framework/css/exception.css')) }}" rel="stylesheet" type="text/css" media="all" />
@@ -9,5 +9,5 @@
 {% endblock %}
 
 {% block body %}
-    {% include 'TwigBundle:Exception:exception.html.twig' %}
+    {% include '@Twig/Exception/exception.html.twig' %}
 {% endblock %}
diff --git a/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/traces.html.twig b/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/traces.html.twig
index cf49082cf4..e846f7a1c6 100644
--- a/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/traces.html.twig
+++ b/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/traces.html.twig
@@ -18,7 +18,7 @@
     <ol class="traces list-exception" id="traces-{{ position }}" style="display: {{ 0 == count ? 'block' : 'none' }}">
         {% for i, trace in exception.trace %}
             <li>
-                {% include 'TwigBundle:Exception:trace.html.twig' with { 'prefix': position, 'i': i, 'trace': trace } only %}
+                {% include '@Twig/Exception/trace.html.twig' with { 'prefix': position, 'i': i, 'trace': trace } only %}
             </li>
         {% endfor %}
     </ol>
diff --git a/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/traces.txt.twig b/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/traces.txt.twig
index 2cb3ba4e09..906be78ca0 100644
--- a/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/traces.txt.twig
+++ b/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/traces.txt.twig
@@ -1,6 +1,6 @@
 {% if exception.trace|length %}
 {% for trace in exception.trace %}
-{% include 'TwigBundle:Exception:trace.txt.twig' with { 'trace': trace } only %}
+{% include '@Twig/Exception/trace.txt.twig' with { 'trace': trace } only %}
 
 {% endfor %}
 {% endif %}
diff --git a/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/traces.xml.twig b/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/traces.xml.twig
index 133a6260f8..d04af93cf1 100644
--- a/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/traces.xml.twig
+++ b/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/traces.xml.twig
@@ -1,7 +1,7 @@
         <traces>
 {% for trace in exception.trace %}
             <trace>
-{% include 'TwigBundle:Exception:trace.txt.twig' with { 'trace': trace } only %}
+{% include '@Twig/Exception/trace.txt.twig' with { 'trace': trace } only %}
 
             </trace>
 {% endfor %}
diff --git a/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/traces_text.html.twig b/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/traces_text.html.twig
index 3ea3d7bba8..16b3579433 100644
--- a/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/traces_text.html.twig
+++ b/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/traces_text.html.twig
@@ -12,7 +12,7 @@
     <div id="traces-text" class="trace" style="display: none;">
 <pre>{% for i, e in exception.toarray %}
 [{{ i + 1 }}] {{ e.class }}: {{ e.message }}
-{% include 'TwigBundle:Exception:traces.txt.twig' with { 'exception': e } only %}
+{% include '@Twig/Exception/traces.txt.twig' with { 'exception': e } only %}
 {% endfor %}</pre>
     </div>
 </div>
diff --git a/src/Symfony/Bundle/TwigBundle/Tests/Controller/ExceptionControllerTest.php b/src/Symfony/Bundle/TwigBundle/Tests/Controller/ExceptionControllerTest.php
index 243bdd23a9..223f26b414 100644
--- a/src/Symfony/Bundle/TwigBundle/Tests/Controller/ExceptionControllerTest.php
+++ b/src/Symfony/Bundle/TwigBundle/Tests/Controller/ExceptionControllerTest.php
@@ -47,7 +47,7 @@ class ExceptionControllerTest extends TestCase
     {
         $twig = new \Twig_Environment(
             new \Twig_Loader_Array(array(
-                'TwigBundle:Exception:error404.html.twig' => 'ok',
+                '@Twig/Exception/error404.html.twig' => 'ok',
             ))
         );
 
@@ -67,7 +67,7 @@ class ExceptionControllerTest extends TestCase
     {
         $twig = new \Twig_Environment(
             new \Twig_Loader_Array(array(
-                'TwigBundle:Exception:error.html.twig' => 'html',
+                '@Twig/Exception/error.html.twig' => 'html',
             ))
         );