diff --git a/source/_layouts/default.html.twig b/source/_layouts/default.html.twig
index 25b1ad76..c95dd3c2 100644
--- a/source/_layouts/default.html.twig
+++ b/source/_layouts/default.html.twig
@@ -57,9 +57,9 @@
             <div class="row">
                 {% block content_wrapper %}
                     <main class="col-md-10">
-                        {% block content %}{% endblock %}
+                        {% block content %}{% endblock content %}
                     </main>
-                {% endblock %}
+                {% endblock content_wrapper %}
 
                 {% block sidebar_wrapper %}
                     <div class="col-md-2">
@@ -72,9 +72,9 @@
                             </section>
 
                             {% include 'availability' %}
-                        {% endblock %}
+                        {% endblock sidebar %}
                     </div>
-                {% endblock %}
+                {% endblock sidebar_wrapper %}
             </div>{# .row #}
         </div>{# .container #}
 
@@ -89,7 +89,7 @@
         <script src="{{ site.url }}/components/highlightjs/highlight.pack.js"></script>
         <script>hljs.initHighlightingOnLoad();</script>
 
-        {% block scripts %}{% endblock %}
+        {% block scripts %}{% endblock scripts %}
 
         {% if page.tweets is defined and page.tweets == true %}
             <script async src="//platform.twitter.com/widgets.js" charset="utf-8"></script>
diff --git a/source/_layouts/post.html.twig b/source/_layouts/post.html.twig
index bc95c75c..e9a399ed 100644
--- a/source/_layouts/post.html.twig
+++ b/source/_layouts/post.html.twig
@@ -6,7 +6,7 @@
     <main class="col-md-10">
         {% include 'post_header' %}
 
-        {% block content %}{% endblock %}
+        {% block content %}{% endblock content %}
 
         {% if page.related -%}
             <h2>Related Posts</h2>
@@ -45,4 +45,4 @@
     {% endif %}
 
     </main>
-{% endblock %}
+{% endblock content_wrapper %}
diff --git a/source/_layouts/talk.html.twig b/source/_layouts/talk.html.twig
index bc99c861..1b8d3bf6 100644
--- a/source/_layouts/talk.html.twig
+++ b/source/_layouts/talk.html.twig
@@ -22,4 +22,4 @@
             </div>
         {% endif %}
     </main>
-{% endblock %}
+{% endblock content_wrapper %}
diff --git a/source/blog.html b/source/blog.html
index e220e307..56355644 100644
--- a/source/blog.html
+++ b/source/blog.html
@@ -38,4 +38,4 @@ use:
             {% endif %}
         </nav>
     {% endif %}
-{% endblock %}
+{% endblock content %}