diff --git a/lib/gollum/frontend/app.rb b/lib/gollum/frontend/app.rb
index 6acb1006..f022e34a 100644
--- a/lib/gollum/frontend/app.rb
+++ b/lib/gollum/frontend/app.rb
@@ -129,8 +129,8 @@ module Precious
     end
 
     get '/search' do
-      @q = params[:q]
-      @search_command = "cd #{$path} && git grep -c '#{@q}' master"
+      @query = params[:q]
+      @search_command = "cd #{$path} && git grep -c '#{@query}' master"
       @results = `#{@search_command}`
       mustache :search
     end
diff --git a/lib/gollum/frontend/templates/search.mustache b/lib/gollum/frontend/templates/search.mustache
index b742ecbb..f6a413fb 100644
--- a/lib/gollum/frontend/templates/search.mustache
+++ b/lib/gollum/frontend/templates/search.mustache
@@ -5,7 +5,7 @@
         <a href="/">Home</a> | <input type="search" name="q" size="10" /> <input type="submit" value="search" />
       </form>
     </div>
-    <h1>Search for “{{search_string}}”</h1>
+    <h1>Search for “{{query}}”</h1>
     <div class="content wikistyle gollum">
       {{#has_results}}
         <ul>
diff --git a/lib/gollum/frontend/views/search.rb b/lib/gollum/frontend/views/search.rb
index 4e04718b..b65191af 100644
--- a/lib/gollum/frontend/views/search.rb
+++ b/lib/gollum/frontend/views/search.rb
@@ -1,11 +1,7 @@
 module Precious
   module Views
     class Search < Layout
-      attr_reader :content, :page, :footer
-
-      def search_string
-        @q
-      end
+      attr_reader :content, :page, :footer, :query
 
       def has_results
         !results.empty?