diff --git a/lib/gollum/app.rb b/lib/gollum/app.rb
index cb4b37ff..0da65acd 100644
--- a/lib/gollum/app.rb
+++ b/lib/gollum/app.rb
@@ -127,7 +127,7 @@ module Precious
         end
       end
 
-      get '/last-commit-info' do
+      get '/last_commit_info' do
         content_type :json
         if page = wiki_page(params[:path]).page
           version = page.last_version
@@ -180,7 +180,7 @@ module Precious
           end
         end
 
-      post '/uploadFile' do
+      post '/upload_file' do
         wiki = wiki_new
 
         unless wiki.allow_uploads
diff --git a/lib/gollum/public/gollum/javascript/gollum.dialog.js b/lib/gollum/public/gollum/javascript/gollum.dialog.js
index 112a59a5..c7dcba0f 100755
--- a/lib/gollum/public/gollum/javascript/gollum.dialog.js
+++ b/lib/gollum/public/gollum/javascript/gollum.dialog.js
@@ -101,7 +101,7 @@
 
       var id = fieldAttributes.id || 'upload';
       var name = fieldAttributes.name || 'file';
-      var action = fieldAttributes.action || '/uploadFile';
+      var action = fieldAttributes.action || '/upload_file';
 
       html += '<form method=post enctype="multipart/form-data" ' +
         'action="' + action + '" ' + 'id="' + id + '">';
diff --git a/lib/gollum/views/helpers.rb b/lib/gollum/views/helpers.rb
index fecd46a1..223b4381 100644
--- a/lib/gollum/views/helpers.rb
+++ b/lib/gollum/views/helpers.rb
@@ -5,9 +5,9 @@ module Precious
     module RouteHelpers
       ROUTES = {
         'gollum' => {
-          last_commit_info: 'last-commit-info',
+          last_commit_info: 'last_commit_info',
           latest_changes: 'latest_changes',
-          upload_file: 'uploadFile',
+          upload_file: 'upload_file',
           create: 'create',
           delete: 'delete',
           edit: 'edit',
diff --git a/test/test_app.rb b/test/test_app.rb
index 207c1e7e..ca7d22ba 100644
--- a/test/test_app.rb
+++ b/test/test_app.rb
@@ -73,7 +73,7 @@ context "Frontend" do
     @wiki.write_page(page1, :markdown, '',
                      { :name => user1, :email => user1 });
 
-    get "/gollum/last-commit-info", :path => page1
+    get "/gollum/last_commit_info", :path => page1
     assert_match /\"author\":\"user1\"/, last_response.body
   end