--- a/dom/base/nsRange.cpp
+++ b/dom/base/nsRange.cpp
@@ -1297,17 +1297,17 @@ nsRange::SetStartAfter(nsINode& aNode, E
   if (!nsContentUtils::LegacyIsCallerNativeCode() &&
       !nsContentUtils::CanCallerAccess(&aNode)) {
     aRv.Throw(NS_ERROR_DOM_SECURITY_ERR);
     return;
   }
 
   AutoInvalidateSelection atEndOfBlock(this);
   int32_t offset = -1;
-  nsINode* parent = GetParentAndOffsetAfter(&aNode, &offset);
+  nsINode* parent = GetContainerAndOffsetAfter(&aNode, &offset);
   aRv = SetStart(parent, offset);
 }
 
 NS_IMETHODIMP
 nsRange::SetStartAfter(nsIDOMNode* aSibling)
 {
   nsCOMPtr<nsINode> sibling = do_QueryInterface(aSibling);
   if (!sibling) {
@@ -1487,17 +1487,17 @@ nsRange::SetEndAfter(nsINode& aNode, Err
   if (!nsContentUtils::LegacyIsCallerNativeCode() &&
       !nsContentUtils::CanCallerAccess(&aNode)) {
     aRv.Throw(NS_ERROR_DOM_SECURITY_ERR);
     return;
   }
 
   AutoInvalidateSelection atEndOfBlock(this);
   int32_t offset = -1;
-  nsINode* parent = GetParentAndOffsetAfter(&aNode, &offset);
+  nsINode* parent = GetContainerAndOffsetAfter(&aNode, &offset);
   aRv = SetEnd(parent, offset);
 }
 
 NS_IMETHODIMP
 nsRange::SetEndAfter(nsIDOMNode* aSibling)
 {
   nsCOMPtr<nsINode> sibling = do_QueryInterface(aSibling);
   if (!sibling) {

--- a/dom/base/nsRange.h
+++ b/dom/base/nsRange.h
@@ -172,17 +172,17 @@ public:
   {
     return SetStartAndEnd(aParent, aOffset, aParent, aOffset);
   }
 
   /**
    * Retrieves node and offset for setting start or end of a range to
    * before or after aNode.
    */
-  static nsINode* GetParentAndOffsetAfter(nsINode* aNode, int32_t* aOffset)
+  static nsINode* GetContainerAndOffsetAfter(nsINode* aNode, int32_t* aOffset)
   {
     MOZ_ASSERT(aNode);
     MOZ_ASSERT(aOffset);
     nsINode* parentNode = aNode->GetParentNode();
     *aOffset = parentNode ? parentNode->IndexOf(aNode) : -1;
     if (*aOffset >= 0) {
       (*aOffset)++;
     }

--- a/extensions/spellcheck/src/mozInlineSpellChecker.cpp
+++ b/extensions/spellcheck/src/mozInlineSpellChecker.cpp
@@ -1212,17 +1212,17 @@ mozInlineSpellChecker::MakeSpellCheckRan
   nsCOMPtr<nsINode> endNode = do_QueryInterface(aEndNode);
   if (aEndOffset) {
     rv = range->SetStartAndEnd(startNode, aStartOffset, endNode, aEndOffset);
     if (NS_WARN_IF(NS_FAILED(rv))) {
       return rv;
     }
   } else {
     int32_t endOffset = -1;
-    endNode = nsRange::GetParentAndOffsetAfter(endNode, &endOffset);
+    endNode = nsRange::GetContainerAndOffsetAfter(endNode, &endOffset);
     rv = range->SetStartAndEnd(startNode, aStartOffset, endNode, endOffset);
     if (NS_WARN_IF(NS_FAILED(rv))) {
       return rv;
     }
   }
 
   range.swap(*aRange);
   return NS_OK;