--- a/app/soc/templates/soc/base.html	Sat Nov 15 03:12:33 2008 +0000
+++ b/app/soc/templates/soc/base.html	Sat Nov 15 16:17:11 2008 +0000
@@ -20,10 +20,10 @@
 	{% endblock %}
   <title>
     {% block page_title %}
-      {% if page %}
-{{ page.long_name }}
+      {% if page_name %}
+{{ page_name }}
       {% else %}
-&lt;Missing Page Object&gt;
+&lt;Missing Page Name&gt;
       {% endif %}
     {% endblock %}
   </title>
@@ -65,13 +65,13 @@
 
    <div id="title">
 	{% block header_title %}
-	  {% if page %}
+	  {% if page_name %}
 {% comment %}
 TODO(tlarsen): replace this with breadcrumbs
 {% endcomment %}
-	    {{ page.short_name }}
+	    {{ page_name }}
 	  {% else %}
-&lt;Missing Page Object&gt;
+&lt;Missing Page Name&gt;
       {% endif %}
     {% endblock %}
    </div>