diff --git a/recess/lib/recess/apps/tools/models/RecessReflectorClass.class.php b/recess/lib/recess/apps/tools/models/RecessReflectorClass.class.php
index e396a4f..9421be4 100644
--- a/recess/lib/recess/apps/tools/models/RecessReflectorClass.class.php
+++ b/recess/lib/recess/apps/tools/models/RecessReflectorClass.class.php
@@ -4,9 +4,9 @@
 Library::import('recess.apps.ide.models.RecessReflectorClassMethods');
 
 /**
- * !BelongsTo package, Class: RecessReflectorPackage, ForeignKey: packageId
- * !BelongsTo parent, Class: RecessReflectorClass, ForeignKey: parentId
- * !HasMany children, Class: RecessReflectorClass, ForeignKey: parentId
+ * !BelongsTo package, Class: RecessReflectorPackage, Key: packageId
+ * !BelongsTo parent, Class: RecessReflectorClass, Key: parentId
+ * !HasMany children, Class: RecessReflectorClass, Key: parentId
  * !Table classes
  */
 class RecessReflectorClass extends Model {
diff --git a/recess/lib/recess/apps/tools/models/RecessReflectorPackage.class.php b/recess/lib/recess/apps/tools/models/RecessReflectorPackage.class.php
index 8ac4b4a..ba5d762 100644
--- a/recess/lib/recess/apps/tools/models/RecessReflectorPackage.class.php
+++ b/recess/lib/recess/apps/tools/models/RecessReflectorPackage.class.php
@@ -2,9 +2,9 @@
 Library::import('recess.database.orm.Model');
 
 /**
- * !HasMany classes, Class: RecessReflectorClass, ForeignKey: packageId
- * !HasMany children, Class: RecessReflectorPackage, ForeignKey: parentId
- * !BelongsTo parent, Class: RecessReflectorPackage, ForeignKey: parentId
+ * !HasMany classes, Class: RecessReflectorClass, Key: packageId
+ * !HasMany children, Class: RecessReflectorPackage, Key: parentId
+ * !BelongsTo parent, Class: RecessReflectorPackage, Key: parentId
  * !Table packages
  */
 class RecessReflectorPackage extends Model {
diff --git a/recess/lib/recess/database/orm/relationships/Relationship.class.php b/recess/lib/recess/database/orm/relationships/Relationship.class.php
index b8dae24..64dbc61 100644
--- a/recess/lib/recess/database/orm/relationships/Relationship.class.php
+++ b/recess/lib/recess/database/orm/relationships/Relationship.class.php
@@ -1,7 +1,7 @@
 <?php
 
 abstract class Relationship {
-	const FOREIGN_KEY = 'foreignkey';
+	const FOREIGN_KEY = 'key';
 	const FOREIGN_CLASS = 'class';
 	const THROUGH = 'through';
 	const ON_DELETE = 'ondelete';
diff --git a/recess/test/lib/recess/database/orm/ModelTest.class.php b/recess/test/lib/recess/database/orm/ModelTest.class.php
index 456ead1..9992df8 100644
--- a/recess/test/lib/recess/database/orm/ModelTest.class.php
+++ b/recess/test/lib/recess/database/orm/ModelTest.class.php
@@ -6,7 +6,7 @@
 Library::import('recess.database.orm.ModelDataSource');
 
 /**
- * !BelongsTo owner, Class: Person, ForeignKey: person_id, OnDelete: Cascade
+ * !BelongsTo owner, Class: Person, Key: person_id, OnDelete: Cascade
  */
 class Car extends Model {
 	
@@ -35,8 +35,8 @@ class Group extends Model {}
 class Groupship extends Model {}
 
 /**
- * !HasMany books, ForeignKey: author_id, OnDelete: Cascade
- * !HasMany novels, ForeignKey: author_id, Class: Book
+ * !HasMany books, Key: author_id, OnDelete: Cascade
+ * !HasMany novels, Key: author_id, Class: Book
  * !HasMany cars, OnDelete: Nullify
  * !HasMany groups, Through: Groupship, OnDelete: Nullify
  * !BelongsTo politicalParty