diff --git a/pelican/themes/templates/archives.html b/pelican/themes/templates/archives.html
index f2f6270b..9414f5be 100644
--- a/pelican/themes/templates/archives.html
+++ b/pelican/themes/templates/archives.html
@@ -1,6 +1,6 @@
 {% extends "base.html" %}
 {% block content %}
-<h1>Archives for {{ BLOGNAME }}</h2>
+<h1>Archives for {{ SITENAME }}</h2>
 
 <dl>
 {% for date, articles in dates %}
diff --git a/pelican/themes/templates/base.html b/pelican/themes/templates/base.html
index 3bf37391..26103864 100644
--- a/pelican/themes/templates/base.html
+++ b/pelican/themes/templates/base.html
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
-        <title>{% block title %}{{ BLOGNAME }}{%endblock%}</title>
+        <title>{% block title %}{{ SITENAME }}{%endblock%}</title>
         <meta charset="utf-8" />
 </head>
 
 <body id="index" class="home">
         <header id="banner" class="body">
-                <h1><a href="{{ BLOGURL }}">{{ BLOGNAME }} <strong>{{ BLOGSUBTITLE }}</strong></a></h1>
+                <h1><a href="{{ SITEURL }}">{{ SITENAME }} <strong>{{ SITESUBTITLE }}</strong></a></h1>
         </header><!-- /#banner -->
         {% if categories %}<ul>
         {% for category, articles in categories %}
diff --git a/samples/themes/notmyidea/templates/archives.html b/samples/themes/notmyidea/templates/archives.html
index d99aad6d..31b02a0d 100644
--- a/samples/themes/notmyidea/templates/archives.html
+++ b/samples/themes/notmyidea/templates/archives.html
@@ -1,6 +1,6 @@
 {% extends "base.html" %}
 {% block content %}
-<h1>Archives for {{ BLOGNAME }}</h1>
+<h1>Archives for {{ SITENAME }}</h1>
 
 <dl>
 {% for date, articles in dates %}
diff --git a/samples/themes/notmyidea/templates/article.html b/samples/themes/notmyidea/templates/article.html
index e3624730..4aed28f4 100644
--- a/samples/themes/notmyidea/templates/article.html
+++ b/samples/themes/notmyidea/templates/article.html
@@ -11,7 +11,7 @@
                 </abbr>
                 <address class="vcard author">
                         By <a class="url fn" href="#">{{ article.author }}</a>
-                </address>In <a href="{{ BLOGURL }}/category/{{ article.category }}.html">{{ article.category }}</a>
+                </address>In <a href="{{ SITEURL }}/category/{{ article.category }}.html">{{ article.category }}</a>
         </footer><!-- /.post-info -->
         {{ article.content }}
         </div><!-- /.entry-content -->
diff --git a/samples/themes/notmyidea/templates/base.html b/samples/themes/notmyidea/templates/base.html
index 245c4f6a..a9572db8 100644
--- a/samples/themes/notmyidea/templates/base.html
+++ b/samples/themes/notmyidea/templates/base.html
@@ -1,21 +1,21 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
-        <title>{% block title %}{{ BLOGNAME }}{%endblock%}</title>
+        <title>{% block title %}{{ SITENAME }}{%endblock%}</title>
         <meta charset="utf-8" />
-        <link rel="stylesheet" href="{{ BLOGURL }}/css/main.css" type="text/css" />
-        <link href="{{ BLOGURL }}/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="{{ BLOGNAME }} ATOM Feed" />
+        <link rel="stylesheet" href="{{ SITEURL }}/css/main.css" type="text/css" />
+        <link href="{{ SITEURL }}/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="{{ SITENAME }} ATOM Feed" />
 
 
         <!--[if IE]>
                 <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
         
         <!--[if lte IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href="{{ BLOGURL }}/css/ie.css"/>
-                <script src="{{ BLOGURL }}/js/IE8.js" type="text/javascript"></script><![endif]-->
+                <link rel="stylesheet" type="text/css" media="all" href="{{ SITEURL }}/css/ie.css"/>
+                <script src="{{ SITEURL }}/js/IE8.js" type="text/javascript"></script><![endif]-->
                 
         <!--[if lt IE 7]>
-                <link rel="stylesheet" type="text/css" media="all" href="{{ BLOGURL }}/css/ie6.css"/><![endif]-->
+                <link rel="stylesheet" type="text/css" media="all" href="{{ SITEURL }}/css/ie6.css"/><![endif]-->
 
 </head>
 
@@ -23,24 +23,24 @@
 <a href="http://github.com/ametaireau"><img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" /></a>        
 
         <header id="banner" class="body">
-                <h1><a href="{{ BLOGURL }}">{{ BLOGNAME }} {% if BLOGSUBTITLE %} <strong>{{ BLOGSUBTITLE }}</strong>{% endif %}</a></h1>
+                <h1><a href="{{ SITEURL }}">{{ SITENAME }} {% if SITESUBTITLE %} <strong>{{ SITESUBTITLE }}</strong>{% endif %}</a></h1>
                 <nav><ul>
                 {% for title, link in MENUITEMS %}
                     <li><a href="{{ link }}">{{ title }}</a></li>
                 {% endfor %}
                 {% for cat, null in categories %}
-                    <li {% if cat == category %}class="active"{% endif %}><a href="{{ BLOGURL }}/category/{{ cat }}.html">{{ cat }}</a></li>
+                    <li {% if cat == category %}class="active"{% endif %}><a href="{{ SITEURL }}/category/{{ cat }}.html">{{ cat }}</a></li>
                 {% endfor %}
                 </ul></nav>
         </header><!-- /#banner -->
         {% block content %}
         {% endblock %}
         <section id="extras" class="body">
-        {% if BLOGROLL %}
+        {% if SITEROLL %}
                 <div class="blogroll">
                         <h2>blogroll</h2>
                         <ul>
-                        {% for name, link in BLOGROLL %}
+                        {% for name, link in SITEROLL %}
                             <li><a href="{{ link }}">{{ name }}</a></li>
                         {% endfor %}
                         </ul>
@@ -50,7 +50,7 @@
                 <div class="social">
                         <h2>social</h2>
                         <ul>
-                            <li><a href="{{ BLOGURL }}/feeds/all.atom.xml" rel="alternate">atom feed</a></li>
+                            <li><a href="{{ SITEURL }}/feeds/all.atom.xml" rel="alternate">atom feed</a></li>
                         {% for name, link in SOCIAL %}
                             <li><a href="{{ link }}">{{ name }}</a></li>
                         {% endfor %}
diff --git a/samples/themes/notmyidea/templates/index.html b/samples/themes/notmyidea/templates/index.html
index 7c1f5bf5..3ee1edb1 100644
--- a/samples/themes/notmyidea/templates/index.html
+++ b/samples/themes/notmyidea/templates/index.html
@@ -4,7 +4,7 @@
 {% for article in articles %}        
     {% if loop.index == 1 %}
         <aside id="featured" class="body"><article>
-                <h2 class="entry-title"><a href="{{ BLOGURL }}/{{ article.url }}">{{ article.title }}</a></h2> 
+                <h2 class="entry-title"><a href="{{ SITEURL }}/{{ article.url }}">{{ article.title }}</a></h2> 
                 <footer class="post-info">
                         <abbr class="published" title="{{ article.date.isoformat() }}">
                                 {{ article.date.strftime('%a %d %B %Y') }}
@@ -12,7 +12,7 @@
 
                         <address class="vcard author">
                                 By <a class="url fn" href="#">{{ article.author }}</a>
-                        </address>In <a href="{{ BLOGURL }}/category/{{ article.category }}.html">{{ article.category }}</a>
+                        </address>In <a href="{{ SITEURL }}/category/{{ article.category }}.html">{{ article.category }}</a>
                 </footer><!-- /.post-info -->
                 {{ article.content }}
         </article></aside><!-- /#featured -->
@@ -25,7 +25,7 @@
     {% else %} 
         <li><article class="hentry">    
                 <header>
-                        <h2><a href="{{ BLOGURL }}/{{ article.url }}" rel="bookmark" title="Permalink to {{ article.title}}">{{ article.title }}</a></h2>
+                        <h2><a href="{{ SITEURL }}/{{ article.url }}" rel="bookmark" title="Permalink to {{ article.title}}">{{ article.title }}</a></h2>
                 </header>
                 
                 <div class="entry-content">
@@ -36,10 +36,10 @@
 
                         <address class="vcard author">
                                 By <a class="url fn" href="#">{{ article.author }}</a>
-                        </address>In <a href="{{ BLOGURL }}/category/{{ article.category }}.html">{{ article.category }}</a>
+                        </address>In <a href="{{ SITEURL }}/category/{{ article.category }}.html">{{ article.category }}</a>
                 </footer><!-- /.post-info -->
                 {{ article.summary }}
-                <a class="readmore" href="{{ BLOGURL }}/{{ article.url }}">read more</a>
+                <a class="readmore" href="{{ SITEURL }}/{{ article.url }}">read more</a>
                 </div><!-- /.entry-content -->
         </article></li>
     {% endif %}
