diff --git a/code/BasicFieldsTestPage.php b/code/BasicFieldsTestPage.php
index 1e35d99..66d9cb7 100644
--- a/code/BasicFieldsTestPage.php
+++ b/code/BasicFieldsTestPage.php
@@ -105,10 +105,10 @@ class BasicFieldsTestPage extends TestPage {
 		$dateTimeShowCalendar->getTimeField()->setConfig('showdropdown', true);
 
 		$fields->addFieldsToTab('Root.File', array(
-			FormField::create('UploadField', 'File','FileUploadField'),
-			FormField::create('UploadField', 'Image','ImageUploadField'),
-			FormField::create('UploadField', 'HasManyFiles','HasManyFilesUploadField'),
-			FormField::create('UploadField', 'ManyManyFiles','ManyManyFilesUploadField')
+			UploadField::create('File','FileUploadField'),
+			UploadField::create('Image','ImageUploadField'),
+			UploadField::create('HasManyFiles','HasManyFilesUploadField'),
+			UploadField::create('ManyManyFiles','ManyManyFilesUploadField')
 		));
 
 		$tabs = array('Root.Text', 'Root.Numeric', 'Root.Option', 'Root.DateTime', 'Root.File');
diff --git a/code/RelationFieldsTestPage.php b/code/RelationFieldsTestPage.php
index 6bac03b..016375a 100644
--- a/code/RelationFieldsTestPage.php
+++ b/code/RelationFieldsTestPage.php
@@ -23,9 +23,9 @@ class RelationFieldsTestPage extends TestPage {
 		);
 
 		$fields->addFieldsToTab('Root.Tree', array(
-			Object::create('TreeDropdownField', 'HasOnePage', 'HasOnePage', 'SiteTree'),
-			Object::create('TreeMultiselectField', 'HasManyPages', 'HasManyPages', 'SiteTree'),
-			Object::create('TreeMultiselectField', 'ManyManyPages', 'ManyManyPages (with search)', 'SiteTree')->setShowSearch(true)
+			TreeDropdownField::create('HasOnePage', 'HasOnePage', 'SiteTree'),
+			TreeMultiselectField::create('HasManyPages', 'HasManyPages', 'SiteTree'),
+			TreeMultiselectField::create('ManyManyPages', 'ManyManyPages (with search)', 'SiteTree')->setShowSearch(true)
 		));
 
 //		$fields->addFieldToTab("Root.Tests.ComplexTableField",