diff --git a/mozilla/layout/generic/nsHTMLParts.h b/mozilla/layout/generic/nsHTMLParts.h
index 2177f6cfb4c..886a065c64e 100644
--- a/mozilla/layout/generic/nsHTMLParts.h
+++ b/mozilla/layout/generic/nsHTMLParts.h
@@ -368,41 +368,6 @@ extern nsresult NS_NewHTMLContentSink(nsIHTMLContentSink** aInstancePtrResult,
                                       nsIURL* aURL,
                                       nsIWebShell* aWebShell);
 
-/** Create a new table content object <TABLE> */
-extern nsresult
-NS_NewTablePart(nsIHTMLContent** aInstancePtrResult,
-               nsIAtom* aTag);
-
-/** Create a new table row group object <THEAD> <TBODY> <TFOOT> */
-extern nsresult
-NS_NewTableRowGroupPart(nsIHTMLContent** aInstancePtrResult,
-                        nsIAtom* aTag);
-
-/** Create a new table row content object <TR> */
-extern nsresult
-NS_NewTableRowPart(nsIHTMLContent** aInstancePtrResult,
-               nsIAtom* aTag);
-
-/** Create a new table column group content object <COLGROUP> */
-extern nsresult
-NS_NewTableColGroupPart(nsIHTMLContent** aInstancePtrResult,
-                        nsIAtom* aTag);
-
-/** Create a new table column content object <COL> */
-extern nsresult
-NS_NewTableColPart(nsIHTMLContent** aInstancePtrResult,
-                   nsIAtom* aTag); 
-
-/** Create a new table cell content object <TD> */
-extern nsresult
-NS_NewTableCellPart(nsIHTMLContent** aInstancePtrResult,
-                    nsIAtom* aTag);
-
-/** Create a new table caption content object <CAPTION> */
-extern nsresult
-NS_NewTableCaptionPart(nsIHTMLContent** aInstancePtrResult,
-                       nsIAtom* aTag);
-
 extern nsresult
 NS_NewHTMLEmbed(nsIHTMLContent** aInstancePtrResult,
                 nsIAtom* aTag);
diff --git a/mozilla/layout/html/base/src/nsHTMLParts.h b/mozilla/layout/html/base/src/nsHTMLParts.h
index 2177f6cfb4c..886a065c64e 100644
--- a/mozilla/layout/html/base/src/nsHTMLParts.h
+++ b/mozilla/layout/html/base/src/nsHTMLParts.h
@@ -368,41 +368,6 @@ extern nsresult NS_NewHTMLContentSink(nsIHTMLContentSink** aInstancePtrResult,
                                       nsIURL* aURL,
                                       nsIWebShell* aWebShell);
 
-/** Create a new table content object <TABLE> */
-extern nsresult
-NS_NewTablePart(nsIHTMLContent** aInstancePtrResult,
-               nsIAtom* aTag);
-
-/** Create a new table row group object <THEAD> <TBODY> <TFOOT> */
-extern nsresult
-NS_NewTableRowGroupPart(nsIHTMLContent** aInstancePtrResult,
-                        nsIAtom* aTag);
-
-/** Create a new table row content object <TR> */
-extern nsresult
-NS_NewTableRowPart(nsIHTMLContent** aInstancePtrResult,
-               nsIAtom* aTag);
-
-/** Create a new table column group content object <COLGROUP> */
-extern nsresult
-NS_NewTableColGroupPart(nsIHTMLContent** aInstancePtrResult,
-                        nsIAtom* aTag);
-
-/** Create a new table column content object <COL> */
-extern nsresult
-NS_NewTableColPart(nsIHTMLContent** aInstancePtrResult,
-                   nsIAtom* aTag); 
-
-/** Create a new table cell content object <TD> */
-extern nsresult
-NS_NewTableCellPart(nsIHTMLContent** aInstancePtrResult,
-                    nsIAtom* aTag);
-
-/** Create a new table caption content object <CAPTION> */
-extern nsresult
-NS_NewTableCaptionPart(nsIHTMLContent** aInstancePtrResult,
-                       nsIAtom* aTag);
-
 extern nsresult
 NS_NewHTMLEmbed(nsIHTMLContent** aInstancePtrResult,
                 nsIAtom* aTag);
diff --git a/mozilla/layout/html/document/src/nsHTMLParts.cpp b/mozilla/layout/html/document/src/nsHTMLParts.cpp
index d3de66a6859..a4120eb2450 100644
--- a/mozilla/layout/html/document/src/nsHTMLParts.cpp
+++ b/mozilla/layout/html/document/src/nsHTMLParts.cpp
@@ -134,20 +134,23 @@ NS_CreateHTMLElement(nsIHTMLContent** aInstancePtrResult,
     rv = NS_NewHTMLSpacer(aInstancePtrResult, atom);
     break;
   case eHTMLTag_table:
-    rv = NS_NewTablePart(aInstancePtrResult, atom);
+    rv = NS_NewHTMLTableElement(aInstancePtrResult, atom);
     break;
   case eHTMLTag_tbody:
   case eHTMLTag_tfoot:
   case eHTMLTag_thead:
-    rv = NS_NewTableRowGroupPart(aInstancePtrResult, atom);
+    rv = NS_NewHTMLTableSectionElement(aInstancePtrResult, atom);
     break;
   case eHTMLTag_td:
   case eHTMLTag_th:
-    rv = NS_NewTableCellPart(aInstancePtrResult, atom);
+    rv = NS_NewHTMLTableCellElement(aInstancePtrResult, atom);
     break;
   case eHTMLTag_tr:
-    rv = NS_NewTableRowPart(aInstancePtrResult, atom);
+    rv = NS_NewHTMLTableRowElement(aInstancePtrResult, atom);
     break;
+  case eHTMLTag_caption:
+    rv = NS_NewHTMLTableCaptionElement(aInstancePtrResult, atom);
+      break;
   case eHTMLTag_wbr:
     rv = NS_NewHTMLWordBreak(aInstancePtrResult, atom);
     break;