diff --git a/xpcom/components/moz.build b/xpcom/components/moz.build
index 7d1ad4b97c7..19bfdd87b7e 100644
--- a/xpcom/components/moz.build
+++ b/xpcom/components/moz.build
@@ -29,13 +29,13 @@ EXPORTS.mozilla += [
 # nsCategoryManager.cpp and nsComponentManager.cpp cannot be built in
 # unified mode because they use thea PL_ARENA_CONST_ALIGN_MASK macro
 # with plarena.h.
-# nsNativeComponentLoader.cpp cannot be built in unified mode because it
+# nsNativeModuleLoader.cpp cannot be built in unified mode because it
 # forces NSPR logging.
 SOURCES += [
     'ManifestParser.cpp',
     'nsCategoryManager.cpp',
     'nsComponentManager.cpp',
-    'nsNativeComponentLoader.cpp',
+    'nsNativeModuleLoader.cpp',
 ]
 
 FAIL_ON_WARNINGS = True
diff --git a/xpcom/components/nsComponentManager.h b/xpcom/components/nsComponentManager.h
index e9354df2c68..7eb903f0d1e 100644
--- a/xpcom/components/nsComponentManager.h
+++ b/xpcom/components/nsComponentManager.h
@@ -19,7 +19,7 @@
 #include "mozilla/ModuleLoader.h"
 #include "mozilla/Mutex.h"
 #include "nsXULAppAPI.h"
-#include "nsNativeComponentLoader.h"
+#include "nsNativeModuleLoader.h"
 #include "nsIFactory.h"
 #include "nsIInterfaceRequestor.h"
 #include "nsIInterfaceRequestorUtils.h"
diff --git a/xpcom/components/nsNativeComponentLoader.cpp b/xpcom/components/nsNativeModuleLoader.cpp
similarity index 99%
rename from xpcom/components/nsNativeComponentLoader.cpp
rename to xpcom/components/nsNativeModuleLoader.cpp
index 3fd40f5669f..402610da876 100644
--- a/xpcom/components/nsNativeComponentLoader.cpp
+++ b/xpcom/components/nsNativeModuleLoader.cpp
@@ -19,7 +19,7 @@
 #define FORCE_PR_LOG
 #endif
 
-#include "nsNativeComponentLoader.h"
+#include "nsNativeModuleLoader.h"
 
 #include "prlog.h"
 #include "prinit.h"
diff --git a/xpcom/components/nsNativeComponentLoader.h b/xpcom/components/nsNativeModuleLoader.h
similarity index 100%
rename from xpcom/components/nsNativeComponentLoader.h
rename to xpcom/components/nsNativeModuleLoader.h