diff --git a/mozilla/widget/public/nsIFilePicker.idl b/mozilla/widget/public/nsIFilePicker.idl
index b118030ad78..4dc6202be31 100644
--- a/mozilla/widget/public/nsIFilePicker.idl
+++ b/mozilla/widget/public/nsIFilePicker.idl
@@ -45,14 +45,14 @@ interface nsIFilePicker : nsISupports
   const long filterXUL        = 0x20;           // *.xul
 
  /**
-  * Create the file widget.
+  * Initialize the file widget.
   *
   * @param      parent   nsIDOMWindow parent.  This dialog should be dependant on this parent.
   * @param      title    The title for the file widget
   * @param      mode     load, save, or get folder
   *
   */
-  void create(in nsIDOMWindow parent, in wstring title, in short mode);
+  void init(in nsIDOMWindow parent, in wstring title, in short mode);
 
  /**
   * Set filter list to something in the predefined list
diff --git a/mozilla/widget/src/windows/nsFilePicker.cpp b/mozilla/widget/src/windows/nsFilePicker.cpp
index 67100e4180f..3c150bf7c34 100644
--- a/mozilla/widget/src/windows/nsFilePicker.cpp
+++ b/mozilla/widget/src/windows/nsFilePicker.cpp
@@ -17,7 +17,7 @@
  * Copyright (C) 2000 Netscape Communications Corporation. All
  * Rights Reserved.
  * 
- * Contributor(s): 
+ * Contributor(s):
  *   Stuart Parmenter <pavlov@netscape.com>
  */
 
@@ -273,17 +273,17 @@ NS_IMETHODIMP nsFilePicker::GetDisplayDirectory(nsILocalFile **aDirectory)
   return NS_OK;
 }
 
-NS_IMETHODIMP nsFilePicker::Create(nsIDOMWindow *aParent,
-                                   const PRUnichar *aTitle,
-                                   PRInt16 aMode)
+NS_IMETHODIMP nsFilePicker::Init(nsIDOMWindow *aParent,
+                                 const PRUnichar *aTitle,
+                                 PRInt16 aMode)
 {
-  return nsBaseFilePicker::Create(aParent, aTitle, aMode);
+  return nsBaseFilePicker::Init(aParent, aTitle, aMode);
 }
 
 //-------------------------------------------------------------------------
-NS_IMETHODIMP nsFilePicker::CreateNative(nsIWidget *aParent,
-                                         const PRUnichar *aTitle,
-                                         PRInt16 aMode)
+NS_IMETHODIMP nsFilePicker::Init(nsIWidget *aParent,
+                                 const PRUnichar *aTitle,
+                                 PRInt16 aMode)
 {
   mWnd = (HWND) ((aParent) ? aParent->GetNativeData(NS_NATIVE_WINDOW) : 0); 
   mTitle.SetLength(0);
diff --git a/mozilla/widget/src/xpwidgets/nsBaseFilePicker.cpp b/mozilla/widget/src/xpwidgets/nsBaseFilePicker.cpp
index 962456b6d60..b19193cf5fc 100644
--- a/mozilla/widget/src/xpwidgets/nsBaseFilePicker.cpp
+++ b/mozilla/widget/src/xpwidgets/nsBaseFilePicker.cpp
@@ -57,46 +57,45 @@ NS_IMETHODIMP nsBaseFilePicker::DOMWindowToWidget(nsIDOMWindow *dw, nsIWidget **
     
     if (docShell) {
 
-          nsCOMPtr<nsIPresShell> presShell;
-          rv = docShell->GetPresShell(getter_AddRefs(presShell));
+      nsCOMPtr<nsIPresShell> presShell;
+      rv = docShell->GetPresShell(getter_AddRefs(presShell));
 
-          if (NS_SUCCEEDED(rv)) {
-            nsCOMPtr<nsIViewManager> viewManager;
-            rv = presShell->GetViewManager(getter_AddRefs(viewManager));
+      if (NS_SUCCEEDED(rv)) {
+        nsCOMPtr<nsIViewManager> viewManager;
+        rv = presShell->GetViewManager(getter_AddRefs(viewManager));
             
-            if (NS_SUCCEEDED(rv)) {
-              nsIView *view;
-              rv = viewManager->GetRootView(view);
+        if (NS_SUCCEEDED(rv)) {
+          nsIView *view;
+          rv = viewManager->GetRootView(view);
               
-              if (NS_SUCCEEDED(rv)) {
-                nsCOMPtr<nsIWidget> widget;
-                rv = view->GetWidget(*getter_AddRefs(widget));
+          if (NS_SUCCEEDED(rv)) {
+            nsCOMPtr<nsIWidget> widget;
+            rv = view->GetWidget(*getter_AddRefs(widget));
 
-		if (NS_SUCCEEDED(rv)) {
-		  *aResult = widget;
-		  NS_ADDREF(*aResult);
-		  return NS_OK;
-		}
-		
-              }
+            if (NS_SUCCEEDED(rv)) {
+              *aResult = widget;
+              NS_ADDREF(*aResult);
+              return NS_OK;
             }
+		
           }
+        }
+      }
     }
   }
   return rv;
 }
 
 //-------------------------------------------------------------------------
-NS_IMETHODIMP nsBaseFilePicker::Create(nsIDOMWindow *aParent,
-				       const PRUnichar *aTitle,
-				       PRInt16 aMode)
+NS_IMETHODIMP nsBaseFilePicker::Init(nsIDOMWindow *aParent,
+                                     const PRUnichar *aTitle,
+                                     PRInt16 aMode)
 {
   nsCOMPtr<nsIWidget> widget;
   nsresult rv = DOMWindowToWidget(aParent, getter_AddRefs(widget));
 
-  if (NS_SUCCEEDED(rv))
-  {
-    return CreateNative(widget, aTitle, aMode);
+  if (NS_SUCCEEDED(rv)) {
+    return InitNative(widget, aTitle, aMode);
   }
 
   return rv;
diff --git a/mozilla/widget/src/xpwidgets/nsBaseFilePicker.h b/mozilla/widget/src/xpwidgets/nsBaseFilePicker.h
index 4d3b917a42b..d417c3628ab 100644
--- a/mozilla/widget/src/xpwidgets/nsBaseFilePicker.h
+++ b/mozilla/widget/src/xpwidgets/nsBaseFilePicker.h
@@ -33,14 +33,14 @@ public:
   nsBaseFilePicker(); 
   virtual ~nsBaseFilePicker();
 
-  NS_IMETHOD Create(nsIDOMWindow *aParent,
-                    const PRUnichar *aTitle,
-                    PRInt16 aMode);
+  NS_IMETHOD Init(nsIDOMWindow *aParent,
+                  const PRUnichar *aTitle,
+                  PRInt16 aMode);
 
 protected:
-  NS_IMETHOD CreateNative(nsIWidget *aParent,
-                          const PRUnichar *aTitle,
-                          PRInt16 aMode) = 0;
+  NS_IMETHOD InitNative(nsIWidget *aParent,
+                        const PRUnichar *aTitle,
+                        PRInt16 aMode) = 0;
 
 private:
   NS_IMETHOD DOMWindowToWidget(nsIDOMWindow *dw, nsIWidget **aResult);
diff --git a/mozilla/xpfe/components/filepicker/src/nsFilePicker.js b/mozilla/xpfe/components/filepicker/src/nsFilePicker.js
index 114394a64a4..fba5cb7ed5d 100644
--- a/mozilla/xpfe/components/filepicker/src/nsFilePicker.js
+++ b/mozilla/xpfe/components/filepicker/src/nsFilePicker.js
@@ -69,7 +69,7 @@ nsFilePicker.prototype = {
   get defaultString()  { return this.mSelectedFilter; },
 
   /* methods */
-  create: function(parent, title, mode) {
+  init: function(parent, title, mode) {
     this.mParentWindow = parent;
     this.mTitle = title;
     this.mMode = mode;
diff --git a/mozilla/xpfe/components/filepicker/src/nsFilePicker.js.in b/mozilla/xpfe/components/filepicker/src/nsFilePicker.js.in
index 114394a64a4..fba5cb7ed5d 100644
--- a/mozilla/xpfe/components/filepicker/src/nsFilePicker.js.in
+++ b/mozilla/xpfe/components/filepicker/src/nsFilePicker.js.in
@@ -69,7 +69,7 @@ nsFilePicker.prototype = {
   get defaultString()  { return this.mSelectedFilter; },
 
   /* methods */
-  create: function(parent, title, mode) {
+  init: function(parent, title, mode) {
     this.mParentWindow = parent;
     this.mTitle = title;
     this.mMode = mode;