diff --git a/mozilla/htmlparser/public/nsHTMLTagList.h b/mozilla/htmlparser/public/nsHTMLTagList.h
index 152cf272847..967afb04909 100644
--- a/mozilla/htmlparser/public/nsHTMLTagList.h
+++ b/mozilla/htmlparser/public/nsHTMLTagList.h
@@ -71,7 +71,7 @@ HTML_TAG(address, Span)
 HTML_TAG(applet, Applet)
 HTML_TAG(area, Area)
 HTML_TAG(b, Span)
-HTML_TAG(base, Base)
+HTML_TAG(base, SharedLeaf)
 HTML_TAG(basefont, BaseFont)
 HTML_TAG(bdo, Span)
 HTML_TAG(bgsound, Span)
@@ -86,7 +86,7 @@ HTML_TAG(center, Span)
 HTML_TAG(cite, Span)
 HTML_TAG(code, Span)
 HTML_TAG(col, TableCol)
-HTML_TAG(colgroup, TableColGroup)
+HTML_TAG(colgroup, TableCol)
 HTML_TAG(counter, Span)
 HTML_TAG(dd, Span)
 HTML_TAG(del, Del)
@@ -96,7 +96,7 @@ HTML_TAG(div, Div)
 HTML_TAG(dl, DList)
 HTML_TAG(dt, Span)
 HTML_TAG(em, Span)
-HTML_TAG(embed, Embed)
+HTML_TAG(embed, SharedLeaf)
 HTML_TAG(endnote, Span)
 HTML_TAG(fieldset, FieldSet)
 HTML_TAG(font, Font)
@@ -118,7 +118,7 @@ HTML_TAG(image, Span)
 HTML_TAG(img, Image)
 HTML_TAG(input, NOTUSED)
 HTML_TAG(ins, Ins)
-HTML_TAG(isindex, IsIndex)
+HTML_TAG(isindex, SharedLeaf)
 HTML_TAG(kbd, Span)
 HTML_TAG(keygen, Span)
 HTML_TAG(label, Label)
@@ -140,7 +140,7 @@ HTML_TAG(ol, OList)
 HTML_TAG(optgroup, OptGroup)
 HTML_TAG(option, Option)
 HTML_TAG(p, Paragraph)
-HTML_TAG(param, Param)
+HTML_TAG(param, SharedLeaf)
 HTML_TAG(parsererror, Div)
 HTML_TAG(plaintext, Span)
 HTML_TAG(pre, Pre)
@@ -153,7 +153,7 @@ HTML_TAG(server, Span)
 HTML_TAG(small, Span)
 HTML_TAG(sound, Span)
 HTML_TAG(sourcetext, Div)
-HTML_TAG(spacer, Spacer)
+HTML_TAG(spacer, SharedLeaf)
 HTML_TAG(span, Span)
 HTML_TAG(strike, Span)
 HTML_TAG(strong, Span)
@@ -173,7 +173,7 @@ HTML_TAG(tt, Span)
 HTML_TAG(u, Span)
 HTML_TAG(ul, UList)
 HTML_TAG(var, Span)
-HTML_TAG(wbr, WBR)
+HTML_TAG(wbr, SharedLeaf)
 HTML_TAG(xmp, Span)
 
 
diff --git a/mozilla/parser/htmlparser/public/nsHTMLTagList.h b/mozilla/parser/htmlparser/public/nsHTMLTagList.h
index 152cf272847..967afb04909 100644
--- a/mozilla/parser/htmlparser/public/nsHTMLTagList.h
+++ b/mozilla/parser/htmlparser/public/nsHTMLTagList.h
@@ -71,7 +71,7 @@ HTML_TAG(address, Span)
 HTML_TAG(applet, Applet)
 HTML_TAG(area, Area)
 HTML_TAG(b, Span)
-HTML_TAG(base, Base)
+HTML_TAG(base, SharedLeaf)
 HTML_TAG(basefont, BaseFont)
 HTML_TAG(bdo, Span)
 HTML_TAG(bgsound, Span)
@@ -86,7 +86,7 @@ HTML_TAG(center, Span)
 HTML_TAG(cite, Span)
 HTML_TAG(code, Span)
 HTML_TAG(col, TableCol)
-HTML_TAG(colgroup, TableColGroup)
+HTML_TAG(colgroup, TableCol)
 HTML_TAG(counter, Span)
 HTML_TAG(dd, Span)
 HTML_TAG(del, Del)
@@ -96,7 +96,7 @@ HTML_TAG(div, Div)
 HTML_TAG(dl, DList)
 HTML_TAG(dt, Span)
 HTML_TAG(em, Span)
-HTML_TAG(embed, Embed)
+HTML_TAG(embed, SharedLeaf)
 HTML_TAG(endnote, Span)
 HTML_TAG(fieldset, FieldSet)
 HTML_TAG(font, Font)
@@ -118,7 +118,7 @@ HTML_TAG(image, Span)
 HTML_TAG(img, Image)
 HTML_TAG(input, NOTUSED)
 HTML_TAG(ins, Ins)
-HTML_TAG(isindex, IsIndex)
+HTML_TAG(isindex, SharedLeaf)
 HTML_TAG(kbd, Span)
 HTML_TAG(keygen, Span)
 HTML_TAG(label, Label)
@@ -140,7 +140,7 @@ HTML_TAG(ol, OList)
 HTML_TAG(optgroup, OptGroup)
 HTML_TAG(option, Option)
 HTML_TAG(p, Paragraph)
-HTML_TAG(param, Param)
+HTML_TAG(param, SharedLeaf)
 HTML_TAG(parsererror, Div)
 HTML_TAG(plaintext, Span)
 HTML_TAG(pre, Pre)
@@ -153,7 +153,7 @@ HTML_TAG(server, Span)
 HTML_TAG(small, Span)
 HTML_TAG(sound, Span)
 HTML_TAG(sourcetext, Div)
-HTML_TAG(spacer, Spacer)
+HTML_TAG(spacer, SharedLeaf)
 HTML_TAG(span, Span)
 HTML_TAG(strike, Span)
 HTML_TAG(strong, Span)
@@ -173,7 +173,7 @@ HTML_TAG(tt, Span)
 HTML_TAG(u, Span)
 HTML_TAG(ul, UList)
 HTML_TAG(var, Span)
-HTML_TAG(wbr, WBR)
+HTML_TAG(wbr, SharedLeaf)
 HTML_TAG(xmp, Span)