diff --git a/mozilla/content/xul/document/public/nsIController.idl b/mozilla/content/xul/document/public/nsIController.idl
index 8f36951d464..545f4f8632d 100644
--- a/mozilla/content/xul/document/public/nsIController.idl
+++ b/mozilla/content/xul/document/public/nsIController.idl
@@ -62,9 +62,9 @@ interface nsICommandParams;
 interface nsICommandController : nsISupports
 {
   
-  void        getCommandState( in string command, in nsICommandParams aCommandParams);
+  void        getCommandStateWithParams( in string command, in nsICommandParams aCommandParams);
     
-  void        doCommand(in string command, in nsICommandParams aCommandParams);
+  void        doCommandWithParams(in string command, in nsICommandParams aCommandParams);
 
 };
 
diff --git a/mozilla/embedding/components/commandhandler/src/nsCommandManager.cpp b/mozilla/embedding/components/commandhandler/src/nsCommandManager.cpp
index 1bbcd11c5a2..b27b60c1385 100644
--- a/mozilla/embedding/components/commandhandler/src/nsCommandManager.cpp
+++ b/mozilla/embedding/components/commandhandler/src/nsCommandManager.cpp
@@ -216,7 +216,7 @@ nsCommandManager::GetCommandState(const char *aCommandName, nsICommandParams *aC
 
   nsCOMPtr<nsICommandController>  commandController = do_QueryInterface(controller);
   if (commandController)
-    rv = commandController->GetCommandState(aCommandName,aCommandParams);
+    rv = commandController->GetCommandStateWithParams(aCommandName, aCommandParams);
   else
     rv = NS_ERROR_NOT_IMPLEMENTED;
   return rv;
@@ -234,7 +234,7 @@ nsCommandManager::DoCommand(const char *aCommandName, nsICommandParams *aCommand
 
   nsCOMPtr<nsICommandController>  commandController = do_QueryInterface(controller);
   if (commandController)
-	  rv = commandController->DoCommand(aCommandName,aCommandParams);
+	  rv = commandController->DoCommandWithParams(aCommandName, aCommandParams);
   else
 	  rv = controller->DoCommand(aCommandName);
   return rv;