diff --git a/lib/WebGUI/Asset/File.pm b/lib/WebGUI/Asset/File.pm
index 2d0ce8a9d..065ce2ee6 100644
--- a/lib/WebGUI/Asset/File.pm
+++ b/lib/WebGUI/Asset/File.pm
@@ -120,14 +120,14 @@ sub getEditForm {
 	my $tabform = $self->SUPER::getEditForm();
 	if ($self->get("filename") ne "") {
 		$tabform->getTab("properties")->readOnly(
-			-label=>WebGUI::International::get('current file', 'Asset'),
+			-label=>WebGUI::International::get('current file', 'File'),
 			-value=>'<a href="'.$self->getFileUrl.'"><img src="'.$self->getFileIconUrl.'" alt="'.$self->get("filename").'" border="0" align="middle" /> '.$self->get("filename").'</a>'
 			);
 		
 	}
         $tabform->getTab("properties")->file(
                	-name=>"file",
-		-label=>WebGUI::International::get('new file', 'Asset'),
+		-label=>WebGUI::International::get('new file', 'File'),
                	);
 	return $tabform;
 }
diff --git a/lib/WebGUI/Help/Asset.pm b/lib/WebGUI/Help/Asset.pm
index 99566b3d7..2fbb4d1b8 100644
--- a/lib/WebGUI/Help/Asset.pm
+++ b/lib/WebGUI/Help/Asset.pm
@@ -1,12 +1,6 @@
 package WebGUI::Help::Asset;
 
 our $HELP = {
-	'asset fields' => {
-		title => 'asset fields title',
-		body => 'asset fields body',
-		related => [
-		]
-	},
 
         'asset macros' => {
 		title => 'asset macros title',
@@ -19,6 +13,13 @@ our $HELP = {
 		]
 	},
 
+	'asset fields' => {
+		title => 'asset fields title',
+		body => 'asset fields body',
+		related => [
+		]
+	},
+
         'snippet add/edit' => {
 		title => 'snippet add/edit title',
 		body => 'snippet add/edit body',
diff --git a/lib/WebGUI/Help/File.pm b/lib/WebGUI/Help/File.pm
new file mode 100644
index 000000000..f769e1707
--- /dev/null
+++ b/lib/WebGUI/Help/File.pm
@@ -0,0 +1,18 @@
+package WebGUI::Help::File;
+
+our $HELP = {
+
+        'file add/edit' => {
+		title => 'file add/edit title',
+		body => 'file add/edit body',
+		related => [
+			{
+				tag => 'asset fields',
+				namespace => 'Asset'
+			},
+		]
+	},
+
+};
+
+1;
diff --git a/lib/WebGUI/i18n/English/Asset.pm b/lib/WebGUI/i18n/English/Asset.pm
index 2fb3c3fc6..08bcb41e4 100644
--- a/lib/WebGUI/i18n/English/Asset.pm
+++ b/lib/WebGUI/i18n/English/Asset.pm
@@ -180,28 +180,6 @@ This is the snippet.  Either type it in or copy and paste it into the form field
         	lastUpdated => 1106683569,
 	},
 
-	'file add/edit title' => {
-		message => q|File, Add/Edit|,
-        	lastUpdated => 1106683494,
-	},
-
-	'file add/edit body' => {
-                message => q|<P>File Assets are files on your site that are available for users to download. If you would like to have multiple files available, try using a FilePile Asset.</P>
-
-<P>Since Files are Assets, so they have all the properties that Assets do.  Below are the properties that are specific to Image Assets:</P>
-
-<P><b>New file to upload</b><br/>
-Enter the path to a file, or use the "Browse" button to find a file on your local hard
-drive that you would like to be uploaded.
-
-<P><b>Current file</b><br/>
-If this Asset already contains a file, a link to the file with its associated icon will be shown.
-
-|,
-		context => 'Describing file add/edit form specific fields',
-		lastUpdated => 1106762796,
-	},
-
 	'image add/edit title' => {
 		message => q|Image, Add/Edit|,
         	lastUpdated => 1106762707,
@@ -268,18 +246,6 @@ The URL where the user will be redirected.
 		context => 'Help text for redirects',
 	},
 
-	'current file' => {
-		message => q|Current file|,
-		context => q|label for File asset form|,
-		lastUpdated => 1106762086
-	},
-
-	'new file' => {
-		message => q|New file to upload|,
-		context => q|label for File asset form|,
-		lastUpdated => 1106762088
-	},
-
 	'upload files' => {
 		message => q|Upload Files|,
 		context => q|label for File Pile asset form|,
diff --git a/lib/WebGUI/i18n/English/File.pm b/lib/WebGUI/i18n/English/File.pm
new file mode 100644
index 000000000..61a1e8d8b
--- /dev/null
+++ b/lib/WebGUI/i18n/English/File.pm
@@ -0,0 +1,40 @@
+package WebGUI::i18n::English::File;
+
+our $I18N = {
+	'file add/edit title' => {
+		message => q|File, Add/Edit|,
+        	lastUpdated => 1106683494,
+	},
+
+	'file add/edit body' => {
+                message => q|<P>File Assets are files on your site that are available for users to download. If you would like to have multiple files available, try using a FilePile Asset.</P>
+
+<P>Since Files are Assets, so they have all the properties that Assets do.  Below are the properties that are specific to Image Assets:</P>
+
+<P><b>New file to upload</b><br/>
+Enter the path to a file, or use the "Browse" button to find a file on your local hard
+drive that you would like to be uploaded.
+
+<P><b>Current file</b><br/>
+If this Asset already contains a file, a link to the file with its associated icon will be shown.
+
+|,
+		context => 'Describing file add/edit form specific fields',
+		lastUpdated => 1106762796,
+	},
+
+	'current file' => {
+		message => q|Current file|,
+		context => q|label for File asset form|,
+		lastUpdated => 1106762086
+	},
+
+	'new file' => {
+		message => q|New file to upload|,
+		context => q|label for File asset form|,
+		lastUpdated => 1106762088
+	},
+
+};
+
+1;