diff --git a/docs/_layouts/default.html b/docs/_layouts/default.html
index a7d4880b..91aa36fe 100644
--- a/docs/_layouts/default.html
+++ b/docs/_layouts/default.html
@@ -10,25 +10,25 @@
       {% endif %}
     </title>
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <link href="{{ page.base_url }}css/vendor/bootstrap.min.css" rel="stylesheet">
-    <link href="{{ page.base_url }}css/main.css" rel="stylesheet">
-    <link href="{{ page.base_url }}css/vendor/lang-eiffel.css" rel="stylesheet">
+    <link href="{{ page.baseurl }}css/vendor/bootstrap.min.css" rel="stylesheet">
+    <link href="{{ page.baseurl }}css/main.css" rel="stylesheet">
+    <link href="{{ page.baseurl }}css/vendor/lang-eiffel.css" rel="stylesheet">
   </head>
   <body>
     <div class="container-narrow">
       <div class="masthead">
         <ul class="nav nav-pills pull-right">
           <li{% if page.title == "EiffelWeb" %} class="active"{% endif %}>
-            <a href="{{ page.base_url }}index.html">Home</a>
+            <a href="{{ page.baseurl }}index.html">Home</a>
           </li>
           <li{% if page.title == "Getting Started" %} class="active"{% endif %}>
-            <a href="{{ page.base_url }}getting-started">Getting Started</a>
+            <a href="{{ page.baseurl }}getting-started">Getting Started</a>
           </li>
           <li{% if page.title == "Community" %} class="active"{% endif %}>
-            <a href="{{ page.base_url }}community">Community</a>
+            <a href="{{ page.baseurl }}community">Community</a>
           </li>
           <li{% if page.title == "Documentation" %} class="active"{% endif %}>
-            <a href="{{ page.base_url }}workbook/readme">Documentation</a>
+            <a href="{{ page.baseurl }}workbook/readme">Documentation</a>
           </li>
         </ul>
         <h3 class="muted">EiffelWeb</h3>
@@ -40,10 +40,10 @@
         <p>&copy; EiffelWeb framework 2012-2017</p>
       </div>
     </div> <!-- /container -->
-    <script src="{{ page.base_url }}js/vendor/jquery.min.js"></script>
-    <script src="{{ page.base_url }}js/vendor/bootstrap.min.js"></script>
+    <script src="{{ page.baseurl }}js/vendor/jquery.min.js"></script>
+    <script src="{{ page.baseurl }}js/vendor/bootstrap.min.js"></script>
     <script src="http://platform.twitter.com/widgets.js"></script>
-    <script src="{{ page.base_url }}js/vendor/run_prettify.js"></script>
-    <script src="{{ page.base_url }}js/vendor/lang-eiffel.js"></script>
+    <script src="{{ page.baseurl }}js/vendor/run_prettify.js"></script>
+    <script src="{{ page.baseurl }}js/vendor/lang-eiffel.js"></script>
   </body>
 </html>
