diff --git a/db/migrate/0000_create_schema.rb b/db/migrate/0000_create_schema.rb
index 073ec8c4c06e62531853d8906d9f5db5e831f93e..7d27bf5fd26f26df201b4a8cf8ea74d1c0646356 100644
--- a/db/migrate/0000_create_schema.rb
+++ b/db/migrate/0000_create_schema.rb
@@ -131,7 +131,7 @@ class CreateSchema < ActiveRecord::Migration
     add_index :requests, [:sender_id, :recipient_id], :unique => true
 
     create_table :services do |t|
-      t.string :_type
+      t.string :type
       t.integer :user_id
       t.string :provider
       t.string :uid
diff --git a/db/schema.rb b/db/schema.rb
index 4a1e22461f8201f4a6f22a2b50fd0d2f9ffd7e56..96416285b09f490655415b7b49a1ae1ef7ebf822 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -162,7 +162,7 @@ ActiveRecord::Schema.define(:version => 0) do
   add_index "requests", ["sender_id"], :name => "index_requests_on_sender_id"
 
   create_table "services", :force => true do |t|
-    t.string   "_type"
+    t.string   "type"
     t.integer  "user_id"
     t.string   "provider"
     t.string   "uid"
diff --git a/lib/collect_user_photos.rb b/lib/collect_user_photos.rb
index f59c737480c5c374ab7b31a250ba4664c4198797..9e4c5befd89d3789276cb43ebf04e4148de51966 100644
--- a/lib/collect_user_photos.rb
+++ b/lib/collect_user_photos.rb
@@ -5,7 +5,7 @@ module PhotoMover
     FileUtils::mkdir_p temp_dir
     Dir.chdir 'tmp/exports'
 
-    photos = user.visible_posts(:person_id => user.person.id, :_type => 'Photo')
+    photos = user.visible_posts(:person_id => user.person.id, :type => 'Photo')
 
     photos_dir = "#{user.id}/photos"
     FileUtils::mkdir_p photos_dir 
diff --git a/spec/controllers/services_controller_spec.rb b/spec/controllers/services_controller_spec.rb
index ab561f1110059c1fe82d0b78836eb24ef5f50722..d940243c6e08478b9fc23e36e147875dbbe8c637 100644
--- a/spec/controllers/services_controller_spec.rb
+++ b/spec/controllers/services_controller_spec.rb
@@ -62,9 +62,11 @@ describe ServicesController do
 
 
     it 'creates a twitter service' do
+      Service.delete_all
       user.getting_started = false
       request.env['omniauth.auth'] = omniauth_auth
       post :create
+      user.reload
       user.services.first.class.name.should == "Services::Twitter"
     end
   end
diff --git a/spec/factories.rb b/spec/factories.rb
index 3b32a134b182e9d50d1de74f872220d7946b8e3c..dca92bf5a59039f9517e3c17cd567040bfcb2591 100644
--- a/spec/factories.rb
+++ b/spec/factories.rb
@@ -72,7 +72,7 @@ Factory.define :service do |service|
   service.sequence(:access_token)  { |token| "12345#{token}" }
   service.sequence(:access_secret) { |token| "98765#{token}" }
   service.after_build do |s|
-    s._type = "Services::#{s.provider.camelize}"
+    s.type = "Services::#{s.provider.camelize}"
   end
 end