diff --git a/site/themes/default/templates/blog.html b/site/themes/default/templates/blog.html
index 43c4d063..a0ec0fcb 100644
--- a/site/themes/default/templates/blog.html
+++ b/site/themes/default/templates/blog.html
@@ -5,15 +5,15 @@
     <h1>{{ entry.title }}</h1>
 
     {# pagination #}
-    {% set entries_limit = entries_fetch('blog').entries_limit %}
-    {% set entries_length = entries_fetch_all('blog', 'date', 'DESC')|length %}
+    {% set entries_limit = entries.fetch('blog').entries_limit %}
+    {% set entries_length = entries.fetchAll('blog', 'date', 'DESC')|length %}
     {% set entries_pages = (entries_length/entries_limit)|round %}
     {% if page < 1 %}{% set page = 1 %}{% elseif page > entries_pages %}{% set page = entries_pages %}{% endif %}
     {% set entries_offset = (page-1)*entries_limit %}
     {% if entries_offset < 0 %}{% set entries_offset = 0 %}{% endif %}
     {# /pagination #}
 
-    {% for entry in entries_fetch_all('blog', 'date', 'DESC', entries_offset, entries_limit) %}
+    {% for entry in entries.fetchAll('blog', 'date', 'DESC', entries_offset, entries_limit) %}
         <a href="{{ entry.slug }}" class="blog-post">
             <h3>{{ entry.title }}</h3>
             <p>{{ entry.summary|shortcode|raw}}</p>
diff --git a/site/themes/default/templates/home.html b/site/themes/default/templates/home.html
index 0eba4038..c52152a3 100644
--- a/site/themes/default/templates/home.html
+++ b/site/themes/default/templates/home.html
@@ -1,17 +1,17 @@
-{% extends "themes/default/templates/partials/base.html" %}
-
-{% block content %}
-
-    {{ entry.content|shortcode|raw}}
-
-    {% for entry in entries_fetch_all('blog', 'date', 'DESC', 0, 3) %}
-        <a href="{{ entry.slug }}" class="blog-post">
-            <h3>{{ entry.title }}</h3>
-            <p>{{ entry.summary|shortcode|raw}}</p>
-            <div>{{ entry.date }}</div>
-        </a>
-    {% endfor %}
-
-    <a href="{{ base_url() }}/blog" class="blog-read">Read the rest of the blog</a>
-
-{% endblock %}
+{% extends "themes/default/templates/partials/base.html" %}
+
+{% block content %}
+
+    {{ entry.content|shortcode|raw}}
+
+    {% for entry in entries.fetchAll('blog', 'date', 'DESC', 0, 3) %}
+        <a href="{{ entry.slug }}" class="blog-post">
+            <h3>{{ entry.title }}</h3>
+            <p>{{ entry.summary|shortcode|raw}}</p>
+            <div>{{ entry.date }}</div>
+        </a>
+    {% endfor %}
+
+    <a href="{{ base_url() }}/blog" class="blog-read">Read the rest of the blog</a>
+
+{% endblock %}
diff --git a/site/themes/default/templates/partials/base.html b/site/themes/default/templates/partials/base.html
index 74f30daf..1336ab2a 100644
--- a/site/themes/default/templates/partials/base.html
+++ b/site/themes/default/templates/partials/base.html
@@ -9,7 +9,7 @@
             <meta name="robots" content="{% if entry.robots %}{{ entry.robots }}{% else %}{{ registry.settings.robots }}{% endif %}">
             <meta name="generator" content="Powered by Flextype Flextype::VERSION" />
 
-            {{ emitter_emit('onThemeMeta') }}
+            {{ emitter.emit('onThemeMeta') }}
 
             <title>{% if entry.title %}{{ entry.title|e('html') }} | {% endif %}{{ registry.settings.title|e('html') }}</title>
 
@@ -17,14 +17,14 @@
 
             {% set bootstrap = base_url() ~ '/site/themes/' ~ registry.settings.theme ~ '/assets/dist/css/bootstrap.min.css' %}
             {% set default = base_url() ~ '/site/themes/' ~ registry.settings.theme ~ '/assets/dist/css/default.min.css' %}
-            {% do assets_add('css', bootstrap, 'site', 1) %}
-            {% do assets_add('css', default, 'site', 2) %}
-            {% for assets_site in assets_get('css', 'site') %}
+            {% do assets.add('css', bootstrap, 'site', 1) %}
+            {% do assets.add('css', default, 'site', 2) %}
+            {% for assets_site in assets.get('css', 'site') %}
                 {% for assets_by_priorities in assets_site %}
                     <link href="{{ assets_by_priorities.asset }}" rel="stylesheet">
                 {% endfor %}
             {% endfor %}
-            {{ emitter_emit('onThemeHeader') }}
+            {{ emitter.emit('onThemeHeader') }}
         {% endblock %}
     </head>
     <body>
@@ -36,7 +36,7 @@
           </button>
           <div class="collapse navbar-collapse justify-content-end" id="navbarNav">
             <ul class="navbar-nav">
-                {% for item in entries_fetch_all('', 'menu_item_order', 'ASC') %}
+                {% for item in entries.fetchAll('', 'menu_item_order', 'ASC') %}
                     {% if item.menu_item_title %}
                         <li class="nav-item">
                             <a class="nav-link {% if item.menu_item_url in entry.slug %}active{% endif %}" href="{{ base_url() }}/{{ item.menu_item_url }}">{{ item.menu_item_title }}</a>
@@ -56,12 +56,12 @@
             </div>
         </main>
         {% set default = base_url() ~ '/site/themes/' ~ registry.settings.theme ~ '/assets/dist/js/default.min.js' %}
-        {% do assets_add('js', default, 'site', 1) %}
-        {% for assets_site in assets_get('js', 'site') %}
+        {% do assets.add('js', default, 'site', 1) %}
+        {% for assets_site in assets.get('js', 'site') %}
             {% for assets_by_priorities in assets_site %}
                 <script src="{{ assets_by_priorities.asset }}"></script>
             {% endfor %}
         {% endfor %}
-        {{ emitter_emit('onThemeTail') }}
+        {{ emitter.emit('onThemeTail') }}
     </body>
 </html>