diff --git a/src/FormatTalksBundle/Resources/config/services.yml b/src/FormatTalksBundle/Resources/config/services.yml
index 9d07c21f..8ed1edab 100644
--- a/src/FormatTalksBundle/Resources/config/services.yml
+++ b/src/FormatTalksBundle/Resources/config/services.yml
@@ -1,5 +1,5 @@
 services:
     twig.format_talks:
-        class: 'FormatTalksBundle\Twig\FormatTalksExtension'
+        class: 'FormatTalksBundle\TwigExtension\FormatTalksExtension'
         tags:
             - { name: twig.extension }
diff --git a/src/FormatTalksBundle/Twig/FormatTalksExtension.php b/src/FormatTalksBundle/TwigExtension/FormatTalksExtension.php
similarity index 98%
rename from src/FormatTalksBundle/Twig/FormatTalksExtension.php
rename to src/FormatTalksBundle/TwigExtension/FormatTalksExtension.php
index 07fb60aa..3c5fd1e6 100644
--- a/src/FormatTalksBundle/Twig/FormatTalksExtension.php
+++ b/src/FormatTalksBundle/TwigExtension/FormatTalksExtension.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace FormatTalksBundle\Twig;
+namespace FormatTalksBundle\TwigExtension;
 
 use Illuminate\Support\Collection;
 use Sculpin\Contrib\ProxySourceCollection\ProxySourceCollection;
diff --git a/tests/FormatTalksBundle/Twig/FormatTalksTest.php b/tests/FormatTalksBundle/TwigExtension/FormatTalksTest.php
similarity index 98%
rename from tests/FormatTalksBundle/Twig/FormatTalksTest.php
rename to tests/FormatTalksBundle/TwigExtension/FormatTalksTest.php
index 155d2a60..300c2c9f 100644
--- a/tests/FormatTalksBundle/Twig/FormatTalksTest.php
+++ b/tests/FormatTalksBundle/TwigExtension/FormatTalksTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Tests\FormatTalksBundle\Twig;
+namespace Tests\FormatTalksBundle\TwigExtension;
 
 use DateTime;
-use FormatTalksBundle\Twig\FormatTalksExtension;
+use FormatTalksBundle\TwigExtension\FormatTalksExtension;
 use Illuminate\Support\Collection;
 use PHPUnit\Framework\TestCase;