diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
index e8a6224..a232f69 100644
--- a/DependencyInjection/Configuration.php
+++ b/DependencyInjection/Configuration.php
@@ -61,10 +61,9 @@ class Configuration implements ConfigurationInterface
      */
     public function getConfigTreeBuilder()
     {
-        $treeBuilder = new TreeBuilder();
-        $rootNode = $treeBuilder->root('stash');
+        $treeBuilder = new TreeBuilder('stash');
 
-        $rootNode
+        $treeBuilder->getRootNode()
             ->beforeNormalization()
                 ->ifTrue(function ($v) {
                     return is_array($v) && !array_key_exists('default_cache', $v) && array_key_exists('caches', $v);
@@ -102,10 +101,9 @@ public function getCachesNode()
     {
         $drivers = array_keys(DriverList::getAvailableDrivers());
 
-        $treeBuilder = new TreeBuilder();
-        $node = $treeBuilder->root('caches');
+        $treeBuilder = new TreeBuilder('caches');
 
-        $childNode = $node
+        $childNode = $treeBuilder->getRootNode()
             ->fixXmlConfig('handler')
             ->fixXmlConfig('driver')
             ->beforeNormalization()
@@ -145,7 +143,7 @@ public function getCachesNode()
         $childNode->end()
         ;
 
-        return $node;
+        return $treeBuilder->getRootNode();
     }
 
     /**
diff --git a/Resources/config/services.xml b/Resources/config/services.xml
index 747a1cb..60db931 100644
--- a/Resources/config/services.xml
+++ b/Resources/config/services.xml
@@ -28,7 +28,7 @@
             <argument>%stash.default_cache%</argument>
             <argument>%stash.caches%</argument>
             <argument>%stash.caches.options%</argument>
-            <tag name="data_collector" id="stash" template="TedivmStashBundle:Profiler:layout"/>
+            <tag name="data_collector" id="stash" template="@TedivmStash/Profiler/layout.html.twig"/>
         </service>
     </services>
 </container>