diff --git a/db/migrate/20090701195337_clearance_create_users.rb b/db/migrate/20090701195337_clearance_create_users.rb
index a5ade2d..215b5d8 100644
--- a/db/migrate/20090701195337_clearance_create_users.rb
+++ b/db/migrate/20090701195337_clearance_create_users.rb
@@ -4,15 +4,15 @@ class ClearanceCreateUsers < ActiveRecord::Migration
       t.string   :email
       t.string   :encrypted_password, :limit => 128
       t.string   :salt,               :limit => 128
-      t.string   :token,              :limit => 128
-      t.datetime :token_expires_at
+      t.string   :confirmation_token, :limit => 128
+      t.string   :remember_token,     :limit => 128
       t.boolean  :email_confirmed, :default => false, :null => false
       t.timestamps
     end
 
-    add_index :users, [:id, :token]
+    add_index :users, [:id, :confirmation_token]
     add_index :users, :email
-    add_index :users, :token
+    add_index :users, :remember_token
   end
 
   def self.down
--
libgit2 0.21.2