diff --git a/templates/base.html b/templates/base.html
index ebaea525c..be6ca7dda 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -24,9 +24,9 @@
 	<meta name="msnbot" content="noindex, nofollow, noarchive, noodp" />
 	<meta name="slurp" content="noindex, nofollow, noarchive, noodp, noydir" />
 
-	<meta name="title" content="{% if title %} {{ title }} {% else %} FreedomBox Dashboard {% endif %}" />
+	<meta name="title" content="{% if title %} {{ title }} {% else %} FreedomBox {% endif %}" />
 	<meta name="description" content="Plinth administrative interface for the FreedomBox" />
-	<title>{% if title %} {{ title }} {% else %} FreedomBox Dashboard {% endif %}</title>
+	<title>{% if title %} {{ title }} {% else %} FreedomBox {% endif %}</title>
 
 	<!-- This is the traditional favicon. Size: 16x16 or 32x32, transparency is OK -->
 	<link rel="shortcut icon" href="{{ basehref }}/static/theme/img/favicon.ico" />
@@ -57,7 +57,7 @@
             <span class="icon-bar"></span>
             <span class="icon-bar"></span>
           </a>
-          <a href="{{ basehref }}/" class="logo-top"><img src="{{ basehref }}/static/theme/img/freedombox-logo-32px.png" alt="FreedomBox" /></a><a class="brand" href="{{ basehref }}/">FreedomBox Dashboard</a>
+          <a href="{{ basehref }}/" class="logo-top"><img src="{{ basehref }}/static/theme/img/freedombox-logo-32px.png" alt="FreedomBox" /></a><a class="brand" href="{{ basehref }}/">FreedomBox</a>
 	  {% block add_nav_and_login %}
 	  {% endblock %}
           </div><!--/.nav-collapse -->