diff --git a/filesystem/Folder.php b/filesystem/Folder.php
index e42383bfd..4133e94f4 100755
--- a/filesystem/Folder.php
+++ b/filesystem/Folder.php
@@ -357,7 +357,6 @@ class Folder extends File {
 	 * and implemeting updateCMSFields(FieldSet $fields) on that decorator.	
 	 */
 	function getCMSFields() {
-		$nameField = ($this->ID > 0) ? new TextField("Name") : new HiddenField("Name");
 		$fileList = new AssetTableField(
 			$this,
 			"Files",
@@ -368,13 +367,13 @@ class Folder extends File {
 		$fileList->setFolder($this);
 		$fileList->setPopupCaption(_t('Folder.VIEWEDITASSET', "View/Edit Asset"));
 
-		$nameField = ($this->ID && $this->ID != "root") ? new TextField("Name", _t('Folder.TITLE')) : new HiddenField("Name");
+		$titleField = ($this->ID && $this->ID != "root") ? new TextField("Title", _t('Folder.TITLE')) : new HiddenField("Title");
 
 		$fields = new FieldSet(
-			new HiddenField("Title"),
+			new HiddenField("Name"),
 			new TabSet("Root", 
 				new Tab("Files", _t('Folder.FILESTAB', "Files"),
-					$nameField,
+					$titleField,
 					$fileList,
 					new HiddenField("DestFolderID")
 				),