diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/collectors.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/collectors.xml
index 28e0a606ed..0e07cdb5d9 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/collectors.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/collectors.xml
@@ -17,41 +17,41 @@
 
     <services>
         <service id="data_collector.config" class="%data_collector.config.class%" public="false">
-            <tag name="data_collector" template="WebProfilerBundle:Collector:config" id="config" priority="255" />
+            <tag name="data_collector" template="@WebProfiler/Collector/config.html.twig" id="config" priority="255" />
             <call method="setKernel"><argument type="service" id="kernel" on-invalid="ignore" /></call>
         </service>
 
         <service id="data_collector.request" class="%data_collector.request.class%">
             <tag name="kernel.event_subscriber" />
-            <tag name="data_collector" template="WebProfilerBundle:Collector:request" id="request" priority="255" />
+            <tag name="data_collector" template="@WebProfiler/Collector/request.html.twig" id="request" priority="255" />
         </service>
 
         <service id="data_collector.exception" class="%data_collector.exception.class%" public="false">
-            <tag name="data_collector" template="WebProfilerBundle:Collector:exception" id="exception" priority="255" />
+            <tag name="data_collector" template="@WebProfiler/Collector/exception.html.twig" id="exception" priority="255" />
         </service>
 
         <service id="data_collector.events" class="%data_collector.events.class%" public="false">
-            <tag name="data_collector" template="WebProfilerBundle:Collector:events" id="events" priority="255" />
+            <tag name="data_collector" template="@WebProfiler/Collector/events.html.twig" id="events" priority="255" />
         </service>
 
         <service id="data_collector.logger" class="%data_collector.logger.class%" public="false">
-            <tag name="data_collector" template="WebProfilerBundle:Collector:logger" id="logger" priority="255" />
+            <tag name="data_collector" template="@WebProfiler/Collector/logger.html.twig" id="logger" priority="255" />
             <tag name="monolog.logger" channel="profiler" />
             <argument type="service" id="logger" on-invalid="ignore" />
         </service>
 
         <service id="data_collector.time" class="%data_collector.time.class%" public="false">
-            <tag name="data_collector" template="WebProfilerBundle:Collector:time" id="time" priority="255" />
+            <tag name="data_collector" template="@WebProfiler/Collector/time.html.twig" id="time" priority="255" />
             <argument type="service" id="kernel" on-invalid="ignore" />
         </service>
 
         <service id="data_collector.memory" class="%data_collector.memory.class%" public="false">
-            <tag name="data_collector" template="WebProfilerBundle:Collector:memory" id="memory" priority="255" />
+            <tag name="data_collector" template="@WebProfiler/Collector/memory.html.twig" id="memory" priority="255" />
         </service>
 
         <service id="data_collector.router" class="%data_collector.router.class%" >
             <tag name="kernel.event_listener" event="kernel.controller" method="onKernelController"/>
-            <tag name="data_collector" template="WebProfilerBundle:Collector:router" id="router" priority="255" />
+            <tag name="data_collector" template="@WebProfiler/Collector/router.html.twig" id="router" priority="255" />
         </service>
     </services>
 </container>