diff --git a/lib/WebGUI/Asset.pm b/lib/WebGUI/Asset.pm
index fca773257..5cd43e0a4 100644
--- a/lib/WebGUI/Asset.pm
+++ b/lib/WebGUI/Asset.pm
@@ -2244,7 +2244,7 @@ sub www_changeUrlConfirm {
 	}
 
 	if ($self->session->form->param("proceed") eq "manageAssets") {
-		$self->session->http->setRedirect($self->getUrl('op=manageAssets'));
+		$self->session->http->setRedirect($self->getUrl('op=assetManager'));
 	} else {
 		$self->session->http->setRedirect($self->getUrl());
 	}
diff --git a/lib/WebGUI/Asset/Wobject/Navigation.pm b/lib/WebGUI/Asset/Wobject/Navigation.pm
index ae5b65065..c14e6fa50 100644
--- a/lib/WebGUI/Asset/Wobject/Navigation.pm
+++ b/lib/WebGUI/Asset/Wobject/Navigation.pm
@@ -312,7 +312,7 @@ sub getToolbar {
 		return '<script type="text/javascript">
                 var contextMenu = new contextMenu_createWithImage("'.$self->getIcon(1).'","'.$self->getId.'","'.$self->getName.'");
                 contextMenu.addLink("'.$self->getUrl("func=copy").'","'.$i18n->get("copy").'");
-                contextMenu.addLink("'.$self->getUrl("op=manageAssets").'","'.$i18n->get("manage").'");
+                contextMenu.addLink("'.$self->getUrl("op=assetManager").'","'.$i18n->get("manage").'");
                 contextMenu.addLink("'.$self->getUrl.'","'.$i18n->get("view").'");
                 contextMenu.print();
                 </script>'.$toolbar;
diff --git a/lib/WebGUI/AssetClipboard.pm b/lib/WebGUI/AssetClipboard.pm
index dd6dff3f6..e148b989d 100644
--- a/lib/WebGUI/AssetClipboard.pm
+++ b/lib/WebGUI/AssetClipboard.pm
@@ -426,7 +426,7 @@ $self->session->style->setLink($self->session->url->extras('assetManager/assetMa
                                 name=>'assetId',
                                 value=>$child->getId
                                 })
-                        ."','" . $plus . "<a href=\"".$child->getUrl("op=manageAssets")."\">" . $title
+                        ."','" . $plus . "<a href=\"".$child->getUrl("op=assetManager")."\">" . $title
                         ."</a>','<p style=\"display:inline;vertical-align:middle;\"><img src=\"".$child->getIcon(1)."\" style=\"border-style:none;vertical-align:middle;\" alt=\"".$child->getName."\" /></p> ".$child->getName
                         ."','".$self->session->datetime->epochToHuman($child->get("revisionDate"))
                         ."','".formatBytes($child->get("assetSize"))."');\n";
diff --git a/lib/WebGUI/AssetTrash.pm b/lib/WebGUI/AssetTrash.pm
index 5a8027481..ecc15381b 100644
--- a/lib/WebGUI/AssetTrash.pm
+++ b/lib/WebGUI/AssetTrash.pm
@@ -339,7 +339,7 @@ sub www_manageTrash {
 				name=>'assetId',
 				value=>$child->getId
 				})
-			."','" . $plus . "<a href=\"".$child->getUrl("op=manageAssets")."\">" . $title
+			."','" . $plus . "<a href=\"".$child->getUrl("op=assetManager")."\">" . $title
 			."</a>','<p style=\"display:inline;vertical-align:middle;\"><img src=\"".$child->getIcon(1)."\" style=\"vertical-align:middle;border-style:none;\" alt=\"".$child->getName."\" /></p> ".$child->getName
 			."','".$self->session->datetime->epochToHuman($child->get("revisionDate"))
 			."','".formatBytes($child->get("assetSize"))."');\n";
diff --git a/lib/WebGUI/Form/Template.pm b/lib/WebGUI/Form/Template.pm
index ad1c59e69..a4de3389d 100644
--- a/lib/WebGUI/Form/Template.pm
+++ b/lib/WebGUI/Form/Template.pm
@@ -176,7 +176,7 @@ sub toHtmlWithWrapper {
                         $returnUrl = ";proceed=goBackToPage;returnUrl=".$self->session->url->escape($self->session->asset->getUrl);
                 }
                 my $buttons = $self->session->icon->edit("func=edit".$returnUrl,$template->get("url"));
-                $buttons .= $self->session->icon->manage("op=manageAssets",$template->getParent->get("url"));
+                $buttons .= $self->session->icon->manage("op=assetManager",$template->getParent->get("url"));
 		$self->set("subtext",$buttons . $self->get("subtext"));
 	}
 	return $self->SUPER::toHtmlWithWrapper;