diff --git a/forms/FormScaffolder.php b/forms/FormScaffolder.php
index b10ebf238..81f886cda 100644
--- a/forms/FormScaffolder.php
+++ b/forms/FormScaffolder.php
@@ -64,7 +64,7 @@ class FormScaffolder extends Object {
 	 * 
 	 * @return FieldList
 	 */
-	public function getFieldSet() {
+	public function getFieldList() {
 		$fields = new FieldList();
 		
 		// tabbed or untabbed
diff --git a/model/DataObject.php b/model/DataObject.php
index a20bbbe95..8d049d1c0 100644
--- a/model/DataObject.php
+++ b/model/DataObject.php
@@ -1869,7 +1869,7 @@ class DataObject extends ViewableData implements DataObjectInterface, i18nEntity
 		$fs->fieldClasses = $params['fieldClasses'];
 		$fs->ajaxSafe = $params['ajaxSafe'];
 		
-		return $fs->getFieldSet();
+		return $fs->getFieldList();
 	}
 	
 	/**