diff --git a/index.php b/index.php
index 26fe3baea..cf7025a4c 100644
--- a/index.php
+++ b/index.php
@@ -17,8 +17,8 @@ if (!ini_get('date.timezone')) {
 
 $grav = Grav::instance(
     [
-        'Loader' => $loader,
-        'Debugger' => new Debugger(Debugger::PRODUCTION)
+        'loader' => $loader,
+        'debugger' => new Debugger(Debugger::PRODUCTION)
     ]
 );
 
@@ -26,7 +26,7 @@ $grav = Grav::instance(
 ob_start();
 
 try {
-    $grav['Debugger']->init();
+    $grav['debugger']->init();
     $grav->process();
 
 } catch (\Exception $e) {
diff --git a/system/src/Grav/Common/Assets.php b/system/src/Grav/Common/Assets.php
index cf9af020b..f4fe9f14d 100644
--- a/system/src/Grav/Common/Assets.php
+++ b/system/src/Grav/Common/Assets.php
@@ -97,7 +97,7 @@ class Assets
     public function init()
     {
         /** @var Config $config */
-        $config = Grav::instance()['Config'];
+        $config = Grav::instance()['config'];
         $base_url = trim($config->get('system.base_url_relative'));
         $theme = $config->get('system.pages.theme');
         $asset_config = (array)$config->get('system.assets');
@@ -383,7 +383,7 @@ class Assets
     protected function pipeline($css = true)
     {
         /** @var Cache $cache */
-        $cache = Grav::instance()['Cache'];
+        $cache = Grav::instance()['cache'];
         $key = '?'.$cache->getKey();
 
         if ($css) {
diff --git a/system/src/Grav/Common/Cache.php b/system/src/Grav/Common/Cache.php
index 27eb942ec..3b92b2849 100644
--- a/system/src/Grav/Common/Cache.php
+++ b/system/src/Grav/Common/Cache.php
@@ -53,10 +53,10 @@ class Cache extends Getters
     public function init(Grav $c)
     {
         /** @var Config $config */
-        $config = $c['Config'];
+        $config = $c['config'];
 
         /** @var Uri $uri */
-        $uri = $c['Uri'];
+        $uri = $c['uri'];
 
         $prefix = $config->get('system.cache.prefix');
 
diff --git a/system/src/Grav/Common/Config.php b/system/src/Grav/Common/Config.php
index 9b96db61f..df25af870 100644
--- a/system/src/Grav/Common/Config.php
+++ b/system/src/Grav/Common/Config.php
@@ -132,11 +132,11 @@ class Config extends Data
 
         // If not set, add manually current base url.
         if (empty($instance->items['system']['base_url_absolute'])) {
-            $instance->items['system']['base_url_absolute'] = $grav['Uri']->rootUrl(true);
+            $instance->items['system']['base_url_absolute'] = $grav['uri']->rootUrl(true);
         }
 
         if (empty($instance->items['system']['base_url_relative'])) {
-            $instance->items['system']['base_url_relative'] = $grav['Uri']->rootUrl(false);
+            $instance->items['system']['base_url_relative'] = $grav['uri']->rootUrl(false);
         }
 
         return $instance;
diff --git a/system/src/Grav/Common/Debugger.php b/system/src/Grav/Common/Debugger.php
index a6e2c56d8..4c54144b9 100644
--- a/system/src/Grav/Common/Debugger.php
+++ b/system/src/Grav/Common/Debugger.php
@@ -23,7 +23,7 @@ class Debugger
     public function init()
     {
         /** @var Config $config */
-        $config = Grav::instance()['Config'];
+        $config = Grav::instance()['config'];
 
         TracyDebugger::$logDirectory = $config->get('system.debugger.log.enabled') ? LOG_DIR : null;
         TracyDebugger::$maxDepth = $config->get('system.debugger.max_depth');
diff --git a/system/src/Grav/Common/Grav.php b/system/src/Grav/Common/Grav.php
index 550427129..8499d1022 100644
--- a/system/src/Grav/Common/Grav.php
+++ b/system/src/Grav/Common/Grav.php
@@ -13,15 +13,6 @@ use Grav\Component\DI\Container;
  *
  * Originally based on Pico by Gilbert Pellegrom - http://pico.dev7studios.com
  * Influenced by Pico, Stacey, Kirby, PieCrust and other great platforms...
- *
- * @property  Uri           $uri
- * @property  Config        $config
- * @property  Plugins       $plugins
- * @property  Cache         $cache
- * @property  Page\Pages    $pages
- * @property  Page\Page     $page
- * @property  Assets        $assets
- * @property  Taxonomy      $taxonomy
  */
 class Grav extends Container
 {
@@ -55,39 +46,42 @@ class Grav extends Container
 
         $container['config_path'] = CACHE_DIR . 'config.php';
 
-        $container['Grav'] = $container;
+        $container['grav'] = $container;
 
-        $container['Uri'] = function ($c) {
+        $container['uri'] = function ($c) {
             return new Uri($c);
         };
-        $container['Config'] = function ($c) {
+        $container['config'] = function ($c) {
             return Config::instance($c);
         };
-        $container['Cache'] = function ($c) {
+        $container['cache'] = function ($c) {
             return new Cache($c);
         };
-        $container['Plugins'] = function ($c) {
+        $container['plugins'] = function ($c) {
             return new Plugins($c);
         };
-        $container['Themes'] = function ($c) {
+        $container['themes'] = function ($c) {
             return new Themes($c);
         };
-        $container['Twig'] = function ($c) {
+        $container['twig'] = function ($c) {
             return new Twig($c);
         };
-        $container['Taxonomy'] = function ($c) {
+        $container['taxonomy'] = function ($c) {
             return new Taxonomy($c);
         };
-        $container['Pages'] = function ($c) {
+        $container['pages'] = function ($c) {
             return new Page\Pages($c);
         };
-        $container['Assets'] = function ($c) {
+        $container['assets'] = function ($c) {
             return new Assets();
         };
-        $container['Page'] = function ($c) {
-            return $c['Pages']->dispatch($c['Uri']->route());
+        $container['page'] = function ($c) {
+            return $c['pages']->dispatch($c['uri']->route());
         };
-        $container['UserAgent'] = function ($c) {
+        $container['output'] = function ($c) {
+            return $c['twig']->processSite($c['uri']->extension());
+        };
+        $container['user_agent'] = function ($c) {
             return new \phpUserAgent();
         };
 
@@ -96,28 +90,28 @@ class Grav extends Container
 
     public function process()
     {
-        $this['Plugins']->init();
+        $this['plugins']->init();
 
         $this->fireEvent('onAfterInitPlugins');
 
-        $this['Assets']->init();
+        $this['assets']->init();
 
         $this->fireEvent('onAfterGetAssets');
 
-        $this['Twig']->init();
-        $this['Pages']->init();
+        $this['twig']->init();
+        $this['pages']->init();
 
         $this->fireEvent('onAfterGetPages');
 
         $this->fireEvent('onAfterGetPage');
 
         // If there's no page, throw exception
-        if (!$this['Page']) {
+        if (!$this['page']) {
             throw new \RuntimeException('Page Not Found', 404);
         }
 
         // Process whole page as required
-        $this->output = $this['Twig']->processSite($this['Uri']->extension());
+        $this->output = $this['output'];
 
         $this->fireEvent('onAfterGetOutput');
 
@@ -136,7 +130,7 @@ class Grav extends Container
     public function redirect($route, $code = 303)
     {
         /** @var Uri $uri */
-        $uri = $this['Uri'];
+        $uri = $this['uri'];
         header("Location: " . rtrim($uri->rootUrl(), '/') .'/'. trim($route, '/'), true, $code);
         exit();
     }
@@ -170,7 +164,7 @@ class Grav extends Container
     public function header()
     {
         /** @var Uri $uri */
-        $uri = $this['Uri'];
+        $uri = $this['uri'];
         header('Content-type: ' . $this->mime($uri->extension()));
     }
 
@@ -184,7 +178,7 @@ class Grav extends Container
         $no_timing_hooks = array('onAfterPageProcessed','onAfterFolderProcessed', 'onAfterCollectionProcessed');
 
         /** @var Plugins $plugins */
-        $plugins = $this['Plugins'];
+        $plugins = $this['plugins'];
 
         if (!empty($plugins)) {
             foreach ($plugins as $plugin) {
@@ -194,13 +188,13 @@ class Grav extends Container
             }
         }
 
-        if (isset($this['Debugger'])) {
-            /** @var Config $config */
-            $config = $this['Config'];
+        /** @var Config $config */
+        $config = $this['config'];
 
-            if ($config && $config->get('system.debugger.log.timing') && !in_array($hook_id, $no_timing_hooks)) {
-                /** @var Debugger $debugger */
-                $debugger = $this['Debugger'];
+        if ($config && $config->get('system.debugger.log.timing') && !in_array($hook_id, $no_timing_hooks)) {
+            /** @var Debugger $debugger */
+            $debugger = isset($this['debugger']) ? $this['debugger'] : null;
+            if ($debugger) {
                 $debugger->log($hook_id.': %f ms');
             }
         }
diff --git a/system/src/Grav/Common/Page/Collection.php b/system/src/Grav/Common/Page/Collection.php
index 2d5bf4766..3eb091ea0 100644
--- a/system/src/Grav/Common/Page/Collection.php
+++ b/system/src/Grav/Common/Page/Collection.php
@@ -26,7 +26,7 @@ class Collection extends Iterator
         parent::__construct($items);
 
         $this->params = $params;
-        $this->pages = $pages ? $pages : Grav::instance()['Pages'];
+        $this->pages = $pages ? $pages : Grav::instance()['pages'];
     }
 
     public function params()
diff --git a/system/src/Grav/Common/Page/Media.php b/system/src/Grav/Common/Page/Media.php
index fbfc47365..3760f14c9 100644
--- a/system/src/Grav/Common/Page/Media.php
+++ b/system/src/Grav/Common/Page/Media.php
@@ -75,7 +75,7 @@ class Media extends Getters
             $basename = implode('.', $parts);
 
             /** @var Config $config */
-            $config = Grav::instance()['Config'];
+            $config = Grav::instance()['config'];
 
             // Check if medium type has been configured.
             $params = $config->get("media.{$ext}");
diff --git a/system/src/Grav/Common/Page/Medium.php b/system/src/Grav/Common/Page/Medium.php
index cefb90906..616472868 100644
--- a/system/src/Grav/Common/Page/Medium.php
+++ b/system/src/Grav/Common/Page/Medium.php
@@ -97,7 +97,7 @@ class Medium extends Data
     public function url()
     {
         /** @var Config $config */
-        $config = Grav::instance()['Config'];
+        $config = Grav::instance()['config'];
 
         if ($this->image) {
             $output = $this->image->cacheFile($this->type, $this->quality);
@@ -174,7 +174,7 @@ class Medium extends Data
 
         if ($this->linkTarget) {
             /** @var Config $config */
-            $config = Grav::instance()['Config'];
+            $config = Grav::instance()['config'];
 
             $output = '<a href="' . $config->get('system.base_url_relative') . '/'. $this->linkTarget
                 . '"' . $this->linkAttributes. ' class="'. $class . '">' . $output . '</a>';
diff --git a/system/src/Grav/Common/Page/Page.php b/system/src/Grav/Common/Page/Page.php
index f72bcee2d..44fd908f4 100644
--- a/system/src/Grav/Common/Page/Page.php
+++ b/system/src/Grav/Common/Page/Page.php
@@ -83,7 +83,7 @@ class Page
     public function __construct($array = array())
     {
         /** @var Config $config */
-        $config = Grav::instance()['Config'];
+        $config = Grav::instance()['config'];
 
         $this->routable = true;
         $this->taxonomy = array();
@@ -230,7 +230,7 @@ class Page
 
         // Return calculated summary based on setting in site config file
         /** @var Config $config */
-        $config = Grav::instance()['Config'];
+        $config = Grav::instance()['config'];
         if (!$size && $config->get('site.summary.size')) {
             $size = $config->get('site.summary.size');
         }
@@ -270,7 +270,7 @@ class Page
 
             // Load cached content
             /** @var Cache $cache */
-            $cache = Grav::instance()['Cache'];
+            $cache = Grav::instance()['cache'];
             $cache_id = md5('page'.$this->id());
             $content = $cache->fetch($cache_id);
 
@@ -296,7 +296,7 @@ class Page
                 // Do we need to process twig this time?
                 if ($update_cache || $process_twig) {
                     /** @var Twig $twig */
-                    $twig = Grav::instance()['Twig'];
+                    $twig = Grav::instance()['twig'];
                     $content = $twig->processPage($this, $content);
                 }
             }
@@ -464,7 +464,7 @@ class Page
     public function blueprints()
     {
         /** @var Pages $pages */
-        $pages = Grav::instance()['Pages'];
+        $pages = Grav::instance()['pages'];
 
         return $pages->blueprints($this->template());
     }
@@ -543,7 +543,7 @@ class Page
     public function media($var = null)
     {
         /** @var Cache $cache */
-        $cache = Grav::instance()['Cache'];
+        $cache = Grav::instance()['cache'];
 
         if ($var) {
             $this->media = $var;
@@ -761,7 +761,7 @@ class Page
     public function url($include_host = false)
     {
         /** @var Uri $uri */
-        $uri = Grav::instance()['Uri'];
+        $uri = Grav::instance()['uri'];
         $rootUrl = $uri->rootUrl($include_host);
         $url = $rootUrl.'/'.trim($this->route(), '/');
 
@@ -957,7 +957,7 @@ class Page
         }
         if (empty($this->max_count)) {
             /** @var Config $config */
-            $config = Grav::instance()['Config'];
+            $config = Grav::instance()['config'];
             $this->max_count = (int) $config->get('system.pages.list.count');
         }
         return $this->max_count;
@@ -1034,7 +1034,7 @@ class Page
         }
 
         /** @var Pages $pages */
-        $pages = Grav::instance()['Pages'];
+        $pages = Grav::instance()['pages'];
 
         return $pages->get($this->parent);
     }
@@ -1047,7 +1047,7 @@ class Page
     public function children()
     {
         /** @var Pages $pages */
-        $pages = Grav::instance()['Pages'];
+        $pages = Grav::instance()['pages'];
 
         return $pages->children($this->path());
     }
@@ -1127,7 +1127,7 @@ class Page
     public function isFirst()
     {
         /** @var Pages $pages */
-        $pages = Grav::instance()['Pages'];
+        $pages = Grav::instance()['pages'];
         $parent = $pages->get($this->parent);
 
         if ($this->path() == array_values($parent->items)[0]) {
@@ -1145,7 +1145,7 @@ class Page
     public function isLast()
     {
         /** @var Pages $pages */
-        $pages = Grav::instance()['Pages'];
+        $pages = Grav::instance()['pages'];
         $parent = $pages->get($this->parent);
 
         if ($this->path() == array_values($parent->items)[count($parent->items)-1]) {
@@ -1184,7 +1184,7 @@ class Page
     public function adjacentSibling($direction = 1)
     {
         /** @var Pages $pages */
-        $pages = Grav::instance()['Pages'];
+        $pages = Grav::instance()['pages'];
         $parent = $pages->get($this->parent);
         $current = $this->slug();
 
@@ -1203,7 +1203,7 @@ class Page
     public function active()
     {
         /** @var Uri $uri */
-        $uri = Grav::instance()['Uri'];
+        $uri = Grav::instance()['uri'];
         if ($this->url() == $uri->url()) {
             return true;
         }
@@ -1218,7 +1218,7 @@ class Page
      */
     public function activeChild()
     {
-        $uri = Grav::instance()['Uri'];
+        $uri = Grav::instance()['uri'];
         if (!$this->home() && (strpos($uri->url(), $this->url()) !== false)) {
             return true;
         }
@@ -1259,7 +1259,7 @@ class Page
     public function find($url)
     {
         /** @var Pages $pages */
-        $pages = Grav::instance()['Pages'];
+        $pages = Grav::instance()['pages'];
         return $pages->dispatch($url);
     }
 
@@ -1290,9 +1290,9 @@ class Page
 
         // TODO: MOVE THIS INTO SOMEWHERE ELSE?
         /** @var Uri $uri */
-        $uri = Grav::instance()['Uri'];
+        $uri = Grav::instance()['uri'];
         /** @var Config $config */
-        $config = Grav::instance()['Config'];
+        $config = Grav::instance()['config'];
 
         foreach ((array) $config->get('site.taxonomies') as $taxonomy) {
             if ($uri->param($taxonomy)) {
@@ -1324,7 +1324,7 @@ class Page
         }
 
         /** @var Grav $grav */
-        $grav = Grav::instance()['Grav'];
+        $grav = Grav::instance()['grav'];
 
         // New Custom event to handle things like pagination.
         $grav->fireEvent('onAfterCollectionProcessed', $collection);
@@ -1392,7 +1392,7 @@ class Page
                 // @taxonomy: { category: [ blog, featured ], level: 1 }
 
                 /** @var Taxonomy $taxonomy_map */
-                $taxonomy_map = Grav::instance()['Taxonomy'];
+                $taxonomy_map = Grav::instance()['taxonomy'];
 
                 if (!empty($parts)) {
                     $params = [implode('.', $parts) => $params];
@@ -1508,7 +1508,7 @@ class Page
     protected function parseMarkdownContent($content)
     {
         /** @var Config $config */
-        $config = Grav::instance()['Config'];
+        $config = Grav::instance()['config'];
         if ($config->get('system.pages.markdown_extra')) {
             $parsedown = new \ParsedownExtra();
         } else {
@@ -1547,7 +1547,7 @@ class Page
         // Do reordering.
         if ($reorder && $this->order() != $this->_original->order()) {
             /** @var Pages $pages */
-            $pages = Grav::instance()['Pages'];
+            $pages = Grav::instance()['pages'];
 
             $parent = $this->parent();
 
diff --git a/system/src/Grav/Common/Page/Pages.php b/system/src/Grav/Common/Page/Pages.php
index b6cdecca4..ef406cca1 100644
--- a/system/src/Grav/Common/Page/Pages.php
+++ b/system/src/Grav/Common/Page/Pages.php
@@ -226,7 +226,7 @@ class Pages
         // If the page cannot be reached, look into site wide routes.
         if (!$all && (!$page || !$page->routable())) {
             /** @var Config $config */
-            $config = $this->grav['Config'];
+            $config = $this->grav['config'];
 
             $route = $config->get("site.routes.{$url}");
             if ($route) {
@@ -257,7 +257,7 @@ class Pages
     {
         if (!isset($this->blueprints)) {
             /** @var Config $config */
-            $config = $this->grav['Config'];
+            $config = $this->grav['config'];
 
             $this->blueprints = new Data\Blueprints(THEMES_DIR . $config->get('system.pages.theme') . '/blueprints/');
         }
@@ -314,7 +314,7 @@ class Pages
     static public function types()
     {
         /** @var Config $config */
-        $config = Grav::instance()['Config'];
+        $config = Grav::instance()['config'];
 
         $blueprints = new Data\Blueprints(THEMES_DIR . $config->get('system.pages.theme') . '/blueprints/');
 
@@ -329,7 +329,7 @@ class Pages
     static public function parents()
     {
         /** @var Pages $pages */
-        $pages = Grav::instance()['Pages'];
+        $pages = Grav::instance()['pages'];
         return $pages->getList();
     }
 
@@ -343,13 +343,13 @@ class Pages
         $this->sort = array();
 
         /** @var Config $config */
-        $config = $this->grav['Config'];
+        $config = $this->grav['config'];
 
         if ($config->get('system.cache.enabled')) {
             /** @var Cache $cache */
-            $cache = $this->grav['Cache'];
+            $cache = $this->grav['cache'];
             /** @var Taxonomy $taxonomy */
-            $taxonomy = $this->grav['Taxonomy'];
+            $taxonomy = $this->grav['taxonomy'];
             $last_modified = $config->get('system.cache.check.pages', true)
                 ? Folder::lastModified(PAGES_DIR) : 0;
             $page_cache_id = md5(USER_DIR.$last_modified);
@@ -388,7 +388,7 @@ class Pages
         $directory  = rtrim($directory, DS);
         $iterator   = new \DirectoryIterator($directory);
         $page       = new Page;
-        $config     = $this->grav['Config'];
+        $config     = $this->grav['config'];
 
         $page->path($directory);
         if ($parent) $page->parent($parent);
@@ -459,7 +459,7 @@ class Pages
     protected function buildRoutes()
     {
         /** @var $taxonomy Taxonomy */
-        $taxonomy = $this->grav['Taxonomy'];
+        $taxonomy = $this->grav['taxonomy'];
 
         // Build routes and taxonomy map.
         /** @var $page Page */
@@ -481,7 +481,7 @@ class Pages
         }
 
         /** @var Config $config */
-        $config = $this->grav['Config'];
+        $config = $this->grav['config'];
 
         // Alias and set default route to home page.
         $home = trim($config->get('system.home.alias'), '/');
diff --git a/system/src/Grav/Common/Plugins.php b/system/src/Grav/Common/Plugins.php
index c275c72e2..92db56461 100644
--- a/system/src/Grav/Common/Plugins.php
+++ b/system/src/Grav/Common/Plugins.php
@@ -27,10 +27,10 @@ class Plugins extends Iterator
     public function init()
     {
         /** @var Config $config */
-        $config = $this->grav['Config'];
+        $config = $this->grav['config'];
         $plugins = (array) $config->get('plugins');
 
-        $instances = ['Theme' => $this->grav['Themes']->load()];
+        $instances = ['theme' => $this->grav['themes']->load()];
         foreach ($plugins as $plugin => $data) {
             if (empty($data['enabled'])) {
                 // Only load enabled plugins.
diff --git a/system/src/Grav/Common/Registry.php b/system/src/Grav/Common/Registry.php
index 97e8ce686..0f7b8d606 100644
--- a/system/src/Grav/Common/Registry.php
+++ b/system/src/Grav/Common/Registry.php
@@ -34,7 +34,7 @@ class Registry
     {
         user_error(__METHOD__ . '()', E_USER_DEPRECATED);
         $instance = Grav::instance();
-        return $instance[$key];
+        return $instance[strtolower($key)];
     }
 
     /**
@@ -62,7 +62,7 @@ class Registry
     {
         user_error(__CLASS__ . '::' . __METHOD__ . '()', E_USER_DEPRECATED);
         $instance = Grav::instance();
-        $instance[$key] = $value;
+        $instance[strtolower($key)] = $value;
     }
 
     /**
@@ -76,6 +76,6 @@ class Registry
     {
         user_error(__CLASS__ . '::' . __METHOD__ . '()', E_USER_DEPRECATED);
         $instance = Grav::instance();
-        return $instance[$key];
+        return $instance[strtolower($key)];
     }
 }
diff --git a/system/src/Grav/Common/Taxonomy.php b/system/src/Grav/Common/Taxonomy.php
index 93e1eca62..dadf42b7f 100644
--- a/system/src/Grav/Common/Taxonomy.php
+++ b/system/src/Grav/Common/Taxonomy.php
@@ -51,7 +51,7 @@ class Taxonomy
         }
 
         /** @var Config $config */
-        $config = $this->grav['Config'];
+        $config = $this->grav['config'];
         if ($config->get('site.taxonomies') && count($page_taxonomy) > 0) {
             foreach ((array) $config->get('site.taxonomies') as $taxonomy) {
                 if (isset($page_taxonomy[$taxonomy])) {
diff --git a/system/src/Grav/Common/Themes.php b/system/src/Grav/Common/Themes.php
index fcc8ed6fc..4d359c24e 100644
--- a/system/src/Grav/Common/Themes.php
+++ b/system/src/Grav/Common/Themes.php
@@ -88,7 +88,7 @@ class Themes
     {
         if (!$name) {
             /** @var Config $config */
-            $config = $this->grav['Config'];
+            $config = $this->grav['config'];
             $name = $config->get('system.pages.theme');
         }
 
diff --git a/system/src/Grav/Common/Twig.php b/system/src/Grav/Common/Twig.php
index f128ffa83..38eec6c21 100644
--- a/system/src/Grav/Common/Twig.php
+++ b/system/src/Grav/Common/Twig.php
@@ -64,7 +64,7 @@ class Twig
     {
         if (!isset($this->twig)) {
             /** @var Config $config */
-            $config = $this->grav['Config'];
+            $config = $this->grav['config'];
 
             $this->twig_paths = array(THEMES_DIR . $config->get('system.pages.theme') . '/templates');
             $this->grav->fireEvent('onAfterTwigTemplatesPaths');
@@ -101,16 +101,16 @@ class Twig
             $this->twig_vars = array(
                 'grav_version' => GRAV_VERSION,
                 'config' => $config,
-                'uri' => $this->grav['Uri'],
+                'uri' => $this->grav['uri'],
                 'base_dir' => rtrim(ROOT_DIR, '/'),
                 'base_url_absolute' => $baseUrlAbsolute,
                 'base_url_relative' => $baseUrlRelative,
                 'theme_dir' => THEMES_DIR . $theme,
                 'theme_url' => $themeUrl,
                 'site' => $config->get('site'),
-                'assets' => $this->grav['Assets'],
-                'taxonomy' => $this->grav['Taxonomy'],
-                'user_agent' => $this->grav['UserAgent'],
+                'assets' => $this->grav['assets'],
+                'taxonomy' => $this->grav['taxonomy'],
+                'user_agent' => $this->grav['user_agent'],
             );
 
         }
@@ -211,8 +211,8 @@ class Twig
         // set the page now its been processed
         $this->grav->fireEvent('onAfterTwigSiteVars');
         $twig_vars = $this->twig_vars;
-        $pages = $this->grav['Pages'];
-        $page = $this->grav['Page'];
+        $pages = $this->grav['pages'];
+        $page = $this->grav['page'];
 
         $twig_vars['pages'] = $pages->root();
         $twig_vars['page'] = $page;