diff --git a/layout/html/base/src/Makefile b/layout/html/base/src/Makefile
index 4bbd5e0464e1..d32669e4d528 100644
--- a/layout/html/base/src/Makefile
+++ b/layout/html/base/src/Makefile
@@ -20,35 +20,36 @@ DEPTH=../../../..
 LIBRARY_NAME = raptorhtmlbase_s
 
 # Note the sophisticated alphabetical ordering :-|
-CPPSRCS =				\
+CPPSRCS=				\
 	nsAbsoluteFrame.cpp		\
-	nsBRPart.cpp			\
+	nsBRFrame.cpp			\
 	nsBodyFrame.cpp			\
 	nsGlobalVariables.cpp		\
-	nsHRPart.cpp			\
+	nsHRFrame.cpp			\
 	nsHTMLAtoms.cpp			\
 	nsHTMLBase.cpp			\
 	nsHTMLBullet.cpp		\
-	nsHTMLContainer.cpp		\
 	nsHTMLContainerFrame.cpp	\
-	nsHTMLContent.cpp		\
 	nsHTMLIIDs.cpp			\
-	nsHTMLImage.cpp			\
+	nsHTMLFrame.cpp			\
 	nsHTMLReflowCommand.cpp		\
-	nsHTMLTagContent.cpp		\
+	nsImageFrame.cpp		\
 	nsImageMap.cpp			\
 	nsLeafFrame.cpp			\
 	nsObjectFrame.cpp		\
 	nsPageFrame.cpp			\
 	nsPlaceholderFrame.cpp		\
-	nsRootPart.cpp			\
 	nsScrollFrame.cpp		\
-	nsSpacerPart.cpp		\
-	nsTextContent.cpp		\
-	nsWBRPart.cpp			\
+	nsSpacerFrame.cpp		\
+	nsTextFrame.cpp			\
+	nsWBRFrame.cpp			\
 	nsDOMNodeList.cpp		\
 	nsDOMAttributes.cpp		\
+	nsHTMLContainer.cpp		\
+	nsHTMLContent.cpp		\
+	nsHTMLTagContent.cpp		\
 	$(NULL)
+
 EXPORTS =				\
 	nsGlobalVariables.h		\
 	$(NULL)
diff --git a/layout/html/base/src/makefile.win b/layout/html/base/src/makefile.win
index c0c68ac40ab7..8514229f1c35 100644
--- a/layout/html/base/src/makefile.win
+++ b/layout/html/base/src/makefile.win
@@ -24,60 +24,60 @@ DEFINES=-D_IMPL_NS_HTML -DWIN32_LEAN_AND_MEAN
 
 CPPSRCS=			\
  nsAbsoluteFrame.cpp		\
- nsBRPart.cpp			\
+ nsBRFrame.cpp			\
  nsBodyFrame.cpp		\
  nsGlobalVariables.cpp		\
- nsHRPart.cpp			\
+ nsHRFrame.cpp			\
  nsHTMLAtoms.cpp		\
  nsHTMLBase.cpp			\
  nsHTMLBullet.cpp		\
- nsHTMLContainer.cpp		\
  nsHTMLContainerFrame.cpp	\
- nsHTMLContent.cpp		\
  nsHTMLIIDs.cpp			\
- nsHTMLImage.cpp		\
+ nsHTMLFrame.cpp		\
  nsHTMLReflowCommand.cpp	\
- nsHTMLTagContent.cpp		\
+ nsImageFrame.cpp		\
  nsImageMap.cpp			\
  nsLeafFrame.cpp		\
  nsObjectFrame.cpp		\
  nsPageFrame.cpp		\
  nsPlaceholderFrame.cpp		\
- nsRootPart.cpp			\
  nsScrollFrame.cpp		\
- nsSpacerPart.cpp		\
- nsTextContent.cpp		\
- nsWBRPart.cpp			\
+ nsSpacerFrame.cpp		\
+ nsTextFrame.cpp		\
+ nsWBRFrame.cpp			\
  nsDOMNodeList.cpp		\
  nsDOMAttributes.cpp		\
+ nsHTMLContainer.cpp		\
+ nsHTMLContent.cpp		\
+ nsHTMLTagContent.cpp		\
  $(NULL)
 
 CPP_OBJS=				\
  .\$(OBJDIR)\nsAbsoluteFrame.obj	\
- .\$(OBJDIR)\nsBRPart.obj		\
+ .\$(OBJDIR)\nsBRFrame.obj		\
  .\$(OBJDIR)\nsBodyFrame.obj		\
  .\$(OBJDIR)\nsGlobalVariables.obj	\
- .\$(OBJDIR)\nsHRPart.obj		\
+ .\$(OBJDIR)\nsHRFrame.obj		\
  .\$(OBJDIR)\nsHTMLAtoms.obj		\
  .\$(OBJDIR)\nsHTMLBase.obj		\
  .\$(OBJDIR)\nsHTMLBullet.obj		\
  .\$(OBJDIR)\nsHTMLContainer.obj	\
  .\$(OBJDIR)\nsHTMLContainerFrame.obj	\
  .\$(OBJDIR)\nsHTMLContent.obj		\
+ .\$(OBJDIR)\nsHTMLFrame.obj		\
  .\$(OBJDIR)\nsHTMLIIDs.obj		\
- .\$(OBJDIR)\nsHTMLImage.obj		\
  .\$(OBJDIR)\nsHTMLReflowCommand.obj	\
  .\$(OBJDIR)\nsHTMLTagContent.obj	\
+ .\$(OBJDIR)\nsImageFrame.obj		\
  .\$(OBJDIR)\nsImageMap.obj		\
  .\$(OBJDIR)\nsLeafFrame.obj		\
  .\$(OBJDIR)\nsObjectFrame.obj		\
  .\$(OBJDIR)\nsPageFrame.obj		\
  .\$(OBJDIR)\nsPlaceholderFrame.obj	\
- .\$(OBJDIR)\nsRootPart.obj		\
  .\$(OBJDIR)\nsScrollFrame.obj		\
- .\$(OBJDIR)\nsSpacerPart.obj		\
- .\$(OBJDIR)\nsTextContent.obj		\
- .\$(OBJDIR)\nsWBRPart.obj		\
+ .\$(OBJDIR)\nsSpacerFrame.obj		\
+ .\$(OBJDIR)\nsTextFrame.obj		\
+ .\$(OBJDIR)\nsWBRFrame.obj		\
  .\$(OBJDIR)\nsDOMNodeList.obj		\
  .\$(OBJDIR)\nsDOMAttributes.obj	\
  $(NULL)