diff --git a/db/migrate/085_add_role_tracker_old_status_index_to_workflows.rb b/db/migrate/085_add_role_tracker_old_status_index_to_workflows.rb
index 523cf091b8..a59135be01 100644
--- a/db/migrate/085_add_role_tracker_old_status_index_to_workflows.rb
+++ b/db/migrate/085_add_role_tracker_old_status_index_to_workflows.rb
@@ -1,9 +1,9 @@
 class AddRoleTrackerOldStatusIndexToWorkflows < ActiveRecord::Migration
   def self.up
-    add_index :workflows, [:role_id, :tracker_id, :old_status_id], :name => :workflows_role_tracker_old_status
+    add_index :workflows, [:role_id, :tracker_id, :old_status_id], :name => :wkfs_role_tracker_old_status
   end
 
   def self.down
-    remove_index :workflows, :name => :workflows_role_tracker_old_status
+    remove_index(:workflows, :name => :wkfs_role_tracker_old_status); rescue
   end
 end