diff --git a/mozilla/modules/plugin/base/src/nsPluginInstancePeer.cpp b/mozilla/modules/plugin/base/src/nsPluginInstancePeer.cpp
index 768a0fb2648..c71b7a1df29 100644
--- a/mozilla/modules/plugin/base/src/nsPluginInstancePeer.cpp
+++ b/mozilla/modules/plugin/base/src/nsPluginInstancePeer.cpp
@@ -170,7 +170,7 @@ protected:
 	char* mTarget;
 	nsFileURL mFileURL;
 	nsFileSpec mFileSpec;
-	nsCOMPtr<nsIFileOutputStream> mFileThing;
+	nsCOMPtr<nsIFileSpecOutputStream> mFileThing;
 	nsIPluginInstanceOwner* mOwner;
 };
 
diff --git a/mozilla/modules/plugin/nglsrc/nsPluginInstancePeer.cpp b/mozilla/modules/plugin/nglsrc/nsPluginInstancePeer.cpp
index 768a0fb2648..c71b7a1df29 100644
--- a/mozilla/modules/plugin/nglsrc/nsPluginInstancePeer.cpp
+++ b/mozilla/modules/plugin/nglsrc/nsPluginInstancePeer.cpp
@@ -170,7 +170,7 @@ protected:
 	char* mTarget;
 	nsFileURL mFileURL;
 	nsFileSpec mFileSpec;
-	nsCOMPtr<nsIFileOutputStream> mFileThing;
+	nsCOMPtr<nsIFileSpecOutputStream> mFileThing;
 	nsIPluginInstanceOwner* mOwner;
 };
 
diff --git a/mozilla/xpcom/io/nsFileStream.h b/mozilla/xpcom/io/nsFileStream.h
index 8d969ab76e8..fb719b7ea5d 100644
--- a/mozilla/xpcom/io/nsFileStream.h
+++ b/mozilla/xpcom/io/nsFileStream.h
@@ -503,7 +503,7 @@ protected:
 
 // DATA
 protected:
-    nsCOMPtr<nsIFileInputStream>      mFileInputStream;
+    nsCOMPtr<nsIFileSpecInputStream>      mFileInputStream;
 }; // class nsInputFileStream
 
 //========================================================================================
@@ -637,7 +637,7 @@ protected:
 
 // DATA
 protected:
-    nsCOMPtr<nsIFileOutputStream>     mFileOutputStream;
+    nsCOMPtr<nsIFileSpecOutputStream>     mFileOutputStream;
 }; // class nsOutputFileStream
 
 //========================================================================================
@@ -757,7 +757,7 @@ public:
 
     // DATA
 protected:
-    nsCOMPtr<nsIFileOutputStream>     mFileOutputStream;
+    nsCOMPtr<nsIFileSpecOutputStream>     mFileOutputStream;
 }; // class nsIOFileStream
  
 //========================================================================================
diff --git a/mozilla/xpcom/io/nsIFileStream.cpp b/mozilla/xpcom/io/nsIFileStream.cpp
index 0d9cf958c5b..041cec6dc71 100644
--- a/mozilla/xpcom/io/nsIFileStream.cpp
+++ b/mozilla/xpcom/io/nsIFileStream.cpp
@@ -43,8 +43,8 @@
 //========================================================================================
 class FileImpl
     : public nsIRandomAccessStore
-    , public nsIFileOutputStream
-    , public nsIFileInputStream
+    , public nsIFileSpecOutputStream
+    , public nsIFileSpecInputStream
     , public nsIOpenFile
 //========================================================================================
 {
@@ -112,8 +112,8 @@ NS_IMPL_QUERY_HEAD(FileImpl)
   NS_IMPL_QUERY_BODY(nsIRandomAccessStore)
   NS_IMPL_QUERY_BODY(nsIOutputStream)
   NS_IMPL_QUERY_BODY(nsIInputStream)
-  NS_IMPL_QUERY_BODY(nsIFileInputStream)
-  NS_IMPL_QUERY_BODY(nsIFileOutputStream)
+  NS_IMPL_QUERY_BODY(nsIFileSpecInputStream)
+  NS_IMPL_QUERY_BODY(nsIFileSpecOutputStream)
 NS_IMPL_QUERY_TAIL(nsIOutputStream)
 
 
diff --git a/mozilla/xpcom/io/nsIFileStream.h b/mozilla/xpcom/io/nsIFileStream.h
index 809d27b6516..25755b9c101 100644
--- a/mozilla/xpcom/io/nsIFileStream.h
+++ b/mozilla/xpcom/io/nsIFileStream.h
@@ -78,12 +78,12 @@ public:
                                 // and mozilla/netwerks/base/nsIFileStreams.idl
 
 /* a6cf90e6-15b3-11d2-932e-00805f8add32 */
-#define NS_IFILEINPUTSTREAM_IID \
+#define NS_IFILESPECINPUTSTREAM_IID \
 { 0xa6cf90e6, 0x15b3, 0x11d2, \
     {0x93, 0x2e, 0x00, 0x80, 0x5f, 0x8a, 0xdd, 0x32} }
     
 //========================================================================================
-class nsIFileInputStream
+class nsIFileSpecInputStream
 // These are additional file-specific methods that files have, above what
 // nsIInputStream supports.  The current implementation supports both
 // interfaces.
@@ -91,16 +91,16 @@ class nsIFileInputStream
 : public nsIInputStream
 {
 public:
-    static const nsIID& GetIID() { static nsIID iid = NS_IFILEINPUTSTREAM_IID; return iid; }
-}; // class nsIFileInputStream
+    static const nsIID& GetIID() { static nsIID iid = NS_IFILESPECINPUTSTREAM_IID; return iid; }
+}; // class nsIFileSpecInputStream
 
 /* a6cf90e7-15b3-11d2-932e-00805f8add32 */
-#define NS_IFILEOUTPUTSTREAM_IID \
+#define NS_IFILESPECOUTPUTSTREAM_IID \
 { 0xa6cf90e7, 0x15b3, 0x11d2, \
     {0x93, 0x2e, 0x00, 0x80, 0x5f, 0x8a, 0xdd, 0x32} }
 
 //========================================================================================
-class nsIFileOutputStream
+class nsIFileSpecOutputStream
 // These are additional file-specific methods that files have, above what
 // nsIOutputStream supports.  The current implementation supports both
 // interfaces.
@@ -108,8 +108,8 @@ class nsIFileOutputStream
 : public nsIOutputStream
 {
 public:
-    static const nsIID& GetIID() { static nsIID iid = NS_IFILEOUTPUTSTREAM_IID; return iid; }
-}; // class nsIFileOutputStream
+    static const nsIID& GetIID() { static nsIID iid = NS_IFILESPECOUTPUTSTREAM_IID; return iid; }
+}; // class nsIFileSpecOutputStream
 
 #endif // NO_XPCOM_FILE_STREAMS
 
@@ -152,4 +152,4 @@ extern "C" NS_COM nsresult NS_NewIOFileStream(
     // Factory method to get an object that implements both nsIInputStream
     // and nsIOutputStream, associated with a single file.
 
-#endif /* nsIFileStream_h___ */
+#endif /* nsIFileSpecStream_h___ */