--- a/xpcom/reflect/xptinfo/xptiInterfaceInfo.cpp
+++ b/xpcom/reflect/xptinfo/xptiInterfaceInfo.cpp
@@ -10,45 +10,46 @@
 #include "mozilla/DebugOnly.h"
 #include "mozilla/XPTInterfaceInfoManager.h"
 #include "mozilla/PodOperations.h"
 #include "jsapi.h"
 
 using namespace mozilla;
 
 /* static */ xptiInterfaceEntry*
-xptiInterfaceEntry::Create(const char* name, const nsID& iid,
+xptiInterfaceEntry::Create(const char* aName,
+                           const nsID& aIID,
                            XPTInterfaceDescriptor* aDescriptor,
                            xptiTypelibGuts* aTypelib)
 {
-    int namelen = strlen(name);
+    int namelen = strlen(aName);
     void* place =
         XPT_CALLOC8(gXPTIStructArena, sizeof(xptiInterfaceEntry) + namelen);
     if (!place) {
         return nullptr;
     }
-    return new (place) xptiInterfaceEntry(name, namelen, iid, aDescriptor,
+    return new (place) xptiInterfaceEntry(aName, namelen, aIID, aDescriptor,
                                           aTypelib);
 }
 
-xptiInterfaceEntry::xptiInterfaceEntry(const char* name,
-                                       size_t nameLength,
-                                       const nsID& iid,
+xptiInterfaceEntry::xptiInterfaceEntry(const char* aName,
+                                       size_t aNameLength,
+                                       const nsID& aIID,
                                        XPTInterfaceDescriptor* aDescriptor,
                                        xptiTypelibGuts* aTypelib)
-    : mIID(iid)
+    : mIID(aIID)
     , mDescriptor(aDescriptor)
     , mTypelib(aTypelib)
     , mParent(nullptr)
     , mInfo(nullptr)
     , mMethodBaseIndex(0)
     , mConstantBaseIndex(0)
     , mFlags(0)
 {
-    memcpy(mName, name, nameLength);
+    memcpy(mName, aName, aNameLength);
     SetResolvedState(PARTIALLY_RESOLVED);
 }
 
 bool
 xptiInterfaceEntry::Resolve()
 {
     MutexAutoLock lock(XPTInterfaceInfoManager::GetResolveLock());
     return ResolveLocked();

--- a/xpcom/reflect/xptinfo/xptiprivate.h
+++ b/xpcom/reflect/xptinfo/xptiprivate.h
@@ -163,18 +163,18 @@ private:
 
 // No virtual methods.
 // We always create in the struct arena and construct using "placement new".
 // No members need dtor calls.
 
 class xptiInterfaceEntry
 {
 public:
-    static xptiInterfaceEntry* Create(const char* name,
-                                      const nsID& iid,
+    static xptiInterfaceEntry* Create(const char* aName,
+                                      const nsID& aIID,
                                       XPTInterfaceDescriptor* aDescriptor,
                                       xptiTypelibGuts* aTypelib);
 
     enum {
         PARTIALLY_RESOLVED    = 1,
         FULLY_RESOLVED        = 2,
         RESOLVE_FAILED        = 3
     };
@@ -261,19 +261,19 @@ public:
     nsresult IsIID(const nsIID * IID, bool *_retval);
     nsresult GetNameShared(const char **name);
     nsresult GetIIDShared(const nsIID * *iid);
     nsresult IsFunction(bool *_retval);
     nsresult HasAncestor(const nsIID * iid, bool *_retval);
     nsresult GetIIDForParamNoAlloc(uint16_t methodIndex, const nsXPTParamInfo * param, nsIID *iid);
 
 private:
-    xptiInterfaceEntry(const char* name,
-                       size_t nameLength,
-                       const nsID& iid,
+    xptiInterfaceEntry(const char* aName,
+                       size_t aNameLength,
+                       const nsID& aIID,
                        XPTInterfaceDescriptor* aDescriptor,
                        xptiTypelibGuts* aTypelib);
     ~xptiInterfaceEntry();
 
     void SetResolvedState(int state)
         {mFlags.SetState(uint8_t(state));}
 
     bool Resolve();