--- a/browser/components/migration/src/Makefile.in
+++ b/browser/components/migration/src/Makefile.in
@@ -50,17 +50,17 @@ USE_STATIC_LIBS = 1
 REQUIRES	= \
 		  xpcom \
 		  string \
 		  necko \
 		  history \
 		  libreg \
 		  browsercomps \
 		  toolkitcomps \
-		  passwordmgr \
+		  loginmgr \
 		  pref \
 		  rdf \
 		  satchel \
 		  intl \
 		  unicharutil \
 		  windowwatcher \
 		  dom \
 		  docshell \

--- a/toolkit/components/passwordmgr/src/Makefile.in
+++ b/toolkit/components/passwordmgr/src/Makefile.in
@@ -36,19 +36,19 @@
 
 DEPTH   = ../../../..
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH   = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-MODULE = passwordmgr
+MODULE = loginmgr
 
 EXTRA_COMPONENTS = \
-            nsLoginManager.js \
+			nsLoginManager.js \
 			nsLoginManagerPrompter.js \
 			nsLoginInfo.js \
 			storage-Legacy.js \
 			$(NULL)
 
 
 include $(topsrcdir)/config/rules.mk

--- a/toolkit/components/satchel/src/Makefile.in
+++ b/toolkit/components/satchel/src/Makefile.in
@@ -64,17 +64,17 @@ REQUIRES =	\
 		content \
 		view \
 		locale \
 		unicharutil \
 		intl \
 		pref \
 		windowwatcher \
 		toolkitcomps \
-		passwordmgr \
+		loginmgr \
 		$(NULL)
 
 CPPSRCS = nsFormFillController.cpp \
           $(NULL)
 
 REQUIRES += storage morkreader
 CPPSRCS += nsStorageFormHistory.cpp