diff --git a/default.hbs b/default.hbs
index a29e65f0..2b5c65af 100644
--- a/default.hbs
+++ b/default.hbs
@@ -28,21 +28,21 @@
                 {{navigation}}
             </nav>
             <div class="site-head-center">
-                {{#if @blog.logo}}
-                <a class="site-head-logo" href="{{@blog.url}}"><img src="{{@blog.logo}}" alt="{{@blog.title}}" /></a>
+                {{#if @site.logo}}
+                <a class="site-head-logo" href="{{@site.url}}"><img src="{{@site.logo}}" alt="{{@site.title}}" /></a>
                 {{else}}
-                <a class="site-head-logo" href="{{@blog.url}}">{{@blog.title}}</a>
+                <a class="site-head-logo" href="{{@site.url}}">{{@site.title}}</a>
                 {{/if}}
             </div>
             <div class="site-head-right">
                 <div class="social-links">
-                    {{#if @blog.facebook}}
-                    <a href="{{facebook_url @blog.facebook}}" title="Facebook" target="_blank" rel="noopener">Facebook</a>
+                    {{#if @site.facebook}}
+                    <a href="{{facebook_url @site.facebook}}" title="Facebook" target="_blank" rel="noopener">Facebook</a>
                     {{/if}}
-                    {{#if @blog.twitter}}
-                    <a href="{{twitter_url @blog.twitter}}" title="Twitter" target="_blank" rel="noopener">Twitter</a>
+                    {{#if @site.twitter}}
+                    <a href="{{twitter_url @site.twitter}}" title="Twitter" target="_blank" rel="noopener">Twitter</a>
                     {{/if}}
-                    <a href="https://feedly.com/i/subscription/feed/{{@blog.url}}/rss/" title="RSS" target="_blank" rel="noopener">RSS</a>
+                    <a href="https://feedly.com/i/subscription/feed/{{@site.url}}/rss/" title="RSS" target="_blank" rel="noopener">RSS</a>
                 </div>
             </div>
         </div>
@@ -57,7 +57,7 @@
 
     {{!-- The footer at the very bottom of the screen --}}
     <footer class="site-foot">
-        &copy; {{date format="YYYY"}} <a href="{{@blog.url}}">{{@blog.title}}</a> &mdash; Published with <a href="https://ghost.org" target="_blank" rel="noopener">Ghost</a>
+        &copy; {{date format="YYYY"}} <a href="{{@site.url}}">{{@site.title}}</a> &mdash; Published with <a href="https://ghost.org" target="_blank" rel="noopener">Ghost</a>
     </footer>
 
 </div>
diff --git a/error.hbs b/error.hbs
index dfeeee88..3a7c8401 100644
--- a/error.hbs
+++ b/error.hbs
@@ -3,7 +3,7 @@
 <header class="page-head error-head">
     <h1 class="page-head-title">{{code}}</h1>
     <p class="page-head-description">{{message}}</p>
-    <a class="error-link" href="{{@blog.url}}">Go to the front page →</a>
+    <a class="error-link" href="{{@site.url}}">Go to the front page →</a>
 </header>
 
 {{#if errorDetails}}
@@ -24,4 +24,4 @@
         </ul>
     </section>
 </div>
-{{/if}}
\ No newline at end of file
+{{/if}}
diff --git a/index.hbs b/index.hbs
index 09b86b6f..f7eebe48 100644
--- a/index.hbs
+++ b/index.hbs
@@ -3,9 +3,9 @@
 into the {body} of the default.hbs template --}}
 
 {{#is "home"}}
-    {{#if @blog.description}}
+    {{#if @site.description}}
     <header class="page-head">
-        <h2 class="page-head-title">{{@blog.description}}</h2>
+        <h2 class="page-head-title">{{@site.description}}</h2>
     </header>
     {{/if}}
 {{/is}}
diff --git a/post.hbs b/post.hbs
index 3c2a906f..8043c213 100644
--- a/post.hbs
+++ b/post.hbs
@@ -24,7 +24,7 @@
     {{!-- Email subscribe form at the bottom of the page --}}
     {{#if @labs.subscribers}}
     <section class="subscribe-form">
-        <h3 class="subscribe-form-title">Subscribe to {{@blog.title}}</h3>
+        <h3 class="subscribe-form-title">Subscribe to {{@site.title}}</h3>
         <p>Get the latest posts delivered right to your inbox</p>
         {{subscribe_form placeholder="youremail@example.com"}}
     </section>