diff --git a/layouts/_default/li.html b/layouts/_default/li.html
index b527029..8f9814a 100644
--- a/layouts/_default/li.html
+++ b/layouts/_default/li.html
@@ -4,7 +4,7 @@
     <div class="post-meta clearfix">
       <div class="post-date pull-left">
         Posted on
-        <time datetime="{{ .Date.Format "2006-01-02T15:04:05Z07:00" | safeHtml }}">
+        <time datetime="{{ .Date.Format "2006-01-02T15:04:05Z07:00" | safeHTML }}">
           {{ .Date.Format "Jan 2, 2006" }}
         </time>
       </div>
diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index 92a485f..e443bc6 100644
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -1,12 +1,12 @@
 {{ partial "header.html" . }}
-{{ $baseurl := .Site.BaseUrl }}
+{{ $baseurl := .Site.BaseURL }}
 <article>
   <header>
     <h1 class="text-primary">{{ .Title }}</h1>
     <div class="post-meta clearfix">
       <div class="post-date pull-left">
         Posted on
-        <time datetime="{{ .Date.Format "2006-01-02T15:04:05Z07:00" | safeHtml }}">
+        <time datetime="{{ .Date.Format "2006-01-02T15:04:05Z07:00" | safeHTML }}">
           {{ .Date.Format "Jan 2, 2006" }}
         </time>
       </div>
diff --git a/layouts/_default/terms.html b/layouts/_default/terms.html
index 3a60537..a7bcd93 100644
--- a/layouts/_default/terms.html
+++ b/layouts/_default/terms.html
@@ -1,5 +1,5 @@
 {{ partial "header.html" . }}
-{{ $baseurl := .Site.BaseUrl}}
+{{ $baseurl := .Site.BaseURL}}
 <section class="taxonomy-terms">
   <h1>{{ .Title }}</h1>
   <ul>
diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html
index 1b24796..63cdbeb 100644
--- a/layouts/partials/footer.html
+++ b/layouts/partials/footer.html
@@ -1,12 +1,12 @@
   </main>
   <footer class="container global-footer">
     <div class="copyright-note pull-left">
-      {{ .Site.Copyright | safeHtml }}
+      {{ .Site.Copyright | safeHTML }}
     </div>
     {{ partial "link.html" . }}
   </footer>
 
-  <script src="{{ .Site.BaseUrl }}js/highlight.pack.js"></script>
+  <script src="{{ .Site.BaseURL }}js/highlight.pack.js"></script>
   <script>
     hljs.initHighlightingOnLoad();
   </script>
diff --git a/layouts/partials/header.html b/layouts/partials/header.html
index 1d870d9..0c06441 100644
--- a/layouts/partials/header.html
+++ b/layouts/partials/header.html
@@ -3,7 +3,7 @@
 <head prefix="og: http://ogp.me/ns#">
   <meta charset="utf-8" />
   <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1" />
-  <meta property="og:title" content="{{ if ne .Url "/" }} {{ .Title }} &middot; {{ end }} {{ .Site.Title }}" />
+  <meta property="og:title" content="{{ if ne .URL "/" }} {{ .Title }} &middot; {{ end }} {{ .Site.Title }}" />
   <meta property="og:site_name" content="{{ .Site.Title }}" />
   <meta property="og:url" content="{{ .Permalink }}" />
   {{ with .Params.images }}{{ range first 5 . }}
@@ -14,7 +14,7 @@
   {{ with .Site.Params.facebook }}
   <meta property="og:article:author" content="https://facebook.com/{{ . }}" />
   {{ end }}
-  <meta property="og:article:published_time" content="{{ .Date.Format "2006-01-02T15:04:05Z07:00" | safeHtml }}" />
+  <meta property="og:article:published_time" content="{{ .Date.Format "2006-01-02T15:04:05Z07:00" | safeHTML }}" />
   {{ range .Params.tags }}
   <meta property="og:article:tag" content="{{ . }}" />
   {{ end }}
@@ -23,32 +23,32 @@
   {{ end }}
 
   <title>
-    {{ if ne .Url "/" }} {{ .Title }} &middot; {{ end }} {{ .Site.Title }}
+    {{ if ne .URL "/" }} {{ .Title }} &middot; {{ end }} {{ .Site.Title }}
   </title>
 
-  <link rel="stylesheet" href="{{ .Site.BaseUrl }}css/bootstrap.min.css" />
-  <link rel="stylesheet" href="{{ .Site.BaseUrl }}css/main.css" />
-  <link rel="stylesheet" href="{{ .Site.BaseUrl }}css/font-awesome.min.css" />
-  <link rel="stylesheet" href="{{ .Site.BaseUrl }}css/github.css" />
+  <link rel="stylesheet" href="{{ .Site.BaseURL }}css/bootstrap.min.css" />
+  <link rel="stylesheet" href="{{ .Site.BaseURL }}css/main.css" />
+  <link rel="stylesheet" href="{{ .Site.BaseURL }}css/font-awesome.min.css" />
+  <link rel="stylesheet" href="{{ .Site.BaseURL }}css/github.css" />
   <link rel="stylesheet" href="//fonts.googleapis.com/css?family=Source+Sans+Pro:200,300,400" type="text/css">
-  <link rel="shortcut icon" href="{{ .Site.BaseUrl }}images/favicon.ico" />
-  <link rel="apple-touch-icon" href="{{ .Site.BaseUrl }}images/apple-touch-icon.png" />
-  {{ if eq .Url "/" }}
+  <link rel="shortcut icon" href="{{ .Site.BaseURL }}images/favicon.ico" />
+  <link rel="apple-touch-icon" href="{{ .Site.BaseURL }}images/apple-touch-icon.png" />
+  {{ if eq .URL "/" }}
   <link href="{{ .RSSLink }}" rel="alternate" type="application/rss+xml" title="{{ .Site.Title }}" />
   {{ end }}
 </head>
 <body>
   <header class="global-header">
     <section class="header-text">
-      <h1><a href="{{ .Site.BaseUrl }}">{{ .Site.Title }}</a></h1>
+      <h1><a href="{{ .Site.BaseURL }}">{{ .Site.Title }}</a></h1>
       {{ with .Site.Params.subtitle }}
       <div class="tag-line">
         {{ . }}
       </div>
       {{ end }}
       {{ partial "link.html" . }}
-      {{ if ne .Url "/" }}
-      <a href="{{ .Site.BaseUrl }}" class="btn-header btn-back hidden-xs">
+      {{ if ne .URL "/" }}
+      <a href="{{ .Site.BaseURL }}" class="btn-header btn-back hidden-xs">
         <i class="fa fa-angle-left"></i>
         &nbsp;Home
       </a>
