diff --git a/app/models/dependency.rb b/app/models/dependency.rb
index 53c73f65..dd347c1f 100644
--- a/app/models/dependency.rb
+++ b/app/models/dependency.rb
@@ -1,9 +1,7 @@
 class Dependency < ActiveRecord::Base
 
-  belongs_to :todo, 
-    :class_name => "Todo", :foreign_key => "todo_id"
-  belongs_to :predecessor, 
-    :class_name => "Todo", :foreign_key => "predecessor_id"
+  belongs_to :predecessor, :foreign_key => 'predecessor_id', :class_name => 'Todo'
+  belongs_to :successor,   :foreign_key => 'successor_id',   :class_name => 'Todo'
   
 end
 
diff --git a/db/migrate/20090516000646_add_todo_dependencies.rb b/db/migrate/20090516000646_add_todo_dependencies.rb
index 769343f2..2ca58dae 100644
--- a/db/migrate/20090516000646_add_todo_dependencies.rb
+++ b/db/migrate/20090516000646_add_todo_dependencies.rb
@@ -1,7 +1,7 @@
 class AddTodoDependencies < ActiveRecord::Migration
   def self.up
     create_table :dependencies do |t|
-      t.integer :todo_id,          :null => false
+      t.integer :successor_id,     :null => false
       t.integer :predecessor_id,   :null => false
       t.string  :relationship_type
     end
diff --git a/db/tracks-17-blank.db b/db/tracks-17-blank.db
index 941c0958..fdbc4ca6 100644
Binary files a/db/tracks-17-blank.db and b/db/tracks-17-blank.db differ