diff --git a/lib/gollum/frontend/templates/compare.mustache b/lib/gollum/frontend/templates/compare.mustache
index 02b42593..3a99fbd2 100644
--- a/lib/gollum/frontend/templates/compare.mustache
+++ b/lib/gollum/frontend/templates/compare.mustache
@@ -3,7 +3,7 @@
     <div class="actions">
       <a href="/{{name}}">&laquo; Back</a>
     </div>
-    <h1>Comparison of {{human_name}}: {{before}} &rarr; {{after}}</h1>
+    <h1>{{title}}: {{before}} &rarr; {{after}}</h1>
     <div id="files">
       <div class="file">
         <div class="meta">
diff --git a/lib/gollum/frontend/templates/create.mustache b/lib/gollum/frontend/templates/create.mustache
index 840f102d..2d897492 100644
--- a/lib/gollum/frontend/templates/create.mustache
+++ b/lib/gollum/frontend/templates/create.mustache
@@ -1,6 +1,6 @@
 <div class="write">
   <a href="/">&laquo; Home</a>
-  <h1>Create a new page</h1>
+  <h1>{{title}}</h1>
 
   <form class="new_wiki" method="post" action="/create/{{name}}">
     <div>
diff --git a/lib/gollum/frontend/templates/edit.mustache b/lib/gollum/frontend/templates/edit.mustache
index fe931d7e..ed2455bc 100644
--- a/lib/gollum/frontend/templates/edit.mustache
+++ b/lib/gollum/frontend/templates/edit.mustache
@@ -1,6 +1,6 @@
 <div class="write">
   <a href="/{{name}}">&laquo; Back</a>
-  <h1>Editing &ldquo;{{name}}&rdquo;</h1>
+  <h1>{{title}}</h1>
 
   <form class="edit_wiki" method="post" action="/edit/{{name}}">
     <div>
diff --git a/lib/gollum/frontend/templates/history.mustache b/lib/gollum/frontend/templates/history.mustache
index 38ad8e5a..19d3d317 100644
--- a/lib/gollum/frontend/templates/history.mustache
+++ b/lib/gollum/frontend/templates/history.mustache
@@ -3,7 +3,7 @@
     <div class="actions">
       <a href="/{{name}}">&laquo; Back</a>
     </div>
-    <h1>History of {{human_name}}</h1>
+    <h1>{{title}}</h1>
     <form id="history" method="post" action="/compare/{{name}}">
       <table class="commits" cellpadding="0" cellspacing="0">
         <tr>
diff --git a/lib/gollum/frontend/templates/layout.mustache b/lib/gollum/frontend/templates/layout.mustache
index 7c2bab21..b08ac18c 100644
--- a/lib/gollum/frontend/templates/layout.mustache
+++ b/lib/gollum/frontend/templates/layout.mustache
@@ -3,7 +3,7 @@
 <html>
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-    <title>Gollum - {{title}}</title>
+    <title>{{title}}</title>
     <link rel="stylesheet" href="/css/screen.css" type="text/css" charset="utf-8" />
     <link rel="stylesheet" href="/css/gollum.css" type="text/css" charset="utf-8" />
     <link rel="stylesheet" href="/css/syntax.css" type="text/css" charset="utf-8" />
diff --git a/lib/gollum/frontend/templates/page.mustache b/lib/gollum/frontend/templates/page.mustache
index ce799d27..24956273 100644
--- a/lib/gollum/frontend/templates/page.mustache
+++ b/lib/gollum/frontend/templates/page.mustache
@@ -3,7 +3,7 @@
     <div class="actions">
       <a href="/">Home</a> | <a href="/edit/{{name}}">Edit</a>
     </div>
-    <h1>{{human_name}}</h1>
+    <h1>{{title}}</h1>
     <div class="content wikistyle gollum {{format}}">
       {{{content}}}
     </div>
diff --git a/lib/gollum/frontend/views/compare.rb b/lib/gollum/frontend/views/compare.rb
index a23ec182..427bc329 100644
--- a/lib/gollum/frontend/views/compare.rb
+++ b/lib/gollum/frontend/views/compare.rb
@@ -3,12 +3,8 @@ module Precious
     class Compare < Layout
       attr_reader :page, :diff, :versions
 
-      def human_name
-        @page.title
-      end
-
       def title
-        "A Page"
+        "Comparison of #{@page.title}"
       end
 
       def path
diff --git a/lib/gollum/frontend/views/edit.rb b/lib/gollum/frontend/views/edit.rb
index 4f1177d8..7165b801 100644
--- a/lib/gollum/frontend/views/edit.rb
+++ b/lib/gollum/frontend/views/edit.rb
@@ -6,7 +6,7 @@ module Precious
       attr_reader :page, :content
 
       def title
-        "Edit"
+        "Editing #{@page.title}"
       end
     end
   end
diff --git a/lib/gollum/frontend/views/history.rb b/lib/gollum/frontend/views/history.rb
index 648db01b..94240468 100644
--- a/lib/gollum/frontend/views/history.rb
+++ b/lib/gollum/frontend/views/history.rb
@@ -3,12 +3,8 @@ module Precious
     class History < Layout
       attr_reader :page
 
-      def human_name
-        @page.title
-      end
-
       def title
-        "A Page"
+        "History of #{@page.title}"
       end
 
       def versions
diff --git a/lib/gollum/frontend/views/page.rb b/lib/gollum/frontend/views/page.rb
index e2211da5..04f1e64a 100644
--- a/lib/gollum/frontend/views/page.rb
+++ b/lib/gollum/frontend/views/page.rb
@@ -3,12 +3,8 @@ module Precious
     class Page < Layout
       attr_reader :content, :page, :footer
 
-      def human_name
-        @page.title
-      end
-
       def title
-        "A Page"
+        @page.title
       end
 
       def format
