diff --git a/lib/config/initializer.php b/lib/config/initializer.php
index ba97fe178b..36dc508684 100644
--- a/lib/config/initializer.php
+++ b/lib/config/initializer.php
@@ -1,7 +1,6 @@
 <?php
 namespace MailPoet\Config;
 use MailPoet\Models;
-use MailPoet\Renderer;
 use MailPoet\WP;
 
 if(!defined('ABSPATH')) exit;
@@ -45,13 +44,13 @@ class Initializer {
     );
 
     // renderer: i18n (passing the text)
-    $this->renderer->addExtension(new Renderer\i18n($this->shortname));
+    $this->renderer->addExtension(new \MailPoet\Twig\i18n($this->shortname));
 
     // renderer: Handlebars extension
-    $this->renderer->addExtension(new Renderer\Handlebars());
+    $this->renderer->addExtension(new \MailPoet\Twig\Handlebars());
 
     // renderer: global variables
-    $this->renderer->addExtension(new Renderer\Assets(array(
+    $this->renderer->addExtension(new \MailPoet\Twig\Assets(array(
       'assets_url' => $this->assets_url,
       'assets_path' => $this->assets_path
     )));
diff --git a/lib/renderer/assets.php b/lib/twig/assets.php
similarity index 97%
rename from lib/renderer/assets.php
rename to lib/twig/assets.php
index 87eba15a91..10f0e3abe6 100644
--- a/lib/renderer/assets.php
+++ b/lib/twig/assets.php
@@ -1,5 +1,5 @@
 <?php
-namespace MailPoet\Renderer;
+namespace MailPoet\Twig;
 
 class Assets extends \Twig_Extension {
 
@@ -56,4 +56,4 @@ class Assets extends \Twig_Extension {
 
     return join("\n", $output);
   }
-}
\ No newline at end of file
+}
diff --git a/lib/renderer/handlebars.php b/lib/twig/handlebars.php
similarity index 97%
rename from lib/renderer/handlebars.php
rename to lib/twig/handlebars.php
index ae4d1f4f55..da6bcf8a58 100644
--- a/lib/renderer/handlebars.php
+++ b/lib/twig/handlebars.php
@@ -1,5 +1,5 @@
 <?php
-namespace MailPoet\Renderer;
+namespace MailPoet\Twig;
 
 class Handlebars extends \Twig_Extension {
 
@@ -58,4 +58,4 @@ class Handlebars extends \Twig_Extension {
     }
     return join("\n", $output);
   }
-}
\ No newline at end of file
+}
diff --git a/lib/renderer/i18n.php b/lib/twig/i18n.php
similarity index 97%
rename from lib/renderer/i18n.php
rename to lib/twig/i18n.php
index 049af30a37..590ffcf7cf 100644
--- a/lib/renderer/i18n.php
+++ b/lib/twig/i18n.php
@@ -1,5 +1,5 @@
 <?php
-namespace MailPoet\Renderer;
+namespace MailPoet\Twig;
 
 class i18n extends \Twig_Extension {