--- a/startupcache/StartupCache.h
+++ b/startupcache/StartupCache.h
@@ -21,17 +21,17 @@
 #include "mozilla/StaticPtr.h"
 
 /**
  * The StartupCache is a persistent cache of simple key-value pairs,
  * where the keys are null-terminated c-strings and the values are 
  * arbitrary data, passed as a (char*, size) tuple. 
  *
  * Clients should use the GetSingleton() static method to access the cache. It 
- * will be available from the end of XPCOM init (NS_InitXPCOM3 in nsXPComInit.cpp), 
+ * will be available from the end of XPCOM init (NS_InitXPCOM3 in XPCOMInit.cpp), 
  * until XPCOM shutdown begins. The GetSingleton() method will return null if the cache
  * is unavailable. The cache is only provided for libxul builds --
  * it will fail to link in non-libxul builds. The XPCOM interface is provided
  * only to allow compiled-code tests; clients should avoid using it.
  *
  * The API provided is very simple: GetBuffer() returns a buffer that was previously
  * stored in the cache (if any), and PutBuffer() inserts a buffer into the cache.
  * GetBuffer returns a new buffer, and the caller must take ownership of it.

rename from xpcom/build/nsXPComInit.cpp
rename to xpcom/build/XPCOMInit.cpp

--- a/xpcom/build/moz.build
+++ b/xpcom/build/moz.build
@@ -46,19 +46,19 @@ include('../glue/objs.mozbuild')
 UNIFIED_SOURCES += xpcom_gluens_src_cppsrcs
 UNIFIED_SOURCES += xpcom_glue_src_cppsrcs
 
 UNIFIED_SOURCES += [
     'FrozenFunctions.cpp',
     'IOInterposer.cpp',
     'LateWriteChecks.cpp',
     'MainThreadIOLogger.cpp',
-    'nsXPComInit.cpp',
     'nsXPCOMStrings.cpp',
     'Services.cpp',
+    'XPCOMInit.cpp',
 ]
 
 if CONFIG['OS_ARCH'] != 'WINNT':
     SOURCES += [
         'NSPRInterposer.cpp',
     ]
 
 # FileLocation.cpp and Omnijar.cpp cannot be built in unified mode because they

--- a/xpcom/io/nsLocalFile.h
+++ b/xpcom/io/nsLocalFile.h
@@ -26,17 +26,17 @@
   nsresult CopyToUnicode(nsIFile *aNewParentDir, const char16_t *aNewLeafName);               \
   nsresult CopyToFollowingLinksUnicode(nsIFile *aNewParentDir, const char16_t *aNewLeafName); \
   nsresult MoveToUnicode(nsIFile *aNewParentDir, const char16_t *aNewLeafName);               \
   nsresult GetUnicodeTarget(char16_t **aTarget);                                              \
   nsresult GetUnicodePath(char16_t **aPath);                                                  \
   nsresult InitWithUnicodePath(const char16_t *aPath);                                        \
   nsresult AppendRelativeUnicodePath(const char16_t *aRelativePath);
 
-// nsXPComInit needs to know about how we are implemented,
+// XPCOMInit needs to know about how we are implemented,
 // so here we will export it.  Other users should not depend
 // on this.
 
 #include <errno.h>
 #include "nsILocalFile.h"
 
 #ifdef XP_WIN
 #include "nsLocalFileWin.h"