diff --git a/lib/WebGUI/Asset/Post.pm b/lib/WebGUI/Asset/Post.pm
index 928567460..7c88e2122 100644
--- a/lib/WebGUI/Asset/Post.pm
+++ b/lib/WebGUI/Asset/Post.pm
@@ -497,7 +497,7 @@ sub getUploadControl {
 	if ($self->get("storageId")) {
 		my $i;
 		foreach my $filename (@{$self->getStorageLocation->getFiles}) {
-			$uploadControl .= $self->session->icon->delete("func=deleteFile;filename=".$filename,$self->get("url"),$i18n->get("delete file warning"))	
+			$uploadControl .= $self->session->icon->delete("func=deleteFile;filename=".$filename,$self->get("url"),$i18n->get("delete file warning","Asset_Collaboration"))	
 				.' <a href="'.$self->getStorageLocation->getUrl($filename).'">'.$filename.'</a>'
 				.'<br />';
 			$i++;
diff --git a/lib/WebGUI/Asset/Wobject/Collaboration.pm b/lib/WebGUI/Asset/Wobject/Collaboration.pm
index d3a508fd1..88071c0e7 100644
--- a/lib/WebGUI/Asset/Wobject/Collaboration.pm
+++ b/lib/WebGUI/Asset/Wobject/Collaboration.pm
@@ -987,7 +987,7 @@ sub www_search {
                 options=>\%results,
                 value=>[$numResults]
                 });
-        $var{'form.search'} = WebGUI::Form::submit($self->session,{value=>$i18n->get(170)});
+        $var{'form.search'} = WebGUI::Form::submit($self->session,{value=>$i18n->get(170,'WebGUI')});
         $var{'form.footer'} = WebGUI::Form::formFooter($self->session,);
         $var{'back.url'} = $self->getUrl;
 	$self->appendTemplateLabels(\%var);
diff --git a/lib/WebGUI/Asset/Wobject/HttpProxy.pm b/lib/WebGUI/Asset/Wobject/HttpProxy.pm
index 382cf0166..481294b0a 100644
--- a/lib/WebGUI/Asset/Wobject/HttpProxy.pm
+++ b/lib/WebGUI/Asset/Wobject/HttpProxy.pm
@@ -104,7 +104,7 @@ sub getCookieJar {
 #-------------------------------------------------------------------
 sub getEditForm {
 	my $self = shift;
-	my $i18n = WebGUI::International->new($self->session,"Asset_IndexedSearch");
+	my $i18n = WebGUI::International->new($self->session,"Asset_HttpProxy");
 	my $tabform = $self->SUPER::getEditForm();
    	$tabform->getTab("display")->template(
       		-value=>$self->getValue('templateId'),
diff --git a/lib/WebGUI/AssetExportHtml.pm b/lib/WebGUI/AssetExportHtml.pm
index 658a07285..5a324860c 100644
--- a/lib/WebGUI/AssetExportHtml.pm
+++ b/lib/WebGUI/AssetExportHtml.pm
@@ -120,7 +120,7 @@ sub www_export {
 	my $self = shift;
 	return $self->session->privilege->insufficient() unless ($self->session->user->isInGroup(13));
         $self->getAdminConsole->setHelp("page export", "Asset");
-	my $i18n = WebGUI::International->new($self->session);
+	my $i18n = WebGUI::International->new($self->session, "Asset");
         my $f = WebGUI::HTMLForm->new($self->session,-action=>$self->getUrl);
         $f->hidden(
 		-name => "func",
@@ -173,7 +173,7 @@ Displays the export status page
 sub www_exportStatus {
 	my $self = shift;
 	return $self->session->privilege->insufficient() unless ($self->session->user->isInGroup(13));
-	my $i18n = WebGUI::International->new($self->session);
+	my $i18n = WebGUI::International->new($self->session, "Asset");
 	my $iframeUrl = $self->getUrl('func=exportGenerate');
 	$iframeUrl = $self->session->url->append($iframeUrl, 'index='.$self->session->form->process("index"));
 	$iframeUrl = $self->session->url->append($iframeUrl, 'depth='.$self->session->form->process("depth"));
@@ -204,7 +204,7 @@ sub www_exportGenerate {
 		$self->session->request->print($error);
 		return;
 	}
-	my $i18n = WebGUI::International->new($self->session);
+	my $i18n = WebGUI::International->new($self->session, 'Asset');
 	my $userId = $self->session->form->process("userId");
 	my $extrasURL = $self->session->form->process("extrasURL");
 	my $uploadsURL = $self->session->form->process("uploadsURL");
diff --git a/lib/WebGUI/Form/Asset.pm b/lib/WebGUI/Form/Asset.pm
index c9fcfd540..313b77d66 100644
--- a/lib/WebGUI/Form/Asset.pm
+++ b/lib/WebGUI/Form/Asset.pm
@@ -67,7 +67,7 @@ sub definition {
 	my $class = shift;
 	my $session = shift;
 	my $definition = shift || [];
-	my $i18n = WebGUI::International->new($session);
+	my $i18n = WebGUI::International->new($session, "Asset");
 	push(@{$definition}, {
 		formName=>{
 			defaultValue=>$i18n->get("asset");
diff --git a/lib/WebGUI/Form/Template.pm b/lib/WebGUI/Form/Template.pm
index 6d1948088..a34127209 100644
--- a/lib/WebGUI/Form/Template.pm
+++ b/lib/WebGUI/Form/Template.pm
@@ -65,7 +65,7 @@ sub definition {
 	my $class = shift;
 	my $session = shift;
 	my $definition = shift || [];
-	my $i18n = WebGUI::International->new($session);
+	my $i18n = WebGUI::International->new($session, 'Asset_Template');
 	push(@{$definition}, {
 		formName=>{
 			defaultValue=>$i18n->get("assetName")
diff --git a/lib/WebGUI/Form/TimeZone.pm b/lib/WebGUI/Form/TimeZone.pm
index 97eed668f..fe8b33ac6 100644
--- a/lib/WebGUI/Form/TimeZone.pm
+++ b/lib/WebGUI/Form/TimeZone.pm
@@ -51,7 +51,7 @@ sub definition {
 	my $i18n = WebGUI::International->new($session);
 	push(@{$definition}, {
 		formName=>{
-			defaultValue=>$i18n->get("timezone")
+			defaultValue=>$i18n->get("timezone", 'DateTime')
 			},
 		value=>{
 			defaultValue=>undef