diff --git a/modules/plugin/base/src/nsPluginInstancePeer.cpp b/modules/plugin/base/src/nsPluginInstancePeer.cpp
index 0209766067cb..1baa758bc5fb 100644
--- a/modules/plugin/base/src/nsPluginInstancePeer.cpp
+++ b/modules/plugin/base/src/nsPluginInstancePeer.cpp
@@ -62,7 +62,6 @@ nsPluginInstancePeerImpl :: ~nsPluginInstancePeerImpl()
 
 static NS_DEFINE_IID(kIPluginTagInfoIID, NS_IPLUGINTAGINFO_IID); 
 static NS_DEFINE_IID(kIPluginTagInfo2IID, NS_IPLUGINTAGINFO2_IID); 
-static NS_DEFINE_IID(kIPluginInstancePeerIID, NS_IPLUGININSTANCEPEER_IID); 
 static NS_DEFINE_IID(kIJVMPluginTagInfoIID, NS_IJVMPLUGINTAGINFO_IID); 
 static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);
 
@@ -74,9 +73,9 @@ nsresult nsPluginInstancePeerImpl :: QueryInterface(const nsIID& iid, void** ins
     if (instance == NULL)
         return NS_ERROR_NULL_POINTER;
 
-    if (iid.Equals(kIPluginInstancePeerIID))
+    if (iid.Equals(nsIPluginInstancePeer::GetIID()) || iid.Equals(nsIPluginInstancePeer2::GetIID()))
     {
-        *instance = (void *)(nsIPluginInstancePeer *)this;
+        *instance = (void *)(nsIPluginInstancePeer2*)this;
         AddRef();
         return NS_OK;
     }
diff --git a/modules/plugin/base/src/nsPluginInstancePeer.h b/modules/plugin/base/src/nsPluginInstancePeer.h
index 2547a2b7872c..5d28a95c25c0 100644
--- a/modules/plugin/base/src/nsPluginInstancePeer.h
+++ b/modules/plugin/base/src/nsPluginInstancePeer.h
@@ -19,14 +19,14 @@
 #ifndef nsPluginInstancePeer_h___
 #define nsPluginInstancePeer_h___
 
-#include "nsIPluginInstancePeer.h"
+#include "nsIPluginInstancePeer2.h"
 #include "nsIWindowlessPlugInstPeer.h"
 #include "nsIPluginTagInfo.h"
 #include "nsIPluginInstanceOwner.h"
 #include "nsIJVMPluginTagInfo.h"
 
 
-class nsPluginInstancePeerImpl : public nsIPluginInstancePeer,
+class nsPluginInstancePeerImpl : public nsIPluginInstancePeer2,
 								 public nsIWindowlessPluginInstancePeer,
                                  public nsIPluginTagInfo2,
                                  public nsIJVMPluginTagInfo
@@ -38,7 +38,7 @@ public:
 
   NS_DECL_ISUPPORTS
 
-  //nsIPluginInstancePeer interface
+  // nsIPluginInstancePeer interface
 
   NS_IMETHOD
   GetValue(nsPluginInstancePeerVariable variable, void *value);
@@ -58,6 +58,8 @@ public:
   NS_IMETHOD
   SetWindowSize(PRUint32 width, PRUint32 height);
 
+  // nsIPluginInstancePeer2 interface
+
   NS_IMETHOD
   GetJSWindow(JSObject* *outJSWindow);
 
diff --git a/modules/plugin/nglsrc/nsPluginInstancePeer.cpp b/modules/plugin/nglsrc/nsPluginInstancePeer.cpp
index 0209766067cb..1baa758bc5fb 100644
--- a/modules/plugin/nglsrc/nsPluginInstancePeer.cpp
+++ b/modules/plugin/nglsrc/nsPluginInstancePeer.cpp
@@ -62,7 +62,6 @@ nsPluginInstancePeerImpl :: ~nsPluginInstancePeerImpl()
 
 static NS_DEFINE_IID(kIPluginTagInfoIID, NS_IPLUGINTAGINFO_IID); 
 static NS_DEFINE_IID(kIPluginTagInfo2IID, NS_IPLUGINTAGINFO2_IID); 
-static NS_DEFINE_IID(kIPluginInstancePeerIID, NS_IPLUGININSTANCEPEER_IID); 
 static NS_DEFINE_IID(kIJVMPluginTagInfoIID, NS_IJVMPLUGINTAGINFO_IID); 
 static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);
 
@@ -74,9 +73,9 @@ nsresult nsPluginInstancePeerImpl :: QueryInterface(const nsIID& iid, void** ins
     if (instance == NULL)
         return NS_ERROR_NULL_POINTER;
 
-    if (iid.Equals(kIPluginInstancePeerIID))
+    if (iid.Equals(nsIPluginInstancePeer::GetIID()) || iid.Equals(nsIPluginInstancePeer2::GetIID()))
     {
-        *instance = (void *)(nsIPluginInstancePeer *)this;
+        *instance = (void *)(nsIPluginInstancePeer2*)this;
         AddRef();
         return NS_OK;
     }
diff --git a/modules/plugin/nglsrc/nsPluginInstancePeer.h b/modules/plugin/nglsrc/nsPluginInstancePeer.h
index 2547a2b7872c..5d28a95c25c0 100644
--- a/modules/plugin/nglsrc/nsPluginInstancePeer.h
+++ b/modules/plugin/nglsrc/nsPluginInstancePeer.h
@@ -19,14 +19,14 @@
 #ifndef nsPluginInstancePeer_h___
 #define nsPluginInstancePeer_h___
 
-#include "nsIPluginInstancePeer.h"
+#include "nsIPluginInstancePeer2.h"
 #include "nsIWindowlessPlugInstPeer.h"
 #include "nsIPluginTagInfo.h"
 #include "nsIPluginInstanceOwner.h"
 #include "nsIJVMPluginTagInfo.h"
 
 
-class nsPluginInstancePeerImpl : public nsIPluginInstancePeer,
+class nsPluginInstancePeerImpl : public nsIPluginInstancePeer2,
 								 public nsIWindowlessPluginInstancePeer,
                                  public nsIPluginTagInfo2,
                                  public nsIJVMPluginTagInfo
@@ -38,7 +38,7 @@ public:
 
   NS_DECL_ISUPPORTS
 
-  //nsIPluginInstancePeer interface
+  // nsIPluginInstancePeer interface
 
   NS_IMETHOD
   GetValue(nsPluginInstancePeerVariable variable, void *value);
@@ -58,6 +58,8 @@ public:
   NS_IMETHOD
   SetWindowSize(PRUint32 width, PRUint32 height);
 
+  // nsIPluginInstancePeer2 interface
+
   NS_IMETHOD
   GetJSWindow(JSObject* *outJSWindow);