diff --git a/src/Assets/File.php b/src/Assets/File.php
index 904f9dd7a..a115646e5 100644
--- a/src/Assets/File.php
+++ b/src/Assets/File.php
@@ -4,6 +4,7 @@ namespace SilverStripe\Assets;
 
 use SilverStripe\Admin\AdminRootController;
 use SilverStripe\Admin\CMSPreviewable;
+use SilverStripe\Assets\Storage\AssetNameGenerator;
 use SilverStripe\Assets\Storage\DBFile;
 use SilverStripe\Assets\Storage\AssetContainer;
 use SilverStripe\CMS\Model\SiteTree;
diff --git a/src/Assets/Folder.php b/src/Assets/Folder.php
index 9bd0b4e2b..c40b52005 100644
--- a/src/Assets/Folder.php
+++ b/src/Assets/Folder.php
@@ -46,18 +46,6 @@ class Folder extends File
         return $this->isInDB();
     }
 
-    /**
-     *
-     */
-    public function populateDefaults()
-    {
-        parent::populateDefaults();
-
-        if (!$this->Name) {
-            $this->Name = _t('AssetAdmin.NEWFOLDER', "NewFolder");
-        }
-    }
-
     /**
      * Find the given folder or create it as a database record
      *
diff --git a/tests/php/Assets/FolderTest.php b/tests/php/Assets/FolderTest.php
index ef1aedc2f..493c77984 100644
--- a/tests/php/Assets/FolderTest.php
+++ b/tests/php/Assets/FolderTest.php
@@ -293,4 +293,10 @@ class FolderTest extends SapphireTest
         $this->assertEquals($newFolder->Name, $newFolder->Title);
         $this->assertEquals($newFolder->Title, 'TestTitleWithIllegalCharactersCopiedToName <!BANG!>');
     }
+
+    public function testRootFolder()
+    {
+        $root = Folder::singleton();
+        $this->assertEquals('/', $root->getFilename());
+    }
 }