diff --git a/src/flextype/app/Foundation/Cors.php b/src/flextype/app/Foundation/Cors.php
index bb88af51..30f15135 100644
--- a/src/flextype/app/Foundation/Cors.php
+++ b/src/flextype/app/Foundation/Cors.php
@@ -29,7 +29,7 @@ class Cors
      */
     public function __construct($flextype)
     {
-        $this->app       = $flextype;
+        $this->flextype       = $flextype;
         $this->container = $flextype->getContainer();
     }
 
@@ -44,11 +44,11 @@ class Cors
             return;
         }
 
-        $this->app->options('/{routes:.+}', function ($request, $response) {
+        $this->flextype->options('/{routes:.+}', function ($request, $response) {
             return $response;
         });
 
-        $this->app->add(function ($req, $res, $next) use ($container) {
+        $this->flextype->add(function ($req, $res, $next) use ($container) {
             $response = $next($req, $res);
 
             // Set variables
diff --git a/src/flextype/app/Foundation/Entries/Entries.php b/src/flextype/app/Foundation/Entries/Entries.php
index 2194bbf8..6ebf2c18 100755
--- a/src/flextype/app/Foundation/Entries/Entries.php
+++ b/src/flextype/app/Foundation/Entries/Entries.php
@@ -86,7 +86,7 @@ class Entries
      */
     public function __construct($flextype)
     {
-        $this->app       = $flextype;
+        $this->flextype       = $flextype;
         $this->container = $flextype->getContainer();
     }
 
diff --git a/src/flextype/app/Foundation/Media/MediaFiles.php b/src/flextype/app/Foundation/Media/MediaFiles.php
index 42a6d7ea..38d51dc9 100644
--- a/src/flextype/app/Foundation/Media/MediaFiles.php
+++ b/src/flextype/app/Foundation/Media/MediaFiles.php
@@ -60,7 +60,7 @@ class MediaFiles
      */
     public function __construct($flextype)
     {
-        $this->app       = $flextype;
+        $this->flextype       = $flextype;
         $this->container = $flextype->getContainer();
     }
 
diff --git a/src/flextype/app/Foundation/Media/MediaFilesMeta.php b/src/flextype/app/Foundation/Media/MediaFilesMeta.php
index 384c87d6..0975e6ee 100644
--- a/src/flextype/app/Foundation/Media/MediaFilesMeta.php
+++ b/src/flextype/app/Foundation/Media/MediaFilesMeta.php
@@ -31,7 +31,7 @@ class MediaFilesMeta
      */
     public function __construct($flextype)
     {
-        $this->app       = $flextype;
+        $this->flextype       = $flextype;
         $this->container = $flextype->getContainer();
     }
 
diff --git a/src/flextype/app/Foundation/Media/MediaFolders.php b/src/flextype/app/Foundation/Media/MediaFolders.php
index 1a4b6c70..30736390 100644
--- a/src/flextype/app/Foundation/Media/MediaFolders.php
+++ b/src/flextype/app/Foundation/Media/MediaFolders.php
@@ -34,7 +34,7 @@ class MediaFolders
      */
     public function __construct($flextype)
     {
-        $this->app       = $flextype;
+        $this->flextype       = $flextype;
         $this->container = $flextype->getContainer();
     }
 
diff --git a/src/flextype/app/Foundation/Media/MediaFoldersMeta.php b/src/flextype/app/Foundation/Media/MediaFoldersMeta.php
index 085fc491..f51fac47 100644
--- a/src/flextype/app/Foundation/Media/MediaFoldersMeta.php
+++ b/src/flextype/app/Foundation/Media/MediaFoldersMeta.php
@@ -28,7 +28,7 @@ class MediaFoldersMeta
      */
     public function __construct($flextype)
     {
-        $this->app       = $flextype;
+        $this->flextype       = $flextype;
         $this->container = $flextype->getContainer();
     }
 
diff --git a/src/flextype/app/Foundation/Plugins.php b/src/flextype/app/Foundation/Plugins.php
index 3d69b486..b106f01e 100755
--- a/src/flextype/app/Foundation/Plugins.php
+++ b/src/flextype/app/Foundation/Plugins.php
@@ -48,7 +48,7 @@ class Plugins
      */
     public function __construct($flextype)
     {
-        $this->app       = $flextype;
+        $this->flextype       = $flextype;
         $this->container = $flextype->getContainer();
         $this->locales   = $this->container['yaml']->decode(Filesystem::read(ROOT_DIR . '/src/flextype/locales.yaml'));
     }
diff --git a/src/flextype/app/Support/Parsers/Markdown.php b/src/flextype/app/Support/Parsers/Markdown.php
index 13365d8b..25e1a4ea 100644
--- a/src/flextype/app/Support/Parsers/Markdown.php
+++ b/src/flextype/app/Support/Parsers/Markdown.php
@@ -35,7 +35,7 @@ class Markdown
      */
     public function __construct($flextype, $markdown)
     {
-        $this->app       = $flextype;
+        $this->flextype       = $flextype;
         $this->container = $flextype->getContainer();
         $this->markdown  = $markdown;
     }
diff --git a/src/flextype/app/Support/Parsers/Shortcode.php b/src/flextype/app/Support/Parsers/Shortcode.php
index 3f440a63..962660cf 100644
--- a/src/flextype/app/Support/Parsers/Shortcode.php
+++ b/src/flextype/app/Support/Parsers/Shortcode.php
@@ -35,7 +35,7 @@ class Shortcode
      */
     public function __construct($flextype, $shortcode)
     {
-        $this->app       = $flextype;
+        $this->flextype       = $flextype;
         $this->container = $flextype->getContainer();
         $this->shortcode = $shortcode;
     }
diff --git a/src/flextype/app/Support/Serializers/Frontmatter.php b/src/flextype/app/Support/Serializers/Frontmatter.php
index bd2d896f..f97d1f98 100644
--- a/src/flextype/app/Support/Serializers/Frontmatter.php
+++ b/src/flextype/app/Support/Serializers/Frontmatter.php
@@ -38,7 +38,7 @@ class Frontmatter
      */
     public function __construct($flextype)
     {
-        $this->app       = $flextype;
+        $this->flextype       = $flextype;
         $this->container = $flextype->getContainer();
     }
 
diff --git a/src/flextype/app/Support/Serializers/Json.php b/src/flextype/app/Support/Serializers/Json.php
index e2bf9ded..e836c5d5 100644
--- a/src/flextype/app/Support/Serializers/Json.php
+++ b/src/flextype/app/Support/Serializers/Json.php
@@ -44,7 +44,7 @@ class Json
      */
     public function __construct($flextype)
     {
-        $this->app       = $flextype;
+        $this->flextype       = $flextype;
         $this->container = $flextype->getContainer();
     }
 
diff --git a/src/flextype/app/Support/Serializers/Yaml.php b/src/flextype/app/Support/Serializers/Yaml.php
index 58c8c2f3..b7b17b52 100644
--- a/src/flextype/app/Support/Serializers/Yaml.php
+++ b/src/flextype/app/Support/Serializers/Yaml.php
@@ -49,7 +49,7 @@ class Yaml
      */
     public function __construct($flextype)
     {
-        $this->app       = $flextype;
+        $this->flextype       = $flextype;
         $this->container = $flextype->getContainer();
     }