diff --git a/filesystem/Folder.php b/filesystem/Folder.php
index 926475e5c..ae8b1c346 100755
--- a/filesystem/Folder.php
+++ b/filesystem/Folder.php
@@ -5,6 +5,10 @@
  * @subpackage filesystem
  */
 class Folder extends File {
+
+	static $singular_name = "Folder";
+
+	static $plural_name = "Folders";
 	
 	/*
 	 * Find the given folder or create it, recursively.
diff --git a/lang/en_US.php b/lang/en_US.php
index ec29f552c..4d95f25cb 100644
--- a/lang/en_US.php
+++ b/lang/en_US.php
@@ -265,12 +265,12 @@ $lang['en_US']['Folder']['FILENAME'] = 'Filename';
 $lang['en_US']['Folder']['FILESTAB'] = 'Files';
 $lang['en_US']['Folder']['LASTEDITED'] = 'Last Updated';
 $lang['en_US']['Folder']['PLURALNAME'] = array(
-	'Files',
+	'Folders',
 	50,
 	'Pural name of the object, used in dropdowns and to generally identify a collection of this object in the interface'
 );
 $lang['en_US']['Folder']['SINGULARNAME'] = array(
-	'File',
+	'Folder',
 	50,
 	'Singular name of the object, used in dropdowns and to generally identify a single object in the interface'
 );