diff --git a/mozilla/content/html/content/src/nsGenericHTMLElement.cpp b/mozilla/content/html/content/src/nsGenericHTMLElement.cpp
index 484d1f0603a..5c15aa74225 100644
--- a/mozilla/content/html/content/src/nsGenericHTMLElement.cpp
+++ b/mozilla/content/html/content/src/nsGenericHTMLElement.cpp
@@ -443,18 +443,18 @@ nsGenericHTMLElement::GetNodeName(nsString& aNodeName)
   mNodeInfo->GetPrefix(aNodeName);
   if (aNodeName.Length()) {
     aNodeName.Append(PRUnichar(':'));
+
+    nsAutoString tmp;
+    mNodeInfo->GetName(tmp);
+
+    tmp.ToUpperCase();
+
+    aNodeName.Append(tmp);
   }
 #else
-  aNodeName.Truncate();
+  mNodeInfo->GetName(aNodeName);
 #endif
 
-  nsCOMPtr<nsIAtom> atom;
-  mNodeInfo->GetNameAtom(*getter_AddRefs(atom));
-
-  atom->ToString(aNodeName);
-
-  aNodeName.ToUpperCase();
-
   return NS_OK;
 }
 
diff --git a/mozilla/layout/html/content/src/nsGenericHTMLElement.cpp b/mozilla/layout/html/content/src/nsGenericHTMLElement.cpp
index 484d1f0603a..5c15aa74225 100644
--- a/mozilla/layout/html/content/src/nsGenericHTMLElement.cpp
+++ b/mozilla/layout/html/content/src/nsGenericHTMLElement.cpp
@@ -443,18 +443,18 @@ nsGenericHTMLElement::GetNodeName(nsString& aNodeName)
   mNodeInfo->GetPrefix(aNodeName);
   if (aNodeName.Length()) {
     aNodeName.Append(PRUnichar(':'));
+
+    nsAutoString tmp;
+    mNodeInfo->GetName(tmp);
+
+    tmp.ToUpperCase();
+
+    aNodeName.Append(tmp);
   }
 #else
-  aNodeName.Truncate();
+  mNodeInfo->GetName(aNodeName);
 #endif
 
-  nsCOMPtr<nsIAtom> atom;
-  mNodeInfo->GetNameAtom(*getter_AddRefs(atom));
-
-  atom->ToString(aNodeName);
-
-  aNodeName.ToUpperCase();
-
   return NS_OK;
 }