diff --git a/askbot/jinja2/404.html b/askbot/jinja2/404.html
index bc7d7e2061..552ac91212 100644
--- a/askbot/jinja2/404.html
+++ b/askbot/jinja2/404.html
@@ -1,7 +1,7 @@
 {% extends "one_column_body.html" %}
 <!-- template 404.jinja.html -->
 {% block title %}{% filter trim %}{% trans %}Page not found{% endtrans %}{% endfilter %}{% endblock %}
-{% block page_class %}error-page error-404-page{% endblock %}
+{% block layout_class %}error-page error-404-page{% endblock %}
 {% block content %}
 <h1>{% trans %}Page not found{% endtrans %}</h1>
 <p class="row">
diff --git a/askbot/jinja2/authopenid/complete.html b/askbot/jinja2/authopenid/complete.html
index 4d7e02abeb..246cf25719 100644
--- a/askbot/jinja2/authopenid/complete.html
+++ b/askbot/jinja2/authopenid/complete.html
@@ -19,7 +19,7 @@
 #}
 {% block head %}{% endblock %}
 {% block title %}{% filter trim %}{% trans %}Complete registration{% endtrans %}{% endfilter %}{% endblock %}
-{% block page_class %}registration-page{% endblock %}
+{% block layout_class %}registration-page{% endblock %}
 {% block content %}
 <div class="flip-tabs">
     <div class="login complete-registration flip-content flip-content-active">
diff --git a/askbot/jinja2/authopenid/logout.html b/askbot/jinja2/authopenid/logout.html
index 6cd846519f..fbcad1ee1d 100644
--- a/askbot/jinja2/authopenid/logout.html
+++ b/askbot/jinja2/authopenid/logout.html
@@ -1,7 +1,7 @@
 {% extends "one_column_body.html" %}
 <!-- template logout.html -->
 {% block title %}{% filter trim %}{% trans %}Logout{% endtrans %}{% endfilter %}{% endblock %}
-{% block page_class %}logout-page{% endblock %}
+{% block layout_class %}logout-page{% endblock %}
 {% block content %}
 <h1>{% trans %}You have successfully logged out{% endtrans %}</h1>
 {% if have_federated_login_methods %}
diff --git a/askbot/jinja2/authopenid/recover_account.html b/askbot/jinja2/authopenid/recover_account.html
index 88ae284c2f..f0cf1048fc 100644
--- a/askbot/jinja2/authopenid/recover_account.html
+++ b/askbot/jinja2/authopenid/recover_account.html
@@ -1,6 +1,6 @@
 {% extends "one_column_body.html" %}
 {% block title %}{% trans %}Recover account{% endtrans %}{% endblock %}
-{% block page_class %}account-recovery-page{% endblock %}
+{% block layout_class %}account-recovery-page{% endblock %}
 {% block content %}
     <h1 class="section-title">
         {% if message %}
diff --git a/askbot/jinja2/flatpages/default.html b/askbot/jinja2/flatpages/default.html
index 3da3d4673b..ea2bbe61a2 100644
--- a/askbot/jinja2/flatpages/default.html
+++ b/askbot/jinja2/flatpages/default.html
@@ -1,6 +1,6 @@
 {% extends "one_column_body.html" %}
 {% block title %}{{ flatpage.title }}{% endblock %}
-{% block page_class %}flat-page{% endblock %}
+{% block layout_class %}flat-page{% endblock %}
 {% block content %}
 <h1>{{ flatpage.title }}</h1>
 {{ flatpage.content }}
diff --git a/askbot/jinja2/list_suggested_tags.html b/askbot/jinja2/list_suggested_tags.html
index 82e30e8f76..10adde38da 100644
--- a/askbot/jinja2/list_suggested_tags.html
+++ b/askbot/jinja2/list_suggested_tags.html
@@ -2,7 +2,7 @@
 {% import "macros.html" as macros %}
 <!-- tags.html -->
 {% block title %}{{ page_title }}{% endblock %}
-{% block page_class %}moderated-tags-page{% endblock %}
+{% block layout_class %}moderated-tags-page{% endblock %}
 {% block content %}
     {% include "tags/header.html" %}
     {% if tags %}