diff --git a/app/controllers/login_controller.rb b/app/controllers/login_controller.rb
index 360a8455..e33046a9 100644
--- a/app/controllers/login_controller.rb
+++ b/app/controllers/login_controller.rb
@@ -80,7 +80,7 @@ class LoginController < ApplicationController
   def redirect_to_login
     respond_to do |format|
       format.html { redirect_to login_path }
-      format.m { redirect_to formatted_login_path(:format => 'm') }
+      format.m { redirect_to login_path(:format => 'm') }
     end
   end
   
diff --git a/app/controllers/todos_controller.rb b/app/controllers/todos_controller.rb
index 3620fe25..65a30e91 100644
--- a/app/controllers/todos_controller.rb
+++ b/app/controllers/todos_controller.rb
@@ -349,7 +349,7 @@ class TodosController < ApplicationController
             cookies[:mobile_url] = {:value => nil, :secure => SITE_CONFIG['secure_cookies']}
             redirect_to old_path
           else
-            redirect_to formatted_todos_path(:m)
+            redirect_to todos_path(:format => 'm')
           end
         else
           render :action => "edit", :format => :m
@@ -461,12 +461,12 @@ class TodosController < ApplicationController
   
   def filter_to_context
     context = current_user.contexts.find(params['context']['id'])
-    redirect_to formatted_context_todos_path(context, :m)
+    redirect_to context_todos_path(context, :format => 'm')
   end
   
   def filter_to_project
     project = current_user.projects.find(params['project']['id'])
-    redirect_to formatted_project_todos_path(project, :m)
+    redirect_to project_todos_path(project, :format => 'm')
   end
   
   # /todos/tag/[tag_name] shows all the actions tagged with tag_name
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 26bff1b3..02786600 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -112,7 +112,7 @@ module ApplicationHelper
   end
   
   def link_to_project_mobile(project, accesskey, descriptor = sanitize(project.name))
-    link_to( descriptor, formatted_project_path(project, :m), {:title => "View project: #{project.name}", :accesskey => accesskey} )
+    link_to( descriptor, project_path(project, :format => 'm'), {:title => "View project: #{project.name}", :accesskey => accesskey} )
   end
   
   def item_link_to_context(item)
diff --git a/app/views/contexts/_mobile_context_listing.rhtml b/app/views/contexts/_mobile_context_listing.rhtml
index 4f770186..c2360ce7 100644
--- a/app/views/contexts/_mobile_context_listing.rhtml
+++ b/app/views/contexts/_mobile_context_listing.rhtml
@@ -1,2 +1,2 @@
 <% context = mobile_context_listing -%>
-<div id="ctx"><%= link_to context.name, formatted_context_path(context, :m) %><%= " (" + count_undone_todos_phrase(context,"actions") + ")" %></div>
\ No newline at end of file
+<div id="ctx"><%= link_to context.name, context_path(context, :format => 'm') %><%= " (" + count_undone_todos_phrase(context,"actions") + ")" %></div>
diff --git a/app/views/login/login_mobile.html.erb b/app/views/login/login_mobile.html.erb
index a2b7cd94..c0c248a1 100644
--- a/app/views/login/login_mobile.html.erb
+++ b/app/views/login/login_mobile.html.erb
@@ -11,7 +11,7 @@
 
 <% if show_database_form %>
   <div id="database_auth_form">
-      <% form_tag formatted_login_path(:format => 'm') do %>
+      <% form_tag login_path(:format => 'm') do %>
         <table>
           <tr>
             <td><label for="user_login">Login:</label></td>
@@ -39,7 +39,7 @@
   <h4>...or login with an Open ID:</h4>
 
   <div id="openid_auth_form">
-    <% form_tag formatted_login_path(:format => 'm') do %>
+    <% form_tag login_path(:format => 'm') do %>
       <table>
         <tr>
           <td width="100px"><label for="openid_url">Identity URL:</label></td>
diff --git a/app/views/notes/_mobile_notes.rhtml b/app/views/notes/_mobile_notes.rhtml
index d5f4d7ab..8c257da5 100644
--- a/app/views/notes/_mobile_notes.rhtml
+++ b/app/views/notes/_mobile_notes.rhtml
@@ -4,7 +4,7 @@
 </div>
 <div class="mobile_note_info">
   <br/>
-  <%= link_to("In: " + note.project.name, formatted_project_path(note.project, :m)) %>
+  <%= link_to("In: " + note.project.name, project_path(note.project, :format => 'm')) %>
   Created: <%= format_date(note.created_at) %>
   <% if note.updated_at? -%>
   &nbsp;|&nbsp;Modified: <%= format_date(note.updated_at) %>
diff --git a/app/views/notes/_mobile_notes_summary.rhtml b/app/views/notes/_mobile_notes_summary.rhtml
index a2e117b6..4a1f7657 100644
--- a/app/views/notes/_mobile_notes_summary.rhtml
+++ b/app/views/notes/_mobile_notes_summary.rhtml
@@ -1,3 +1,3 @@
 <% note = mobile_notes_summary -%>
-<div class="note"><%= link_to( truncated_note(note), formatted_note_path(note, :m)) %></div>
+<div class="note"><%= link_to( truncated_note(note), note_path(note, :format => 'm')) %></div>
 <% note = nil -%>
diff --git a/app/views/projects/_mobile_project_listing.rhtml b/app/views/projects/_mobile_project_listing.rhtml
index 167854bb..440536bb 100644
--- a/app/views/projects/_mobile_project_listing.rhtml
+++ b/app/views/projects/_mobile_project_listing.rhtml
@@ -1,4 +1,4 @@
 <% project = mobile_project_listing -%>
 <div id="pjr"><%= 
-    link_to(project.name, formatted_project_path(project)) +
-    " (" + count_undone_todos_and_notes_phrase(project,"actions") + ")" %></div>
\ No newline at end of file
+  link_to(project.name, project_path(project, :format => 'm')) +
+    " (" + count_undone_todos_and_notes_phrase(project,"actions") + ")" %></div>
diff --git a/app/views/todos/show.m.erb b/app/views/todos/show.m.erb
index 004b94f6..e8105669 100644
--- a/app/views/todos/show.m.erb
+++ b/app/views/todos/show.m.erb
@@ -1,4 +1,4 @@
-<% form_tag formatted_todo_path(@todo, :m), :method => :put do %>
+<% form_tag todo_path(@todo, :format => 'm'), :method => :put do %>
   <%= render :partial => 'edit_mobile', :locals => { :parent_container_type => "show_mobile" } %>
   <p><input type="submit" value="Update" tabindex="6" accesskey="#" /></p>
 <% end -%>