diff --git a/src/Controller/.gitignore b/src/Controller/.gitignore
new file mode 100644
index 00000000..e69de29b
diff --git a/src/DataFixtures/PHPCR/LoadNewsData.php b/src/DataFixtures/PHPCR/LoadNewsData.php
index c86edad2..f015018e 100644
--- a/src/DataFixtures/PHPCR/LoadNewsData.php
+++ b/src/DataFixtures/PHPCR/LoadNewsData.php
@@ -49,7 +49,7 @@ public function load(ObjectManager $manager)
 'This is a news item which demonstrates the routing auto bundle. The routing
 auto bundle automatically creates routes for documents which are persisted.
 
-See the routing auto <a href="https://github.com/symfony-cmf/cmf-sandbox/blob/master/src/AppBundle/Resources/config/cmf_routing_auto.yml">configuration file</a> to see how this works.
+See the routing auto <a href="https://github.com/symfony-cmf/cmf-sandbox/blob/master/src/Resources/config/cmf_routing_auto.yml">configuration file</a> to see how this works.
 EOT
     );
 
diff --git a/src/Resources/data/page.yml b/src/Resources/data/page.yml
index 4d69e0c5..28307556 100644
--- a/src/Resources/data/page.yml
+++ b/src/Resources/data/page.yml
@@ -37,7 +37,7 @@ static:
                             body: To log into the <a href="admin/dashboard">backend admin</a>, use the username 'admin' and the password 'admin'.
                     child3:
                         class: Symfony\Cmf\Bundle\BlockBundle\Doctrine\Phpcr\ActionBlock
-                        actionName: AppBundle:Default:block
+                        actionName: App:Default:block
             rssBlock:
                 class: Symfony\Cmf\Bundle\BlockBundle\Doctrine\Phpcr\RssBlock
                 properties:
diff --git a/src/Twig/MenuExtension.php b/src/Twig/MenuExtension.php
deleted file mode 100644
index 6f2e9317..00000000
--- a/src/Twig/MenuExtension.php
+++ /dev/null
@@ -1,60 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony CMF package.
- *
- * (c) 2011-2017 Symfony CMF
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace App\Twig;
-
-use Knp\Menu\ItemInterface;
-use Knp\Menu\Matcher\MatcherInterface;
-use Knp\Menu\Twig\Helper;
-
-class MenuExtension extends \Twig_Extension
-{
-    private $helper;
-
-    private $matcher;
-
-    public function __construct(Helper $helper, MatcherInterface $matcher)
-    {
-        $this->helper = $helper;
-        $this->matcher = $matcher;
-    }
-
-    public function getFunctions()
-    {
-        return [
-            new \Twig_SimpleFunction('app_get_current_menu_item', [$this, 'getCurrent']),
-        ];
-    }
-
-    public function getCurrent($menu, array $path = [], array $options = [])
-    {
-        return $this->doGetCurrent($this->helper->get($menu, $path, $options));
-    }
-
-    private function doGetCurrent(ItemInterface $item)
-    {
-        if ($this->matcher->isCurrent($item)) {
-            return $item;
-        }
-
-        foreach ($item->getChildren() as $child) {
-            $result = $this->doGetCurrent($child);
-            if (null !== $result) {
-                return $result;
-            }
-        }
-    }
-
-    public function getName()
-    {
-        return 'app_menu';
-    }
-}
diff --git a/tests/Functional/WebTestCase.php b/tests/Functional/WebTestCase.php
index bd29b15c..d0fb17d1 100644
--- a/tests/Functional/WebTestCase.php
+++ b/tests/Functional/WebTestCase.php
@@ -25,9 +25,9 @@ public function setUp()
         }
 
         $this->loadFixtures([
-            'AppBundle\DataFixtures\PHPCR\LoadStaticPageData',
-            'AppBundle\DataFixtures\PHPCR\LoadMenuData',
-            'AppBundle\DataFixtures\PHPCR\LoadRoutingData',
+            'App\DataFixtures\PHPCR\LoadStaticPageData',
+            'App\DataFixtures\PHPCR\LoadMenuData',
+            'App\DataFixtures\PHPCR\LoadRoutingData',
         ], null, 'doctrine_phpcr');
 
         self::$fixturesLoaded = true;