diff --git a/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ppc_aix.s b/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ppc_aix.s
index dc9a4799ab7..0a9ce3db90f 100644
--- a/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ppc_aix.s
+++ b/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ppc_aix.s
@@ -58,24 +58,24 @@
 
 
         .rename H.10.NO_SYMBOL{PR},""
-        .rename H.18.XPTC_InvokeByIndex{TC},"XPTC_InvokeByIndex"
+        .rename H.18.NS_InvokeByIndex_P{TC},"NS_InvokeByIndex_P"
 
 
 # .text section
 
         .csect  H.10.NO_SYMBOL{PR}
-        .globl  .XPTC_InvokeByIndex
-        .globl  XPTC_InvokeByIndex{DS}
+        .globl  .NS_InvokeByIndex_P
+        .globl  NS_InvokeByIndex_P{DS}
         .extern .invoke_copy_to_stack
         .extern ._ptrgl{PR}
 
 
 #
-#   XPTC_InvokeByIndex(nsISupports* that, PRUint32 methodIndex,
+#   NS_InvokeByIndex_P(nsISupports* that, PRUint32 methodIndex,
 #                   PRUint32 paramCount, nsXPTCVariant* params)
 #
 
-.XPTC_InvokeByIndex:
+.NS_InvokeByIndex_P:
 		mflr	r0
 		stw	r31,-4(sp)
 #
@@ -150,13 +150,13 @@
 # .data section
 
         .toc                            # 0x00000038
-T.18.XPTC_InvokeByIndex:
-        .tc     H.18.XPTC_InvokeByIndex{TC},XPTC_InvokeByIndex{DS}
+T.18.NS_InvokeByIndex_P:
+        .tc     H.18.NS_InvokeByIndex_P{TC},NS_InvokeByIndex_P{DS}
 
-        .csect  XPTC_InvokeByIndex{DS}
-        .long   .XPTC_InvokeByIndex     # "\0\0\0\0"
+        .csect  NS_InvokeByIndex_P{DS}
+        .long   .NS_InvokeByIndex_P     # "\0\0\0\0"
         .long   TOC{TC0}                # "\0\0\0008"
         .long   0x00000000              # "\0\0\0\0"
-# End   csect   XPTC_InvokeByIndex{DS}
+# End   csect   NS_InvokeByIndex_P{DS}
 
 # .bss section	
diff --git a/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ppc_aix64.s b/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ppc_aix64.s
index a174e424a6f..4ad53069cc4 100644
--- a/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ppc_aix64.s
+++ b/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ppc_aix64.s
@@ -53,23 +53,23 @@
 .set CR0_EQ,2
 
         .rename H.10.NO_SYMBOL{PR},""
-        .rename H.18.XPTC_InvokeByIndex{TC},"XPTC_InvokeByIndex"
+        .rename H.18.NS_InvokeByIndex_P{TC},"NS_InvokeByIndex_P"
 
 
 # .text section
 
         .csect  H.10.NO_SYMBOL{PR}
-        .globl  .XPTC_InvokeByIndex
-        .globl  XPTC_InvokeByIndex{DS}
+        .globl  .NS_InvokeByIndex_P
+        .globl  NS_InvokeByIndex_P{DS}
         .extern .invoke_copy_to_stack
         .extern ._ptrgl{PR}
 
 #
-#   XPTC_InvokeByIndex(nsISupports* that, PRUint32 methodIndex,
+#   NS_InvokeByIndex_P(nsISupports* that, PRUint32 methodIndex,
 #                      PRUint32 paramCount, nsXPTCVariant* params)
 #
 
-.XPTC_InvokeByIndex:
+.NS_InvokeByIndex_P:
         mflr    r0
         std     r31,-8(sp)
 #
@@ -149,13 +149,13 @@
 # .data section
 
         .toc                            # 0x00000038
-T.18.XPTC_InvokeByIndex:
-        .tc     H.18.XPTC_InvokeByIndex{TC},XPTC_InvokeByIndex{DS}
+T.18.NS_InvokeByIndex_P:
+        .tc     H.18.NS_InvokeByIndex_P{TC},NS_InvokeByIndex_P{DS}
 
-        .csect  XPTC_InvokeByIndex{DS}
-        .llong  .XPTC_InvokeByIndex     # "\0\0\0\0"
+        .csect  NS_InvokeByIndex_P{DS}
+        .llong  .NS_InvokeByIndex_P     # "\0\0\0\0"
         .llong  TOC{TC0}                # "\0\0\0008"
         .llong  0x00000000              # "\0\0\0\0"
-# End   csect   XPTC_InvokeByIndex{DS}
+# End   csect   NS_InvokeByIndex_P{DS}
 
 # .bss section
diff --git a/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ppc_ibmobj_aix.s b/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ppc_ibmobj_aix.s
index d90d4eca8fe..851a134c08d 100644
--- a/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ppc_ibmobj_aix.s
+++ b/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ppc_ibmobj_aix.s
@@ -57,24 +57,24 @@
 
 
         .rename H.10.NO_SYMBOL{PR},""
-        .rename H.18.XPTC_InvokeByIndex{TC},"XPTC_InvokeByIndex"
+        .rename H.18.NS_InvokeByIndex_P{TC},"NS_InvokeByIndex_P"
 
 
 # .text section
 
         .csect  H.10.NO_SYMBOL{PR}
-        .globl  .XPTC_InvokeByIndex
-        .globl  XPTC_InvokeByIndex{DS}
+        .globl  .NS_InvokeByIndex_P
+        .globl  NS_InvokeByIndex_P{DS}
         .extern .invoke_copy_to_stack
         .extern ._ptrgl{PR}
 
 
 #
-#   XPTC_InvokeByIndex(nsISupports* that, PRUint32 methodIndex,
+#   NS_InvokeByIndex_P(nsISupports* that, PRUint32 methodIndex,
 #                   PRUint32 paramCount, nsXPTCVariant* params)
 #
 
-.XPTC_InvokeByIndex:
+.NS_InvokeByIndex_P:
 		mflr	r0
 		stw	r31,-4(sp)
 #
@@ -144,13 +144,13 @@
 # .data section
 
         .toc                            # 0x00000038
-T.18.XPTC_InvokeByIndex:
-        .tc     H.18.XPTC_InvokeByIndex{TC},XPTC_InvokeByIndex{DS}
+T.18.NS_InvokeByIndex_P:
+        .tc     H.18.NS_InvokeByIndex_P{TC},NS_InvokeByIndex_P{DS}
 
-        .csect  XPTC_InvokeByIndex{DS}
-        .long   .XPTC_InvokeByIndex     # "\0\0\0\0"
+        .csect  NS_InvokeByIndex_P{DS}
+        .long   .NS_InvokeByIndex_P     # "\0\0\0\0"
         .long   TOC{TC0}                # "\0\0\0008"
         .long   0x00000000              # "\0\0\0\0"
-# End   csect   XPTC_InvokeByIndex{DS}
+# End   csect   NS_InvokeByIndex_P{DS}
 
 # .bss section	
diff --git a/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_ppc_aix.cpp b/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_ppc_aix.cpp
index 870669d78e5..60172c67f87 100644
--- a/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_ppc_aix.cpp
+++ b/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_ppc_aix.cpp
@@ -38,6 +38,7 @@
 /* Implement shared vtbl methods. */
 
 #include "xptcprivate.h"
+#include "xptiprivate.h"
 
 #if defined(AIX)
 
@@ -60,19 +61,15 @@ PrepareAndDispatch(nsXPTCStubBase* self, PRUint32 methodIndex, PRUint32* args, P
 
     nsXPTCMiniVariant paramBuffer[PARAM_BUFFER_COUNT];
     nsXPTCMiniVariant* dispatchParams = NULL;
-    nsIInterfaceInfo* iface_info = NULL;
-    const nsXPTMethodInfo* info;
+    const nsXPTMethodInfo* info = NULL;
     PRUint8 paramCount;
     PRUint8 i;
     nsresult result = NS_ERROR_FAILURE;
 
     NS_ASSERTION(self,"no self");
 
-    self->GetInterfaceInfo(&iface_info);
-    NS_ASSERTION(iface_info,"no interface info");
-
-    iface_info->GetMethodInfo(PRUint16(methodIndex), &info);
-    NS_ASSERTION(info,"no interface info");
+    self->mEntry->GetMethodInfo(PRUint16(methodIndex), &info);
+    NS_ASSERTION(info,"no method info");
 
     paramCount = info->GetParamCount();
 
@@ -198,9 +195,7 @@ PrepareAndDispatch(nsXPTCStubBase* self, PRUint32 methodIndex, PRUint32* args, P
         }
     }
 
-    result = self->CallMethod((PRUint16)methodIndex, info, dispatchParams);
-
-    NS_RELEASE(iface_info);
+    result = self->mOuter->CallMethod((PRUint16)methodIndex,info,dispatchParams);
 
     if(dispatchParams != paramBuffer)
         delete [] dispatchParams;
diff --git a/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_ppc_aix64.cpp b/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_ppc_aix64.cpp
index cf2ddba96f6..22d00293a39 100644
--- a/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_ppc_aix64.cpp
+++ b/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_ppc_aix64.cpp
@@ -37,6 +37,7 @@
 /* Implement shared vtbl methods. */
 
 #include "xptcprivate.h"
+#include "xptiprivate.h"
 
 #if defined(AIX)
 
@@ -55,19 +56,15 @@ PrepareAndDispatch(nsXPTCStubBase* self, PRUint64 methodIndex, PRUint64* args, P
 
     nsXPTCMiniVariant paramBuffer[PARAM_BUFFER_COUNT];
     nsXPTCMiniVariant* dispatchParams = NULL;
-    nsIInterfaceInfo* iface_info = NULL;
-    const nsXPTMethodInfo* info;
+    const nsXPTMethodInfo* info = NULL;
     PRUint8 paramCount;
     PRUint8 i;
     nsresult result = NS_ERROR_FAILURE;
 
     NS_ASSERTION(self,"no self");
 
-    self->GetInterfaceInfo(&iface_info);
-    NS_ASSERTION(iface_info,"no interface info");
-
-    iface_info->GetMethodInfo(PRUint16(methodIndex), &info);
-    NS_ASSERTION(info,"no interface info");
+    self->mEntry->GetMethodInfo(PRUint16(methodIndex), &info);
+    NS_ASSERTION(info,"no method info");
 
     paramCount = info->GetParamCount();
 
@@ -185,9 +182,7 @@ PrepareAndDispatch(nsXPTCStubBase* self, PRUint64 methodIndex, PRUint64* args, P
         }
     }
 
-    result = self->CallMethod((PRUint16)methodIndex, info, dispatchParams);
-
-    NS_RELEASE(iface_info);
+    result = self->mOuter->CallMethod((PRUint16)methodIndex,info,dispatchParams);
 
     if(dispatchParams != paramBuffer)
         delete [] dispatchParams;