--- a/layout/generic/BlockReflowInput.cpp
+++ b/layout/generic/BlockReflowInput.cpp
@@ -479,17 +479,17 @@ BlockReflowInput::AppendPushedFloatChain
  * around, attached to the frame tree.
  */
 void
 BlockReflowInput::RecoverFloats(nsLineList::iterator aLine,
                                   nscoord aDeltaBCoord)
 {
   WritingMode wm = mReflowInput.GetWritingMode();
   if (aLine->HasFloats()) {
-    // Place the floats into the space-manager again. Also slide
+    // Place the floats into the float manager again. Also slide
     // them, just like the regular frames on the line.
     nsFloatCache* fc = aLine->GetFirstFloat();
     while (fc) {
       nsIFrame* floatFrame = fc->mFloat;
       if (aDeltaBCoord != 0) {
         floatFrame->MovePositionBy(nsPoint(0, aDeltaBCoord));
         nsContainerFrame::PositionFrameView(floatFrame);
         nsContainerFrame::PositionChildViews(floatFrame);

--- a/layout/generic/BlockReflowInput.h
+++ b/layout/generic/BlockReflowInput.h
@@ -249,17 +249,17 @@ public:
 
   nsPresContext* mPresContext;
 
   const ReflowInput& mReflowInput;
 
   // The coordinates within the float manager where the block is being
   // placed <b>after</b> taking into account the blocks border and
   // padding. This, therefore, represents the inner "content area" (in
-  // spacemanager coordinates) where child frames will be placed,
+  // float manager coordinates) where child frames will be placed,
   // including child blocks and floats.
   nscoord mFloatManagerI, mFloatManagerB;
 
   // XXX get rid of this
   nsReflowStatus mReflowStatus;
 
   // The float manager state as it was before the contents of this
   // block.  This is needed for positioning bullets, since we only want

--- a/layout/generic/nsBlockFrame.cpp
+++ b/layout/generic/nsBlockFrame.cpp
@@ -4047,17 +4047,17 @@ nsBlockFrame::DoReflowInlineFrames(Block
     // See the analogous code for blocks in BlockReflowInput::ClearFloats.
     nscoord bandBSize = aFloatAvailableSpace.mRect.BSize(outerWM);
     if (bandBSize > 0 ||
         NS_UNCONSTRAINEDSIZE == aState.mReflowInput.AvailableBSize()) {
       NS_ASSERTION(bandBSize == 0 || aFloatAvailableSpace.HasFloats(),
                    "redo line on totally empty line with non-empty band...");
       // We should never hit this case if we've placed floats on the
       // line; if we have, then the GetFloatAvailableSpace call is wrong
-      // and needs to happen after the caller pops the space manager
+      // and needs to happen after the caller pops the float manager
       // state.
       aState.FloatManager()->AssertStateMatches(aFloatStateBeforeLine);
 
       if (!aFloatAvailableSpace.MayWiden() && bandBSize > 0) {
         // Move it down far enough to clear the current band.
         aState.mBCoord += bandBSize;
       } else {
         // Move it down by one dev pixel.
@@ -6514,17 +6514,17 @@ nsBlockFrame::RecoverFloatsFor(nsIFrame*
                                nsFloatManager& aFloatManager,
                                WritingMode     aWM,
                                const nsSize&   aContainerSize)
 {
   MOZ_ASSERT(aFrame, "null frame");
 
   // Only blocks have floats
   nsBlockFrame* block = nsLayoutUtils::GetAsBlock(aFrame);
-  // Don't recover any state inside a block that has its own space manager
+  // Don't recover any state inside a block that has its own float manager
   // (we don't currently have any blocks like this, though, thanks to our
   // use of extra frames for 'overflow')
   if (block && !nsBlockFrame::BlockNeedsFloatManager(block)) {
     // If the element is relatively positioned, then adjust x and y
     // accordingly so that we consider relatively positioned frames
     // at their original position.
 
     LogicalRect rect(aWM, block->GetNormalRect(), aContainerSize);

--- a/layout/generic/nsLineLayout.cpp
+++ b/layout/generic/nsLineLayout.cpp
@@ -897,17 +897,17 @@ nsLineLayout::ReflowFrame(nsIFrame* aFra
   // to lazily initialize its (possibly-percent-valued) intrinsic size.)
   if (mGotLineBox && IsPercentageAware(aFrame)) {
     mLineBox->DisableResizeReflowOptimization();
   }
 
   // Note that we don't bother positioning the frame yet, because we're probably
   // going to end up moving it when we do the block-direction alignment.
 
-  // Adjust spacemanager coordinate system for the frame.
+  // Adjust float manager coordinate system for the frame.
   ReflowOutput reflowOutput(lineWM);
 #ifdef DEBUG
   reflowOutput.ISize(lineWM) = nscoord(0xdeadbeef);
   reflowOutput.BSize(lineWM) = nscoord(0xdeadbeef);
 #endif
   nscoord tI = pfd->mBounds.LineLeft(lineWM, ContainerSize());
   nscoord tB = pfd->mBounds.BStart(lineWM);
   mFloatManager->Translate(tI, tB);