diff --git a/mozilla/docshell/base/nsIGenericWindow.idl b/mozilla/docshell/base/nsIGenericWindow.idl
index 8034775450c..57409246b7b 100644
--- a/mozilla/docshell/base/nsIGenericWindow.idl
+++ b/mozilla/docshell/base/nsIGenericWindow.idl
@@ -42,7 +42,7 @@ interface nsIGenericWindow : nsISupports
 {
 	/*
 	Allows a client to initialize an object implementing this interface with
-	the usually required setup information.
+	the usually required window setup information.
 
 	@param parentNativeWindow - This allows a system to pass in the parenting
 		window as a native reference rather than relying on the calling
diff --git a/mozilla/docshell/base/nsIScrollable.idl b/mozilla/docshell/base/nsIScrollable.idl
index c6334b631e3..90d460adb96 100644
--- a/mozilla/docshell/base/nsIScrollable.idl
+++ b/mozilla/docshell/base/nsIScrollable.idl
@@ -81,8 +81,8 @@ interface nsIScrollable : nsISupports
 	/*
 	Retrieves of Set the preferences for the scroll bar.
 	*/
-	void setScrollbarPreferences(in long scrollOrientation, in long scrollBarPref);
-	void getScrollbarPreferences(in long scrollOrientation, out long scrollBarPref);
+	void getScrollbarPreferences(in long scrollOrientation, out long scrollbarPref);
+	void setScrollbarPreferences(in long scrollOrientation, in long scrollbarPref);
 
 	/*
 	Get information about whether the vertical and horizontal scrollbars are