diff --git a/src/nu/validator/htmlparser/impl/ElementName.java b/src/nu/validator/htmlparser/impl/ElementName.java
index f0a1076a..2d09c338 100644
--- a/src/nu/validator/htmlparser/impl/ElementName.java
+++ b/src/nu/validator/htmlparser/impl/ElementName.java
@@ -845,10 +845,6 @@ public void destructor() {
 // CPPONLY: NS_NewHTMLUnknownElement,
 // CPPONLY: NS_NewSVGUnknownElement,
 TreeBuilder.LINK_OR_BASEFONT_OR_BGSOUND | SPECIAL);
-public static final ElementName DISCARD = new ElementName("discard", "discard",
-// CPPONLY: NS_NewHTMLUnknownElement,
-// CPPONLY: NS_NewSVGDiscardElement,
-TreeBuilder.OTHER);
 public static final ElementName EMBED = new ElementName("embed", "embed",
 // CPPONLY: NS_NewHTMLEmbedElement,
 // CPPONLY: NS_NewSVGUnknownElement,
@@ -1486,31 +1482,31 @@ public void destructor() {
 // CPPONLY: NS_NewSVGUnknownElement,
 TreeBuilder.TBODY_OR_THEAD_OR_TFOOT | SPECIAL | FOSTER_PARENTING | OPTIONAL_END_TAG);
 private final static @NoLength ElementName[] ELEMENT_NAMES = {
-CAPTION,
-CIRCLE,
+FIGCAPTION,
+CITE,
 FRAMESET,
 H1,
-ALTGLYPH,
-MARKER,
+CLIPPATH,
+METER,
 RADIALGRADIENT,
 B,
 BGSOUND,
-PICTURE,
-TRACK,
-HGROUP,
+SOURCE,
+DL,
+RP,
 NOFRAMES,
 MTEXT,
 VIEW,
 DIV,
 G,
 FEFUNCA,
-TD,
-FRAME,
-ALTGLYPHDEF,
-SWITCH,
-ALTGLYPHITEM,
-SPAN,
-CENTER,
+THEAD,
+FIGURE,
+GLYPHREF,
+TEXTPATH,
+ANIMATETRANSFORM,
+SECTION,
+HR,
 CANVAS,
 BASEFONT,
 FEDISTANTLIGHT,
@@ -1523,20 +1519,20 @@ public void destructor() {
 P,
 H5,
 FEFUNCB,
-FEFLOOD,
-ANIMATE,
-FEMERGENODE,
-IFRAME,
-TABLE,
-FEDIFFUSELIGHTING,
-MPATH,
-LINK,
-LABEL,
-FORM,
-MAIN,
-MO,
-STOP,
-FILTER,
+HEAD,
+BASE,
+FEIMAGE,
+LINE,
+TITLE,
+FESPECULARLIGHTING,
+PATH,
+MARK,
+UL,
+PARAM,
+OPTION,
+VIDEO,
+BR,
+FOOTER,
 TR,
 DETAILS,
 DT,
@@ -1561,34 +1557,34 @@ public void destructor() {
 AREA,
 META,
 DESC,
-EMBED,
-LEGEND,
-ASIDE,
-BLOCKQUOTE,
-ELLIPSE,
-FEMERGE,
-FECOMPOSITE,
-MARQUEE,
-STRIKE,
-TIME,
-DIALOG,
-LISTING,
-MGLYPH,
-TH,
-LI,
-MALIGNMARK,
-HTML,
-SMALL,
-ACRONYM,
-ANIMATEMOTION,
-MN,
-POLYGON,
-TSPAN,
-COLGROUP,
-OPTGROUP,
-ABBR,
-FEFUNCR,
-FEGAUSSIANBLUR,
+FEBLEND,
+NOEMBED,
+ARTICLE,
+CODE,
+FETURBULENCE,
+FETILE,
+IMAGE,
+POLYLINE,
+STYLE,
+TEMPLATE,
+FEFUNCG,
+STRONG,
+MATH,
+SEARCH,
+MI,
+MASK,
+OL,
+SYMBOL,
+EM,
+BUTTON,
+KEYGEN,
+PATTERN,
+AUDIO,
+FEDISPLACEMENTMAP,
+SAMP,
+ANIMATECOLOR,
+FECOMPONENTTRANSFER,
+HEADER,
 NOBR,
 ADDRESS,
 DEFS,
@@ -1637,90 +1633,89 @@ public void destructor() {
 TEXTAREA,
 RB,
 DD,
-DISCARD,
-FEBLEND,
-HEAD,
-NOEMBED,
-THEAD,
-ARTICLE,
-BASE,
-CODE,
-CITE,
-FETURBULENCE,
-FEIMAGE,
-FETILE,
-FIGURE,
-IMAGE,
-LINE,
-POLYLINE,
-SOURCE,
-STYLE,
-TITLE,
-TEMPLATE,
-GLYPHREF,
-FEFUNCG,
-FESPECULARLIGHTING,
-STRONG,
-CLIPPATH,
-MATH,
-PATH,
-SEARCH,
-TEXTPATH,
-MI,
-MARK,
-MASK,
-DL,
-OL,
-UL,
-SYMBOL,
-ANIMATETRANSFORM,
-EM,
-PARAM,
-BUTTON,
-FIGCAPTION,
-KEYGEN,
-OPTION,
-PATTERN,
-SECTION,
-AUDIO,
-VIDEO,
-FEDISPLACEMENTMAP,
-RP,
-SAMP,
-BR,
-ANIMATECOLOR,
-HR,
-FECOMPONENTTRANSFER,
-FOOTER,
-HEADER,
-METER,
+EMBED,
+FEFLOOD,
+LEGEND,
+TD,
+ASIDE,
+ANIMATE,
+BLOCKQUOTE,
+CIRCLE,
+ELLIPSE,
+FEMERGENODE,
+FEMERGE,
+FRAME,
+FECOMPOSITE,
+IFRAME,
+MARQUEE,
+PICTURE,
+STRIKE,
+TABLE,
+TIME,
+ALTGLYPHDEF,
+DIALOG,
+FEDIFFUSELIGHTING,
+LISTING,
+ALTGLYPH,
+MGLYPH,
+MPATH,
+TH,
+SWITCH,
+LI,
+LINK,
+MALIGNMARK,
+TRACK,
+HTML,
+LABEL,
+SMALL,
+ALTGLYPHITEM,
+ACRONYM,
+FORM,
+ANIMATEMOTION,
+CAPTION,
+MN,
+MAIN,
+POLYGON,
+SPAN,
+TSPAN,
+MO,
+COLGROUP,
+HGROUP,
+OPTGROUP,
+STOP,
+ABBR,
+CENTER,
+FEFUNCR,
+FILTER,
+FEGAUSSIANBLUR,
+MARKER,
 };
 private final static int[] ELEMENT_HASHES = {
-1899272519,
-1748225318,
+1900845386,
+1748359220,
 2001349720,
 876609538,
-1797585096,
-1971461414,
+1798686984,
+1971465813,
 2007781534,
 59768833,
 1730965751,
-1755148615,
-1857653029,
-1935549734,
+1756474198,
+1864368130,
+1938817026,
 1988763672,
 2005324101,
 2060065124,
 52490899,
 62390273,
 1682547543,
-1738539010,
-1749813541,
-1763839627,
-1806806678,
-1881288348,
-1907435316,
-1966223078,
+1740181637,
+1749905526,
+1766992520,
+1807599880,
+1881498736,
+1907661127,
+1967128578,
 1982935782,
 1999397992,
 2001392798,
@@ -1733,20 +1728,20 @@ public void destructor() {
 67108865,
 943718402,
 1699324759,
-1733076167,
-1747306711,
-1749673195,
-1751386406,
-1757137429,
-1783388497,
-1803929861,
-1853642948,
-1870268949,
-1884120164,
-1904412884,
-1919418370,
-1941221172,
-1967795910,
+1733890180,
+1747814436,
+1749715159,
+1752979652,
+1757146773,
+1783388498,
+1805502724,
+1854228692,
+1873281026,
+1889085973,
+1905563974,
+1925844629,
+1963982850,
+1967795958,
 1973420034,
 1983633431,
 1998585858,
@@ -1771,34 +1766,34 @@ public void destructor() {
 1679960596,
 1686491348,
 1715310660,
-1732381397,
-1736200310,
-1747048757,
-1747838298,
-1749395095,
-1749723735,
-1749932347,
-1753362711,
-1756600614,
-1757157700,
-1782357526,
-1786534215,
-1803876550,
-1805647874,
-1818230786,
-1854228698,
-1868312196,
-1874053333,
-1881613047,
-1898223949,
-1902641154,
-1906087319,
-1907959605,
-1932928296,
-1939219752,
-1965115924,
-1967760215,
-1968053806,
+1733054663,
+1737099991,
+1747176599,
+1748100148,
+1749656156,
+1749801286,
+1751288021,
+1755076808,
+1756625221,
+1757268168,
+1783210839,
+1790207270,
+1803929812,
+1806805526,
+1818755074,
+1854245076,
+1870135298,
+1874102998,
+1881669634,
+1898753862,
+1903302038,
+1906135367,
+1914900309,
+1934172497,
+1941178676,
+1965334268,
+1967788867,
+1968836118,
 1971938532,
 1982173479,
 1983533124,
@@ -1847,62 +1842,61 @@ public void destructor() {
 1689922072,
 1703936002,
 1730150402,
-1732069431,
-1733054663,
-1733890180,
-1737099991,
-1740181637,
-1747176599,
-1747814436,
-1748100148,
-1748359220,
-1749656156,
-1749715159,
-1749801286,
-1749905526,
-1751288021,
-1752979652,
-1755076808,
-1756474198,
-1756625221,
-1757146773,
-1757268168,
-1766992520,
-1783210839,
-1783388498,
-1790207270,
-1798686984,
-1803929812,
-1805502724,
-1806805526,
-1807599880,
-1818755074,
-1854228692,
-1854245076,
-1864368130,
-1870135298,
-1873281026,
-1874102998,
-1881498736,
-1881669634,
-1889085973,
-1898753862,
-1900845386,
-1903302038,
-1905563974,
-1906135367,
-1907661127,
-1914900309,
-1925844629,
-1934172497,
-1938817026,
-1941178676,
-1963982850,
-1965334268,
-1967128578,
-1967788867,
-1967795958,
-1968836118,
-1971465813,
+1732381397,
+1733076167,
+1736200310,
+1738539010,
+1747048757,
+1747306711,
+1747838298,
+1748225318,
+1749395095,
+1749673195,
+1749723735,
+1749813541,
+1749932347,
+1751386406,
+1753362711,
+1755148615,
+1756600614,
+1757137429,
+1757157700,
+1763839627,
+1782357526,
+1783388497,
+1786534215,
+1797585096,
+1803876550,
+1803929861,
+1805647874,
+1806806678,
+1818230786,
+1853642948,
+1854228698,
+1857653029,
+1868312196,
+1870268949,
+1874053333,
+1881288348,
+1881613047,
+1884120164,
+1898223949,
+1899272519,
+1902641154,
+1904412884,
+1906087319,
+1907435316,
+1907959605,
+1919418370,
+1932928296,
+1935549734,
+1939219752,
+1941221172,
+1965115924,
+1966223078,
+1967760215,
+1967795910,
+1968053806,
+1971461414,
 };
 }