changeset 58398:5e0d9f0b1029

8240916: Convert to using hyphenated naming for CSS classes Reviewed-by: hannesw
author jjg
date Fri, 13 Mar 2020 10:57:41 -0700
parents 3ac1c2ef94e2
children dc1cf3a5d7db
files make/jdk/src/classes/build/tools/taglet/ModuleGraph.java src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SourceToHTMLConverter.java src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlStyle.java src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlTree.java src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/Table.java src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/stylesheet.css test/langtools/jdk/javadoc/doclet/AccessSkipNav/AccessSkipNav.java test/langtools/jdk/javadoc/doclet/constantValues/TestConstantValuesDriver.java test/langtools/jdk/javadoc/doclet/testAbstractMethod/TestAbstractMethod.java test/langtools/jdk/javadoc/doclet/testAnchorNames/TestAnchorNames.java test/langtools/jdk/javadoc/doclet/testAnnotationTypes/TestAnnotationTypes.java test/langtools/jdk/javadoc/doclet/testClassCrossReferences/TestClassCrossReferences.java test/langtools/jdk/javadoc/doclet/testClassLinks/TestClassLinks.java test/langtools/jdk/javadoc/doclet/testClassTree/TestClassTree.java test/langtools/jdk/javadoc/doclet/testDeprecatedDocs/TestDeprecatedDocs.java test/langtools/jdk/javadoc/doclet/testDocRootInlineTag/TestDocRootInlineTag.java test/langtools/jdk/javadoc/doclet/testExternalOverriddenMethod/TestExternalOverriddenMethod.java test/langtools/jdk/javadoc/doclet/testGroupName/TestGroupName.java test/langtools/jdk/javadoc/doclet/testHeadings/TestHeadings.java test/langtools/jdk/javadoc/doclet/testHiddenTag/TestHiddenTag.java test/langtools/jdk/javadoc/doclet/testHref/TestHref.java test/langtools/jdk/javadoc/doclet/testHtmlDefinitionListTag/TestHtmlDefinitionListTag.java test/langtools/jdk/javadoc/doclet/testHtmlLandmarkRegions/TestHtmlLandmarkRegions.java test/langtools/jdk/javadoc/doclet/testHtmlTableStyles/TestHtmlTableStyles.java test/langtools/jdk/javadoc/doclet/testHtmlTableTags/TestHtmlTableTags.java test/langtools/jdk/javadoc/doclet/testHtmlTag/TestHtmlTag.java test/langtools/jdk/javadoc/doclet/testHtmlVersion/TestHtmlVersion.java test/langtools/jdk/javadoc/doclet/testIndentation/TestIndentation.java test/langtools/jdk/javadoc/doclet/testIndex/TestIndex.java test/langtools/jdk/javadoc/doclet/testIndexInDocFiles/TestIndexInDocFiles.java test/langtools/jdk/javadoc/doclet/testIndexInPackageFiles/TestIndexInPackageFiles.java test/langtools/jdk/javadoc/doclet/testIndexTaglet/TestIndexTaglet.java test/langtools/jdk/javadoc/doclet/testInterface/TestInterface.java test/langtools/jdk/javadoc/doclet/testJavaFX/TestJavaFX.java test/langtools/jdk/javadoc/doclet/testLambdaFeature/TestLambdaFeature.java test/langtools/jdk/javadoc/doclet/testLinkOption/TestLinkOption.java test/langtools/jdk/javadoc/doclet/testLinkOption/TestLinkOptionWithAutomaticModule.java test/langtools/jdk/javadoc/doclet/testLinkOption/TestLinkOptionWithModule.java test/langtools/jdk/javadoc/doclet/testLinkOption/TestOptionOrder.java test/langtools/jdk/javadoc/doclet/testLinkOption/TestRedirectLinks.java test/langtools/jdk/javadoc/doclet/testLinkToSerialForm/TestLinkToSerialForm.java test/langtools/jdk/javadoc/doclet/testLinksWithNoDeprecatedOption/TestLinksWithNoDeprecatedOption.java test/langtools/jdk/javadoc/doclet/testLiteralCodeInPre/TestLiteralCodeInPre.java test/langtools/jdk/javadoc/doclet/testMemberInheritance/TestMemberInheritance.java test/langtools/jdk/javadoc/doclet/testMemberSummary/TestMemberSummary.java test/langtools/jdk/javadoc/doclet/testMethodSignature/TestMethodSignature.java test/langtools/jdk/javadoc/doclet/testMethodTypes/TestMethodTypes.java test/langtools/jdk/javadoc/doclet/testModifierEx/TestModifierEx.java test/langtools/jdk/javadoc/doclet/testModules/TestIndirectExportsOpens.java test/langtools/jdk/javadoc/doclet/testModules/TestModulePackages.java test/langtools/jdk/javadoc/doclet/testModules/TestModuleServices.java test/langtools/jdk/javadoc/doclet/testModules/TestModules.java test/langtools/jdk/javadoc/doclet/testNavigation/TestNavigation.java test/langtools/jdk/javadoc/doclet/testNewLanguageFeatures/TestNewLanguageFeatures.java test/langtools/jdk/javadoc/doclet/testOptions/TestOptions.java test/langtools/jdk/javadoc/doclet/testOrdering/TestOrdering.java test/langtools/jdk/javadoc/doclet/testOverriddenMethods/TestBadOverride.java test/langtools/jdk/javadoc/doclet/testOverriddenMethods/TestOverriddenDeprecatedMethods.java test/langtools/jdk/javadoc/doclet/testOverriddenMethods/TestOverriddenMethodDocCopy.java test/langtools/jdk/javadoc/doclet/testOverriddenMethods/TestOverrideMethods.java test/langtools/jdk/javadoc/doclet/testPackageAnnotation/TestPackageAnnotation.java test/langtools/jdk/javadoc/doclet/testPackageDeprecation/TestPackageDeprecation.java test/langtools/jdk/javadoc/doclet/testPackageDescription/TestPackageDescription.java test/langtools/jdk/javadoc/doclet/testPackagePage/TestPackagePage.java test/langtools/jdk/javadoc/doclet/testPackageSummary/TestPackageSummary.java test/langtools/jdk/javadoc/doclet/testPrivateClasses/TestPrivateClasses.java test/langtools/jdk/javadoc/doclet/testProperty/TestProperty.java test/langtools/jdk/javadoc/doclet/testRecordTypes/TestRecordTypes.java test/langtools/jdk/javadoc/doclet/testSearch/TestSearch.java test/langtools/jdk/javadoc/doclet/testSerializedForm/TestSerializedForm.java test/langtools/jdk/javadoc/doclet/testSerializedFormDeprecationInfo/TestSerializedFormDeprecationInfo.java test/langtools/jdk/javadoc/doclet/testSerializedFormWithClassFile/TestSerializedFormWithClassFile.java test/langtools/jdk/javadoc/doclet/testStylesheet/TestStylesheet.java test/langtools/jdk/javadoc/doclet/testSubTitle/TestSubTitle.java test/langtools/jdk/javadoc/doclet/testSummaryTag/TestSummaryTag.java test/langtools/jdk/javadoc/doclet/testSystemPropertyPage/TestSystemPropertyPage.java test/langtools/jdk/javadoc/doclet/testSystemPropertyTaglet/TestSystemPropertyTaglet.java test/langtools/jdk/javadoc/doclet/testTagOutput/TestTagOutput.java test/langtools/jdk/javadoc/doclet/testTitleInHref/TestTitleInHref.java test/langtools/jdk/javadoc/doclet/testTypeAnnotations/TestTypeAnnotations.java test/langtools/jdk/javadoc/doclet/testTypeParams/TestTypeParameters.java test/langtools/jdk/javadoc/doclet/testUnnamedPackage/TestUnnamedPackage.java test/langtools/jdk/javadoc/doclet/testUseOption/TestUseOption.java test/langtools/jdk/javadoc/doclet/testValueTag/TestValueTagInModule.java test/langtools/jdk/javadoc/tool/testLocaleOption/TestLocaleOption.java
diffstat 85 files changed, 2076 insertions(+), 2052 deletions(-) [+]
line wrap: on
line diff
--- a/make/jdk/src/classes/build/tools/taglet/ModuleGraph.java	Fri Mar 13 18:43:11 2020 +0100
+++ b/make/jdk/src/classes/build/tools/taglet/ModuleGraph.java	Fri Mar 13 10:57:41 2020 -0700
@@ -75,7 +75,7 @@
         }
         return "<dt>Module Graph:</dt>"
             + "<dd>"
-            + "<a class=moduleGraph href=\"" + imageFile + "\">"
+            + "<a class=\"module-graph\" href=\"" + imageFile + "\">"
             + getImage(moduleName, imageFile, thumbnailHeight, false)
             + hoverImage
             + "</a>"
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SourceToHTMLConverter.java	Fri Mar 13 18:43:11 2020 +0100
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SourceToHTMLConverter.java	Fri Mar 13 10:57:41 2020 -0700
@@ -287,7 +287,7 @@
      * @return the header content for the HTML file
      */
     private static Content getHeader() {
-        return new HtmlTree(HtmlTag.BODY).put(HtmlAttr.CLASS, "source");
+        return new HtmlTree(HtmlTag.BODY).setStyle(HtmlStyle.source);
     }
 
     /**
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlStyle.java	Fri Mar 13 18:43:11 2020 +0100
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlStyle.java	Fri Mar 13 10:57:41 2020 -0700
@@ -25,8 +25,11 @@
 
 package jdk.javadoc.internal.doclets.formats.html.markup;
 
+import java.util.Locale;
+import java.util.regex.Pattern;
+
 /**
- * Enum representing HTML styles. The name map to values in the CSS file.
+ * Enum representing HTML styles, with associated entries in the stylesheet files.
  *
  *  <p><b>This is NOT part of any supported API.
  *  If you write code that depends on this, you do so at your own risk.
@@ -118,6 +121,7 @@
     serializedClassDetails,
     servicesSummary,
     skipNav,
+    source,
     sourceContainer,
     sourceLineNo,
     subNav,
@@ -136,5 +140,25 @@
     typeSummary,
     useSummary,
     usesSummary,
-    verticalSeparator
+    verticalSeparator;
+
+    private final String cssName;
+
+    HtmlStyle() {
+        cssName = Pattern.compile("\\p{Upper}")
+                .matcher(toString())
+                .replaceAll(mr -> "-" + mr.group().toLowerCase(Locale.US));
+    }
+
+    HtmlStyle(String cssName) {
+        this.cssName = cssName;
+    }
+
+    /**
+     * Returns the CSS class name associated with this style.
+     * @return the CSS class name
+     */
+    public String cssName() {
+        return cssName;
+    }
 }
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlTree.java	Fri Mar 13 18:43:11 2020 +0100
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlTree.java	Fri Mar 13 10:57:41 2020 -0700
@@ -147,7 +147,7 @@
      * @return this object
      */
     public HtmlTree setStyle(HtmlStyle style) {
-        return put(HtmlAttr.CLASS, style.toString());
+        return put(HtmlAttr.CLASS, style.cssName());
     }
 
     /**
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/Table.java	Fri Mar 13 18:43:11 2020 +0100
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/Table.java	Fri Mar 13 10:57:41 2020 -0700
@@ -357,7 +357,7 @@
 
         if (stripedStyles != null) {
             int rowIndex = bodyRows.size();
-            row.put(HtmlAttr.CLASS, stripedStyles.get(rowIndex % 2).name());
+            row.setStyle(stripedStyles.get(rowIndex % 2));
         }
         int colIndex = 0;
         for (Content c : contents) {
@@ -444,7 +444,7 @@
                 }
             }
             HtmlTree tabpanel = new HtmlTree(HtmlTag.DIV)
-                    .put(HtmlAttr.ID, tableStyle + "_tabpanel")
+                    .put(HtmlAttr.ID, tableStyle.cssName() + "_tabpanel")
                     .put(HtmlAttr.ROLE, "tabpanel");
             table.add(getTableBody());
             tabpanel.add(table);
@@ -458,7 +458,7 @@
         HtmlTree tab = new HtmlTree(HtmlTag.BUTTON)
                 .put(HtmlAttr.ROLE, "tab")
                 .put(HtmlAttr.ARIA_SELECTED, defaultTab ? "true" : "false")
-                .put(HtmlAttr.ARIA_CONTROLS, tableStyle + "_tabpanel")
+                .put(HtmlAttr.ARIA_CONTROLS, tableStyle.cssName() + "_tabpanel")
                 .put(HtmlAttr.TABINDEX, defaultTab ? "0" : "-1")
                 .put(HtmlAttr.ONKEYDOWN, "switchTab(event)")
                 .put(HtmlAttr.ID, tabId)
@@ -543,7 +543,7 @@
 
     private void appendStyleInfo(StringBuilder sb, HtmlStyle... styles) {
         for (HtmlStyle style : styles) {
-            sb.append("var ").append(style).append(" = \"").append(style).append("\";\n");
+            sb.append("var ").append(style.name()).append(" = \"").append(style.cssName()).append("\";\n");
         }
 
     }
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/stylesheet.css	Fri Mar 13 18:43:11 2020 +0100
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/stylesheet.css	Fri Mar 13 10:57:41 2020 -0700
@@ -104,14 +104,14 @@
     height:0px;
     overflow:hidden;
 }
-.aboutLanguage {
+.about-language {
     float:right;
     padding:0px 21px;
     font-size:11px;
     z-index:200;
     margin-top:-9px;
 }
-.legalCopy {
+.legal-copy {
     margin-left:.5em;
 }
 .tab {
@@ -125,22 +125,22 @@
  * Styles for navigation bar.
  */
 @media screen {
-    .flexBox {
+    .flex-box {
         position:fixed;
         display:flex;
         flex-direction:column;
         height: 100%;
         width: 100%;
     }
-    .flexHeader {
+    .flex-header {
         flex: 0 0 auto;
     }
-    .flexContent {
+    .flex-content {
         flex: 1 1 auto;
         overflow-y: auto;
     }
 }
-.topNav {
+.top-nav {
     background-color:#4D7A97;
     color:#FFFFFF;
     float:left;
@@ -152,7 +152,7 @@
     overflow:hidden;
     font-size:12px;
 }
-.bottomNav {
+.bottom-nav {
     margin-top:10px;
     background-color:#4D7A97;
     color:#FFFFFF;
@@ -165,64 +165,64 @@
     overflow:hidden;
     font-size:12px;
 }
-.subNav {
+.sub-nav {
     background-color:#dee3e9;
     float:left;
     width:100%;
     overflow:hidden;
     font-size:12px;
 }
-.subNav div {
+.sub-nav div {
     clear:left;
     float:left;
     padding:0 0 5px 6px;
     text-transform:uppercase;
 }
-.subNav .navList {
+.sub-nav .nav-list {
     padding-top:5px;
 }
-ul.navList, ul.subNavList {
+ul.nav-list, ul.sub-nav-list {
     float:left;
     margin:0 25px 0 0;
     padding:0;
 }
-ul.navList li{
+ul.nav-list li{
     list-style:none;
     float:left;
     padding: 5px 6px;
     text-transform:uppercase;
 }
-.subNav .navListSearch {
+.sub-nav .nav-list-search {
     float:right;
     margin:0 0 0 0;
     padding:5px 6px;
     clear:none;
 }
-.navListSearch label {
+.nav-list-search label {
     position:relative;
     right:-16px;
 }
-ul.subNavList li {
+ul.sub-nav-list li {
     list-style:none;
     float:left;
     padding-top:10px;
 }
-.topNav a:link, .topNav a:active, .topNav a:visited, .bottomNav a:link, .bottomNav a:active, .bottomNav a:visited {
+.top-nav a:link, .top-nav a:active, .top-nav a:visited, .bottom-nav a:link, .bottom-nav a:active, .bottom-nav a:visited {
     color:#FFFFFF;
     text-decoration:none;
     text-transform:uppercase;
 }
-.topNav a:hover, .bottomNav a:hover {
+.top-nav a:hover, .bottom-nav a:hover {
     text-decoration:none;
     color:#bb7a2a;
     text-transform:uppercase;
 }
-.navBarCell1Rev {
+.nav-bar-cell1-rev {
     background-color:#F8981D;
     color:#253441;
     margin: auto 5px;
 }
-.skipNav {
+.skip-nav {
     position:absolute;
     top:auto;
     left:-9999px;
@@ -232,7 +232,7 @@
  * Hide navigation links and search box in print layout
  */
 @media print {
-    ul.navList, div.subNav  {
+    ul.nav-list, div.sub-nav  {
         display:none;
     }
 }
@@ -243,7 +243,7 @@
     color:#2c4557;
     margin:10px 0;
 }
-.subTitle {
+.sub-title {
     margin:5px 0 0 0;
 }
 .header ul {
@@ -260,14 +260,14 @@
 body.class-declaration .summary h2,
 body.class-declaration .details h2,
 body.class-use h2,
-body.module-declaration .blockList h2 {
+body.module-declaration .block-list h2 {
     font-style: italic;
     padding:0;
     margin:15px 0;
 }
 body.class-declaration .summary h3,
 body.class-declaration .details h3,
-body.class-declaration .summary .inheritedList h2 {
+body.class-declaration .summary .inherited-list h2 {
     background-color:#dee3e9;
     border:1px solid #d0d9e0;
     margin:0 0 6px -8px;
@@ -293,13 +293,13 @@
     font-size:14px;
     font-family:'DejaVu Serif', Georgia, "Times New Roman", Times, serif;
 }
-dl.nameValue > dt {
+dl.name-value > dt {
     margin-left:1px;
     font-size:1.1em;
     display:inline;
     font-weight:bold;
 }
-dl.nameValue > dd {
+dl.name-value > dd {
     margin:0 0 0 1px;
     font-size:1.1em;
     display:inline;
@@ -321,11 +321,11 @@
 div.inheritance div.inheritance {
     margin-left:2em;
 }
-ul.blockList {
+ul.block-list {
     margin:10px 0 10px 0;
     padding:0;
 }
-ul.blockList li.blockList {
+ul.block-list li.block-list {
     list-style:none;
     margin-bottom:15px;
     line-height:1.4;
@@ -337,22 +337,22 @@
 /*
  * Styles for tables.
  */
-.overviewSummary table, .memberSummary table, .typeSummary table, .useSummary table, .constantsSummary table, .deprecatedSummary table,
-.requiresSummary table, .packagesSummary table, .providesSummary table, .usesSummary table, .systemPropertiesSummary table {
+.overview-summary table, .member-summary table, .type-summary table, .use-summary table, .constants-summary table, .deprecated-summary table,
+.requires-summary table, .packages-summary table, .provides-summary table, .uses-summary table, .system-properties-summary table {
     width:100%;
     border-spacing:0;
     border-left:1px solid #EEE;
     border-right:1px solid #EEE;
     border-bottom:1px solid #EEE;
 }
-.overviewSummary table, .memberSummary table, .requiresSummary table, .packagesSummary table,
-.providesSummary table, .usesSummary table, .systemPropertiesSummary table {
+.overview-summary table, .member-summary table, .requires-summary table, .packages-summary table,
+.provides-summary table, .uses-summary table, .system-properties-summary table {
     padding:0px;
 }
-.overviewSummary caption, .memberSummary caption, .typeSummary caption,
-.useSummary caption, .constantsSummary caption, .deprecatedSummary caption,
-.requiresSummary caption, .packagesSummary caption, .providesSummary caption,
-.usesSummary caption, .systemPropertiesSummary caption {
+.overview-summary caption, .member-summary caption, .type-summary caption,
+.use-summary caption, .constants-summary caption, .deprecated-summary caption,
+.requires-summary caption, .packages-summary caption, .provides-summary caption,
+.uses-summary caption, .system-properties-summary caption {
     position:relative;
     text-align:left;
     background-repeat:no-repeat;
@@ -366,32 +366,32 @@
     margin:0px;
     white-space:pre;
 }
-.constantsSummary caption a:link, .constantsSummary caption a:visited,
-.useSummary caption a:link, .useSummary caption a:visited {
+.constants-summary caption a:link, .constants-summary caption a:visited,
+.use-summary caption a:link, .use-summary caption a:visited {
     color:#1f389c;
 }
-.overviewSummary caption a:link, .memberSummary caption a:link, .typeSummary caption a:link,
-.deprecatedSummary caption a:link,
-.requiresSummary caption a:link, .packagesSummary caption a:link, .providesSummary caption a:link,
-.usesSummary caption a:link,
-.overviewSummary caption a:hover, .memberSummary caption a:hover, .typeSummary caption a:hover,
-.useSummary caption a:hover, .constantsSummary caption a:hover, .deprecatedSummary caption a:hover,
-.requiresSummary caption a:hover, .packagesSummary caption a:hover, .providesSummary caption a:hover,
-.usesSummary caption a:hover,
-.overviewSummary caption a:active, .memberSummary caption a:active, .typeSummary caption a:active,
-.useSummary caption a:active, .constantsSummary caption a:active, .deprecatedSummary caption a:active,
-.requiresSummary caption a:active, .packagesSummary caption a:active, .providesSummary caption a:active,
-.usesSummary caption a:active,
-.overviewSummary caption a:visited, .memberSummary caption a:visited, .typeSummary caption a:visited,
-.deprecatedSummary caption a:visited,
-.requiresSummary caption a:visited, .packagesSummary caption a:visited, .providesSummary caption a:visited,
-.usesSummary caption a:visited {
+.overview-summary caption a:link, .member-summary caption a:link, .type-summary caption a:link,
+.deprecated-summary caption a:link,
+.requires-summary caption a:link, .packages-summary caption a:link, .provides-summary caption a:link,
+.uses-summary caption a:link,
+.overview-summary caption a:hover, .member-summary caption a:hover, .type-summary caption a:hover,
+.use-summary caption a:hover, .constants-summary caption a:hover, .deprecated-summary caption a:hover,
+.requires-summary caption a:hover, .packages-summary caption a:hover, .provides-summary caption a:hover,
+.uses-summary caption a:hover,
+.overview-summary caption a:active, .member-summary caption a:active, .type-summary caption a:active,
+.use-summary caption a:active, .constants-summary caption a:active, .deprecated-summary caption a:active,
+.requires-summary caption a:active, .packages-summary caption a:active, .provides-summary caption a:active,
+.uses-summary caption a:active,
+.overview-summary caption a:visited, .member-summary caption a:visited, .type-summary caption a:visited,
+.deprecated-summary caption a:visited,
+.requires-summary caption a:visited, .packages-summary caption a:visited, .provides-summary caption a:visited,
+.uses-summary caption a:visited {
     color:#FFFFFF;
 }
-.overviewSummary caption span, .memberSummary caption span, .typeSummary caption span,
-.useSummary caption span, .constantsSummary caption span, .deprecatedSummary caption span,
-.requiresSummary caption span, .packagesSummary caption span, .providesSummary caption span,
-.usesSummary caption span, .systemPropertiesSummary caption span {
+.overview-summary caption span, .member-summary caption span, .type-summary caption span,
+.use-summary caption span, .constants-summary caption span, .deprecated-summary caption span,
+.requires-summary caption span, .packages-summary caption span, .provides-summary caption span,
+.uses-summary caption span, .system-properties-summary caption span {
     white-space:nowrap;
     padding-top:5px;
     padding-left:12px;
@@ -403,102 +403,102 @@
     border: none;
     height:16px;
 }
-.overviewSummary .tabEnd, .memberSummary .tabEnd, .typeSummary .tabEnd,
-.useSummary .tabEnd, .constantsSummary .tabEnd, .deprecatedSummary .tabEnd,
-.requiresSummary .tabEnd, .packagesSummary .tabEnd, .providesSummary .tabEnd, .usesSummary .tabEnd {
+.overview-summary .tab-end, .member-summary .tab-end, .type-summary .tab-end,
+.use-summary .tab-end, .constants-summary .tab-end, .deprecated-summary .tab-end,
+.requires-summary .tab-end, .packages-summary .tab-end, .provides-summary .tab-end, .uses-summary .tab-end {
     display:none;
     width:5px;
     position:relative;
     float:left;
     background-color:#F8981D;
 }
-.overviewSummary [role=tablist] button, .memberSummary [role=tablist] button,
-.typeSummary [role=tablist] button, .packagesSummary [role=tablist] button {
+.overview-summary [role=tablist] button, .member-summary [role=tablist] button,
+.type-summary [role=tablist] button, .packages-summary [role=tablist] button {
    border: none;
    cursor: pointer;
    padding: 5px 12px 7px 12px;
    font-weight: bold;
    margin-right: 3px;
 }
-.overviewSummary [role=tablist] .activeTableTab, .memberSummary [role=tablist] .activeTableTab,
-.typeSummary [role=tablist] .activeTableTab, .packagesSummary [role=tablist] .activeTableTab {
+.overview-summary [role=tablist] .active-table-tab, .member-summary [role=tablist] .active-table-tab,
+.type-summary [role=tablist] .active-table-tab, .packages-summary [role=tablist] .active-table-tab {
    background: #F8981D;
    color: #253441;
 }
-.overviewSummary [role=tablist] .tableTab, .memberSummary [role=tablist] .tableTab,
-.typeSummary [role=tablist] .tableTab, .packagesSummary [role=tablist] .tableTab {
+.overview-summary [role=tablist] .table-tab, .member-summary [role=tablist] .table-tab,
+.type-summary [role=tablist] .table-tab, .packages-summary [role=tablist] .table-tab {
    background: #4D7A97;
    color: #FFFFFF;
 }
-.rowColor th, .altColor th {
+.row-color th, .alt-color th {
     font-weight:normal;
 }
-.overviewSummary td, .memberSummary td, .typeSummary td,
-.useSummary td, .constantsSummary td, .deprecatedSummary td,
-.requiresSummary td, .packagesSummary td, .providesSummary td,
-.usesSummary td, .systemPropertiesSummary td {
+.overview-summary td, .member-summary td, .type-summary td,
+.use-summary td, .constants-summary td, .deprecated-summary td,
+.requires-summary td, .packages-summary td, .provides-summary td,
+.uses-summary td, .system-properties-summary td {
     text-align:left;
     padding:0px 0px 12px 10px;
 }
-th.colFirst, th.colSecond, th.colLast, th.colConstructorName, th.colDeprecatedItemName, .useSummary th,
-.constantsSummary th, .packagesSummary th, td.colFirst, td.colSecond, td.colLast, .useSummary td,
-.constantsSummary td, .systemPropertiesSummary th {
+th.col-first, th.col-second, th.col-last, th.col-constructor-name, th.col-deprecated-item-name, .use-summary th,
+.constants-summary th, .packages-summary th, td.col-first, td.col-second, td.col-last, .use-summary td,
+.constants-summary td, .system-properties-summary th {
     vertical-align:top;
     padding-right:0px;
     padding-top:8px;
     padding-bottom:3px;
 }
-th.colFirst, th.colSecond, th.colLast, th.colConstructorName, th.colDeprecatedItemName, .constantsSummary th,
-.packagesSummary th {
+th.col-first, th.col-second, th.col-last, th.col-constructor-name, th.col-deprecated-item-name, .constants-summary th,
+.packages-summary th {
     background:#dee3e9;
     text-align:left;
     padding:8px 3px 3px 7px;
 }
-td.colFirst, th.colFirst {
+td.col-first, th.col-first {
     font-size:13px;
 }
-td.colSecond, th.colSecond, td.colLast, th.colConstructorName, th.colDeprecatedItemName, th.colLast {
+td.col-second, th.col-second, td.col-last, th.col-constructor-name, th.col-deprecated-item-name, th.col-last {
     font-size:13px;
 }
-.constantsSummary th, .packagesSummary th {
+.constants-summary th, .packages-summary th {
     font-size:13px;
 }
-.providesSummary th.colFirst, .providesSummary th.colLast, .providesSummary td.colFirst,
-.providesSummary td.colLast {
+.provides-summary th.col-first, .provides-summary th.col-last, .provides-summary td.col-first,
+.provides-summary td.col-last {
     white-space:normal;
     font-size:13px;
 }
-.overviewSummary td.colFirst, .overviewSummary th.colFirst,
-.requiresSummary td.colFirst, .requiresSummary th.colFirst,
-.packagesSummary td.colFirst, .packagesSummary td.colSecond, .packagesSummary th.colFirst, .packagesSummary th,
-.usesSummary td.colFirst, .usesSummary th.colFirst,
-.providesSummary td.colFirst, .providesSummary th.colFirst,
-.memberSummary td.colFirst, .memberSummary th.colFirst,
-.memberSummary td.colSecond, .memberSummary th.colSecond, .memberSummary th.colConstructorName,
-.typeSummary td.colFirst, .typeSummary th.colFirst {
+.overview-summary td.col-first, .overview-summary th.col-first,
+.requires-summary td.col-first, .requires-summary th.col-first,
+.packages-summary td.col-first, .packages-summary td.col-second, .packages-summary th.col-first, .packages-summary th,
+.uses-summary td.col-first, .uses-summary th.col-first,
+.provides-summary td.col-first, .provides-summary th.col-first,
+.member-summary td.col-first, .member-summary th.col-first,
+.member-summary td.col-second, .member-summary th.col-second, .member-summary th.col-constructor-name,
+.type-summary td.col-first, .type-summary th.col-first {
     vertical-align:top;
 }
-.packagesSummary th.colLast, .packagesSummary td.colLast {
+.packages-summary th.col-last, .packages-summary td.col-last {
     white-space:normal;
 }
-td.colFirst a:link, td.colFirst a:visited,
-td.colSecond a:link, td.colSecond a:visited,
-th.colFirst a:link, th.colFirst a:visited,
-th.colSecond a:link, th.colSecond a:visited,
-th.colConstructorName a:link, th.colConstructorName a:visited,
-th.colDeprecatedItemName a:link, th.colDeprecatedItemName a:visited,
-.constantValuesContainer td a:link, .constantValuesContainer td a:visited,
-.allClassesContainer td a:link, .allClassesContainer td a:visited,
-.allPackagesContainer td a:link, .allPackagesContainer td a:visited {
+td.col-first a:link, td.col-first a:visited,
+td.col-second a:link, td.col-second a:visited,
+th.col-first a:link, th.col-first a:visited,
+th.col-second a:link, th.col-second a:visited,
+th.col-constructor-name a:link, th.col-constructor-name a:visited,
+th.col-deprecated-item-name a:link, th.col-deprecated-item-name a:visited,
+.constant-values-container td a:link, .constant-values-container td a:visited,
+.all-classes-container td a:link, .all-classes-container td a:visited,
+.all-packages-container td a:link, .all-packages-container td a:visited {
     font-weight:bold;
 }
-.tableSubHeadingColor {
+.table-sub-heading-color {
     background-color:#EEEEFF;
 }
-.altColor, .altColor th {
+.alt-color, .alt-color th {
     background-color:#FFFFFF;
 }
-.rowColor, .rowColor th {
+.row-color, .row-color th {
     background-color:#EEEEEF;
 }
 /*
@@ -507,7 +507,7 @@
 .description pre {
     margin-top:0;
 }
-.deprecatedContent {
+.deprecated-content {
     margin:0;
     padding:10px 0;
 }
@@ -515,35 +515,35 @@
     font-size:14px;
     font-family:'DejaVu Serif', Georgia, "Times New Roman", Times, serif;
 }
-td.colLast div {
+td.col-last div {
     padding-top:0px;
 }
-td.colLast a {
+td.col-last a {
     padding-bottom:3px;
 }
-div.memberSignature {
+div.member-signature {
     font-family:'DejaVu Sans Mono', monospace;
     font-size:14px;
     margin:14px 0;
     white-space: pre-wrap;
 }
-div.memberSignature span.annotations {
+div.member-signature span.annotations {
     white-space: pre-wrap;
 }
-div.memberSignature span.typeParametersLong,
-div.memberSignature span.arguments,
-div.memberSignature span.exceptions {
+div.member-signature span.type-parameters-long,
+div.member-signature span.arguments,
+div.member-signature span.exceptions {
     display: inline-block;
     vertical-align: top;
     white-space: pre;
 }
-div.memberSignature span.typeParameters {
+div.member-signature span.type-parameters {
     white-space: normal;
 }
 /*
  * Styles for formatting effect.
  */
-.sourceLineNo {
+.source-line-no {
     color:green;
     padding:0 30px 0 0;
 }
@@ -557,15 +557,15 @@
     margin:0 10px 5px 0;
     color:#474747;
 }
-.deprecatedLabel, .descfrmTypeLabel, .implementationLabel, .memberNameLabel, .memberNameLink,
-.moduleLabelInPackage, .moduleLabelInType, .overrideSpecifyLabel, .packageLabelInType,
-.packageHierarchyLabel, .typeNameLabel, .typeNameLink, .searchTagLink {
+.deprecated-label, .descfrm-type-label, .implementation-label, .member-name-label, .member-name-link,
+.module-label-in-package, .module-label-in-type, .override-specify-label, .package-label-in-type,
+.package-hierarchy-label, .type-name-label, .type-name-link, .search-tag-link {
     font-weight:bold;
 }
-.deprecationComment, .emphasizedPhrase, .interfaceName {
+.deprecation-comment, .emphasized-phrase, .interface-name {
     font-style:italic;
 }
-.deprecationBlock {
+.deprecation-block {
     font-size:14px;
     font-family:'DejaVu Serif', Georgia, "Times New Roman", Times, serif;
     border-style:solid;
@@ -576,8 +576,8 @@
     margin-right:10px;
     display:inline-block;
 }
-div.block div.deprecationComment, div.block div.block span.emphasizedPhrase,
-div.block div.block span.interfaceName {
+div.block div.deprecation-comment, div.block div.block span.emphasized-phrase,
+div.block div.block span.interface-name {
     font-style:normal;
 }
 /*
@@ -596,7 +596,7 @@
     background-color:#4D7A97;
     color:#FFFFFF;
 }
-.resultItem {
+.result-item {
     font-size:13px;
 }
 .ui-autocomplete {
@@ -616,7 +616,7 @@
     clear:both;
     width:100%;
 }
-.resultHighlight {
+.result-highlight {
     font-weight:bold;
 }
 #search {
@@ -646,44 +646,44 @@
 .watermark {
     color:#545454;
 }
-.searchTagDescResult {
+.search-tag-desc-result {
     font-style:italic;
     font-size:11px;
 }
-.searchTagHolderResult {
+.search-tag-holder-result {
     font-style:italic;
     font-size:12px;
 }
-.searchTagResult:target {
+.search-tag-result:target {
     background-color:yellow;
 }
-.moduleGraph span {
+.module-graph span {
     display:none;
     position:absolute;
 }
-.moduleGraph:hover span {
+.module-graph:hover span {
     display:block;
     margin: -100px 0 0 100px;
     z-index: 1;
 }
-.inheritedList {
+.inherited-list {
     margin: 10px 0 10px 0;
 }
 section.description {
     line-height: 1.4;
 }
 .summary section[class$="Summary"], .details section[class$="Details"],
-.classUses .detail, .serializedClassDetails {
+.class-uses .detail, .serialized-class-details {
     padding: 0px 20px 5px 10px;
     border: 1px solid #ededed;
     background-color: #f8f8f8;
 }
-.inheritedList, section[class$="Details"] .detail {
+.inherited-list, section[class$="Details"] .detail {
     padding:0 0 5px 8px;
     background-color:#ffffff;
     border:none;
 }
-.verticalSeparator {
+.vertical-separator {
     padding: 0 5px;
 }
 /*
--- a/test/langtools/jdk/javadoc/doclet/AccessSkipNav/AccessSkipNav.java	Fri Mar 13 18:43:11 2020 +0100
+++ b/test/langtools/jdk/javadoc/doclet/AccessSkipNav/AccessSkipNav.java	Fri Mar 13 10:57:41 2020 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2020, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -52,13 +52,13 @@
                 // Top navbar <a href>
                 "<a href=\"#skip.navbar.top\" title=\"Skip navigation links\">Skip navigation links</a>",
                 // Top navbar <span id>
-                "<span class=\"skipNav\" id=\"skip.navbar.top\">\n"
+                "<span class=\"skip-nav\" id=\"skip.navbar.top\">\n"
                 + "<!--   -->\n"
                 + "</span>",
                 // Bottom navbar <a href>
                 "<a href=\"#skip.navbar.bottom\" title=\"Skip navigation links\">Skip navigation links</a>",
                 // Bottom navbar <span id>
-                "<span class=\"skipNav\" id=\"skip.navbar.bottom\">\n"
+                "<span class=\"skip-nav\" id=\"skip.navbar.bottom\">\n"
                 + "<!--   -->\n"
                 + "</span>");
     }
--- a/test/langtools/jdk/javadoc/doclet/constantValues/TestConstantValuesDriver.java	Fri Mar 13 18:43:11 2020 +0100
+++ b/test/langtools/jdk/javadoc/doclet/constantValues/TestConstantValuesDriver.java	Fri Mar 13 10:57:41 2020 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2020, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -54,30 +54,30 @@
                 "TEST4PASSES",
                 "<code>\"&lt;Hello World&gt;\"</code>",
                 "<code id=\"TestConstantValues.BYTE_MAX_VALUE\">public&nbsp;static&nbsp;final&nbsp;byte</code></td>\n" +
-                    "<th class=\"colSecond\" scope=\"row\"><code><a href=\"TestConstantValues.html#BYTE_MAX_VALUE\">" +
+                    "<th class=\"col-second\" scope=\"row\"><code><a href=\"TestConstantValues.html#BYTE_MAX_VALUE\">" +
                     "BYTE_MAX_VALUE</a></code></th>\n" +
-                    "<td class=\"colLast\"><code>127</code></td>",
+                    "<td class=\"col-last\"><code>127</code></td>",
                 "<code id=\"TestConstantValues.BYTE_MIN_VALUE\">public&nbsp;static&nbsp;final&nbsp;byte</code></td>\n" +
-                    "<th class=\"colSecond\" scope=\"row\"><code><a href=\"TestConstantValues.html#BYTE_MIN_VALUE\">" +
+                    "<th class=\"col-second\" scope=\"row\"><code><a href=\"TestConstantValues.html#BYTE_MIN_VALUE\">" +
                     "BYTE_MIN_VALUE</a></code></th>\n" +
-                    "<td class=\"colLast\"><code>-127</code></td>",
+                    "<td class=\"col-last\"><code>-127</code></td>",
                 "<code id=\"TestConstantValues.CHAR_MAX_VALUE\">public&nbsp;static&nbsp;final&nbsp;char</code></td>\n" +
-                    "<th class=\"colSecond\" scope=\"row\"><code><a href=\"TestConstantValues.html#CHAR_MAX_VALUE\">" +
+                    "<th class=\"col-second\" scope=\"row\"><code><a href=\"TestConstantValues.html#CHAR_MAX_VALUE\">" +
                     "CHAR_MAX_VALUE</a></code></th>\n" +
-                    "<td class=\"colLast\"><code>65535</code></td>",
+                    "<td class=\"col-last\"><code>65535</code></td>",
                 "<code id=\"TestConstantValues.DOUBLE_MAX_VALUE\">public&nbsp;static&nbsp;final&nbsp;double</code></td>",
-                    "<th class=\"colSecond\" scope=\"row\"><code><a href=\"TestConstantValues.html#DOUBLE_MAX_VALUE\">" +
+                    "<th class=\"col-second\" scope=\"row\"><code><a href=\"TestConstantValues.html#DOUBLE_MAX_VALUE\">" +
                     "DOUBLE_MAX_VALUE</a></code></th>\n" +
-                    "<td class=\"colLast\"><code>1.7976931348623157E308</code></td>",
+                    "<td class=\"col-last\"><code>1.7976931348623157E308</code></td>",
                 "<code id=\"TestConstantValues.DOUBLE_MIN_VALUE\">public&nbsp;static&nbsp;final&nbsp;double</code></td>\n" +
-                    "<th class=\"colSecond\" scope=\"row\"><code><a href=\"TestConstantValues.html#DOUBLE_MIN_VALUE\">" +
+                    "<th class=\"col-second\" scope=\"row\"><code><a href=\"TestConstantValues.html#DOUBLE_MIN_VALUE\">" +
                     "DOUBLE_MIN_VALUE</a></code></th>",
                 "<code id=\"TestConstantValues.GOODBYE\">public&nbsp;static&nbsp;final&nbsp;boolean</code></td>\n" +
-                    "<th class=\"colSecond\" scope=\"row\"><code><a href=\"TestConstantValues.html#GOODBYE\">" +
+                    "<th class=\"col-second\" scope=\"row\"><code><a href=\"TestConstantValues.html#GOODBYE\">" +
                     "GOODBYE</a></code></th>",
                 "<code id=\"TestConstantValues.HELLO\">public&nbsp;static&nbsp;final&nbsp;boolean</code></td>\n" +
-                    "<th class=\"colSecond\" scope=\"row\"><code><a href=\"TestConstantValues.html#HELLO\">HELLO</a></code></th>\n" +
-                    "<td class=\"colLast\"><code>true</code></td>"
+                    "<th class=\"col-second\" scope=\"row\"><code><a href=\"TestConstantValues.html#HELLO\">HELLO</a></code></th>\n" +
+                    "<td class=\"col-last\"><code>true</code></td>"
         );
     }
 }
--- a/test/langtools/jdk/javadoc/doclet/testAbstractMethod/TestAbstractMethod.java	Fri Mar 13 18:43:11 2020 +0100
+++ b/test/langtools/jdk/javadoc/doclet/testAbstractMethod/TestAbstractMethod.java	Fri Mar 13 10:57:41 2020 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2020, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -49,62 +49,62 @@
         checkExit(Exit.OK);
 
         checkOutput("pkg/A.html", true,
-                "<td class=\"colFirst\"><code>default void</code></td>",
+                "<td class=\"col-first\"><code>default void</code></td>",
                 "<div role=\"tablist\" aria-orientation=\"horizontal\"><button role=\"tab\" "
-                + "aria-selected=\"true\" aria-controls=\"memberSummary_tabpanel\" tabindex=\"0\""
-                + " onkeydown=\"switchTab(event)\" id=\"t0\" class=\"activeTableTab\">All Methods"
+                + "aria-selected=\"true\" aria-controls=\"member-summary_tabpanel\" tabindex=\"0\""
+                + " onkeydown=\"switchTab(event)\" id=\"t0\" class=\"active-table-tab\">All Methods"
                 + "</button><button role=\"tab\" aria-selected=\"false\""
-                + " aria-controls=\"memberSummary_tabpanel\" tabindex=\"-1\" "
-                + "onkeydown=\"switchTab(event)\" id=\"t2\" class=\"tableTab\""
+                + " aria-controls=\"member-summary_tabpanel\" tabindex=\"-1\" "
+                + "onkeydown=\"switchTab(event)\" id=\"t2\" class=\"table-tab\""
                 + " onclick=\"show(2);\">Instance Methods</button><button role=\"tab\""
-                + " aria-selected=\"false\" aria-controls=\"memberSummary_tabpanel\" tabindex=\"-1\""
-                + " onkeydown=\"switchTab(event)\" id=\"t3\" class=\"tableTab\" onclick=\"show(4);\">"
+                + " aria-selected=\"false\" aria-controls=\"member-summary_tabpanel\" tabindex=\"-1\""
+                + " onkeydown=\"switchTab(event)\" id=\"t3\" class=\"table-tab\" onclick=\"show(4);\">"
                 + "Abstract Methods</button><button role=\"tab\" aria-selected=\"false\""
-                + " aria-controls=\"memberSummary_tabpanel\" tabindex=\"-1\""
-                + " onkeydown=\"switchTab(event)\" id=\"t5\" class=\"tableTab\" onclick=\"show(16);\">"
+                + " aria-controls=\"member-summary_tabpanel\" tabindex=\"-1\""
+                + " onkeydown=\"switchTab(event)\" id=\"t5\" class=\"table-tab\" onclick=\"show(16);\">"
                 + "Default Methods</button></div>");
 
         checkOutput("pkg/B.html", true,
                 "<div role=\"tablist\" aria-orientation=\"horizontal\"><button role=\"tab\""
-                + " aria-selected=\"true\" aria-controls=\"memberSummary_tabpanel\" tabindex=\"0\""
-                + " onkeydown=\"switchTab(event)\" id=\"t0\" class=\"activeTableTab\">All Methods"
+                + " aria-selected=\"true\" aria-controls=\"member-summary_tabpanel\" tabindex=\"0\""
+                + " onkeydown=\"switchTab(event)\" id=\"t0\" class=\"active-table-tab\">All Methods"
                 + "</button><button role=\"tab\" aria-selected=\"false\""
-                + " aria-controls=\"memberSummary_tabpanel\" tabindex=\"-1\""
-                + " onkeydown=\"switchTab(event)\" id=\"t2\" class=\"tableTab\" onclick=\"show(2);\">"
+                + " aria-controls=\"member-summary_tabpanel\" tabindex=\"-1\""
+                + " onkeydown=\"switchTab(event)\" id=\"t2\" class=\"table-tab\" onclick=\"show(2);\">"
                 + "Instance Methods</button><button role=\"tab\" aria-selected=\"false\""
-                + " aria-controls=\"memberSummary_tabpanel\" tabindex=\"-1\""
-                + " onkeydown=\"switchTab(event)\" id=\"t3\" class=\"tableTab\" onclick=\"show(4);\">"
+                + " aria-controls=\"member-summary_tabpanel\" tabindex=\"-1\""
+                + " onkeydown=\"switchTab(event)\" id=\"t3\" class=\"table-tab\" onclick=\"show(4);\">"
                 + "Abstract Methods</button><button role=\"tab\" aria-selected=\"false\""
-                + " aria-controls=\"memberSummary_tabpanel\" tabindex=\"-1\""
-                + " onkeydown=\"switchTab(event)\" id=\"t4\" class=\"tableTab\""
+                + " aria-controls=\"member-summary_tabpanel\" tabindex=\"-1\""
+                + " onkeydown=\"switchTab(event)\" id=\"t4\" class=\"table-tab\""
                 + " onclick=\"show(8);\">Concrete Methods</button></div>",
-                "<td class=\"colFirst\"><code>abstract void</code></td>");
+                "<td class=\"col-first\"><code>abstract void</code></td>");
 
         checkOutput("pkg/C.html", true,
                 "<div role=\"tablist\" aria-orientation=\"horizontal\"><button role=\"tab\""
-                + " aria-selected=\"true\" aria-controls=\"memberSummary_tabpanel\" tabindex=\"0\""
-                + " onkeydown=\"switchTab(event)\" id=\"t0\" class=\"activeTableTab\">All Methods"
+                + " aria-selected=\"true\" aria-controls=\"member-summary_tabpanel\" tabindex=\"0\""
+                + " onkeydown=\"switchTab(event)\" id=\"t0\" class=\"active-table-tab\">All Methods"
                 + "</button><button role=\"tab\" aria-selected=\"false\""
-                + " aria-controls=\"memberSummary_tabpanel\" tabindex=\"-1\""
-                + " onkeydown=\"switchTab(event)\" id=\"t2\" class=\"tableTab\" onclick=\"show(2);\">"
+                + " aria-controls=\"member-summary_tabpanel\" tabindex=\"-1\""
+                + " onkeydown=\"switchTab(event)\" id=\"t2\" class=\"table-tab\" onclick=\"show(2);\">"
                 + "Instance Methods</button><button role=\"tab\" aria-selected=\"false\""
-                + " aria-controls=\"memberSummary_tabpanel\" tabindex=\"-1\""
-                + " onkeydown=\"switchTab(event)\" id=\"t5\" class=\"tableTab\" onclick=\"show(16);\">"
+                + " aria-controls=\"member-summary_tabpanel\" tabindex=\"-1\""
+                + " onkeydown=\"switchTab(event)\" id=\"t5\" class=\"table-tab\" onclick=\"show(16);\">"
                 + "Default Methods</button></div>");
 
         checkOutput("pkg/A.html", false,
-                "<td class=\"colFirst\"><code>abstract void</code></td>");
+                "<td class=\"col-first\"><code>abstract void</code></td>");
 
         checkOutput("pkg/B.html", false,
-                "<button role=\"tab\" aria-selected=\"false\" aria-controls=\"memberSummary_tabpanel\""
-                + " tabindex=\"-1\" onkeydown=\"switchTab(event)\" id=\"t5\" class=\"tableTab\""
+                "<button role=\"tab\" aria-selected=\"false\" aria-controls=\"member-summary_tabpanel\""
+                + " tabindex=\"-1\" onkeydown=\"switchTab(event)\" id=\"t5\" class=\"table-tab\""
                 + " onclick=\"show(16);\">Default Methods</button>",
-                "<td class=\"colFirst\"><code>default void</code></td>");
+                "<td class=\"col-first\"><code>default void</code></td>");
 
         checkOutput("pkg/C.html", false,
-                "<button role=\"tab\" aria-selected=\"false\" aria-controls=\"memberSummary_tabpanel\""
-                + " tabindex=\"-1\" onkeydown=\"switchTab(event)\" id=\"t3\" class=\"tableTab\""
+                "<button role=\"tab\" aria-selected=\"false\" aria-controls=\"member-summary_tabpanel\""
+                + " tabindex=\"-1\" onkeydown=\"switchTab(event)\" id=\"t3\" class=\"table-tab\""
                 + " onclick=\"show(4);\">Abstract Methods</button>"
-                + "<span class=\"tabEnd\">&nbsp;</span>");
+                + "<span class=\"tab-end\">&nbsp;</span>");
     }
 }
--- a/test/langtools/jdk/javadoc/doclet/testAnchorNames/TestAnchorNames.java	Fri Mar 13 18:43:11 2020 +0100
+++ b/test/langtools/jdk/javadoc/doclet/testAnchorNames/TestAnchorNames.java	Fri Mar 13 10:57:41 2020 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2020, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -61,18 +61,18 @@
 
         // Test some section markers and links to these markers
         checkOutput("pkg1/RegClass.html", true,
-                "<span class=\"skipNav\" id=\"skip.navbar.top\">",
+                "<span class=\"skip-nav\" id=\"skip.navbar.top\">",
                 "<a href=\"#skip.navbar.top\" title=\"Skip navigation links\">",
-                "<section class=\"nestedClassSummary\" id=\"nested.class.summary\">\n"
+                "<section class=\"nested-class-summary\" id=\"nested.class.summary\">\n"
                 + "<h2>Nested Class Summary</h2>",
                 "<a href=\"#nested.class.summary\">",
-                "<section class=\"methodSummary\" id=\"method.summary\">\n"
+                "<section class=\"method-summary\" id=\"method.summary\">\n"
                 + "<h2>Method Summary</h2>",
                 "<a href=\"#method.summary\">",
-                "<section class=\"fieldDetails\" id=\"field.detail\">\n"
+                "<section class=\"field-details\" id=\"field.detail\">\n"
                 + "<h2>Field Details</h2>",
                 "<a href=\"#field.detail\">",
-                "<section class=\"constructorDetails\" id=\"constructor.detail\">\n"
+                "<section class=\"constructor-details\" id=\"constructor.detail\">\n"
                 + "<h2>Constructor Details</h2>",
                 "<a href=\"#constructor.detail\">");
 
@@ -155,7 +155,7 @@
         // Test serialized form page
         checkOutput("serialized-form.html", true,
                 //This is the marker for the link that appears in the pkg1.RegClass.html page
-                "<section class=\"serializedClassDetails\" id=\"pkg1.RegClass\">");
+                "<section class=\"serialized-class-details\" id=\"pkg1.RegClass\">");
 
         // Test member name index page
         checkOutput("index-all.html", true,
--- a/test/langtools/jdk/javadoc/doclet/testAnnotationTypes/TestAnnotationTypes.java	Fri Mar 13 18:43:11 2020 +0100
+++ b/test/langtools/jdk/javadoc/doclet/testAnnotationTypes/TestAnnotationTypes.java	Fri Mar 13 10:57:41 2020 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2020, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -57,14 +57,14 @@
                 + "field.detail\">Field</a>&nbsp;|&nbsp;</li>",
                 "<!-- =========== ANNOTATION TYPE FIELD SUMMARY =========== -->",
                 "<h2>Field Summary</h2>",
-                "<th class=\"colSecond\" scope=\"row\"><code><span class=\"memberNameLink\"><a href=\"#DEFAULT_NAME\">DEFAULT_NAME</a></span>"
+                "<th class=\"col-second\" scope=\"row\"><code><span class=\"member-name-link\"><a href=\"#DEFAULT_NAME\">DEFAULT_NAME</a></span>"
                 + "</code></th>",
                 "<!-- ============ ANNOTATION TYPE FIELD DETAIL =========== -->",
                 "<section class=\"detail\" id=\"DEFAULT_NAME\">\n"
                 + "<h3>DEFAULT_NAME</h3>\n"
-                + "<div class=\"memberSignature\"><span class=\"modifiers\">static final</span>&nbsp;"
-                + "<span class=\"returnType\">java.lang.String</span>&nbsp;"
-                + "<span class=\"memberName\">DEFAULT_NAME</span></div>\n");
+                + "<div class=\"member-signature\"><span class=\"modifiers\">static final</span>&nbsp;"
+                + "<span class=\"return-type\">java.lang.String</span>&nbsp;"
+                + "<span class=\"member-name\">DEFAULT_NAME</span></div>\n");
 
         checkOutput("pkg/AnnotationType.html", true,
                 "<li>Summary:&nbsp;</li>\n"
@@ -74,18 +74,18 @@
 
         checkOutput("pkg/AnnotationType.html", true,
                     "<!-- ============ ANNOTATION TYPE MEMBER DETAIL =========== -->",
-                    "<ul class=\"blockList\">",
-                    "<li class=\"blockList\">",
+                    "<ul class=\"block-list\">",
+                    "<li class=\"block-list\">",
                     "<section class=\"details\" id=\"annotation.type.element.detail\">",
                     "<h2>Element Details</h2>",
                     "<!--   -->",
                     "</a>",
-                    "<ul class=\"blockList\">",
-                    "<li class=\"blockList\">",
+                    "<ul class=\"block-list\">",
+                    "<li class=\"block-list\">",
                     "<section class=\"detail\" id=\"value()\">",
                     "<h3>value</h3>\n",
-                    "<div class=\"memberSignature\"><span class=\"returnType\">int</span>"
-                    + "&nbsp;<span class=\"memberName\">value</span></div>");
+                    "<div class=\"member-signature\"><span class=\"return-type\">int</span>"
+                    + "&nbsp;<span class=\"member-name\">value</span></div>");
 
         checkOutput("pkg/AnnotationType.html", false,
                 "<HR>\n\n"
--- a/test/langtools/jdk/javadoc/doclet/testClassCrossReferences/TestClassCrossReferences.java	Fri Mar 13 18:43:11 2020 +0100
+++ b/test/langtools/jdk/javadoc/doclet/testClassCrossReferences/TestClassCrossReferences.java	Fri Mar 13 10:57:41 2020 -0700
@@ -54,16 +54,16 @@
         checkExit(Exit.OK);
 
         checkOutput("C.html", true,
-                "<a href=\"" + uri + "java/math/package-summary.html\" class=\"externalLink\">"
+                "<a href=\"" + uri + "java/math/package-summary.html\" class=\"external-link\">"
                 + "<code>Link to math package</code></a>",
                 "<a href=\"" + uri + "javax/swing/text/AbstractDocument.AttributeContext.html\" "
-                + "title=\"class or interface in javax.swing.text\" class=\"externalLink\"><code>Link to AttributeContext innerclass</code></a>",
+                + "title=\"class or interface in javax.swing.text\" class=\"external-link\"><code>Link to AttributeContext innerclass</code></a>",
                 "<a href=\"" + uri + "java/math/BigDecimal.html\" "
-                + "title=\"class or interface in java.math\" class=\"externalLink\"><code>Link to external class BigDecimal</code></a>",
+                + "title=\"class or interface in java.math\" class=\"external-link\"><code>Link to external class BigDecimal</code></a>",
                 "<a href=\"" + uri + "java/math/BigInteger.html#gcd(java.math.BigInteger)\" "
-                + "title=\"class or interface in java.math\" class=\"externalLink\"><code>Link to external member gcd</code></a>",
+                + "title=\"class or interface in java.math\" class=\"external-link\"><code>Link to external member gcd</code></a>",
                 "<a href=\"" + uri + "javax/tools/SimpleJavaFileObject.html#uri\" "
-                + "title=\"class or interface in javax.tools\" class=\"externalLink\"><code>Link to external member URI</code></a>",
+                + "title=\"class or interface in javax.tools\" class=\"external-link\"><code>Link to external member URI</code></a>",
                 "<dl class=\"notes\">\n"
                 + "<dt>Overrides:</dt>\n"
                 + "<dd><code>toString</code>&nbsp;in class&nbsp;<code>java.lang.Object</code></dd>\n"
--- a/test/langtools/jdk/javadoc/doclet/testClassLinks/TestClassLinks.java	Fri Mar 13 18:43:11 2020 +0100
+++ b/test/langtools/jdk/javadoc/doclet/testClassLinks/TestClassLinks.java	Fri Mar 13 10:57:41 2020 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2020, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -53,11 +53,11 @@
 
         checkOutput("p/C1.html", true,
                 "<code><a href=\"C2.html\" title=\"class in p\">C2</a></code>",
-                "<code><span class=\"memberNameLink\"><a href=\"#%3Cinit%3E()\">C1</a></span>()</code>");
+                "<code><span class=\"member-name-link\"><a href=\"#%3Cinit%3E()\">C1</a></span>()</code>");
 
         checkOutput("p/C2.html", true,
                 "<code><a href=\"C3.html\" title=\"class in p\">C3</a></code>",
-                "<code><span class=\"memberNameLink\"><a href=\"#%3Cinit%3E()\">C2</a></span>()</code>");
+                "<code><span class=\"member-name-link\"><a href=\"#%3Cinit%3E()\">C2</a></span>()</code>");
 
         checkOutput("p/C3.html", true,
                 "<code><a href=\"I1.html\" title=\"interface in p\">I1</a></code>, "
@@ -65,7 +65,7 @@
                 + "<code><a href=\"I2.html\" title=\"interface in p\">I2</a></code>, "
                 + "<code><a href=\"IT1.html\" title=\"interface in p\">IT1</a>&lt;T&gt;</code>, "
                 + "<code><a href=\"IT2.html\" title=\"interface in p\">IT2</a>&lt;java.lang.String&gt;</code>",
-                "<code><span class=\"memberNameLink\"><a href=\"#%3Cinit%3E()\">C3</a></span>()</code>");
+                "<code><span class=\"member-name-link\"><a href=\"#%3Cinit%3E()\">C3</a></span>()</code>");
 
         checkOutput("p/I1.html", true,
                 "<code><a href=\"C3.html\" title=\"class in p\">C3</a></code>",
--- a/test/langtools/jdk/javadoc/doclet/testClassTree/TestClassTree.java	Fri Mar 13 18:43:11 2020 +0100
+++ b/test/langtools/jdk/javadoc/doclet/testClassTree/TestClassTree.java	Fri Mar 13 10:57:41 2020 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2020, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -53,11 +53,11 @@
         checkOutput("pkg/package-tree.html", true,
                 "<ul>\n"
                 + "<li class=\"circle\">pkg.<a href=\"ParentClass.html\" "
-                + "title=\"class in pkg\"><span class=\"typeNameLink\">ParentClass</span></a>",
+                + "title=\"class in pkg\"><span class=\"type-name-link\">ParentClass</span></a>",
                 "<h2 title=\"Annotation Type Hierarchy\">Annotation Type Hierarchy</h2>\n"
                 + "<ul>\n"
                 + "<li class=\"circle\">pkg.<a href=\"AnnotationType.html\" "
-                + "title=\"annotation in pkg\"><span class=\"typeNameLink\">AnnotationType</span></a> "
+                + "title=\"annotation in pkg\"><span class=\"type-name-link\">AnnotationType</span></a> "
                 + "(implements java.lang.annotation.Annotation)</li>\n"
                 + "</ul>",
                 "<h2 title=\"Enum Hierarchy\">Enum Hierarchy</h2>\n"
@@ -67,7 +67,7 @@
                 + "<li class=\"circle\">java.lang.Enum&lt;E&gt; (implements java.lang.Comparable&lt;T&gt;, java.lang.constant.Constable, java.io.Serializable)\n"
                 + "<ul>\n"
                 + "<li class=\"circle\">pkg.<a href=\"Coin.html\" "
-                + "title=\"enum in pkg\"><span class=\"typeNameLink\">Coin</span></a></li>\n"
+                + "title=\"enum in pkg\"><span class=\"type-name-link\">Coin</span></a></li>\n"
                 + "</ul>\n"
                 + "</li>\n"
                 + "</ul>\n"
@@ -76,6 +76,6 @@
 
         checkOutput("pkg/package-tree.html", false,
                 "<li class=\"circle\">class pkg.<a href=\".ParentClass.html\" "
-                + "title=\"class in pkg\"><span class=\"typeNameLink\">ParentClass</span></a></li>");
+                + "title=\"class in pkg\"><span class=\"type-name-link\">ParentClass</span></a></li>");
     }
 }
--- a/test/langtools/jdk/javadoc/doclet/testDeprecatedDocs/TestDeprecatedDocs.java	Fri Mar 13 18:43:11 2020 +0100
+++ b/test/langtools/jdk/javadoc/doclet/testDeprecatedDocs/TestDeprecatedDocs.java	Fri Mar 13 10:57:41 2020 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -79,125 +79,125 @@
 
         checkOutput("pkg/DeprecatedClassByAnnotation.html", true,
                 "<pre>@Deprecated\n"
-                + "public class <span class=\"typeNameLabel\">DeprecatedClassByAnnotation</span>\n"
+                + "public class <span class=\"type-name-label\">DeprecatedClassByAnnotation</span>\n"
                 + "extends java.lang.Object</pre>",
-                "<div class=\"memberSignature\"><span class=\"annotations\">@Deprecated(forRemoval=true)\n"
-                + "</span><span class=\"modifiers\">public</span>&nbsp;<span class=\"returnType\">int</span>"
-                + "&nbsp;<span class=\"memberName\">field</span></div>\n"
-                + "<div class=\"deprecationBlock\"><span class=\"deprecatedLabel\">Deprecated, for removal: This API element is subject to removal in a future version.</span></div>",
-                "<div class=\"memberSignature\"><span class=\"annotations\">@Deprecated(forRemoval=true)\n"
-                + "</span><span class=\"modifiers\">public</span>&nbsp;<span class=\"memberName\">DeprecatedClassByAnnotation</span>()</div>\n"
-                + "<div class=\"deprecationBlock\"><span class=\"deprecatedLabel\">Deprecated, for removal: This API element is subject to removal in a future version.</span></div>",
-                "<div class=\"memberSignature\"><span class=\"annotations\">@Deprecated\n"
-                + "</span><span class=\"modifiers\">public</span>&nbsp;<span class=\"returnType\">"
-                + "void</span>&nbsp;<span class=\"memberName\">method</span>()</div>\n"
-                + "<div class=\"deprecationBlock\"><span class=\"deprecatedLabel\">Deprecated.</span></div>");
+                "<div class=\"member-signature\"><span class=\"annotations\">@Deprecated(forRemoval=true)\n"
+                + "</span><span class=\"modifiers\">public</span>&nbsp;<span class=\"return-type\">int</span>"
+                + "&nbsp;<span class=\"member-name\">field</span></div>\n"
+                + "<div class=\"deprecation-block\"><span class=\"deprecated-label\">Deprecated, for removal: This API element is subject to removal in a future version.</span></div>",
+                "<div class=\"member-signature\"><span class=\"annotations\">@Deprecated(forRemoval=true)\n"
+                + "</span><span class=\"modifiers\">public</span>&nbsp;<span class=\"member-name\">DeprecatedClassByAnnotation</span>()</div>\n"
+                + "<div class=\"deprecation-block\"><span class=\"deprecated-label\">Deprecated, for removal: This API element is subject to removal in a future version.</span></div>",
+                "<div class=\"member-signature\"><span class=\"annotations\">@Deprecated\n"
+                + "</span><span class=\"modifiers\">public</span>&nbsp;<span class=\"return-type\">"
+                + "void</span>&nbsp;<span class=\"member-name\">method</span>()</div>\n"
+                + "<div class=\"deprecation-block\"><span class=\"deprecated-label\">Deprecated.</span></div>");
 
         checkOutput("pkg/TestAnnotationType.html", true,
                 "<hr>\n"
                 + "<pre>@Deprecated(forRemoval=true)\n"
                 + "@Documented\n"
-                + "public @interface <span class=\"memberNameLabel\">TestAnnotationType</span></pre>\n"
-                + "<div class=\"deprecationBlock\"><span class=\"deprecatedLabel\">Deprecated, for removal: This API element is subject to removal in a future version.</span>\n"
-                + "<div class=\"deprecationComment\">annotation_test1 passes.</div>\n"
+                + "public @interface <span class=\"member-name-label\">TestAnnotationType</span></pre>\n"
+                + "<div class=\"deprecation-block\"><span class=\"deprecated-label\">Deprecated, for removal: This API element is subject to removal in a future version.</span>\n"
+                + "<div class=\"deprecation-comment\">annotation_test1 passes.</div>\n"
                 + "</div>",
-                "<div class=\"memberSignature\"><span class=\"annotations\">@Deprecated(forRemoval=true)\n" +
-                        "</span><span class=\"modifiers\">static final</span>&nbsp;<span class=\"returnType\">int</span>&nbsp;<span class=\"memberName\">field</span></div>\n"
-                + "<div class=\"deprecationBlock\"><span class=\"deprecatedLabel\">Deprecated, for removal: This "
+                "<div class=\"member-signature\"><span class=\"annotations\">@Deprecated(forRemoval=true)\n" +
+                        "</span><span class=\"modifiers\">static final</span>&nbsp;<span class=\"return-type\">int</span>&nbsp;<span class=\"member-name\">field</span></div>\n"
+                + "<div class=\"deprecation-block\"><span class=\"deprecated-label\">Deprecated, for removal: This "
                 + "API element is subject to removal in a future version.</span>\n"
-                + "<div class=\"deprecationComment\">annotation_test4 passes.</div>\n"
+                + "<div class=\"deprecation-comment\">annotation_test4 passes.</div>\n"
                 + "</div>",
-                "<div class=\"memberSignature\"><span class=\"annotations\">@Deprecated(forRemoval=true)\n"
-                + "</span><span class=\"returnType\">int</span>&nbsp;<span class=\"memberName\">required</span></div>\n"
-                + "<div class=\"deprecationBlock\"><span class=\"deprecatedLabel\">Deprecated, for removal: This API element is subject to removal in a future version.</span>\n"
-                + "<div class=\"deprecationComment\">annotation_test3 passes.</div>\n"
+                "<div class=\"member-signature\"><span class=\"annotations\">@Deprecated(forRemoval=true)\n"
+                + "</span><span class=\"return-type\">int</span>&nbsp;<span class=\"member-name\">required</span></div>\n"
+                + "<div class=\"deprecation-block\"><span class=\"deprecated-label\">Deprecated, for removal: This API element is subject to removal in a future version.</span>\n"
+                + "<div class=\"deprecation-comment\">annotation_test3 passes.</div>\n"
                 + "</div>",
-                "<div class=\"memberSignature\"><span class=\"returnType\">java.lang.String</span>"
-                + "&nbsp;<span class=\"memberName\">optional</span></div>\n"
-                + "<div class=\"deprecationBlock\"><span class=\"deprecatedLabel\">Deprecated.</span>\n"
-                + "<div class=\"deprecationComment\">annotation_test2 passes.</div>\n"
+                "<div class=\"member-signature\"><span class=\"return-type\">java.lang.String</span>"
+                + "&nbsp;<span class=\"member-name\">optional</span></div>\n"
+                + "<div class=\"deprecation-block\"><span class=\"deprecated-label\">Deprecated.</span>\n"
+                + "<div class=\"deprecation-comment\">annotation_test2 passes.</div>\n"
                 + "</div>");
 
         checkOutput("pkg/TestClass.html", true,
                 "<hr>\n"
                 + "<pre>@Deprecated(forRemoval=true)\n"
-                + "public class <span class=\"typeNameLabel\">TestClass</span>\n"
+                + "public class <span class=\"type-name-label\">TestClass</span>\n"
                 + "extends java.lang.Object</pre>\n"
-                + "<div class=\"deprecationBlock\"><span class=\"deprecatedLabel\">Deprecated, for removal: This API element is subject to removal in a future version.</span>\n"
-                + "<div class=\"deprecationComment\">class_test1 passes.</div>\n"
+                + "<div class=\"deprecation-block\"><span class=\"deprecated-label\">Deprecated, for removal: This API element is subject to removal in a future version.</span>\n"
+                + "<div class=\"deprecation-comment\">class_test1 passes.</div>\n"
                 + "</div>",
-                "<div class=\"memberSignature\"><span class=\"annotations\">@Deprecated(forRemoval=true)\n"
-                + "</span><span class=\"modifiers\">public</span>&nbsp;<span class=\"memberName\">TestClass</span>()</div>\n"
-                + "<div class=\"deprecationBlock\"><span class=\"deprecatedLabel\">Deprecated, for removal: This API element is subject to removal in a future version.</span>\n"
-                + "<div class=\"deprecationComment\">class_test3 passes. This is the second sentence of deprecated description for a constructor.</div>\n"
+                "<div class=\"member-signature\"><span class=\"annotations\">@Deprecated(forRemoval=true)\n"
+                + "</span><span class=\"modifiers\">public</span>&nbsp;<span class=\"member-name\">TestClass</span>()</div>\n"
+                + "<div class=\"deprecation-block\"><span class=\"deprecated-label\">Deprecated, for removal: This API element is subject to removal in a future version.</span>\n"
+                + "<div class=\"deprecation-comment\">class_test3 passes. This is the second sentence of deprecated description for a constructor.</div>\n"
                 + "</div>",
-                "<td class=\"colLast\">\n"
-                + "<div class=\"block\"><span class=\"deprecatedLabel\">Deprecated.</span>\n"
-                + "<div class=\"deprecationComment\">class_test2 passes.</div>\n"
+                "<td class=\"col-last\">\n"
+                + "<div class=\"block\"><span class=\"deprecated-label\">Deprecated.</span>\n"
+                + "<div class=\"deprecation-comment\">class_test2 passes.</div>\n"
                 + "</div>\n"
                 + "</td>",
-                "<td class=\"colLast\">\n"
-                + "<div class=\"block\"><span class=\"deprecatedLabel\">Deprecated, for removal: This API element is subject to removal in a future version.</span>\n"
-                + "<div class=\"deprecationComment\">class_test3 passes.</div>\n"
+                "<td class=\"col-last\">\n"
+                + "<div class=\"block\"><span class=\"deprecated-label\">Deprecated, for removal: This API element is subject to removal in a future version.</span>\n"
+                + "<div class=\"deprecation-comment\">class_test3 passes.</div>\n"
                 + "</div>\n"
                 + "</td>",
-                "<td class=\"colLast\">\n"
-                + "<div class=\"block\"><span class=\"deprecatedLabel\">Deprecated.</span>\n"
-                + "<div class=\"deprecationComment\">class_test4 passes.</div>\n"
+                "<td class=\"col-last\">\n"
+                + "<div class=\"block\"><span class=\"deprecated-label\">Deprecated.</span>\n"
+                + "<div class=\"deprecation-comment\">class_test4 passes.</div>\n"
                 + "</div>\n"
                 + "</td>");
 
         checkOutput("pkg/TestClass.html", false,
-                "<div class=\"deprecationComment\">class_test2 passes. This is the second sentence of deprecated description for a field.</div>\n"
+                "<div class=\"deprecation-comment\">class_test2 passes. This is the second sentence of deprecated description for a field.</div>\n"
                 + "</div>\n"
                 + "</td>",
-                "<div class=\"deprecationComment\">class_test3 passes. This is the second sentence of deprecated description for a constructor.</div>\n"
+                "<div class=\"deprecation-comment\">class_test3 passes. This is the second sentence of deprecated description for a constructor.</div>\n"
                 + "</div>\n"
                 + "</td>",
-                "<div class=\"deprecationComment\">class_test4 passes. This is the second sentence of deprecated description for a method.</div>\n"
+                "<div class=\"deprecation-comment\">class_test4 passes. This is the second sentence of deprecated description for a method.</div>\n"
                 + "</div>\n"
                 + "</td>");
 
         checkOutput("pkg/TestEnum.html", true,
                 "<hr>\n"
                 + "<pre>@Deprecated(forRemoval=true)\n"
-                + "public enum <span class=\"typeNameLabel\">TestEnum</span>\n"
+                + "public enum <span class=\"type-name-label\">TestEnum</span>\n"
                 + "extends java.lang.Enum&lt;<a href=\"TestEnum.html\" title=\"enum in pkg\">TestEnum</a>&gt;</pre>\n"
-                + "<div class=\"deprecationBlock\"><span class=\"deprecatedLabel\">Deprecated, for removal: This API element is subject to removal in a future version.</span>\n"
-                + "<div class=\"deprecationComment\">enum_test1 passes.</div>\n"
+                + "<div class=\"deprecation-block\"><span class=\"deprecated-label\">Deprecated, for removal: This API element is subject to removal in a future version.</span>\n"
+                + "<div class=\"deprecation-comment\">enum_test1 passes.</div>\n"
                 + "</div>",
-                "<div class=\"memberSignature\"><span class=\"annotations\">@Deprecated(forRemoval=true)\n"
-                + "</span><span class=\"modifiers\">public static final</span>&nbsp;<span class=\"returnType\">"
-                + "<a href=\"TestEnum.html\" title=\"enum in pkg\">TestEnum</a></span>&nbsp;<span class=\"memberName\">FOR_REMOVAL</span></div>\n"
-                + "<div class=\"deprecationBlock\"><span class=\"deprecatedLabel\">Deprecated, for removal: This API element is subject to removal in a future version.</span>\n"
-                + "<div class=\"deprecationComment\">enum_test3 passes.</div>\n"
+                "<div class=\"member-signature\"><span class=\"annotations\">@Deprecated(forRemoval=true)\n"
+                + "</span><span class=\"modifiers\">public static final</span>&nbsp;<span class=\"return-type\">"
+                + "<a href=\"TestEnum.html\" title=\"enum in pkg\">TestEnum</a></span>&nbsp;<span class=\"member-name\">FOR_REMOVAL</span></div>\n"
+                + "<div class=\"deprecation-block\"><span class=\"deprecated-label\">Deprecated, for removal: This API element is subject to removal in a future version.</span>\n"
+                + "<div class=\"deprecation-comment\">enum_test3 passes.</div>\n"
                 + "</div>");
 
         checkOutput("pkg/TestError.html", true,
                 "<hr>\n"
                 + "<pre>@Deprecated(forRemoval=true)\n"
-                + "public class <span class=\"typeNameLabel\">TestError</span>\n"
+                + "public class <span class=\"type-name-label\">TestError</span>\n"
                 + "extends java.lang.Error</pre>\n"
-                + "<div class=\"deprecationBlock\"><span class=\"deprecatedLabel\">Deprecated, for removal: This API element is subject to removal in a future version.</span>\n"
-                + "<div class=\"deprecationComment\">error_test1 passes.</div>\n"
+                + "<div class=\"deprecation-block\"><span class=\"deprecated-label\">Deprecated, for removal: This API element is subject to removal in a future version.</span>\n"
+                + "<div class=\"deprecation-comment\">error_test1 passes.</div>\n"
                 + "</div>");
 
         checkOutput("pkg/TestException.html", true,
                 "<hr>\n"
                 + "<pre>@Deprecated(forRemoval=true)\n"
-                + "public class <span class=\"typeNameLabel\">TestException</span>\n"
+                + "public class <span class=\"type-name-label\">TestException</span>\n"
                 + "extends java.lang.Exception</pre>\n"
-                + "<div class=\"deprecationBlock\"><span class=\"deprecatedLabel\">Deprecated, for removal: This API element is subject to removal in a future version.</span>\n"
-                + "<div class=\"deprecationComment\">exception_test1 passes.</div>\n"
+                + "<div class=\"deprecation-block\"><span class=\"deprecated-label\">Deprecated, for removal: This API element is subject to removal in a future version.</span>\n"
+                + "<div class=\"deprecation-comment\">exception_test1 passes.</div>\n"
                 + "</div>");
 
         checkOutput("pkg/TestInterface.html", true,
                 "<hr>\n"
                 + "<pre>@Deprecated(forRemoval=true)\n"
-                + "public class <span class=\"typeNameLabel\">TestInterface</span>\n"
+                + "public class <span class=\"type-name-label\">TestInterface</span>\n"
                 + "extends java.lang.Object</pre>\n"
-                + "<div class=\"deprecationBlock\"><span class=\"deprecatedLabel\">Deprecated, for removal: This API element is subject to removal in a future version.</span>\n"
-                + "<div class=\"deprecationComment\">interface_test1 passes.</div>\n"
+                + "<div class=\"deprecation-block\"><span class=\"deprecated-label\">Deprecated, for removal: This API element is subject to removal in a future version.</span>\n"
+                + "<div class=\"deprecation-comment\">interface_test1 passes.</div>\n"
                 + "</div>");
 
         checkOutput("deprecated-list.html", true,
@@ -214,95 +214,95 @@
                 + "<li><a href=\"#enum.constant\">Enum Constants</a></li>\n"
                 + "<li><a href=\"#annotation.type.member\">Annotation Type Elements</a></li>\n"
                 + "</ul>",
-                "<div class=\"deprecatedSummary\" id=\"forRemoval\">\n"
+                "<div class=\"deprecated-summary\" id=\"forRemoval\">\n"
                 + "<table>\n"
-                + "<caption><span>For Removal</span><span class=\"tabEnd\">&nbsp;</span></caption>\n"
+                + "<caption><span>For Removal</span><span class=\"tab-end\">&nbsp;</span></caption>\n"
                 + "<thead>\n"
                 + "<tr>\n"
-                + "<th class=\"colFirst\" scope=\"col\">Element</th>\n"
-                + "<th class=\"colLast\" scope=\"col\">Description</th>\n"
+                + "<th class=\"col-first\" scope=\"col\">Element</th>\n"
+                + "<th class=\"col-last\" scope=\"col\">Description</th>\n"
                 + "</tr>\n"
                 + "</thead>",
-                "<div class=\"deprecatedSummary\" id=\"enum\">\n"
+                "<div class=\"deprecated-summary\" id=\"enum\">\n"
                 + "<table>\n"
-                + "<caption><span>Enums</span><span class=\"tabEnd\">&nbsp;</span></caption>\n"
+                + "<caption><span>Enums</span><span class=\"tab-end\">&nbsp;</span></caption>\n"
                 + "<thead>\n"
                 + "<tr>\n"
-                + "<th class=\"colFirst\" scope=\"col\">Enum</th>\n"
-                + "<th class=\"colLast\" scope=\"col\">Description</th>\n"
+                + "<th class=\"col-first\" scope=\"col\">Enum</th>\n"
+                + "<th class=\"col-last\" scope=\"col\">Description</th>\n"
                 + "</tr>\n"
                 + "</thead>\n"
                 + "<tbody>\n"
-                + "<tr class=\"altColor\">\n"
-                + "<th class=\"colDeprecatedItemName\" scope=\"row\"><a href=\"pkg/TestEnum.html\" title=\"enum in pkg\">pkg.TestEnum</a></th>\n"
-                + "<td class=\"colLast\">\n"
-                + "<div class=\"deprecationComment\">enum_test1 passes.</div>\n"
+                + "<tr class=\"alt-color\">\n"
+                + "<th class=\"col-deprecated-item-name\" scope=\"row\"><a href=\"pkg/TestEnum.html\" title=\"enum in pkg\">pkg.TestEnum</a></th>\n"
+                + "<td class=\"col-last\">\n"
+                + "<div class=\"deprecation-comment\">enum_test1 passes.</div>\n"
                 + "</td>\n"
                 + "</tr>\n"
                 + "</tbody>\n"
                 + "</table>\n"
                 + "</div>",
-                "<div class=\"deprecatedSummary\" id=\"exception\">\n"
+                "<div class=\"deprecated-summary\" id=\"exception\">\n"
                 + "<table>\n"
-                + "<caption><span>Exceptions</span><span class=\"tabEnd\">&nbsp;</span></caption>\n"
+                + "<caption><span>Exceptions</span><span class=\"tab-end\">&nbsp;</span></caption>\n"
                 + "<thead>\n"
                 + "<tr>\n"
-                + "<th class=\"colFirst\" scope=\"col\">Exceptions</th>\n"
-                + "<th class=\"colLast\" scope=\"col\">Description</th>\n"
+                + "<th class=\"col-first\" scope=\"col\">Exceptions</th>\n"
+                + "<th class=\"col-last\" scope=\"col\">Description</th>\n"
                 + "</tr>\n"
                 + "</thead>\n"
                 + "<tbody>\n"
-                + "<tr class=\"altColor\">\n"
-                + "<th class=\"colDeprecatedItemName\" scope=\"row\"><a href=\"pkg/TestException.html\" title=\"class in pkg\">pkg.TestException</a></th>\n"
-                + "<td class=\"colLast\">\n"
-                + "<div class=\"deprecationComment\">exception_test1 passes.</div>\n"
+                + "<tr class=\"alt-color\">\n"
+                + "<th class=\"col-deprecated-item-name\" scope=\"row\"><a href=\"pkg/TestException.html\" title=\"class in pkg\">pkg.TestException</a></th>\n"
+                + "<td class=\"col-last\">\n"
+                + "<div class=\"deprecation-comment\">exception_test1 passes.</div>\n"
                 + "</td>\n"
                 + "</tr>\n"
                 + "</tbody>\n"
                 + "</table>\n"
                 + "</div>",
-                "<div class=\"deprecatedSummary\" id=\"field\">\n"
+                "<div class=\"deprecated-summary\" id=\"field\">\n"
                 + "<table>\n"
-                + "<caption><span>Fields</span><span class=\"tabEnd\">&nbsp;</span></caption>\n"
+                + "<caption><span>Fields</span><span class=\"tab-end\">&nbsp;</span></caption>\n"
                 + "<thead>\n"
                 + "<tr>\n"
-                + "<th class=\"colFirst\" scope=\"col\">Field</th>\n"
-                + "<th class=\"colLast\" scope=\"col\">Description</th>\n"
+                + "<th class=\"col-first\" scope=\"col\">Field</th>\n"
+                + "<th class=\"col-last\" scope=\"col\">Description</th>\n"
                 + "</tr>\n"
                 + "</thead>\n"
                 + "<tbody>\n"
-                + "<tr class=\"altColor\">\n"
-                + "<th class=\"colDeprecatedItemName\" scope=\"row\"><a href=\"pkg/DeprecatedClassByAnnotation.html#field\">pkg.DeprecatedClassByAnnotation.field</a></th>\n"
-                + "<td class=\"colLast\"></td>\n"
+                + "<tr class=\"alt-color\">\n"
+                + "<th class=\"col-deprecated-item-name\" scope=\"row\"><a href=\"pkg/DeprecatedClassByAnnotation.html#field\">pkg.DeprecatedClassByAnnotation.field</a></th>\n"
+                + "<td class=\"col-last\"></td>\n"
                 + "</tr>\n"
-                + "<tr class=\"rowColor\">\n"
-                + "<th class=\"colDeprecatedItemName\" scope=\"row\"><a href=\"pkg/TestAnnotationType.html#field\">pkg.TestAnnotationType.field</a></th>\n"
-                + "<td class=\"colLast\">\n"
-                + "<div class=\"deprecationComment\">annotation_test4 passes.</div>\n"
+                + "<tr class=\"row-color\">\n"
+                + "<th class=\"col-deprecated-item-name\" scope=\"row\"><a href=\"pkg/TestAnnotationType.html#field\">pkg.TestAnnotationType.field</a></th>\n"
+                + "<td class=\"col-last\">\n"
+                + "<div class=\"deprecation-comment\">annotation_test4 passes.</div>\n"
                 + "</td>\n"
                 + "</tr>\n"
-                + "<tr class=\"altColor\">\n"
-                + "<th class=\"colDeprecatedItemName\" scope=\"row\"><a href=\"pkg/TestClass.html#field\">pkg.TestClass.field</a></th>\n"
-                + "<td class=\"colLast\">\n"
-                + "<div class=\"deprecationComment\">class_test2 passes. This is the second sentence of deprecated description for a field.</div>\n"
+                + "<tr class=\"alt-color\">\n"
+                + "<th class=\"col-deprecated-item-name\" scope=\"row\"><a href=\"pkg/TestClass.html#field\">pkg.TestClass.field</a></th>\n"
+                + "<td class=\"col-last\">\n"
+                + "<div class=\"deprecation-comment\">class_test2 passes. This is the second sentence of deprecated description for a field.</div>\n"
                 + "</td>\n"
                 + "</tr>\n"
-                + "<tr class=\"rowColor\">\n"
-                + "<th class=\"colDeprecatedItemName\" scope=\"row\"><a href=\"pkg/TestError.html#field\">pkg.TestError.field</a></th>\n"
-                + "<td class=\"colLast\">\n"
-                + "<div class=\"deprecationComment\">error_test2 passes.</div>\n"
+                + "<tr class=\"row-color\">\n"
+                + "<th class=\"col-deprecated-item-name\" scope=\"row\"><a href=\"pkg/TestError.html#field\">pkg.TestError.field</a></th>\n"
+                + "<td class=\"col-last\">\n"
+                + "<div class=\"deprecation-comment\">error_test2 passes.</div>\n"
                 + "</td>\n"
                 + "</tr>\n"
-                + "<tr class=\"altColor\">\n"
-                + "<th class=\"colDeprecatedItemName\" scope=\"row\"><a href=\"pkg/TestException.html#field\">pkg.TestException.field</a></th>\n"
-                + "<td class=\"colLast\">\n"
-                + "<div class=\"deprecationComment\">exception_test2 passes.</div>\n"
+                + "<tr class=\"alt-color\">\n"
+                + "<th class=\"col-deprecated-item-name\" scope=\"row\"><a href=\"pkg/TestException.html#field\">pkg.TestException.field</a></th>\n"
+                + "<td class=\"col-last\">\n"
+                + "<div class=\"deprecation-comment\">exception_test2 passes.</div>\n"
                 + "</td>\n"
                 + "</tr>\n"
-                + "<tr class=\"rowColor\">\n"
-                + "<th class=\"colDeprecatedItemName\" scope=\"row\"><a href=\"pkg/TestInterface.html#field\">pkg.TestInterface.field</a></th>\n"
-                + "<td class=\"colLast\">\n"
-                + "<div class=\"deprecationComment\">interface_test2 passes.</div>\n"
+                + "<tr class=\"row-color\">\n"
+                + "<th class=\"col-deprecated-item-name\" scope=\"row\"><a href=\"pkg/TestInterface.html#field\">pkg.TestInterface.field</a></th>\n"
+                + "<td class=\"col-last\">\n"
+                + "<div class=\"deprecation-comment\">interface_test2 passes.</div>\n"
                 + "</td>\n"
                 + "</tr>\n"
                 + "</tbody>\n"
--- a/test/langtools/jdk/javadoc/doclet/testDocRootInlineTag/TestDocRootInlineTag.java	Fri Mar 13 18:43:11 2020 +0100
+++ b/test/langtools/jdk/javadoc/doclet/testDocRootInlineTag/TestDocRootInlineTag.java	Fri Mar 13 10:57:41 2020 -0700
@@ -56,10 +56,10 @@
 
         checkOutput("TestDocRootTag.html", true,
                 "<a href=\"" + uri + "/java/io/File.html\" "
-                + "title=\"class or interface in java.io\" class=\"externalLink\"><code>File</code></a>",
+                + "title=\"class or interface in java.io\" class=\"external-link\"><code>File</code></a>",
                 "<a href=\"./index-all.html\">index</a>",
                 "<a href=\"" + uri + "/java/io/File.html\" "
-                + "title=\"class or interface in java.io\" class=\"externalLink\"><code>Second File Link</code></a>",
+                + "title=\"class or interface in java.io\" class=\"external-link\"><code>Second File Link</code></a>",
                 "The value of @docRoot is \"./\"");
 
         checkOutput("index-all.html", true,
--- a/test/langtools/jdk/javadoc/doclet/testExternalOverriddenMethod/TestExternalOverriddenMethod.java	Fri Mar 13 18:43:11 2020 +0100
+++ b/test/langtools/jdk/javadoc/doclet/testExternalOverriddenMethod/TestExternalOverriddenMethod.java	Fri Mar 13 10:57:41 2020 -0700
@@ -55,14 +55,14 @@
         checkOutput("pkg/XReader.html", true,
                 "<dt>Overrides:</dt>\n"
                 + "<dd><code><a href=\"" + uri + "/java/io/FilterReader.html#read()\" "
-                + "title=\"class or interface in java.io\" class=\"externalLink\">read</a></code>&nbsp;in class&nbsp;<code>"
+                + "title=\"class or interface in java.io\" class=\"external-link\">read</a></code>&nbsp;in class&nbsp;<code>"
                 + "<a href=\"" + uri + "/java/io/FilterReader.html\" "
-                + "title=\"class or interface in java.io\" class=\"externalLink\">FilterReader</a></code></dd>",
+                + "title=\"class or interface in java.io\" class=\"external-link\">FilterReader</a></code></dd>",
                 "<dt>Specified by:</dt>\n"
                 + "<dd><code><a href=\"" + uri + "/java/io/DataInput.html#readInt()\" "
-                + "title=\"class or interface in java.io\" class=\"externalLink\">readInt</a></code>&nbsp;in interface&nbsp;<code>"
+                + "title=\"class or interface in java.io\" class=\"external-link\">readInt</a></code>&nbsp;in interface&nbsp;<code>"
                 + "<a href=\"" + uri + "/java/io/DataInput.html\" "
-                + "title=\"class or interface in java.io\" class=\"externalLink\">DataInput</a></code></dd>"
+                + "title=\"class or interface in java.io\" class=\"external-link\">DataInput</a></code></dd>"
         );
     }
 }
--- a/test/langtools/jdk/javadoc/doclet/testGroupName/TestGroupName.java	Fri Mar 13 18:43:11 2020 +0100
+++ b/test/langtools/jdk/javadoc/doclet/testGroupName/TestGroupName.java	Fri Mar 13 10:57:41 2020 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -65,8 +65,8 @@
         checkExit(Exit.OK);
 
         checkOutput("index.html", true,
-                "<button role=\"tab\" aria-selected=\"false\" aria-controls=\"overviewSummary_tabpanel\""
-                + " tabindex=\"-1\" onkeydown=\"switchTab(event)\" id=\"t1\" class=\"tableTab\""
+                "<button role=\"tab\" aria-selected=\"false\" aria-controls=\"overview-summary_tabpanel\""
+                + " tabindex=\"-1\" onkeydown=\"switchTab(event)\" id=\"t1\" class=\"table-tab\""
                 + " onclick=\"show(1);\">abc &lt; &amp; &gt; def</button>",
                 ",\"abc < & > def\"],");
     }
@@ -100,8 +100,8 @@
         checkExit(Exit.OK);
 
         checkOutput("index.html", true,
-                "<button role=\"tab\" aria-selected=\"false\" aria-controls=\"overviewSummary_tabpanel\""
-                + " tabindex=\"-1\" onkeydown=\"switchTab(event)\" id=\"t2\" class=\"tableTab\""
+                "<button role=\"tab\" aria-selected=\"false\" aria-controls=\"overview-summary_tabpanel\""
+                + " tabindex=\"-1\" onkeydown=\"switchTab(event)\" id=\"t2\" class=\"table-tab\""
                 + " onclick=\"show(2);\">Other Modules</button>",
                 ",\"abc < & > def\"],");
     }
--- a/test/langtools/jdk/javadoc/doclet/testHeadings/TestHeadings.java	Fri Mar 13 18:43:11 2020 +0100
+++ b/test/langtools/jdk/javadoc/doclet/testHeadings/TestHeadings.java	Fri Mar 13 10:57:41 2020 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -52,38 +52,38 @@
 
         //Package summary
         checkOutput("pkg1/package-summary.html", true,
-                "<th class=\"colFirst\" scope=\"col\">"
+                "<th class=\"col-first\" scope=\"col\">"
                 + "Class</th>\n"
-                + "<th class=\"colLast\" scope=\"col\""
+                + "<th class=\"col-last\" scope=\"col\""
                 + ">Description</th>");
 
         // Class documentation
         checkOutput("pkg1/C1.html", true,
-                "<th class=\"colFirst\" scope=\"col\">Modifier and Type</th>\n"
-                + "<th class=\"colSecond\" scope=\"col\">Field</th>\n"
-                + "<th class=\"colLast\" scope=\"col\">Description</th>",
+                "<th class=\"col-first\" scope=\"col\">Modifier and Type</th>\n"
+                + "<th class=\"col-second\" scope=\"col\">Field</th>\n"
+                + "<th class=\"col-last\" scope=\"col\">Description</th>",
                 "<h3 id=\"methods.inherited.from.class.java.lang.Object\">"
                 + "Methods inherited from class&nbsp;java.lang.Object</h3>");
 
         // Class use documentation
         checkOutput("pkg1/class-use/C1.html", true,
-                "<th class=\"colFirst\" scope=\"col\">Package</th>\n"
-                + "<th class=\"colLast\" scope=\"col\">Description</th>",
-                "<th class=\"colFirst\" scope=\"col\">Modifier and Type</th>\n"
-                + "<th class=\"colSecond\" scope=\"col\">Field</th>\n"
-                + "<th class=\"colLast\" scope=\"col\">Description</th>");
+                "<th class=\"col-first\" scope=\"col\">Package</th>\n"
+                + "<th class=\"col-last\" scope=\"col\">Description</th>",
+                "<th class=\"col-first\" scope=\"col\">Modifier and Type</th>\n"
+                + "<th class=\"col-second\" scope=\"col\">Field</th>\n"
+                + "<th class=\"col-last\" scope=\"col\">Description</th>");
 
         // Deprecated
         checkOutput("deprecated-list.html", true,
-                "<th class=\"colFirst\" scope=\"col\">Method</th>\n"
-                + "<th class=\"colLast\" scope=\"col\">Description</th>");
+                "<th class=\"col-first\" scope=\"col\">Method</th>\n"
+                + "<th class=\"col-last\" scope=\"col\">Description</th>");
 
         // Constant values
         checkOutput("constant-values.html", true,
-                "<th class=\"colFirst\" scope=\"col\">"
+                "<th class=\"col-first\" scope=\"col\">"
                 + "Modifier and Type</th>\n"
-                + "<th class=\"colSecond\" scope=\"col\">Constant Field</th>\n"
-                + "<th class=\"colLast\" scope=\"col\">Value</th>");
+                + "<th class=\"col-second\" scope=\"col\">Constant Field</th>\n"
+                + "<th class=\"col-last\" scope=\"col\">Value</th>");
 
         // Serialized Form
         checkOutput("serialized-form.html", true,
--- a/test/langtools/jdk/javadoc/doclet/testHiddenTag/TestHiddenTag.java	Fri Mar 13 18:43:11 2020 +0100
+++ b/test/langtools/jdk/javadoc/doclet/testHiddenTag/TestHiddenTag.java	Fri Mar 13 10:57:41 2020 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2020, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -79,7 +79,7 @@
                 "<a id=\"inVisibleMethod()\">");
 
         checkOutput("pkg1/A.VisibleInnerExtendsInvisibleInner.html", true,
-                "<pre>public static class <span class=\"typeNameLabel\">" +
+                "<pre>public static class <span class=\"type-name-label\">" +
                 "A.VisibleInnerExtendsInvisibleInner</span>\n" +
                 "extends <a href=\"A.html\" title=\"class in pkg1\">A</a></pre>",
                 "<code><a href=\"A.html#visibleField\">visibleField</a></code>",
--- a/test/langtools/jdk/javadoc/doclet/testHref/TestHref.java	Fri Mar 13 18:43:11 2020 +0100
+++ b/test/langtools/jdk/javadoc/doclet/testHref/TestHref.java	Fri Mar 13 10:57:41 2020 -0700
@@ -70,7 +70,7 @@
                 //Header does not link to the page itself.
                 "Class C4&lt;E extends C4&lt;E&gt;&gt;</h1>",
                 //Signature does not link to the page itself.
-                "public abstract class <span class=\"typeNameLabel\">C4&lt;E extends C4&lt;E&gt;&gt;</span>"
+                "public abstract class <span class=\"type-name-label\">C4&lt;E extends C4&lt;E&gt;&gt;</span>"
         );
 
         checkOutput(Output.OUT, false,
--- a/test/langtools/jdk/javadoc/doclet/testHtmlDefinitionListTag/TestHtmlDefinitionListTag.java	Fri Mar 13 18:43:11 2020 +0100
+++ b/test/langtools/jdk/javadoc/doclet/testHtmlDefinitionListTag/TestHtmlDefinitionListTag.java	Fri Mar 13 10:57:41 2020 -0700
@@ -101,7 +101,7 @@
         // Optional Element should print properly nested definition list tags
         // for default value.
         checkOutput("pkg1/C1.html", true,
-                "<pre>public class <span class=\"typeNameLabel\">C1</span>\n" +
+                "<pre>public class <span class=\"type-name-label\">C1</span>\n" +
                 "extends java.lang.Object\n" +
                 "implements java.io.Serializable</pre>");
         checkOutput("pkg1/C4.html", true,
@@ -214,8 +214,8 @@
                 + "<dd><a href=\"pkg1/C1.html#setUndecorated(boolean)\">"
                 + "<code>C1.setUndecorated(boolean)</code></a></dd>\n"
                 + "</dl>",
-                "<span class=\"deprecatedLabel\">Deprecated.</span>\n"
-                + "<div class=\"deprecationComment\">As of JDK version 1.5, replaced by\n"
+                "<span class=\"deprecated-label\">Deprecated.</span>\n"
+                + "<div class=\"deprecation-comment\">As of JDK version 1.5, replaced by\n"
                 + " <a href=\"pkg1/C1.html#setUndecorated(boolean)\">"
                 + "<code>setUndecorated(boolean)</code></a>.</div>\n"
                 + "</div>\n"
@@ -229,8 +229,8 @@
                 + "<dd><a href=\"pkg1/C1.html#setUndecorated(boolean)\">"
                 + "<code>C1.setUndecorated(boolean)</code></a></dd>\n"
                 + "</dl>",
-                "<span class=\"deprecatedLabel\">Deprecated.</span>\n"
-                + "<div class=\"deprecationComment\">As of JDK version 1.5, replaced by\n"
+                "<span class=\"deprecated-label\">Deprecated.</span>\n"
+                + "<div class=\"deprecation-comment\">As of JDK version 1.5, replaced by\n"
                 + " <a href=\"pkg1/C1.html#setUndecorated(boolean)\">"
                 + "<code>setUndecorated(boolean)</code></a>.</div>\n"
                 + "</div>\n"
@@ -239,7 +239,7 @@
                 + "<dt>Throws:</dt>\n"
                 + "<dd><code>java.io.IOException</code></dd>\n"
                 + "</dl>",
-                "<span class=\"deprecatedLabel\">Deprecated.</span>"
+                "<span class=\"deprecated-label\">Deprecated.</span>"
                 + "</div>\n"
                 + "<div class=\"block\">The name for this class.</div>");
     }
@@ -312,8 +312,8 @@
                 + "<dd><a href=\"pkg1/C1.html#setUndecorated(boolean)\">"
                 + "<code>C1.setUndecorated(boolean)</code></a></dd>\n"
                 + "</dl>",
-                "<span class=\"deprecatedLabel\">Deprecated.</span>\n"
-                + "<div class=\"deprecationComment\">As of JDK version 1.5, replaced by\n"
+                "<span class=\"deprecated-label\">Deprecated.</span>\n"
+                + "<div class=\"deprecation-comment\">As of JDK version 1.5, replaced by\n"
                 + " <a href=\"pkg1/C1.html#setUndecorated(boolean)\">"
                 + "<code>setUndecorated(boolean)</code></a>.</div>\n"
                 + "</div>\n"
@@ -327,8 +327,8 @@
                 + "<dd><a href=\"pkg1/C1.html#setUndecorated(boolean)\">"
                 + "<code>C1.setUndecorated(boolean)</code></a></dd>\n"
                 + "</dl>",
-                "<span class=\"deprecatedLabel\">Deprecated.</span>\n"
-                + "<div class=\"deprecationComment\">As of JDK version 1.5, replaced by\n"
+                "<span class=\"deprecated-label\">Deprecated.</span>\n"
+                + "<div class=\"deprecation-comment\">As of JDK version 1.5, replaced by\n"
                 + " <a href=\"pkg1/C1.html#setUndecorated(boolean)\">"
                 + "<code>setUndecorated(boolean)</code></a>.</div>\n"
                 + "</div>\n"
@@ -337,7 +337,7 @@
                 + "<dt>Throws:</dt>\n"
                 + "<dd><code>java.io.IOException</code></dd>\n"
                 + "</dl>",
-                "<span class=\"deprecatedLabel\">Deprecated.</span>"
+                "<span class=\"deprecated-label\">Deprecated.</span>"
                 + "</div>\n"
                 + "<div class=\"block\">"
                 + "The name for this class.</div>");
@@ -347,39 +347,39 @@
         // Test with -nocomment and -nodeprecated options. The ClassDocs whould
         // not display definition lists for any member details.
         checkOutput("pkg1/C1.html", expectFound,
-                "<div class=\"memberSignature\"><span class=\"modifiers\">public</span>&nbsp;" +
-                "<span class=\"returnType\">void</span>&nbsp;<span class=\"memberName\">readObject</span>()\n" +
+                "<div class=\"member-signature\"><span class=\"modifiers\">public</span>&nbsp;" +
+                "<span class=\"return-type\">void</span>&nbsp;<span class=\"member-name\">readObject</span>()\n" +
                 "                throws <span class=\"exceptions\">java.io.IOException</span></div>\n" +
                 "</section>\n" +
                 "</li>");
 
         checkOutput("pkg1/C2.html", expectFound,
-                "<div class=\"memberSignature\"><span class=\"modifiers\">public</span>" +
-                "&nbsp;<span class=\"memberName\">C2</span>()</div>\n" +
+                "<div class=\"member-signature\"><span class=\"modifiers\">public</span>" +
+                "&nbsp;<span class=\"member-name\">C2</span>()</div>\n" +
                 "</section>\n" +
                 "</li>");
 
         checkOutput("pkg1/C1.ModalExclusionType.html", expectFound,
-                "<div class=\"memberSignature\"><span class=\"modifiers\">public static final</span>&nbsp;" +
-                "<span class=\"returnType\"><a href=\"C1.ModalExclusionType.html\" title=\"enum in pkg1\">" +
-                "C1.ModalExclusionType</a></span>&nbsp;<span class=\"memberName\">APPLICATION_EXCLUDE</span></div>\n" +
+                "<div class=\"member-signature\"><span class=\"modifiers\">public static final</span>&nbsp;" +
+                "<span class=\"return-type\"><a href=\"C1.ModalExclusionType.html\" title=\"enum in pkg1\">" +
+                "C1.ModalExclusionType</a></span>&nbsp;<span class=\"member-name\">APPLICATION_EXCLUDE</span></div>\n" +
                 "</section>\n" +
                 "</li>");
 
         checkOutput("serialized-form.html", expectFound,
                 "<pre>boolean " +
                 "undecorated</pre>\n" +
-                "<div class=\"deprecationBlock\"><span class=\"deprecatedLabel\">" +
+                "<div class=\"deprecation-block\"><span class=\"deprecated-label\">" +
                 "Deprecated.</span>\n"
-                + "<div class=\"deprecationComment\">As of JDK version 1.5, replaced by\n"
+                + "<div class=\"deprecation-comment\">As of JDK version 1.5, replaced by\n"
                 + " <a href=\"pkg1/C1.html#setUndecorated(boolean)\"><code>"
                 + "setUndecorated(boolean)</code></a>.</div>\n"
                 + "</div>\n"
                 +
                 "</li>",
-                "<span class=\"deprecatedLabel\">"
+                "<span class=\"deprecated-label\">"
                 + "Deprecated.</span>\n"
-                + "<div class=\"deprecationComment\">As of JDK version"
+                + "<div class=\"deprecation-comment\">As of JDK version"
                 + " 1.5, replaced by\n"
                 + " <a href=\"pkg1/C1.html#setUndecorated(boolean)\">"
                 + "<code>setUndecorated(boolean)</code></a>.</div>\n"
--- a/test/langtools/jdk/javadoc/doclet/testHtmlLandmarkRegions/TestHtmlLandmarkRegions.java	Fri Mar 13 18:43:11 2020 +0100
+++ b/test/langtools/jdk/javadoc/doclet/testHtmlLandmarkRegions/TestHtmlLandmarkRegions.java	Fri Mar 13 10:57:41 2020 -0700
@@ -74,7 +74,7 @@
         checkExit(Exit.OK);
 
         checkOrder("index.html",
-                "<header role=\"banner\" class=\"flexHeader\">\n"
+                "<header role=\"banner\" class=\"flex-header\">\n"
                 + "<nav role=\"navigation\">",
                 "<main role=\"main\">\n"
                 + "<div class=\"header\">\n"
@@ -98,7 +98,7 @@
         checkExit(Exit.OK);
 
         checkOrder("index.html",
-                "<header role=\"banner\" class=\"flexHeader\">\n"
+                "<header role=\"banner\" class=\"flex-header\">\n"
                 + "<nav role=\"navigation\">",
                 "<main role=\"main\">\n"
                 + "<div class=\"header\">\n"
@@ -130,7 +130,7 @@
         checkExit(Exit.OK);
 
         checkOrder("pkg1/doc-files/s.html",
-                "<header role=\"banner\" class=\"flexHeader\">\n"
+                "<header role=\"banner\" class=\"flex-header\">\n"
                 + "<nav role=\"navigation\">\n",
                 "<main role=\"main\">"
                 + "A sample doc file",
--- a/test/langtools/jdk/javadoc/doclet/testHtmlTableStyles/TestHtmlTableStyles.java	Fri Mar 13 18:43:11 2020 +0100
+++ b/test/langtools/jdk/javadoc/doclet/testHtmlTableStyles/TestHtmlTableStyles.java	Fri Mar 13 10:57:41 2020 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2020, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -56,23 +56,23 @@
 
         checkOutput("pkg1/TestTable.html", true,
                 "<table summary=\"Summary\" border cellpadding=3 cellspacing=1>",
-                "<div class=\"memberSummary\">\n<table>",
-                "<div class=\"memberSummary\">\n<table>",
-                "<div class=\"memberSummary\">\n<table>");
+                "<div class=\"member-summary\">\n<table>",
+                "<div class=\"member-summary\">\n<table>",
+                "<div class=\"member-summary\">\n<table>");
 
         checkOutput("pkg1/package-summary.html", true,
-                "<div class=\"typeSummary\">\n<table>");
+                "<div class=\"type-summary\">\n<table>");
 
         checkOutput("pkg1/class-use/TestTable.html", true,
-                "<div class=\"useSummary\">\n<table>");
+                "<div class=\"use-summary\">\n<table>");
 
         checkOutput("index.html", true,
-                "<div class=\"overviewSummary\">\n<table>");
+                "<div class=\"overview-summary\">\n<table>");
 
         checkOutput("deprecated-list.html", true,
-            "<div class=\"deprecatedSummary\" id=\"method\">\n<table>");
+            "<div class=\"deprecated-summary\" id=\"method\">\n<table>");
 
         checkOutput("constant-values.html", true,
-            "<div class=\"constantsSummary\">\n<table>");
+            "<div class=\"constants-summary\">\n<table>");
     }
 }
--- a/test/langtools/jdk/javadoc/doclet/testHtmlTableTags/TestHtmlTableTags.java	Fri Mar 13 18:43:11 2020 +0100
+++ b/test/langtools/jdk/javadoc/doclet/testHtmlTableTags/TestHtmlTableTags.java	Fri Mar 13 10:57:41 2020 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2020, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -65,70 +65,70 @@
     void checkHtmlTableTag() {
         //Package summary
         checkOutput("pkg1/package-summary.html", true,
-                "<div class=\"typeSummary\">\n<table>",
-                "<div class=\"typeSummary\">\n<table>");
+                "<div class=\"type-summary\">\n<table>",
+                "<div class=\"type-summary\">\n<table>");
 
         checkOutput("pkg2/package-summary.html", true,
-                "<div class=\"typeSummary\">\n<table>",
-                "<div class=\"typeSummary\">\n<table>");
+                "<div class=\"type-summary\">\n<table>",
+                "<div class=\"type-summary\">\n<table>");
 
         // Class documentation
         checkOutput("pkg1/C1.html", true,
-                "<div class=\"memberSummary\">\n<table>",
-                "<div class=\"memberSummary\">\n<table>");
+                "<div class=\"member-summary\">\n<table>",
+                "<div class=\"member-summary\">\n<table>");
 
         checkOutput("pkg2/C2.html", true,
-                "<div class=\"memberSummary\">\n<table>",
-                "<div class=\"memberSummary\">\n<table>");
+                "<div class=\"member-summary\">\n<table>",
+                "<div class=\"member-summary\">\n<table>");
 
         checkOutput("pkg2/C2.ModalExclusionType.html", true,
-                "<div class=\"memberSummary\">\n<table>");
+                "<div class=\"member-summary\">\n<table>");
 
         checkOutput("pkg2/C3.html", true,
-                "<div class=\"memberSummary\">\n<table>");
+                "<div class=\"member-summary\">\n<table>");
 
         checkOutput("pkg2/C4.html", true,
-                "<div class=\"memberSummary\">\n<table>");
+                "<div class=\"member-summary\">\n<table>");
 
         // Class use documentation
         checkOutput("pkg1/class-use/I1.html", true,
-                "<div class=\"useSummary\">\n<table>");
+                "<div class=\"use-summary\">\n<table>");
 
         checkOutput("pkg1/class-use/C1.html", true,
-                "<div class=\"useSummary\">\n<table>",
-                "<div class=\"useSummary\">\n<table>");
+                "<div class=\"use-summary\">\n<table>",
+                "<div class=\"use-summary\">\n<table>");
 
         checkOutput("pkg2/class-use/C2.html", true,
-                "<div class=\"useSummary\">\n<table>",
-                "<div class=\"useSummary\">\n<table>");
+                "<div class=\"use-summary\">\n<table>",
+                "<div class=\"use-summary\">\n<table>");
 
         checkOutput("pkg2/class-use/C2.ModalExclusionType.html", true,
-                "<div class=\"useSummary\">\n<table>");
+                "<div class=\"use-summary\">\n<table>");
 
         checkOutput("pkg2/class-use/C2.ModalExclusionType.html", true,
-                "<div class=\"useSummary\">\n<table>");
+                "<div class=\"use-summary\">\n<table>");
 
         // Package use documentation
         checkOutput("pkg1/package-use.html", true,
-                "<div class=\"useSummary\">\n<table>",
-                "<div class=\"useSummary\">\n<table>");
+                "<div class=\"use-summary\">\n<table>",
+                "<div class=\"use-summary\">\n<table>");
 
         checkOutput("pkg2/package-use.html", true,
-                "<div class=\"useSummary\">\n<table>",
-                "<div class=\"useSummary\">\n<table>");
+                "<div class=\"use-summary\">\n<table>",
+                "<div class=\"use-summary\">\n<table>");
 
         // Deprecated
         checkOutput("deprecated-list.html", true,
-                "<div class=\"deprecatedSummary\" id=\"field\">\n<table>",
-                "<div class=\"deprecatedSummary\" id=\"method\">\n<table>");
+                "<div class=\"deprecated-summary\" id=\"field\">\n<table>",
+                "<div class=\"deprecated-summary\" id=\"method\">\n<table>");
 
         // Constant values
         checkOutput("constant-values.html", true,
-                "<div class=\"constantsSummary\">\n<table>");
+                "<div class=\"constants-summary\">\n<table>");
 
         // Overview Summary
         checkOutput("index.html", true,
-                "<div class=\"overviewSummary\">\n<table>");
+                "<div class=\"overview-summary\">\n<table>");
     }
 
     /*
@@ -137,109 +137,109 @@
     void checkHtmlTableSummaries() {
         //Package summary
         checkOutput("pkg1/package-summary.html", true,
-                "<div class=\"typeSummary\">\n"
+                "<div class=\"type-summary\">\n"
                 + "<table summary=\"Class Summary table, "
                 + "listing classes, and an explanation\">",
-                "<div class=\"typeSummary\">\n"
+                "<div class=\"type-summary\">\n"
                 + "<table summary=\"Interface Summary table, "
                 + "listing interfaces, and an explanation\">");
 
         checkOutput("pkg2/package-summary.html", true,
-                "<div class=\"typeSummary\">\n"
+                "<div class=\"type-summary\">\n"
                 + "<table summary=\"Enum Summary table, "
                 + "listing enums, and an explanation\">",
-                "<div class=\"typeSummary\">\n"
+                "<div class=\"type-summary\">\n"
                 + "<table summary=\"Annotation Types Summary table, "
                 + "listing annotation types, and an explanation\">");
 
         // Class documentation
         checkOutput("pkg1/C1.html", true,
-                "<div class=\"memberSummary\">\n"
+                "<div class=\"member-summary\">\n"
                 + "<table summary=\"Field Summary table, listing fields, "
                 + "and an explanation\">",
-                "<div class=\"memberSummary\">\n",
+                "<div class=\"member-summary\">\n",
                 "<table summary=\"Method Summary table, listing methods, "
                 + "and an explanation\" aria-labelledby=\"t0\">");
 
         checkOutput("pkg2/C2.html", true,
-                "<div class=\"memberSummary\">\n"
+                "<div class=\"member-summary\">\n"
                 + "<table summary=\"Nested Class Summary table, listing "
                 + "nested classes, and an explanation\">",
-                "<div class=\"memberSummary\">\n"
+                "<div class=\"member-summary\">\n"
                 + "<table summary=\"Constructor Summary table, listing "
                 + "constructors, and an explanation\">");
 
         checkOutput("pkg2/C2.ModalExclusionType.html", true,
-                "<div class=\"memberSummary\">\n"
+                "<div class=\"member-summary\">\n"
                 + "<table summary=\"Enum Constant Summary table, listing "
                 + "enum constants, and an explanation\">");
 
         checkOutput("pkg2/C3.html", true,
-                "<div class=\"memberSummary\">\n"
+                "<div class=\"member-summary\">\n"
                 + "<table summary=\"Required Element Summary table, "
                 + "listing required elements, and an explanation\">");
 
         checkOutput("pkg2/C4.html", true,
-                "<div class=\"memberSummary\">\n"
+                "<div class=\"member-summary\">\n"
                 + "<table summary=\"Optional Element Summary table, "
                 + "listing optional elements, and an explanation\">");
 
         // Class use documentation
         checkOutput("pkg1/class-use/I1.html", true,
-                "<div class=\"useSummary\">\n"
+                "<div class=\"use-summary\">\n"
                 + "<table summary=\"Use table, listing packages, and an explanation\">");
 
         checkOutput("pkg1/class-use/C1.html", true,
-                "<div class=\"useSummary\">\n"
+                "<div class=\"use-summary\">\n"
                 + "<table summary=\"Use table, listing fields, and an explanation\">",
-                "<div class=\"useSummary\">\n"
+                "<div class=\"use-summary\">\n"
                 + "<table summary=\"Use table, listing methods, and an explanation\">");
 
         checkOutput("pkg2/class-use/C2.html", true,
-                "<div class=\"useSummary\">\n"
+                "<div class=\"use-summary\">\n"
                 + "<table summary=\"Use table, listing fields, and an explanation\">",
-                "<div class=\"useSummary\">\n"
+                "<div class=\"use-summary\">\n"
                 + "<table summary=\"Use table, listing methods, and an explanation\">");
 
         checkOutput("pkg2/class-use/C2.ModalExclusionType.html", true,
-                "<div class=\"useSummary\">\n"
+                "<div class=\"use-summary\">\n"
                 + "<table summary=\"Use table, listing packages, and an explanation\">");
 
         checkOutput("pkg2/class-use/C2.ModalExclusionType.html", true,
-                "<div class=\"useSummary\">\n"
+                "<div class=\"use-summary\">\n"
                 + "<table summary=\"Use table, listing methods, and an explanation\">");
 
         // Package use documentation
         checkOutput("pkg1/package-use.html", true,
-                "<div class=\"useSummary\">\n"
+                "<div class=\"use-summary\">\n"
                 + "<table summary=\"Use table, listing packages, and an explanation\">",
-                "<div class=\"useSummary\">\n"
+                "<div class=\"use-summary\">\n"
                 + "<table summary=\"Use table, listing classes, and an explanation\">");
 
         checkOutput("pkg2/package-use.html", true,
-                "<div class=\"useSummary\">\n"
+                "<div class=\"use-summary\">\n"
                 + "<table summary=\"Use table, listing packages, and an explanation\">",
-                "<div class=\"useSummary\">\n"
+                "<div class=\"use-summary\">\n"
                 + "<table summary=\"Use table, listing classes, and an explanation\">");
 
         // Deprecated
         checkOutput("deprecated-list.html", true,
-                "<div class=\"deprecatedSummary\" id=\"field\">\n"
+                "<div class=\"deprecated-summary\" id=\"field\">\n"
                 + "<table summary=\"Fields table, listing fields, "
                 + "and an explanation\">",
-                "<div class=\"deprecatedSummary\" id=\"method\">\n"
+                "<div class=\"deprecated-summary\" id=\"method\">\n"
                 + "<table summary=\"Methods table, listing methods, "
                 + "and an explanation\">");
 
         // Constant values
         checkOutput("constant-values.html", true,
-                "<div class=\"constantsSummary\">\n"
+                "<div class=\"constants-summary\">\n"
                 + "<table summary=\"Constant Field Values table, listing "
                 + "constant fields, and values\">");
 
         // Overview Summary
         checkOutput("index.html", true,
-                "<div class=\"overviewSummary\">\n"
+                "<div class=\"overview-summary\">\n"
                 + "<table summary=\"Package Summary table, listing packages, and an explanation\">");
     }
 
@@ -249,110 +249,110 @@
     void checkHtmlTableCaptions() {
         //Package summary
         checkOutput("pkg1/package-summary.html", true,
-                "<caption><span>Class Summary</span><span class=\"tabEnd\">"
+                "<caption><span>Class Summary</span><span class=\"tab-end\">"
                 + "&nbsp;</span></caption>",
-                "<caption><span>Interface Summary</span><span class=\"tabEnd\">"
+                "<caption><span>Interface Summary</span><span class=\"tab-end\">"
                 + "&nbsp;</span></caption>");
 
         checkOutput("pkg2/package-summary.html", true,
-                "<caption><span>Enum Summary</span><span class=\"tabEnd\">"
+                "<caption><span>Enum Summary</span><span class=\"tab-end\">"
                 + "&nbsp;</span></caption>",
-                "<caption><span>Annotation Types Summary</span><span class=\"tabEnd\">"
+                "<caption><span>Annotation Types Summary</span><span class=\"tab-end\">"
                 + "&nbsp;</span></caption>");
 
         // Class documentation
         checkOutput("pkg1/C1.html", true,
-                "<caption><span>Fields</span><span class=\"tabEnd\">&nbsp;</span></caption>",
+                "<caption><span>Fields</span><span class=\"tab-end\">&nbsp;</span></caption>",
                 "<div role=\"tablist\" aria-orientation=\"horizontal\"><button role=\"tab\""
-                + " aria-selected=\"true\" aria-controls=\"memberSummary_tabpanel\" tabindex=\"0\""
-                + " onkeydown=\"switchTab(event)\" id=\"t0\" class=\"activeTableTab\">All Methods"
+                + " aria-selected=\"true\" aria-controls=\"member-summary_tabpanel\" tabindex=\"0\""
+                + " onkeydown=\"switchTab(event)\" id=\"t0\" class=\"active-table-tab\">All Methods"
                 + "</button><button role=\"tab\" aria-selected=\"false\""
-                + " aria-controls=\"memberSummary_tabpanel\" tabindex=\"-1\""
-                + " onkeydown=\"switchTab(event)\" id=\"t2\" class=\"tableTab\" onclick=\"show(2);\">"
+                + " aria-controls=\"member-summary_tabpanel\" tabindex=\"-1\""
+                + " onkeydown=\"switchTab(event)\" id=\"t2\" class=\"table-tab\" onclick=\"show(2);\">"
                 + "Instance Methods</button><button role=\"tab\" aria-selected=\"false\""
-                + " aria-controls=\"memberSummary_tabpanel\" tabindex=\"-1\""
-                + " onkeydown=\"switchTab(event)\" id=\"t4\" class=\"tableTab\" onclick=\"show(8);\">"
+                + " aria-controls=\"member-summary_tabpanel\" tabindex=\"-1\""
+                + " onkeydown=\"switchTab(event)\" id=\"t4\" class=\"table-tab\" onclick=\"show(8);\">"
                 + "Concrete Methods</button><button role=\"tab\" aria-selected=\"false\""
-                + " aria-controls=\"memberSummary_tabpanel\" tabindex=\"-1\" onkeydown=\"switchTab(event)\""
-                + " id=\"t6\" class=\"tableTab\" onclick=\"show(32);\">Deprecated Methods</button></div>\n");
+                + " aria-controls=\"member-summary_tabpanel\" tabindex=\"-1\" onkeydown=\"switchTab(event)\""
+                + " id=\"t6\" class=\"table-tab\" onclick=\"show(32);\">Deprecated Methods</button></div>\n");
 
         checkOutput("pkg2/C2.html", true,
-                "<caption><span>Nested Classes</span><span class=\"tabEnd\">&nbsp;</span></caption>",
-                "<caption><span>Constructors</span><span class=\"tabEnd\">&nbsp;</span></caption>");
+                "<caption><span>Nested Classes</span><span class=\"tab-end\">&nbsp;</span></caption>",
+                "<caption><span>Constructors</span><span class=\"tab-end\">&nbsp;</span></caption>");
 
         checkOutput("pkg2/C2.ModalExclusionType.html", true,
-                "<caption><span>Enum Constants</span><span class=\"tabEnd\">&nbsp;</span></caption>");
+                "<caption><span>Enum Constants</span><span class=\"tab-end\">&nbsp;</span></caption>");
 
         checkOutput("pkg2/C3.html", true,
-                "<caption><span>Required Elements</span><span class=\"tabEnd\">&nbsp;"
+                "<caption><span>Required Elements</span><span class=\"tab-end\">&nbsp;"
                 + "</span></caption>");
 
         checkOutput("pkg2/C4.html", true,
-                "<caption><span>Optional Elements</span><span class=\"tabEnd\">&nbsp;"
+                "<caption><span>Optional Elements</span><span class=\"tab-end\">&nbsp;"
                 + "</span></caption>");
 
         // Class use documentation
         checkOutput("pkg1/class-use/I1.html", true,
                 "<caption><span>Packages that use <a href=\"../I1.html\" "
-                + "title=\"interface in pkg1\">I1</a></span><span class=\"tabEnd\">"
+                + "title=\"interface in pkg1\">I1</a></span><span class=\"tab-end\">"
                 + "&nbsp;</span></caption>");
 
         checkOutput("pkg1/class-use/C1.html", true,
                 "<caption><span>Fields in <a href=\"../../pkg2/package-summary.html\">"
                 + "pkg2</a> declared as <a href=\"../C1.html\" "
-                + "title=\"class in pkg1\">C1</a></span><span class=\"tabEnd\">&nbsp;"
+                + "title=\"class in pkg1\">C1</a></span><span class=\"tab-end\">&nbsp;"
                 + "</span></caption>",
                 "<caption><span>Methods in <a href=\"../../pkg2/package-summary.html\">"
                 + "pkg2</a> that return <a href=\"../C1.html\" "
-                + "title=\"class in pkg1\">C1</a></span><span class=\"tabEnd\">"
+                + "title=\"class in pkg1\">C1</a></span><span class=\"tab-end\">"
                 + "&nbsp;</span></caption>");
 
         checkOutput("pkg2/class-use/C2.html", true,
                 "<caption><span>Fields in <a href=\"../../pkg1/package-summary.html\">"
                 + "pkg1</a> declared as <a href=\"../C2.html\" "
-                + "title=\"class in pkg2\">C2</a></span><span class=\"tabEnd\">"
+                + "title=\"class in pkg2\">C2</a></span><span class=\"tab-end\">"
                 + "&nbsp;</span></caption>",
                 "<caption><span>Methods in <a href=\"../../pkg1/package-summary.html\">"
                 + "pkg1</a> that return <a href=\"../C2.html\" "
-                + "title=\"class in pkg2\">C2</a></span><span class=\"tabEnd\">"
+                + "title=\"class in pkg2\">C2</a></span><span class=\"tab-end\">"
                 + "&nbsp;</span></caption>");
 
         checkOutput("pkg2/class-use/C2.ModalExclusionType.html", true,
                 "<caption><span>Methods in <a href=\"../package-summary.html\">"
                 + "pkg2</a> that return <a href=\"../C2.ModalExclusionType.html\" "
                 + "title=\"enum in pkg2\">C2.ModalExclusionType</a></span>"
-                + "<span class=\"tabEnd\">&nbsp;</span></caption>");
+                + "<span class=\"tab-end\">&nbsp;</span></caption>");
 
         // Package use documentation
         checkOutput("pkg1/package-use.html", true,
                 "<caption><span>Packages that use <a href=\"package-summary.html\">"
-                + "pkg1</a></span><span class=\"tabEnd\">&nbsp;</span></caption>",
+                + "pkg1</a></span><span class=\"tab-end\">&nbsp;</span></caption>",
                 "<caption><span>Classes in <a href=\"package-summary.html\">"
                 + "pkg1</a> used by <a href=\"package-summary.html\">pkg1</a>"
-                + "</span><span class=\"tabEnd\">&nbsp;</span></caption>");
+                + "</span><span class=\"tab-end\">&nbsp;</span></caption>");
 
         checkOutput("pkg2/package-use.html", true,
                 "<caption><span>Packages that use <a href=\"package-summary.html\">"
-                + "pkg2</a></span><span class=\"tabEnd\">&nbsp;</span></caption>",
+                + "pkg2</a></span><span class=\"tab-end\">&nbsp;</span></caption>",
                 "<caption><span>Classes in <a href=\"package-summary.html\">"
                 + "pkg2</a> used by <a href=\"../pkg1/package-summary.html\">pkg1</a>"
-                + "</span><span class=\"tabEnd\">&nbsp;</span></caption>");
+                + "</span><span class=\"tab-end\">&nbsp;</span></caption>");
 
         // Deprecated
         checkOutput("deprecated-list.html", true,
-                "<caption><span>Fields</span><span class=\"tabEnd\">"
+                "<caption><span>Fields</span><span class=\"tab-end\">"
                 + "&nbsp;</span></caption>",
-                "<caption><span>Methods</span><span class=\"tabEnd\">"
+                "<caption><span>Methods</span><span class=\"tab-end\">"
                 + "&nbsp;</span></caption>");
 
         // Constant values
         checkOutput("constant-values.html", true,
                 "<caption><span>pkg1.<a href=\"pkg1/C1.html\" title=\"class in pkg1\">"
-                + "C1</a></span><span class=\"tabEnd\">&nbsp;</span></caption>");
+                + "C1</a></span><span class=\"tab-end\">&nbsp;</span></caption>");
 
         // Overview Summary
         checkOutput("index.html", true,
-                "<caption><span>Packages</span><span class=\"tabEnd\">&nbsp;</span></caption>");
+                "<caption><span>Packages</span><span class=\"tab-end\">&nbsp;</span></caption>");
     }
 
     /*
@@ -361,116 +361,116 @@
     void checkHtmlTableHeaders() {
         //Package summary
         checkOutput("pkg1/package-summary.html", true,
-                "<th class=\"colFirst\" scope=\"col\">"
+                "<th class=\"col-first\" scope=\"col\">"
                 + "Class</th>\n"
-                + "<th class=\"colLast\" scope=\"col\""
+                + "<th class=\"col-last\" scope=\"col\""
                 + ">Description</th>",
-                "<th class=\"colFirst\" scope=\"col\">"
+                "<th class=\"col-first\" scope=\"col\">"
                 + "Interface</th>\n"
-                + "<th class=\"colLast\" scope=\"col\""
+                + "<th class=\"col-last\" scope=\"col\""
                 + ">Description</th>");
 
         checkOutput("pkg2/package-summary.html", true,
-                "<th class=\"colFirst\" scope=\"col\">"
+                "<th class=\"col-first\" scope=\"col\">"
                 + "Enum</th>\n"
-                + "<th class=\"colLast\" scope=\"col\""
+                + "<th class=\"col-last\" scope=\"col\""
                 + ">Description</th>",
-                "<th class=\"colFirst\" scope=\"col\">"
+                "<th class=\"col-first\" scope=\"col\">"
                 + "Annotation Type</th>\n"
-                + "<th class=\"colLast\""
+                + "<th class=\"col-last\""
                 + " scope=\"col\">Description</th>");
 
         // Class documentation
         checkOutput("pkg1/C1.html", true,
-                "<th class=\"colFirst\" scope=\"col\">Modifier and Type</th>\n"
-                + "<th class=\"colSecond\" scope=\"col\">Field</th>\n"
-                + "<th class=\"colLast\" scope=\"col\">Description</th>",
-                "<th class=\"colFirst\" scope=\"col\">Modifier and Type</th>\n"
-                + "<th class=\"colSecond\" scope=\"col\">Method</th>\n"
-                + "<th class=\"colLast\" scope=\"col\">Description</th>");
+                "<th class=\"col-first\" scope=\"col\">Modifier and Type</th>\n"
+                + "<th class=\"col-second\" scope=\"col\">Field</th>\n"
+                + "<th class=\"col-last\" scope=\"col\">Description</th>",
+                "<th class=\"col-first\" scope=\"col\">Modifier and Type</th>\n"
+                + "<th class=\"col-second\" scope=\"col\">Method</th>\n"
+                + "<th class=\"col-last\" scope=\"col\">Description</th>");
 
         checkOutput("pkg2/C2.html", true,
-                "<th class=\"colFirst\" scope=\"col\">Modifier and Type</th>\n"
-                + "<th class=\"colSecond\" scope=\"col\">Class</th>\n"
-                + "<th class=\"colLast\" scope=\"col\">Description</th>",
-                "<th class=\"colFirst\" scope=\"col\">Constructor</th>\n"
-                + "<th class=\"colLast\" scope=\"col\">Description</th>");
+                "<th class=\"col-first\" scope=\"col\">Modifier and Type</th>\n"
+                + "<th class=\"col-second\" scope=\"col\">Class</th>\n"
+                + "<th class=\"col-last\" scope=\"col\">Description</th>",
+                "<th class=\"col-first\" scope=\"col\">Constructor</th>\n"
+                + "<th class=\"col-last\" scope=\"col\">Description</th>");
 
         checkOutput("pkg2/C2.ModalExclusionType.html", true,
-                "<th class=\"colFirst\" scope=\"col\">Enum Constant</th>\n"
-                + "<th class=\"colLast\" scope=\"col\">Description</th>");
+                "<th class=\"col-first\" scope=\"col\">Enum Constant</th>\n"
+                + "<th class=\"col-last\" scope=\"col\">Description</th>");
 
         checkOutput("pkg2/C3.html", true,
-                "<th class=\"colFirst\" scope=\"col\">Modifier and Type</th>\n"
-                + "<th class=\"colSecond\" scope=\"col\">Required Element</th>\n"
-                + "<th class=\"colLast\" scope=\"col\">Description</th>");
+                "<th class=\"col-first\" scope=\"col\">Modifier and Type</th>\n"
+                + "<th class=\"col-second\" scope=\"col\">Required Element</th>\n"
+                + "<th class=\"col-last\" scope=\"col\">Description</th>");
 
         checkOutput("pkg2/C4.html", true,
-                "<th class=\"colFirst\" scope=\"col\">Modifier and Type</th>\n"
-                + "<th class=\"colSecond\" scope=\"col\">Optional Element</th>\n"
-                + "<th class=\"colLast\" scope=\"col\">Description</th>");
+                "<th class=\"col-first\" scope=\"col\">Modifier and Type</th>\n"
+                + "<th class=\"col-second\" scope=\"col\">Optional Element</th>\n"
+                + "<th class=\"col-last\" scope=\"col\">Description</th>");
 
         // Class use documentation
         checkOutput("pkg1/class-use/I1.html", true,
-                "<th class=\"colFirst\" scope=\"col\">Package</th>\n"
-                + "<th class=\"colLast\" scope=\"col\">Description</th>");
+                "<th class=\"col-first\" scope=\"col\">Package</th>\n"
+                + "<th class=\"col-last\" scope=\"col\">Description</th>");
 
         checkOutput("pkg1/class-use/C1.html", true,
-                "<th class=\"colFirst\" scope=\"col\">Modifier and Type</th>\n"
-                + "<th class=\"colSecond\" scope=\"col\">Field</th>\n"
-                + "<th class=\"colLast\" scope=\"col\">Description</th>",
-                "<th class=\"colFirst\" scope=\"col\">Modifier and Type</th>\n"
-                + "<th class=\"colSecond\" scope=\"col\">Method</th>\n"
-                + "<th class=\"colLast\" scope=\"col\">Description</th>");
+                "<th class=\"col-first\" scope=\"col\">Modifier and Type</th>\n"
+                + "<th class=\"col-second\" scope=\"col\">Field</th>\n"
+                + "<th class=\"col-last\" scope=\"col\">Description</th>",
+                "<th class=\"col-first\" scope=\"col\">Modifier and Type</th>\n"
+                + "<th class=\"col-second\" scope=\"col\">Method</th>\n"
+                + "<th class=\"col-last\" scope=\"col\">Description</th>");
 
         checkOutput("pkg2/class-use/C2.html", true,
-                "<th class=\"colFirst\" scope=\"col\">Modifier and Type</th>\n"
-                + "<th class=\"colSecond\" scope=\"col\">Field</th>\n"
-                + "<th class=\"colLast\" scope=\"col\">Description</th>",
-                "<th class=\"colFirst\" scope=\"col\">Modifier and Type</th>\n"
-                + "<th class=\"colSecond\" scope=\"col\">Method</th>\n"
-                + "<th class=\"colLast\" scope=\"col\">Description</th>");
+                "<th class=\"col-first\" scope=\"col\">Modifier and Type</th>\n"
+                + "<th class=\"col-second\" scope=\"col\">Field</th>\n"
+                + "<th class=\"col-last\" scope=\"col\">Description</th>",
+                "<th class=\"col-first\" scope=\"col\">Modifier and Type</th>\n"
+                + "<th class=\"col-second\" scope=\"col\">Method</th>\n"
+                + "<th class=\"col-last\" scope=\"col\">Description</th>");
 
         checkOutput("pkg2/class-use/C2.ModalExclusionType.html", true,
-                "<th class=\"colFirst\" scope=\"col\">Package</th>\n"
-                + "<th class=\"colLast\" scope=\"col\">Description</th>",
-                "<th class=\"colFirst\" scope=\"col\">Modifier and Type</th>\n"
-                + "<th class=\"colSecond\" scope=\"col\">Method</th>\n"
-                + "<th class=\"colLast\" scope=\"col\">Description</th>");
+                "<th class=\"col-first\" scope=\"col\">Package</th>\n"
+                + "<th class=\"col-last\" scope=\"col\">Description</th>",
+                "<th class=\"col-first\" scope=\"col\">Modifier and Type</th>\n"
+                + "<th class=\"col-second\" scope=\"col\">Method</th>\n"
+                + "<th class=\"col-last\" scope=\"col\">Description</th>");
 
         // Package use documentation
         checkOutput("pkg1/package-use.html", true,
-                "<th class=\"colFirst\" scope=\"col\">Package</th>\n"
-                + "<th class=\"colLast\" scope=\"col\">Description</th>",
-                "<th class=\"colFirst\" scope=\"col\">Class</th>\n"
-                + "<th class=\"colLast\" scope=\"col\">Description</th>");
+                "<th class=\"col-first\" scope=\"col\">Package</th>\n"
+                + "<th class=\"col-last\" scope=\"col\">Description</th>",
+                "<th class=\"col-first\" scope=\"col\">Class</th>\n"
+                + "<th class=\"col-last\" scope=\"col\">Description</th>");
 
         checkOutput("pkg2/package-use.html", true,
-                "<th class=\"colFirst\" scope=\"col\">Package</th>\n"
-                + "<th class=\"colLast\" scope=\"col\">Description</th>",
-                "<th class=\"colFirst\" scope=\"col\">Class</th>\n"
-                + "<th class=\"colLast\" scope=\"col\">Description</th>");
+                "<th class=\"col-first\" scope=\"col\">Package</th>\n"
+                + "<th class=\"col-last\" scope=\"col\">Description</th>",
+                "<th class=\"col-first\" scope=\"col\">Class</th>\n"
+                + "<th class=\"col-last\" scope=\"col\">Description</th>");
 
         // Deprecated
         checkOutput("deprecated-list.html", true,
-                "<th class=\"colFirst\" scope=\"col\">Field</th>\n"
-                + "<th class=\"colLast\" scope=\"col\">Description</th>",
-                "<th class=\"colFirst\" scope=\"col\">Method</th>\n"
-                + "<th class=\"colLast\" scope=\"col\">Description</th>");
+                "<th class=\"col-first\" scope=\"col\">Field</th>\n"
+                + "<th class=\"col-last\" scope=\"col\">Description</th>",
+                "<th class=\"col-first\" scope=\"col\">Method</th>\n"
+                + "<th class=\"col-last\" scope=\"col\">Description</th>");
 
         // Constant values
         checkOutput("constant-values.html", true,
-                "<th class=\"colFirst\" scope=\"col\">"
+                "<th class=\"col-first\" scope=\"col\">"
                 + "Modifier and Type</th>\n"
-                + "<th class=\"colSecond\""
+                + "<th class=\"col-second\""
                 + " scope=\"col\">Constant Field</th>\n"
-                + "<th class=\"colLast\" scope=\"col\">Value</th>");
+                + "<th class=\"col-last\" scope=\"col\">Value</th>");
 
         // Overview Summary
         checkOutput("index.html", true,
-                "<th class=\"colFirst\" scope=\"col\">"
+                "<th class=\"col-first\" scope=\"col\">"
                 + "Package</th>\n"
-                + "<th class=\"colLast\" scope=\"col\""
+                + "<th class=\"col-last\" scope=\"col\""
                 + ">Description</th>");
     }
 }
--- a/test/langtools/jdk/javadoc/doclet/testHtmlTag/TestHtmlTag.java	Fri Mar 13 18:43:11 2020 +0100
+++ b/test/langtools/jdk/javadoc/doclet/testHtmlTag/TestHtmlTag.java	Fri Mar 13 10:57:41 2020 -0700
@@ -107,7 +107,7 @@
         checkExit(Exit.OK);
 
         checkOutput("pkg3/package-summary.html", true,
-                "<section class=\"packageDescription\" id=\"package.description\">\n"
+                "<section class=\"package-description\" id=\"package.description\">\n"
                 + "<div class=\"block\"><p>This is the first line. Note the newlines before the &lt;p&gt; is relevant.</div>\n"
                 + "</section>");
 
@@ -154,7 +154,7 @@
                 + " </ol></div>");
 
         checkOutput("pkg3/A.ActivationDesc.html", true,
-                "<pre>public class <span class=\"typeNameLabel\">A.ActivationDesc</span>\n"
+                "<pre>public class <span class=\"type-name-label\">A.ActivationDesc</span>\n"
                 + "extends java.lang.Object\n"
                 + "implements java.io.Serializable</pre>\n"
                 + "<div class=\"block\">An activation descriptor contains the information necessary to activate\n"
@@ -175,7 +175,7 @@
                 + " during reinitialization/activation.</div>");
 
         checkOutput("pkg3/A.ActivationGroupID.html", true,
-                "<pre>public class <span class=\"typeNameLabel\">A.ActivationGroupID</span>\n"
+                "<pre>public class <span class=\"type-name-label\">A.ActivationGroupID</span>\n"
                 + "extends java.lang.Object\n"
                 + "implements java.io.Serializable</pre>\n"
                 + "<div class=\"block\">The identifier for a registered activation group serves several purposes:\n"
--- a/test/langtools/jdk/javadoc/doclet/testHtmlVersion/TestHtmlVersion.java	Fri Mar 13 18:43:11 2020 +0100
+++ b/test/langtools/jdk/javadoc/doclet/testHtmlVersion/TestHtmlVersion.java	Fri Mar 13 10:57:41 2020 -0700
@@ -71,11 +71,11 @@
         checkOutput("index.html", true,
                 "<!DOCTYPE HTML>",
                 "<meta name=\"dc.created\"",
-                "<ul id=\"navbar.top.firstrow\" class=\"navList\" title=\"Navigation\">\n",
-                "<div class=\"overviewSummary\">\n"
+                "<ul id=\"navbar.top.firstrow\" class=\"nav-list\" title=\"Navigation\">\n",
+                "<div class=\"overview-summary\">\n"
                 + "<table>\n"
                 + "<caption>",
-                "<header role=\"banner\" class=\"flexHeader\">\n"
+                "<header role=\"banner\" class=\"flex-header\">\n"
                 + "<nav role=\"navigation\">\n"
                 + "<!-- ========= START OF TOP NAVBAR ======= -->",
                 "<footer role=\"contentinfo\">\n"
@@ -86,14 +86,14 @@
         checkOutput("pkg/package-summary.html", true,
                 "<!DOCTYPE HTML>",
                 "<meta name=\"dc.created\"",
-                "<ul id=\"navbar.top.firstrow\" class=\"navList\" title=\"Navigation\">\n",
-                "<div class=\"typeSummary\">\n<table>",
-                "<header role=\"banner\" class=\"flexHeader\">\n"
+                "<ul id=\"navbar.top.firstrow\" class=\"nav-list\" title=\"Navigation\">\n",
+                "<div class=\"type-summary\">\n<table>",
+                "<header role=\"banner\" class=\"flex-header\">\n"
                 + "<nav role=\"navigation\">\n"
                 + "<!-- ========= START OF TOP NAVBAR ======= -->",
                 "<main role=\"main\">\n"
                 + "<div class=\"header\">",
-                "<section class=\"packageDescription\" id=\"package.description\">\n"
+                "<section class=\"package-description\" id=\"package.description\">\n"
                 + "<div class=\"block\">Test package.</div>",
                 "<footer role=\"contentinfo\">\n"
                 + "<nav role=\"navigation\">\n"
@@ -101,18 +101,18 @@
         // No package description
         checkOutput("pkg1/package-summary.html", true,
                 "<section class=\"summary\">\n"
-                + "<ul class=\"blockList\">\n"
-                + "<li class=\"blockList\">\n"
-                + "<div class=\"typeSummary\">\n<table>\n"
-                + "<caption><span>Class Summary</span><span class=\"tabEnd\">&nbsp;</span></caption>");
+                + "<ul class=\"block-list\">\n"
+                + "<li class=\"block-list\">\n"
+                + "<div class=\"type-summary\">\n<table>\n"
+                + "<caption><span>Class Summary</span><span class=\"tab-end\">&nbsp;</span></caption>");
 
         // Test for package-tree page
         checkOutput("pkg/package-tree.html", true,
                 "<!DOCTYPE HTML>",
                 "<meta name=\"dc.created\"",
-                "<ul id=\"navbar.top.firstrow\" class=\"navList\" title=\"Navigation\">\n",
+                "<ul id=\"navbar.top.firstrow\" class=\"nav-list\" title=\"Navigation\">\n",
                 "<li class=\"circle\">",
-                "<header role=\"banner\" class=\"flexHeader\">\n"
+                "<header role=\"banner\" class=\"flex-header\">\n"
                 + "<nav role=\"navigation\">\n"
                 + "<!-- ========= START OF TOP NAVBAR ======= -->",
                 "<main role=\"main\">\n"
@@ -133,9 +133,9 @@
         checkOutput("pkg1/package-use.html", true,
                 "<!DOCTYPE HTML>",
                 "<meta name=\"dc.created\"",
-                "<ul id=\"navbar.top.firstrow\" class=\"navList\" title=\"Navigation\">\n",
-                "<div class=\"useSummary\">\n<table>",
-                "<header role=\"banner\" class=\"flexHeader\">\n"
+                "<ul id=\"navbar.top.firstrow\" class=\"nav-list\" title=\"Navigation\">\n",
+                "<div class=\"use-summary\">\n<table>",
+                "<header role=\"banner\" class=\"flex-header\">\n"
                 + "<nav role=\"navigation\">\n"
                 + "<!-- ========= START OF TOP NAVBAR ======= -->",
                 "<main role=\"main\">\n"
@@ -148,16 +148,16 @@
         checkOutput("constant-values.html", true,
                 "<!DOCTYPE HTML>",
                 "<meta name=\"dc.created\"",
-                "<ul id=\"navbar.top.firstrow\" class=\"navList\" title=\"Navigation\">\n",
-                "<div class=\"constantsSummary\">\n<table>",
-                "<header role=\"banner\" class=\"flexHeader\">\n"
+                "<ul id=\"navbar.top.firstrow\" class=\"nav-list\" title=\"Navigation\">\n",
+                "<div class=\"constants-summary\">\n<table>",
+                "<header role=\"banner\" class=\"flex-header\">\n"
                 + "<nav role=\"navigation\">\n"
                 + "<!-- ========= START OF TOP NAVBAR ======= -->",
                 "<main role=\"main\">\n"
                 + "<div class=\"header\">",
                 "<section class=\"packages\">\n"
                 + "<h2 title=\"Contents\">Contents</h2>\n",
-                "<section class=\"constantsSummary\" id=\"pkg\">\n"
+                "<section class=\"constants-summary\" id=\"pkg\">\n"
                 + "<h2 title=\"pkg\">pkg.*</h2>\n",
                 "<footer role=\"contentinfo\">\n"
                 + "<nav role=\"navigation\">\n"
@@ -167,9 +167,9 @@
         checkOutput("deprecated-list.html", true,
                 "<!DOCTYPE HTML>",
                 "<meta name=\"dc.created\"",
-                "<ul id=\"navbar.top.firstrow\" class=\"navList\" title=\"Navigation\">\n",
-                "<div class=\"deprecatedSummary\" id=\"class\">\n<table>",
-                "<header role=\"banner\" class=\"flexHeader\">\n"
+                "<ul id=\"navbar.top.firstrow\" class=\"nav-list\" title=\"Navigation\">\n",
+                "<div class=\"deprecated-summary\" id=\"class\">\n<table>",
+                "<header role=\"banner\" class=\"flex-header\">\n"
                 + "<nav role=\"navigation\">\n"
                 + "<!-- ========= START OF TOP NAVBAR ======= -->",
                 "<main role=\"main\">\n"
@@ -182,13 +182,13 @@
         checkOutput("serialized-form.html", true,
                 "<!DOCTYPE HTML>",
                 "<meta name=\"dc.created\"",
-                "<ul id=\"navbar.top.firstrow\" class=\"navList\" title=\"Navigation\">\n",
-                "<header role=\"banner\" class=\"flexHeader\">\n"
+                "<ul id=\"navbar.top.firstrow\" class=\"nav-list\" title=\"Navigation\">\n",
+                "<header role=\"banner\" class=\"flex-header\">\n"
                 + "<nav role=\"navigation\">\n"
                 + "<!-- ========= START OF TOP NAVBAR ======= -->",
                 "<main role=\"main\">\n"
                 + "<div class=\"header\">",
-                "<section class=\"serializedPackageContainer\">\n"
+                "<section class=\"serialized-package-container\">\n"
                 + "<h2 title=\"Package\">Package&nbsp;pkg</h2>\n",
                 "<footer role=\"contentinfo\">\n"
                 + "<nav role=\"navigation\">\n"
@@ -198,9 +198,9 @@
         checkOutput("overview-tree.html", true,
                 "<!DOCTYPE HTML>",
                 "<meta name=\"dc.created\"",
-                "<ul id=\"navbar.top.firstrow\" class=\"navList\" title=\"Navigation\">\n",
+                "<ul id=\"navbar.top.firstrow\" class=\"nav-list\" title=\"Navigation\">\n",
                 "<li class=\"circle\">",
-                "<header role=\"banner\" class=\"flexHeader\">\n"
+                "<header role=\"banner\" class=\"flex-header\">\n"
                 + "<nav role=\"navigation\">\n"
                 + "<!-- ========= START OF TOP NAVBAR ======= -->",
                 "<main role=\"main\">\n"
@@ -221,12 +221,12 @@
         checkOutput("index-all.html", true,
                 "<!DOCTYPE HTML>",
                 "<meta name=\"dc.created\"",
-                "<ul id=\"navbar.top.firstrow\" class=\"navList\" title=\"Navigation\">\n",
-                "<header role=\"banner\" class=\"flexHeader\">\n"
+                "<ul id=\"navbar.top.firstrow\" class=\"nav-list\" title=\"Navigation\">\n",
+                "<header role=\"banner\" class=\"flex-header\">\n"
                 + "<nav role=\"navigation\">\n"
                 + "<!-- ========= START OF TOP NAVBAR ======= -->",
                 "</header>\n"
-                + "<div class=\"flexContent\">\n"
+                + "<div class=\"flex-content\">\n"
                 + "<main role=\"main\">",
                 "<footer role=\"contentinfo\">\n"
                 + "<nav role=\"navigation\">\n"
@@ -236,23 +236,23 @@
         checkOutput("src-html/pkg/AnotherClass.html", true,
                 "<!DOCTYPE HTML>",
                 "<main role=\"main\">\n"
-                + "<div class=\"sourceContainer\">");
+                + "<div class=\"source-container\">");
 
         // Test for help-doc page
         checkOutput("help-doc.html", true,
                 "<!DOCTYPE HTML>",
                 "<meta name=\"dc.created\"",
-                "<ul id=\"navbar.top.firstrow\" class=\"navList\" title=\"Navigation\">\n",
-                "<header role=\"banner\" class=\"flexHeader\">\n"
+                "<ul id=\"navbar.top.firstrow\" class=\"nav-list\" title=\"Navigation\">\n",
+                "<header role=\"banner\" class=\"flex-header\">\n"
                 + "<nav role=\"navigation\">\n"
                 + "<!-- ========= START OF TOP NAVBAR ======= -->",
                 "<main role=\"main\">\n"
                 + "<div class=\"header\">",
-                "<section class=\"helpSection\">\n"
+                "<section class=\"help-section\">\n"
                 + "<h2>Overview</h2>\n",
-                "<section class=\"helpSection\">\n"
+                "<section class=\"help-section\">\n"
                 + "<h2>Package</h2>\n",
-                "<section class=\"helpSection\">\n"
+                "<section class=\"help-section\">\n"
                 + "<h2>Class or Interface</h2>\n",
                 "<footer role=\"contentinfo\">\n"
                 + "<nav role=\"navigation\">\n"
@@ -262,29 +262,29 @@
         checkOutput("pkg/AnotherClass.html", true,
                 "<!DOCTYPE HTML>",
                 "<meta name=\"dc.created\"",
-                "<ul id=\"navbar.top.firstrow\" class=\"navList\" title=\"Navigation\">\n",
-                "<header role=\"banner\" class=\"flexHeader\">\n"
+                "<ul id=\"navbar.top.firstrow\" class=\"nav-list\" title=\"Navigation\">\n",
+                "<header role=\"banner\" class=\"flex-header\">\n"
                 + "<nav role=\"navigation\">\n"
                 + "<!-- ========= START OF TOP NAVBAR ======= -->",
                 "<main role=\"main\">\n"
                 + "<!-- ======== START OF CLASS DATA ======== -->\n"
                 + "<div class=\"header\">",
-                "<section class=\"nestedClassSummary\" id=\"nested.class.summary\">\n"
+                "<section class=\"nested-class-summary\" id=\"nested.class.summary\">\n"
                 + "<h2>Nested Class Summary</h2>\n"
-                + "<div class=\"memberSummary\">\n<table>",
-                "<section class=\"fieldSummary\" id=\"field.summary\">\n"
+                + "<div class=\"member-summary\">\n<table>",
+                "<section class=\"field-summary\" id=\"field.summary\">\n"
                 + "<h2>Field Summary</h2>\n"
-                + "<div class=\"memberSummary\">\n<table>",
-                "<section class=\"constructorSummary\" id=\"constructor.summary\">\n"
+                + "<div class=\"member-summary\">\n<table>",
+                "<section class=\"constructor-summary\" id=\"constructor.summary\">\n"
                 + "<h2>Constructor Summary</h2>\n"
-                + "<div class=\"memberSummary\">\n<table>",
-                "<section class=\"methodSummary\" id=\"method.summary\">\n"
+                + "<div class=\"member-summary\">\n<table>",
+                "<section class=\"method-summary\" id=\"method.summary\">\n"
                 + "<h2>Method Summary</h2>",
-                "<section class=\"fieldDetails\" id=\"field.detail\">\n"
+                "<section class=\"field-details\" id=\"field.detail\">\n"
                 + "<h2>Field Details</h2>\n",
-                "<section class=\"constructorDetails\" id=\"constructor.detail\">\n"
+                "<section class=\"constructor-details\" id=\"constructor.detail\">\n"
                 + "<h2>Constructor Details</h2>\n",
-                "<section class=\"methodDetails\" id=\"method.detail\">\n"
+                "<section class=\"method-details\" id=\"method.detail\">\n"
                 + "<h2>Method Details</h2>\n",
                 "<footer role=\"contentinfo\">\n"
                 + "<nav role=\"navigation\">\n"
@@ -294,24 +294,24 @@
         checkOutput("pkg/AnotherClass.ModalExclusionType.html", true,
                 "<!DOCTYPE HTML>",
                 "<meta name=\"dc.created\"",
-                "<ul id=\"navbar.top.firstrow\" class=\"navList\" title=\"Navigation\">\n",
-                "<header role=\"banner\" class=\"flexHeader\">\n"
+                "<ul id=\"navbar.top.firstrow\" class=\"nav-list\" title=\"Navigation\">\n",
+                "<header role=\"banner\" class=\"flex-header\">\n"
                 + "<nav role=\"navigation\">\n"
                 + "<!-- ========= START OF TOP NAVBAR ======= -->",
                 "<main role=\"main\">\n"
                 + "<!-- ======== START OF CLASS DATA ======== -->\n"
                 + "<div class=\"header\">",
-                "<section class=\"constantsSummary\" id=\"enum.constant.summary\">\n"
+                "<section class=\"constants-summary\" id=\"enum.constant.summary\">\n"
                 + "<h2>Enum Constant Summary</h2>\n"
-                + "<div class=\"memberSummary\">\n",
+                + "<div class=\"member-summary\">\n",
                 "<table aria-labelledby=\"t0\">\n",
-                "<section class=\"methodSummary\" id=\"method.summary\">\n"
+                "<section class=\"method-summary\" id=\"method.summary\">\n"
                 + "<h2>Method Summary</h2>\n"
-                + "<div class=\"memberSummary\">\n",
+                + "<div class=\"member-summary\">\n",
                 "<table aria-labelledby=\"t0\">",
-                "<section class=\"constantDetails\" id=\"enum.constant.detail\">\n"
+                "<section class=\"constant-details\" id=\"enum.constant.detail\">\n"
                 + "<h2>Enum Constant Details</h2>\n",
-                "<section class=\"methodDetails\" id=\"method.detail\">\n"
+                "<section class=\"method-details\" id=\"method.detail\">\n"
                 + "<h2>Method Details</h2>\n",
                 "<footer role=\"contentinfo\">\n"
                 + "<nav role=\"navigation\">\n"
@@ -321,18 +321,18 @@
         checkOutput("pkg2/Interface.html", true,
                 "<!DOCTYPE HTML>",
                 "<meta name=\"dc.created\"",
-                "<ul id=\"navbar.top.firstrow\" class=\"navList\" title=\"Navigation\">\n",
-                "<header role=\"banner\" class=\"flexHeader\">\n"
+                "<ul id=\"navbar.top.firstrow\" class=\"nav-list\" title=\"Navigation\">\n",
+                "<header role=\"banner\" class=\"flex-header\">\n"
                 + "<nav role=\"navigation\">\n"
                 + "<!-- ========= START OF TOP NAVBAR ======= -->",
                 "<main role=\"main\">\n"
                 + "<!-- ======== START OF CLASS DATA ======== -->\n"
                 + "<div class=\"header\">",
-                "<section class=\"methodSummary\" id=\"method.summary\">\n"
+                "<section class=\"method-summary\" id=\"method.summary\">\n"
                 + "<h2>Method Summary</h2>\n"
-                + "<div class=\"memberSummary\">\n",
+                + "<div class=\"member-summary\">\n",
                 "<table aria-labelledby=\"t0\">\n",
-                "<section class=\"methodDetails\" id=\"method.detail\">\n"
+                "<section class=\"method-details\" id=\"method.detail\">\n"
                 + "<h2>Method Details</h2>\n",
                 "<footer role=\"contentinfo\">\n"
                 + "<nav role=\"navigation\">\n"
@@ -342,16 +342,16 @@
         checkOutput("pkg/TestError.html", true,
                 "<!DOCTYPE HTML>",
                 "<meta name=\"dc.created\"",
-                "<ul id=\"navbar.top.firstrow\" class=\"navList\" title=\"Navigation\">\n",
-                "<header role=\"banner\" class=\"flexHeader\">\n"
+                "<ul id=\"navbar.top.firstrow\" class=\"nav-list\" title=\"Navigation\">\n",
+                "<header role=\"banner\" class=\"flex-header\">\n"
                 + "<nav role=\"navigation\">\n"
                 + "<!-- ========= START OF TOP NAVBAR ======= -->",
                 "<main role=\"main\">\n"
                 + "<!-- ======== START OF CLASS DATA ======== -->\n"
                 + "<div class=\"header\">",
-                "<section class=\"constructorSummary\" id=\"constructor.summary\">\n"
+                "<section class=\"constructor-summary\" id=\"constructor.summary\">\n"
                 + "<h2>Constructor Summary</h2>",
-                "<section class=\"constructorDetails\" id=\"constructor.detail\">\n"
+                "<section class=\"constructor-details\" id=\"constructor.detail\">\n"
                 + "<h2>Constructor Details</h2>\n",
                 "<footer role=\"contentinfo\">\n"
                 + "<nav role=\"navigation\">\n"
@@ -361,16 +361,16 @@
         checkOutput("pkg/TestException.html", true,
                 "<!DOCTYPE HTML>",
                 "<meta name=\"dc.created\"",
-                "<ul id=\"navbar.top.firstrow\" class=\"navList\" title=\"Navigation\">\n",
-                "<header role=\"banner\" class=\"flexHeader\">\n"
+                "<ul id=\"navbar.top.firstrow\" class=\"nav-list\" title=\"Navigation\">\n",
+                "<header role=\"banner\" class=\"flex-header\">\n"
                 + "<nav role=\"navigation\">\n"
                 + "<!-- ========= START OF TOP NAVBAR ======= -->",
                 "<main role=\"main\">\n"
                 + "<!-- ======== START OF CLASS DATA ======== -->\n"
                 + "<div class=\"header\">",
-                "<section class=\"constructorSummary\" id=\"constructor.summary\">\n"
+                "<section class=\"constructor-summary\" id=\"constructor.summary\">\n"
                 + "<h2>Constructor Summary</h2>",
-                "<section class=\"constructorDetails\" id=\"constructor.detail\">\n"
+                "<section class=\"constructor-details\" id=\"constructor.detail\">\n"
                 + "<h2>Constructor Details</h2>\n",
                 "<footer role=\"contentinfo\">\n"
                 + "<nav role=\"navigation\">\n"
@@ -380,24 +380,24 @@
         checkOutput("pkg2/TestAnnotationType.html", true,
                 "<!DOCTYPE HTML>",
                 "<meta name=\"dc.created\"",
-                "<ul id=\"navbar.top.firstrow\" class=\"navList\" title=\"Navigation\">\n",
-                "<header role=\"banner\" class=\"flexHeader\">\n"
+                "<ul id=\"navbar.top.firstrow\" class=\"nav-list\" title=\"Navigation\">\n",
+                "<header role=\"banner\" class=\"flex-header\">\n"
                 + "<nav role=\"navigation\">\n"
                 + "<!-- ========= START OF TOP NAVBAR ======= -->",
                 "<main role=\"main\">\n"
                 + "<!-- ======== START OF CLASS DATA ======== -->\n"
                 + "<div class=\"header\">",
-                "<section class=\"memberSummary\" id=\"annotation.type.required.element.summary\">\n"
+                "<section class=\"member-summary\" id=\"annotation.type.required.element.summary\">\n"
                 + "<h2>Required Element Summary</h2>\n"
-                + "<div class=\"memberSummary\">\n<table>",
-                "<section class=\"memberSummary\" id=\"annotation.type.optional.element.summary\">\n"
+                + "<div class=\"member-summary\">\n<table>",
+                "<section class=\"member-summary\" id=\"annotation.type.optional.element.summary\">\n"
                 + "<h2>Optional Element Summary</h2>\n"
-                + "<div class=\"memberSummary\">\n<table>",
+                + "<div class=\"member-summary\">\n<table>",
                 "<section class=\"details\" id=\"annotation.type.element.detail\">\n"
-                + "<ul class=\"blockList\">\n"
+                + "<ul class=\"block-list\">\n"
                 + "<!-- ============ ANNOTATION TYPE MEMBER DETAIL =========== -->\n"
-                + "<li class=\"blockList\">\n"
-                + "<section class=\"memberDetails\">\n"
+                + "<li class=\"block-list\">\n"
+                + "<section class=\"member-details\">\n"
                 + "<h2>Element Details</h2>\n",
                 "<footer role=\"contentinfo\">\n"
                 + "<nav role=\"navigation\">\n"
@@ -407,16 +407,16 @@
         checkOutput("pkg1/class-use/RegClass.html", true,
                 "<!DOCTYPE HTML>",
                 "<meta name=\"dc.created\"",
-                "<ul id=\"navbar.top.firstrow\" class=\"navList\" title=\"Navigation\">\n",
-                "<header role=\"banner\" class=\"flexHeader\">\n"
+                "<ul id=\"navbar.top.firstrow\" class=\"nav-list\" title=\"Navigation\">\n",
+                "<header role=\"banner\" class=\"flex-header\">\n"
                 + "<nav role=\"navigation\">\n"
                 + "<!-- ========= START OF TOP NAVBAR ======= -->",
                 "<main role=\"main\">\n"
                 + "<div class=\"header\">",
-                "<div class=\"useSummary\">\n<table>",
+                "<div class=\"use-summary\">\n<table>",
                 "<section class=\"detail\" id=\"pkg\">\n"
                 + "<h2>Uses of <a href=\"../RegClass.html\" title=\"class in pkg1\">RegClass</a> in <a href=\"../../pkg/package-summary.html\">pkg</a></h2>\n"
-                + "<div class=\"useSummary\">\n<table>",
+                + "<div class=\"use-summary\">\n<table>",
                 "<footer role=\"contentinfo\">\n"
                 + "<nav role=\"navigation\">\n"
                 + "<!-- ======= START OF BOTTOM NAVBAR ====== -->");
@@ -444,12 +444,12 @@
                 + "</a>",
                 "<section>\n"
                 + "<h2 title=\"PackagAnotherClass.ModalExclusionType.htmle pkg Description\">Package pkg Description</h2>\n",
-                "<div class=\"typeSummary\">\n<table summary=\"Interface Summary table, listing interfaces, and an explanation\">",
-                "<div class=\"typeSummary\">\n<table summary=\"Class Summary table, listing classes, and an explanation\">",
-                "<div class=\"typeSummary\">\n<table summary=\"Enum Summary table, listing enums, and an explanation\">",
-                "<div class=\"typeSummary\">\n<table summary=\"Exception Summary table, listing exceptions, and an explanation\">",
-                "<div class=\"typeSummary\">\n<table summary=\"Error Summary table, listing errors, and an explanation\">",
-                "<div class=\"typeSummary\">\n<table summary=\"Annotation Types Summary table, listing annotation types, and an explanation\">");
+                "<div class=\"type-summary\">\n<table summary=\"Interface Summary table, listing interfaces, and an explanation\">",
+                "<div class=\"type-summary\">\n<table summary=\"Class Summary table, listing classes, and an explanation\">",
+                "<div class=\"type-summary\">\n<table summary=\"Enum Summary table, listing enums, and an explanation\">",
+                "<div class=\"type-summary\">\n<table summary=\"Exception Summary table, listing exceptions, and an explanation\">",
+                "<div class=\"type-summary\">\n<table summary=\"Error Summary table, listing errors, and an explanation\">",
+                "<div class=\"type-summary\">\n<table summary=\"Annotation Types Summary table, listing annotation types, and an explanation\">");
 
         // Negated test for package-tree page
         checkOutput("pkg/package-tree.html", false,
@@ -466,7 +466,7 @@
                 "<a name=\"navbar.top.firstrow\">\n"
                 + "<!--   -->\n"
                 + "</a>",
-                "<div class=\"useSummary\">\n"
+                "<div class=\"use-summary\">\n"
                 + "<table summary=\"Use table, listing packages, and an explanation\">");
 
         // Negated test for constant-values page
@@ -479,7 +479,7 @@
                 "<!-- ========= END OF TOP NAVBAR ========= -->\n"
                 + "</div>\n"
                 + "<div class=\"header\">",
-                "<div class=\"constantsSummary\">\n"
+                "<div class=\"constants-summary\">\n"
                 + "<table summary=\"Constant Field Values table, listing constant fields, and values\">");
 
         // Negated test for deprecated-list page
@@ -494,16 +494,16 @@
                 + "<div class=\"header\">\n"
                 + "<h1 title=\"Deprecated API\" class=\"title\">Deprecated API</h1>\n"
                 + "<h2 title=\"Contents\">Contents</h2>",
-                "<div class=\"deprecatedSummary\">\n<table summary=\"Classes table, listing classes, and an explanation\">",
-                "<div class=\"deprecatedSummary\">\n<table summary=\"Enums table, listing enums, and an explanation\">",
-                "<div class=\"deprecatedSummary\">\n<table summary=\"Exceptions table, listing exceptions, and an explanation\">",
-                "<div class=\"deprecatedSummary\">\n<table summary=\"Errors table, listing errors, and an explanation\">",
-                "<div class=\"deprecatedSummary\">\n<table summary=\"Annotation Types table, listing annotation types, and an explanation\">",
-                "<div class=\"deprecatedSummary\">\n<table summary=\"Fields table, listing fields, and an explanation\">",
-                "<div class=\"deprecatedSummary\">\n<table summary=\"Methods table, listing methods, and an explanation\">",
-                "<div class=\"deprecatedSummary\">\n<table summary=\"Constructors table, listing constructors, and an explanation\">",
-                "<div class=\"deprecatedSummary\">\n<table summary=\"Enum Constants table, listing enum constants, and an explanation\">",
-                "<div class=\"deprecatedSummary\">\n<table summary=\"Annotation Type Elements table, listing annotation type elements, and an explanation\">");
+                "<div class=\"deprecated-summary\">\n<table summary=\"Classes table, listing classes, and an explanation\">",
+                "<div class=\"deprecated-summary\">\n<table summary=\"Enums table, listing enums, and an explanation\">",
+                "<div class=\"deprecated-summary\">\n<table summary=\"Exceptions table, listing exceptions, and an explanation\">",
+                "<div class=\"deprecated-summary\">\n<table summary=\"Errors table, listing errors, and an explanation\">",
+                "<div class=\"deprecated-summary\">\n<table summary=\"Annotation Types table, listing annotation types, and an explanation\">",
+                "<div class=\"deprecated-summary\">\n<table summary=\"Fields table, listing fields, and an explanation\">",
+                "<div class=\"deprecated-summary\">\n<table summary=\"Methods table, listing methods, and an explanation\">",
+                "<div class=\"deprecated-summary\">\n<table summary=\"Constructors table, listing constructors, and an explanation\">",
+                "<div class=\"deprecated-summary\">\n<table summary=\"Enum Constants table, listing enum constants, and an explanation\">",
+                "<div class=\"deprecated-summary\">\n<table summary=\"Annotation Type Elements table, listing annotation type elements, and an explanation\">");
 
         // Negated test for serialized-form page
         checkOutput("serialized-form.html", false,
@@ -515,7 +515,7 @@
                 "<!-- ========= END OF TOP NAVBAR ========= -->\n"
                 + "</div>\n"
                 + "<div class=\"header\">",
-                "<li class=\"blockList\">\n"
+                "<li class=\"block-list\">\n"
                 + "<h2 title=\"Package\">Package&nbsp;pkg</h2>");
 
         // Negated test for overview-tree page
@@ -550,7 +550,7 @@
         checkOutput("src-html/pkg/AnotherClass.html", false,
                 "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"http://www.w3.org/TR/html4/loose.dtd\">",
                 "<body>\n"
-                + "<div class=\"sourceContainer\">");
+                + "<div class=\"source-container\">");
 
         // Negated test for help-doc page
         checkOutput("help-doc.html", false,
@@ -562,12 +562,12 @@
                 "<!-- ========= END OF TOP NAVBAR ========= -->\n"
                 + "</div>\n"
                 + "<div class=\"header\">",
-                "<ul class=\"blockList\">\n"
-                + "<li class=\"blockList\">\n"
+                "<ul class=\"block-list\">\n"
+                + "<li class=\"block-list\">\n"
                 + "<h2>Overview</h2>",
-                "<li class=\"blockList\">\n"
+                "<li class=\"block-list\">\n"
                 + "<h2>Package</h2>",
-                "<li class=\"blockList\">\n"
+                "<li class=\"block-list\">\n"
                 + "<h2>Class/Interface</h2>");
 
         // Negated test for a regular class page and members (nested class, field, constructore and method)
@@ -578,52 +578,52 @@
                 + "<!--   -->\n"
                 + "</a>",
                 "<!-- ======== NESTED CLASS SUMMARY ======== -->\n"
-                + "<ul class=\"blockList\">\n"
-                + "<li class=\"blockList\"><a name=\"nested.class.summary\">\n"
+                + "<ul class=\"block-list\">\n"
+                + "<li class=\"block-list\"><a name=\"nested.class.summary\">\n"
                 + "<!--   -->\n"
                 + "</a>\n"
                 + "<h2>Nested Class Summary</h2>\n"
-                + "<div class=\"memberSummary\">\n"
+                + "<div class=\"member-summary\">\n"
                 + "<table summary=\"Nested Class Summary table, listing nested classes, and an explanation\">",
                 "<!-- =========== FIELD SUMMARY =========== -->\n"
-                + "<ul class=\"blockList\">\n"
-                + "<li class=\"blockList\"><a name=\"field.summary\">\n"
+                + "<ul class=\"block-list\">\n"
+                + "<li class=\"block-list\"><a name=\"field.summary\">\n"
                 + "<!--   -->\n"
                 + "</a>\n"
                 + "<h2>Field Summary</h2>\n"
-                + "<div class=\"memberSummary\">\n"
+                + "<div class=\"member-summary\">\n"
                 + "<table summary=\"Field Summary table, listing fields, and an explanation\">",
                 "<!-- ======== CONSTRUCTOR SUMMARY ======== -->\n"
-                + "<ul class=\"blockList\">\n"
-                + "<li class=\"blockList\"><a name=\"constructor.summary\">\n"
+                + "<ul class=\"block-list\">\n"
+                + "<li class=\"block-list\"><a name=\"constructor.summary\">\n"
                 + "<!--   -->\n"
                 + "</a>\n"
                 + "<h2>Constructor Summary</h2>\n"
-                + "<div class=\"memberSummary\">\n"
+                + "<div class=\"member-summary\">\n"
                 + "<table summary=\"Constructor Summary table, listing constructors, and an explanation\">",
                 "<!-- ========== METHOD SUMMARY =========== -->\n"
-                + "<ul class=\"blockList\">\n"
-                + "<li class=\"blockList\"><a name=\"method.summary\">\n"
+                + "<ul class=\"block-list\">\n"
+                + "<li class=\"block-list\"><a name=\"method.summary\">\n"
                 + "<!--   -->\n"
                 + "</a>\n"
                 + "<h2>Method Summary</h2>\n"
-                + "<div class=\"memberSummary\">\n"
+                + "<div class=\"member-summary\">\n"
                 + "<table summary=\"Method Summary table, listing methods, and an explanation\">",
                 "<!-- ============ FIELD DETAIL =========== -->\n"
-                + "<ul class=\"blockList\">\n"
-                + "<li class=\"blockList\"><a name=\"field.detail\">\n"
+                + "<ul class=\"block-list\">\n"
+                + "<li class=\"block-list\"><a name=\"field.detail\">\n"
                 + "<!--   -->\n"
                 + "</a>\n"
                 + "<h2>Field Details</h2>",
                 "<!-- ========= CONSTRUCTOR DETAIL ======== -->\n"
-                + "<ul class=\"blockList\">\n"
-                + "<li class=\"blockList\"><a name=\"constructor.detail\">\n"
+                + "<ul class=\"block-list\">\n"
+                + "<li class=\"block-list\"><a name=\"constructor.detail\">\n"
                 + "<!--   -->\n"
                 + "</a>\n"
                 + "<h2>Constructor Details</h2>",
                 "<!-- ============ METHOD DETAIL ========== -->\n"
-                + "<ul class=\"blockList\">\n"
-                + "<li class=\"blockList\"><a name=\"method.detail\">\n"
+                + "<ul class=\"block-list\">\n"
+                + "<li class=\"block-list\"><a name=\"method.detail\">\n"
                 + "<!--   -->\n"
                 + "</a>\n"
                 + "<h2>Method Details</h2>");
@@ -636,30 +636,30 @@
                 + "<!--   -->\n"
                 + "</a>",
                 "<!-- =========== ENUM CONSTANT SUMMARY =========== -->\n"
-                + "<ul class=\"blockList\">\n"
-                + "<li class=\"blockList\"><a name=\"enum.constant.summary\">\n"
+                + "<ul class=\"block-list\">\n"
+                + "<li class=\"block-list\"><a name=\"enum.constant.summary\">\n"
                 + "<!--   -->\n"
                 + "</a>\n"
                 + "<h2>Enum Constant Summary</h2>\n"
-                + "<div class=\"memberSummary\">\n"
+                + "<div class=\"member-summary\">\n"
                 + "<table summary=\"Enum Constant Summary table, listing enum constants, and an explanation\">",
                 "<!-- ========== METHOD SUMMARY =========== -->\n"
-                + "<ul class=\"blockList\">\n"
-                + "<li class=\"blockList\"><a name=\"method.summary\">\n"
+                + "<ul class=\"block-list\">\n"
+                + "<li class=\"block-list\"><a name=\"method.summary\">\n"
                 + "<!--   -->\n"
                 + "</a>\n"
                 + "<h2>Method Summary</h2>\n"
-                + "<div class=\"memberSummary\">\n"
+                + "<div class=\"member-summary\">\n"
                 + "<table summary=\"Method Summary table, listing methods, and an explanation\">",
                 "<!-- ============ ENUM CONSTANT DETAIL =========== -->\n"
-                + "<ul class=\"blockList\">\n"
-                + "<li class=\"blockList\"><a name=\"enum.constant.detail\">\n"
+                + "<ul class=\"block-list\">\n"
+                + "<li class=\"block-list\"><a name=\"enum.constant.detail\">\n"
                 + "<!--   -->\n"
                 + "</a>\n"
                 + "<h2>Enum Constant Details</h2>",
                 "<!-- ============ METHOD DETAIL ========== -->\n"
-                + "<ul class=\"blockList\">\n"
-                + "<li class=\"blockList\"><a name=\"method.detail\">\n"
+                + "<ul class=\"block-list\">\n"
+                + "<li class=\"block-list\"><a name=\"method.detail\">\n"
                 + "<!--   -->\n"
                 + "</a>\n"
                 + "<h2>Method Details</h2>");
@@ -672,16 +672,16 @@
                 + "<!--   -->\n"
                 + "</a>",
                 "<!-- ========== METHOD SUMMARY =========== -->\n"
-                + "<ul class=\"blockList\">\n"
-                + "<li class=\"blockList\"><a name=\"method.summary\">\n"
+                + "<ul class=\"block-list\">\n"
+                + "<li class=\"block-list\"><a name=\"method.summary\">\n"
                 + "<!--   -->\n"
                 + "</a>\n"
                 + "<h2>Method Summary</h2>\n"
-                + "<div class=\"memberSummary\">\n"
+                + "<div class=\"member-summary\">\n"
                 + "<table summary=\"Method Summary table, listing methods, and an explanation\">",
                 "<!-- ============ METHOD DETAIL ========== -->\n"
-                + "<ul class=\"blockList\">\n"
-                + "<li class=\"blockList\"><a name=\"method.detail\">\n"
+                + "<ul class=\"block-list\">\n"
+                + "<li class=\"block-list\"><a name=\"method.detail\">\n"
                 + "<!--   -->\n"
                 + "</a>\n"
                 + "<h2>Method Details</h2>");
@@ -694,14 +694,14 @@
                 + "<!--   -->\n"
                 + "</a>",
                 "<!-- ======== CONSTRUCTOR SUMMARY ======== -->\n"
-                + "<ul class=\"blockList\">\n"
-                + "<li class=\"blockList\"><a name=\"constructor.summary\">\n"
+                + "<ul class=\"block-list\">\n"
+                + "<li class=\"block-list\"><a name=\"constructor.summary\">\n"
                 + "<!--   -->\n"
                 + "</a>\n"
                 + "<h2>Constructor Summary</h2>",
                 "<!-- ========= CONSTRUCTOR DETAIL ======== -->\n"
-                + "<ul class=\"blockList\">\n"
-                + "<li class=\"blockList\"><a name=\"constructor.detail\">\n"
+                + "<ul class=\"block-list\">\n"
+                + "<li class=\"block-list\"><a name=\"constructor.detail\">\n"
                 + "<!--   -->\n"
                 + "</a>\n"
                 + "<h2>Constructor Details</h2>");
@@ -714,14 +714,14 @@
                 + "<!--   -->\n"
                 + "</a>",
                 "<!-- ======== CONSTRUCTOR SUMMARY ======== -->\n"
-                + "<ul class=\"blockList\">\n"
-                + "<li class=\"blockList\"><a name=\"constructor.summary\">\n"
+                + "<ul class=\"block-list\">\n"
+                + "<li class=\"block-list\"><a name=\"constructor.summary\">\n"
                 + "<!--   -->\n"
                 + "</a>\n"
                 + "<h2>Constructor Summary</h2>",
                 "<!-- ========= CONSTRUCTOR DETAIL ======== -->\n"
-                + "<ul class=\"blockList\">\n"
-                + "<li class=\"blockList\"><a name=\"constructor.detail\">\n"
+                + "<ul class=\"block-list\">\n"
+                + "<li class=\"block-list\"><a name=\"constructor.detail\">\n"
                 + "<!--   -->\n"
                 + "</a>\n"
                 + "<h2>Constructor Details</h2>");
@@ -734,24 +734,24 @@
                 + "<!--   -->\n"
                 + "</a>",
                 "<!-- =========== ANNOTATION TYPE REQUIRED MEMBER SUMMARY =========== -->\n"
-                + "<ul class=\"blockList\">\n"
-                + "<li class=\"blockList\"><a name=\"annotation.type.required.element.summary\">\n"
+                + "<ul class=\"block-list\">\n"
+                + "<li class=\"block-list\"><a name=\"annotation.type.required.element.summary\">\n"
                 + "<!--   -->\n"
                 + "</a>\n"
                 + "<h2>Required Element Summary</h2>\n"
-                + "<div class=\"memberSummary\">\n"
+                + "<div class=\"member-summary\">\n"
                 + "<table summary=\"Required Element Summary table, listing required elements, and an explanation\">",
                 "<!-- =========== ANNOTATION TYPE OPTIONAL MEMBER SUMMARY =========== -->\n"
-                + "<ul class=\"blockList\">\n"
-                + "<li class=\"blockList\"><a name=\"annotation.type.optional.element.summary\">\n"
+                + "<ul class=\"block-list\">\n"
+                + "<li class=\"block-list\"><a name=\"annotation.type.optional.element.summary\">\n"
                 + "<!--   -->\n"
                 + "</a>\n"
                 + "<h2>Optional Element Summary</h2>\n"
-                + "<div class=\"memberSummary\">\n"
+                + "<div class=\"member-summary\">\n"
                 + "<table summary=\"Optional Element Summary table, listing optional elements, and an explanation\">",
                 "<!-- ============ ANNOTATION TYPE MEMBER DETAIL =========== -->\n"
-                + "<ul class=\"blockList\">\n"
-                + "<li class=\"blockList\"><a name=\"annotation.type.element.detail\">\n"
+                + "<ul class=\"block-list\">\n"
+                + "<li class=\"block-list\"><a name=\"annotation.type.element.detail\">\n"
                 + "<!--   -->\n"
                 + "</a>\n"
                 + "<h2>Element Details</h2>");
@@ -766,13 +766,13 @@
                 "<!-- ========= END OF TOP NAVBAR ========= -->\n"
                 + "</div>\n"
                 + "<div class=\"header\">",
-                "<div class=\"useSummary\">\n"
+                "<div class=\"use-summary\">\n"
                 + "<table summary=\"Use table, listing packages, and an explanation\">",
-                "<li class=\"blockList\"><a name=\"pkg\">\n"
+                "<li class=\"block-list\"><a name=\"pkg\">\n"
                 + "<!--   -->\n"
                 + "</a>\n"
                 + "<h2>Uses of <a href=\"../RegClass.html\" title=\"class in pkg1\">RegClass</a> in <a href=\"../../pkg/package-summary.html\">pkg</a></h2>\n"
-                + "<div class=\"useSummary\">\n<table summary=\"Use table, listing fields, and an explanation\">");
+                + "<div class=\"use-summary\">\n<table summary=\"Use table, listing fields, and an explanation\">");
 
         // Negated test for main index page
         checkOutput("index.html", false,
--- a/test/langtools/jdk/javadoc/doclet/testIndentation/TestIndentation.java	Fri Mar 13 18:43:11 2020 +0100
+++ b/test/langtools/jdk/javadoc/doclet/testIndentation/TestIndentation.java	Fri Mar 13 10:57:41 2020 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2020, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -48,9 +48,9 @@
         checkExit(Exit.OK);
 
         checkOutput("p/Indent.html", true,
-                "<div class=\"memberSignature\"><span class=\"modifiers\">public</span>&nbsp;"
-                + "<span class=\"typeParameters\">&lt;T&gt;</span>&nbsp;"
-                + "<span class=\"returnType\">void</span>&nbsp;<span class=\"memberName\">m</span>"
+                "<div class=\"member-signature\"><span class=\"modifiers\">public</span>&nbsp;"
+                + "<span class=\"type-parameters\">&lt;T&gt;</span>&nbsp;"
+                + "<span class=\"return-type\">void</span>&nbsp;<span class=\"member-name\">m</span>"
                 + "&#8203;(<span class=\"arguments\">T&nbsp;t1,\n"
                 + "T&nbsp;t2)</span>\n"
                 + "           throws <span class=\"exceptions\">java.lang.Exception</span></div>");
--- a/test/langtools/jdk/javadoc/doclet/testIndex/TestIndex.java	Fri Mar 13 18:43:11 2020 +0100
+++ b/test/langtools/jdk/javadoc/doclet/testIndex/TestIndex.java	Fri Mar 13 10:57:41 2020 -0700
@@ -51,29 +51,29 @@
 
         //Test index-all.html
         checkOutput("index-all.html", true,
-                "<a href=\"pkg/C.html\" title=\"class in pkg\"><span class=\"typeNameLink\">C</span></a>"
+                "<a href=\"pkg/C.html\" title=\"class in pkg\"><span class=\"type-name-link\">C</span></a>"
                 + " - Class in <a href=\"pkg/package-summary.html\">pkg</a>",
                 "<a href=\"pkg/Interface.html\" title=\"interface in pkg\">"
-                + "<span class=\"typeNameLink\">Interface</span></a> - Interface in "
+                + "<span class=\"type-name-link\">Interface</span></a> - Interface in "
                 + "<a href=\"pkg/package-summary.html\">pkg</a>",
                 "<a href=\"pkg/AnnotationType.html\" title=\"annotation in pkg\">"
-                + "<span class=\"typeNameLink\">AnnotationType</span></a> - Annotation Type in "
+                + "<span class=\"type-name-link\">AnnotationType</span></a> - Annotation Type in "
                 + "<a href=\"pkg/package-summary.html\">pkg</a>",
                 "<a href=\"pkg/Coin.html\" title=\"enum in pkg\">"
-                + "<span class=\"typeNameLink\">Coin</span></a> - Enum in "
+                + "<span class=\"type-name-link\">Coin</span></a> - Enum in "
                 + "<a href=\"pkg/package-summary.html\">pkg</a>",
                 "Class in <a href=\"package-summary.html\">&lt;Unnamed&gt;</a>",
                 "<dl class=\"index\">\n"
-                + "<dt><span class=\"memberNameLink\"><a href=\"pkg/C.html#Java\">"
+                + "<dt><span class=\"member-name-link\"><a href=\"pkg/C.html#Java\">"
                 + "Java</a></span> - Static variable in class pkg.<a href=\"pkg/C.html\" "
                 + "title=\"class in pkg\">C</a></dt>\n"
                 + "<dd>&nbsp;</dd>\n"
-                + "<dt><span class=\"memberNameLink\"><a href=\"pkg/C.html#JDK\">JDK</a></span> "
+                + "<dt><span class=\"member-name-link\"><a href=\"pkg/C.html#JDK\">JDK</a></span> "
                 + "- Static variable in class pkg.<a href=\"pkg/C.html\" title=\"class in pkg\">"
                 + "C</a></dt>\n"
                 + "<dd>&nbsp;</dd>\n"
                 + "</dl>",
-                "<dt><span class=\"searchTagLink\"><a href=\"pkg/Coin.html#Enum\">Enum</a>"
+                "<dt><span class=\"search-tag-link\"><a href=\"pkg/Coin.html#Enum\">Enum</a>"
                 + "</span> - Search tag in enum pkg.Coin</dt>");
     }
 }
--- a/test/langtools/jdk/javadoc/doclet/testIndexInDocFiles/TestIndexInDocFiles.java	Fri Mar 13 18:43:11 2020 +0100
+++ b/test/langtools/jdk/javadoc/doclet/testIndexInDocFiles/TestIndexInDocFiles.java	Fri Mar 13 10:57:41 2020 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2020, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -96,12 +96,12 @@
 
         checkOutput("doc-files/top-level-file.html", true,
                 "<h1>Package HTML file</h1>\n"
-                + "<span id=\"top-level-index\" class=\"searchTagResult\">top-level-index</span>\n"
-                + "<code><span id=\"top.level.property\" class=\"searchTagResult\">top.level.property</span></code>\n");
+                + "<span id=\"top-level-index\" class=\"search-tag-result\">top-level-index</span>\n"
+                + "<code><span id=\"top.level.property\" class=\"search-tag-result\">top.level.property</span></code>\n");
         checkOutput("p/q/doc-files/package-file.html", true,
                 "<h1>Package HTML file</h1>\n"
-                + "<span id=\"package-index\" class=\"searchTagResult\">package-index</span>\n"
-                + "<code><span id=\"package.property\" class=\"searchTagResult\">package.property</span></code>\n");
+                + "<span id=\"package-index\" class=\"search-tag-result\">package-index</span>\n"
+                + "<code><span id=\"package.property\" class=\"search-tag-result\">package.property</span></code>\n");
         checkOutput("tag-search-index.js", true,
                 "{\"l\":\"package-index\",\"h\":\"package p.q\",\"d\":\"additional info\","
                 + "\"u\":\"p/q/doc-files/package-file.html#package-index\"}",
@@ -157,12 +157,12 @@
 
         checkOutput("m.n/doc-files/module-file.html", true,
                 "<h1>Module HTML file</h1>\n"
-                + "<span id=\"module-index\" class=\"searchTagResult\">module-index</span>\n"
-                + "<code><span id=\"module.property\" class=\"searchTagResult\">module.property</span></code>\n");
+                + "<span id=\"module-index\" class=\"search-tag-result\">module-index</span>\n"
+                + "<code><span id=\"module.property\" class=\"search-tag-result\">module.property</span></code>\n");
         checkOutput("m.n/p/q/doc-files/package-file.html", true,
                 "<h1>Package HTML file</h1>\n"
-                + "<span id=\"package-index\" class=\"searchTagResult\">package-index</span>\n"
-                + "<code><span id=\"package.property\" class=\"searchTagResult\">package.property</span></code>\n");
+                + "<span id=\"package-index\" class=\"search-tag-result\">package-index</span>\n"
+                + "<code><span id=\"package.property\" class=\"search-tag-result\">package.property</span></code>\n");
         checkOutput("tag-search-index.js", true,
                 "{\"l\":\"module-index\",\"h\":\"module m.n\",\"d\":\"additional info\","
                 + "\"u\":\"m.n/doc-files/module-file.html#module-index\"}",
--- a/test/langtools/jdk/javadoc/doclet/testIndexInPackageFiles/TestIndexInPackageFiles.java	Fri Mar 13 18:43:11 2020 +0100
+++ b/test/langtools/jdk/javadoc/doclet/testIndexInPackageFiles/TestIndexInPackageFiles.java	Fri Mar 13 10:57:41 2020 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -88,22 +88,22 @@
         // to match the A-Z index files checked here.
 
         checkOutput("p/q/package-summary.html", true,
-            "<span id=\"test.name.1\" class=\"searchTagResult\">test.name.1</span>",
-            "<span id=\"test.property.1\" class=\"searchTagResult\">test.property.1</span>");
+            "<span id=\"test.name.1\" class=\"search-tag-result\">test.name.1</span>",
+            "<span id=\"test.property.1\" class=\"search-tag-result\">test.property.1</span>");
 
         checkOutput("p/q/doc-files/extra.html", true,
-            "<span id=\"test.name.2\" class=\"searchTagResult\">test.name.2</span>",
-            "<span id=\"test.property.2\" class=\"searchTagResult\">test.property.2</span>");
+            "<span id=\"test.name.2\" class=\"search-tag-result\">test.name.2</span>",
+            "<span id=\"test.property.2\" class=\"search-tag-result\">test.property.2</span>");
 
         checkOutput("index.html", true,
-            "<span id=\"test.name.3\" class=\"searchTagResult\">test.name.3</span>");
+            "<span id=\"test.name.3\" class=\"search-tag-result\">test.name.3</span>");
 
         checkOutput("index-all.html", true,
-            "<span class=\"searchTagLink\"><a href=\"p/q/package-summary.html#test.name.1\">test.name.1</a></span>",
-            "<span class=\"searchTagLink\"><a href=\"p/q/doc-files/extra.html#test.name.2\">test.name.2</a></span>",
-            "<span class=\"searchTagLink\"><a href=\"index.html#test.name.3\">test.name.3</a></span> - Search tag in Overview</dt>",
-            "<span class=\"searchTagLink\"><a href=\"p/q/package-summary.html#test.property.1\">test.property.1</a></span>",
-            "<span class=\"searchTagLink\"><a href=\"p/q/doc-files/extra.html#test.property.2\">test.property.2</a></span>");
+            "<span class=\"search-tag-link\"><a href=\"p/q/package-summary.html#test.name.1\">test.name.1</a></span>",
+            "<span class=\"search-tag-link\"><a href=\"p/q/doc-files/extra.html#test.name.2\">test.name.2</a></span>",
+            "<span class=\"search-tag-link\"><a href=\"index.html#test.name.3\">test.name.3</a></span> - Search tag in Overview</dt>",
+            "<span class=\"search-tag-link\"><a href=\"p/q/package-summary.html#test.property.1\">test.property.1</a></span>",
+            "<span class=\"search-tag-link\"><a href=\"p/q/doc-files/extra.html#test.property.2\">test.property.2</a></span>");
     }
 }
 
--- a/test/langtools/jdk/javadoc/doclet/testIndexTaglet/TestIndexTaglet.java	Fri Mar 13 18:43:11 2020 +0100
+++ b/test/langtools/jdk/javadoc/doclet/testIndexTaglet/TestIndexTaglet.java	Fri Mar 13 10:57:41 2020 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -77,7 +77,7 @@
         checkOrder("pkg/A.html",
                 "<h2>Method Details</h2>\n",
                 "<div class=\"block\">test description with <span id=\"search_phrase_a\" "
-                 +    "class=\"searchTagResult\">search_phrase_a</span></div>");
+                 +    "class=\"search-tag-result\">search_phrase_a</span></div>");
 
         checkOrder("pkg/A.html",
                 "<h2>Method Summary</h2>\n",
@@ -124,7 +124,7 @@
         checkExit(Exit.OK);
 
         checkOutput("pkg/A.html", true,
-                "This is a class. Here is <span id=\"foo\" class=\"searchTagResult\">foo</span>.",
-                "This is a method. Here is <span id=\"foo-1\" class=\"searchTagResult\">foo</span>.");
+                "This is a class. Here is <span id=\"foo\" class=\"search-tag-result\">foo</span>.",
+                "This is a method. Here is <span id=\"foo-1\" class=\"search-tag-result\">foo</span>.");
     }
 }
--- a/test/langtools/jdk/javadoc/doclet/testInterface/TestInterface.java	Fri Mar 13 18:43:11 2020 +0100
+++ b/test/langtools/jdk/javadoc/doclet/testInterface/TestInterface.java	Fri Mar 13 10:57:41 2020 -0700
@@ -66,10 +66,10 @@
         checkExit(Exit.OK);
 
         checkOutput("pkg/Interface.html", true,
-                "<div class=\"memberSignature\"><span class=\"returnType\">int</span>&nbsp;"
-                + "<span class=\"memberName\">method</span>()</div>",
-                "<div class=\"memberSignature\"><span class=\"modifiers\">static final</span>&nbsp;"
-                + "<span class=\"returnType\">int</span>&nbsp;<span class=\"memberName\">field</span></div>",
+                "<div class=\"member-signature\"><span class=\"return-type\">int</span>&nbsp;"
+                + "<span class=\"member-name\">method</span>()</div>",
+                "<div class=\"member-signature\"><span class=\"modifiers\">static final</span>&nbsp;"
+                + "<span class=\"return-type\">int</span>&nbsp;<span class=\"member-name\">field</span></div>",
                 // Make sure known implementing class list is correct and omits type parameters.
                 "<dl class=\"notes\">\n"
                 + "<dt>All Known Implementing Classes:</dt>\n"
@@ -125,29 +125,29 @@
         checkOutput("pkg/ClassWithStaticMembers.html", true,
                 "<section class=\"detail\" id=\"f\">\n"
                 + "<h3>f</h3>\n"
-                + "<div class=\"memberSignature\"><span class=\"modifiers\">public static</span>&nbsp;"
-                + "<span class=\"returnType\">int</span>&nbsp;<span class=\"memberName\">f</span></div>\n"
+                + "<div class=\"member-signature\"><span class=\"modifiers\">public static</span>&nbsp;"
+                + "<span class=\"return-type\">int</span>&nbsp;<span class=\"member-name\">f</span></div>\n"
                 + "<div class=\"block\">A hider field</div>",
 
-                "<td class=\"colFirst\"><code>static void</code></td>\n"
-                + "<th class=\"colSecond\" scope=\"row\"><code><span class=\"memberNameLink\">"
+                "<td class=\"col-first\"><code>static void</code></td>\n"
+                + "<th class=\"col-second\" scope=\"row\"><code><span class=\"member-name-link\">"
                 + "<a href=\"#m()\">m</a></span>()</code></th>\n"
-                + "<td class=\"colLast\">\n"
+                + "<td class=\"col-last\">\n"
                 + "<div class=\"block\">A hider method</div>\n"
                 + "</td>\n",
 
                 "<section class=\"detail\" id=\"staticMethod()\">\n"
                 + "<h3>staticMethod</h3>\n"
-                + "<div class=\"memberSignature\"><span class=\"modifiers\">public static</span>&nbsp;"
-                + "<span class=\"returnType\">void</span>&nbsp;<span class=\"memberName\">staticMethod</span>()</div>\n"
-                + "<div class=\"block\"><span class=\"descfrmTypeLabel\">"
+                + "<div class=\"member-signature\"><span class=\"modifiers\">public static</span>&nbsp;"
+                + "<span class=\"return-type\">void</span>&nbsp;<span class=\"member-name\">staticMethod</span>()</div>\n"
+                + "<div class=\"block\"><span class=\"descfrm-type-label\">"
                 + "Description copied from interface:&nbsp;<code>"
                 + "<a href=\"InterfaceWithStaticMembers.html#staticMethod()\">"
                 + "InterfaceWithStaticMembers</a></code></span></div>\n"
                 + "<div class=\"block\">A static method</div>\n");
 
         checkOutput("pkg/ClassWithStaticMembers.InnerClass.html", true,
-                "<pre>public static class <span class=\"typeNameLabel\">"
+                "<pre>public static class <span class=\"type-name-label\">"
                 + "ClassWithStaticMembers.InnerClass</span>\n"
                 + "extends java.lang.Object</pre>\n"
                 + "<div class=\"block\">A hider inner class</div>");
--- a/test/langtools/jdk/javadoc/doclet/testJavaFX/TestJavaFX.java	Fri Mar 13 18:43:11 2020 +0100
+++ b/test/langtools/jdk/javadoc/doclet/testJavaFX/TestJavaFX.java	Fri Mar 13 10:57:41 2020 -0700
@@ -56,22 +56,22 @@
                 "<dt>See Also:</dt>\n"
                 + "<dd><a href=\"#getRate()\"><code>getRate()</code></a>, \n"
                 + "<a href=\"#setRate(double)\"><code>setRate(double)</code></a></dd>",
-                "<div class=\"memberSignature\"><span class=\"modifiers\">public final</span>&nbsp;"
-                + "<span class=\"returnType\">void</span>&nbsp;<span class=\"memberName\">setRate</span>&#8203;"
+                "<div class=\"member-signature\"><span class=\"modifiers\">public final</span>&nbsp;"
+                + "<span class=\"return-type\">void</span>&nbsp;<span class=\"member-name\">setRate</span>&#8203;"
                 + "(<span class=\"arguments\">double&nbsp;value)</span></div>\n"
                 + "<div class=\"block\">Sets the value of the property rate.</div>\n"
                 + "<dl class=\"notes\">\n"
                 + "<dt>Property description:</dt>",
-                "<div class=\"memberSignature\"><span class=\"modifiers\">public final</span>&nbsp;"
-                + "<span class=\"returnType\">double</span>&nbsp;<span class=\"memberName\">getRate</span>()</div>\n"
+                "<div class=\"member-signature\"><span class=\"modifiers\">public final</span>&nbsp;"
+                + "<span class=\"return-type\">double</span>&nbsp;<span class=\"member-name\">getRate</span>()</div>\n"
                 + "<div class=\"block\">Gets the value of the property rate.</div>\n"
                 + "<dl class=\"notes\">\n"
                 + "<dt>Property description:</dt>",
-                "<td class=\"colFirst\"><code><a href=\"C.DoubleProperty.html\" "
+                "<td class=\"col-first\"><code><a href=\"C.DoubleProperty.html\" "
                 + "title=\"class in pkg1\">C.DoubleProperty</a></code></td>\n"
-                + "<th class=\"colSecond\" scope=\"row\"><code><span class=\"memberNameLink\">"
+                + "<th class=\"col-second\" scope=\"row\"><code><span class=\"member-name-link\">"
                 + "<a href=\"#rateProperty\">rate</a></span></code></th>\n"
-                + "<td class=\"colLast\">\n"
+                + "<td class=\"col-last\">\n"
                 + "<div class=\"block\">Defines the direction/speed at which the "
                 + "<code>Timeline</code> is expected to\n"
                 + " be played.</div>\n</td>",
@@ -81,28 +81,28 @@
                 "<p>Sets the value of the property <code>Property</code>",
                 "<p>Gets the value of the property <code>Property</code>",
                 "<dt>Property description:</dt>",
-                "<th class=\"colSecond\" scope=\"row\"><code><span class=\"memberNameLink\">"
+                "<th class=\"col-second\" scope=\"row\"><code><span class=\"member-name-link\">"
                 + "<a href=\"#setTestMethodProperty()\">"
                 + "setTestMethodProperty</a></span>()</code></th>",
-                "<th class=\"colSecond\" scope=\"row\"><code><span class=\"memberNameLink\">"
+                "<th class=\"col-second\" scope=\"row\"><code><span class=\"member-name-link\">"
                 + "<a href=\"#pausedProperty\">paused</a></span></code></th>\n"
-                + "<td class=\"colLast\">\n"
+                + "<td class=\"col-last\">\n"
                 + "<div class=\"block\">Defines if paused.</div>",
                 "<section class=\"detail\" id=\"pausedProperty\">\n"
                 + "<h3>paused</h3>\n"
-                + "<div class=\"memberSignature\"><span class=\"modifiers\">public final</span>&nbsp;"
-                + "<span class=\"returnType\"><a href=\"C.BooleanProperty.html\" title=\"class in pkg1\">"
-                + "C.BooleanProperty</a></span>&nbsp;<span class=\"memberName\">pausedProperty</span></div>\n"
+                + "<div class=\"member-signature\"><span class=\"modifiers\">public final</span>&nbsp;"
+                + "<span class=\"return-type\"><a href=\"C.BooleanProperty.html\" title=\"class in pkg1\">"
+                + "C.BooleanProperty</a></span>&nbsp;<span class=\"member-name\">pausedProperty</span></div>\n"
                 + "<div class=\"block\">Defines if paused. The second line.</div>",
                 "<section class=\"detail\" id=\"isPaused()\">\n"
                 + "<h3>isPaused</h3>\n"
-                + "<div class=\"memberSignature\"><span class=\"modifiers\">public final</span>&nbsp;"
-                + "<span class=\"returnType\">double</span>&nbsp;<span class=\"memberName\">isPaused</span>()</div>\n"
+                + "<div class=\"member-signature\"><span class=\"modifiers\">public final</span>&nbsp;"
+                + "<span class=\"return-type\">double</span>&nbsp;<span class=\"member-name\">isPaused</span>()</div>\n"
                 + "<div class=\"block\">Gets the value of the property paused.</div>",
                 "<section class=\"detail\" id=\"setPaused(boolean)\">\n"
                 + "<h3>setPaused</h3>\n"
-                + "<div class=\"memberSignature\"><span class=\"modifiers\">public final</span>&nbsp;"
-                + "<span class=\"returnType\">void</span>&nbsp;<span class=\"memberName\">setPaused</span>&#8203;"
+                + "<div class=\"member-signature\"><span class=\"modifiers\">public final</span>&nbsp;"
+                + "<span class=\"return-type\">void</span>&nbsp;<span class=\"member-name\">setPaused</span>&#8203;"
                 + "(<span class=\"arguments\">boolean&nbsp;value)</span></div>\n"
                 + "<div class=\"block\">Sets the value of the property paused.</div>\n"
                 + "<dl class=\"notes\">\n"
@@ -112,8 +112,8 @@
                 + "<dd>false</dd>",
                 "<section class=\"detail\" id=\"isPaused()\">\n"
                 + "<h3>isPaused</h3>\n"
-                + "<div class=\"memberSignature\"><span class=\"modifiers\">public final</span>&nbsp;"
-                + "<span class=\"returnType\">double</span>&nbsp;<span class=\"memberName\">isPaused</span>()</div>\n"
+                + "<div class=\"member-signature\"><span class=\"modifiers\">public final</span>&nbsp;"
+                + "<span class=\"return-type\">double</span>&nbsp;<span class=\"member-name\">isPaused</span>()</div>\n"
                 + "<div class=\"block\">Gets the value of the property paused.</div>\n"
                 + "<dl class=\"notes\">\n"
                 + "<dt>Property description:</dt>\n"
@@ -122,16 +122,16 @@
                 + "<dd>false</dd>",
                 "<section class=\"detail\" id=\"rateProperty\">\n"
                 + "<h3>rate</h3>\n"
-                + "<div class=\"memberSignature\"><span class=\"modifiers\">public final</span>&nbsp;"
-                + "<span class=\"returnType\"><a href=\"C.DoubleProperty.html\" title=\"class in pkg1\">"
-                + "C.DoubleProperty</a></span>&nbsp;<span class=\"memberName\">rateProperty</span></div>\n"
+                + "<div class=\"member-signature\"><span class=\"modifiers\">public final</span>&nbsp;"
+                + "<span class=\"return-type\"><a href=\"C.DoubleProperty.html\" title=\"class in pkg1\">"
+                + "C.DoubleProperty</a></span>&nbsp;<span class=\"member-name\">rateProperty</span></div>\n"
                 + "<div class=\"block\">Defines the direction/speed at which the "
                 + "<code>Timeline</code> is expected to\n"
                 + " be played. This is the second line.</div>",
                 "<section class=\"detail\" id=\"setRate(double)\">\n"
                 + "<h3>setRate</h3>\n"
-                + "<div class=\"memberSignature\"><span class=\"modifiers\">public final</span>&nbsp;"
-                + "<span class=\"returnType\">void</span>&nbsp;<span class=\"memberName\">setRate</span>&#8203;"
+                + "<div class=\"member-signature\"><span class=\"modifiers\">public final</span>&nbsp;"
+                + "<span class=\"return-type\">void</span>&nbsp;<span class=\"member-name\">setRate</span>&#8203;"
                 + "(<span class=\"arguments\">double&nbsp;value)</span></div>\n"
                 + "<div class=\"block\">Sets the value of the property rate.</div>\n"
                 + "<dl class=\"notes\">\n"
@@ -144,8 +144,8 @@
                 + "<dd>JavaFX 8.0</dd>",
                 "<section class=\"detail\" id=\"getRate()\">\n"
                 + "<h3>getRate</h3>\n"
-                + "<div class=\"memberSignature\"><span class=\"modifiers\">public final</span>&nbsp;"
-                + "<span class=\"returnType\">double</span>&nbsp;<span class=\"memberName\">getRate</span>()</div>\n"
+                + "<div class=\"member-signature\"><span class=\"modifiers\">public final</span>&nbsp;"
+                + "<span class=\"return-type\">double</span>&nbsp;<span class=\"member-name\">getRate</span>()</div>\n"
                 + "<div class=\"block\">Gets the value of the property rate.</div>\n"
                 + "<dl class=\"notes\">\n"
                 + "<dt>Property description:</dt>\n"
@@ -155,32 +155,32 @@
                 + "<dd>11</dd>\n"
                 + "<dt>Since:</dt>\n"
                 + "<dd>JavaFX 8.0</dd>",
-                "<section class=\"propertySummary\" id=\"property.summary\">\n"
+                "<section class=\"property-summary\" id=\"property.summary\">\n"
                 + "<h2>Property Summary</h2>\n"
-                + "<div class=\"memberSummary\">\n<table>\n"
-                + "<caption><span>Properties</span><span class=\"tabEnd\">&nbsp;</span></caption>",
-                "<tr class=\"altColor\">\n"
-                + "<td class=\"colFirst\"><code><a href=\"C.BooleanProperty.html\" title=\"class in pkg1\">C.BooleanProperty</a></code></td>\n",
-                "<tr class=\"rowColor\">\n"
-                + "<td class=\"colFirst\"><code><a href=\"C.DoubleProperty.html\" title=\"class in pkg1\">C.DoubleProperty</a></code></td>\n");
+                + "<div class=\"member-summary\">\n<table>\n"
+                + "<caption><span>Properties</span><span class=\"tab-end\">&nbsp;</span></caption>",
+                "<tr class=\"alt-color\">\n"
+                + "<td class=\"col-first\"><code><a href=\"C.BooleanProperty.html\" title=\"class in pkg1\">C.BooleanProperty</a></code></td>\n",
+                "<tr class=\"row-color\">\n"
+                + "<td class=\"col-first\"><code><a href=\"C.DoubleProperty.html\" title=\"class in pkg1\">C.DoubleProperty</a></code></td>\n");
 
         checkOutput("pkg1/C.html", false,
                 "A()",
                 "<h2 id=\"property.summary\">Property Summary</h2>\n"
-                + "<div class=\"memberSummary\">\n"
+                + "<div class=\"member-summary\">\n"
                 + "<div role=\"tablist\" aria-orientation=\"horizontal\"><button role=\"tab\""
-                + " aria-selected=\"true\" aria-controls=\"memberSummary_tabpanel\" tabindex=\"0\""
-                + " onkeydown=\"switchTab(event)\" id=\"t0\" class=\"activeTableTab\">All Methods"
+                + " aria-selected=\"true\" aria-controls=\"member-summary_tabpanel\" tabindex=\"0\""
+                + " onkeydown=\"switchTab(event)\" id=\"t0\" class=\"active-table-tab\">All Methods"
                 + "</button><button role=\"tab\" aria-selected=\"false\""
-                + " aria-controls=\"memberSummary_tabpanel\" tabindex=\"-1\" onkeydown=\"switchTab(event)\""
-                + " id=\"t2\" class=\"tableTab\" onclick=\"show(2);\">Instance Methods</button>"
-                + "<button role=\"tab\" aria-selected=\"false\" aria-controls=\"memberSummary_tabpanel\""
-                + " tabindex=\"-1\" onkeydown=\"switchTab(event)\" id=\"t4\" class=\"tableTab\""
+                + " aria-controls=\"member-summary_tabpanel\" tabindex=\"-1\" onkeydown=\"switchTab(event)\""
+                + " id=\"t2\" class=\"table-tab\" onclick=\"show(2);\">Instance Methods</button>"
+                + "<button role=\"tab\" aria-selected=\"false\" aria-controls=\"member-summary_tabpanel\""
+                + " tabindex=\"-1\" onkeydown=\"switchTab(event)\" id=\"t4\" class=\"table-tab\""
                 + " onclick=\"show(8);\">Concrete Methods</button></div>",
-                "<tr id=\"i0\" class=\"altColor\">\n"
-                + "<td class=\"colFirst\"><code><a href=\"C.BooleanProperty.html\" title=\"class in pkg1\">C.BooleanProperty</a></code></td>\n",
-                "<tr id=\"i1\" class=\"rowColor\">\n"
-                + "<td class=\"colFirst\"><code><a href=\"C.DoubleProperty.html\" title=\"class in pkg1\">C.DoubleProperty</a></code></td>\n");
+                "<tr id=\"i0\" class=\"alt-color\">\n"
+                + "<td class=\"col-first\"><code><a href=\"C.BooleanProperty.html\" title=\"class in pkg1\">C.BooleanProperty</a></code></td>\n",
+                "<tr id=\"i1\" class=\"row-color\">\n"
+                + "<td class=\"col-first\"><code><a href=\"C.DoubleProperty.html\" title=\"class in pkg1\">C.DoubleProperty</a></code></td>\n");
 
         checkOutput("index-all.html", true,
                 "<div class=\"block\">Gets the value of the property paused.</div>",
@@ -209,51 +209,51 @@
                 "pkg2");
         checkExit(Exit.OK);
         checkOutput("pkg2/Test.html", true,
-                "<section class=\"propertyDetails\" id=\"property.detail\">\n"
+                "<section class=\"property-details\" id=\"property.detail\">\n"
                 + "<h2>Property Details</h2>\n"
-                + "<ul class=\"blockList\">\n"
-                + "<li class=\"blockList\">\n"
+                + "<ul class=\"block-list\">\n"
+                + "<li class=\"block-list\">\n"
                 + "<section class=\"detail\" id=\"betaProperty\">\n"
                 + "<h3>beta</h3>\n"
-                + "<div class=\"memberSignature\"><span class=\"modifiers\">public</span>&nbsp;"
-                + "<span class=\"returnType\">java.lang.Object</span>"
-                + "&nbsp;<span class=\"memberName\">betaProperty</span></div>\n"
+                + "<div class=\"member-signature\"><span class=\"modifiers\">public</span>&nbsp;"
+                + "<span class=\"return-type\">java.lang.Object</span>"
+                + "&nbsp;<span class=\"member-name\">betaProperty</span></div>\n"
                 + "</section>\n"
                 + "</li>\n"
-                + "<li class=\"blockList\">\n"
+                + "<li class=\"block-list\">\n"
                 + "<section class=\"detail\" id=\"gammaProperty\">\n"
                 + "<h3>gamma</h3>\n"
-                + "<div class=\"memberSignature\"><span class=\"modifiers\">public final</span>&nbsp;"
-                + "<span class=\"returnType\">java.util.List&lt;java.lang.String&gt;</span>"
-                + "&nbsp;<span class=\"memberName\">gammaProperty</span></div>\n"
+                + "<div class=\"member-signature\"><span class=\"modifiers\">public final</span>&nbsp;"
+                + "<span class=\"return-type\">java.util.List&lt;java.lang.String&gt;</span>"
+                + "&nbsp;<span class=\"member-name\">gammaProperty</span></div>\n"
                 + "</section>\n"
                 + "</li>\n"
-                + "<li class=\"blockList\">\n"
+                + "<li class=\"block-list\">\n"
                 + "<section class=\"detail\" id=\"deltaProperty\">\n"
                 + "<h3>delta</h3>\n"
-                + "<div class=\"memberSignature\"><span class=\"modifiers\">public final</span>&nbsp;"
-                + "<span class=\"returnType\">java.util.List&lt;java.util.Set&lt;? super java.lang.Object&gt;&gt;"
-                + "</span>&nbsp;<span class=\"memberName\">deltaProperty</span></div>\n"
+                + "<div class=\"member-signature\"><span class=\"modifiers\">public final</span>&nbsp;"
+                + "<span class=\"return-type\">java.util.List&lt;java.util.Set&lt;? super java.lang.Object&gt;&gt;"
+                + "</span>&nbsp;<span class=\"member-name\">deltaProperty</span></div>\n"
                 + "</section>\n"
                 + "</li>\n"
                 + "</ul>\n"
                 + "</section>",
-                "<section class=\"propertySummary\" id=\"property.summary\">\n"
+                "<section class=\"property-summary\" id=\"property.summary\">\n"
                 + "<h2>Property Summary</h2>\n"
-                + "<div class=\"memberSummary\">\n<table>\n"
-                + "<caption><span>Properties</span><span class=\"tabEnd\">&nbsp;</span></caption>");
+                + "<div class=\"member-summary\">\n<table>\n"
+                + "<caption><span>Properties</span><span class=\"tab-end\">&nbsp;</span></caption>");
 
         checkOutput("pkg2/Test.html", false,
                 "<h2>Property Summary</h2>\n"
-                + "<div class=\"memberSummary\">\n"
+                + "<div class=\"member-summary\">\n"
                 + "<div role=\"tablist\" aria-orientation=\"horizontal\"><button role=\"tab\""
-                + " aria-selected=\"true\" aria-controls=\"memberSummary_tabpanel\" tabindex=\"0\""
-                + " onkeydown=\"switchTab(event)\" id=\"t0\" class=\"activeTableTab\">All Methods"
+                + " aria-selected=\"true\" aria-controls=\"member-summary_tabpanel\" tabindex=\"0\""
+                + " onkeydown=\"switchTab(event)\" id=\"t0\" class=\"active-table-tab\">All Methods"
                 + "</button><button role=\"tab\" aria-selected=\"false\""
-                + " aria-controls=\"memberSummary_tabpanel\" tabindex=\"-1\" onkeydown=\"switchTab(event)\""
-                + " id=\"t2\" class=\"tableTab\" onclick=\"show(2);\">Instance Methods</button>"
-                + "<button role=\"tab\" aria-selected=\"false\" aria-controls=\"memberSummary_tabpanel\""
-                + " tabindex=\"-1\" onkeydown=\"switchTab(event)\" id=\"t4\" class=\"tableTab\""
+                + " aria-controls=\"member-summary_tabpanel\" tabindex=\"-1\" onkeydown=\"switchTab(event)\""
+                + " id=\"t2\" class=\"table-tab\" onclick=\"show(2);\">Instance Methods</button>"
+                + "<button role=\"tab\" aria-selected=\"false\" aria-controls=\"member-summary_tabpanel\""
+                + " tabindex=\"-1\" onkeydown=\"switchTab(event)\" id=\"t4\" class=\"table-tab\""
                 + " onclick=\"show(8);\">Concrete Methods</button></div>");
     }
 
@@ -272,37 +272,37 @@
         checkOutput("pkg2/Test.html", true,
                 "<thead>\n"
                 + "<tr>\n"
-                + "<th class=\"colFirst\" scope=\"col\">Modifier and Type</th>\n"
-                + "<th class=\"colSecond\" scope=\"col\">Method</th>\n"
-                + "<th class=\"colLast\" scope=\"col\">Description</th>\n"
+                + "<th class=\"col-first\" scope=\"col\">Modifier and Type</th>\n"
+                + "<th class=\"col-second\" scope=\"col\">Method</th>\n"
+                + "<th class=\"col-last\" scope=\"col\">Description</th>\n"
                 + "</tr>\n"
                 + "</thead>\n"
                 + "<tbody>\n"
-                + "<tr class=\"altColor\" id=\"i0\">\n"
-                + "<td class=\"colFirst\"><code>&lt;T&gt;&nbsp;java.lang.Object</code></td>\n"
-                + "<th class=\"colSecond\" scope=\"row\"><code><span class=\"memberNameLink\">"
+                + "<tr class=\"alt-color\" id=\"i0\">\n"
+                + "<td class=\"col-first\"><code>&lt;T&gt;&nbsp;java.lang.Object</code></td>\n"
+                + "<th class=\"col-second\" scope=\"row\"><code><span class=\"member-name-link\">"
                 + "<a href=\"#alphaProperty(java.util.List)\">alphaProperty</a>"
                 + "</span>&#8203;(java.util.List&lt;T&gt;&nbsp;foo)</code></th>\n"
-                + "<td class=\"colLast\">&nbsp;</td>\n"
+                + "<td class=\"col-last\">&nbsp;</td>\n"
                 + "</tr>\n"
-                + "<tr class=\"rowColor\" id=\"i1\">\n"
-                + "<td class=\"colFirst\"><code>java.lang.Object</code></td>\n"
-                + "<th class=\"colSecond\" scope=\"row\"><code><span class=\"memberNameLink\">"
+                + "<tr class=\"row-color\" id=\"i1\">\n"
+                + "<td class=\"col-first\"><code>java.lang.Object</code></td>\n"
+                + "<th class=\"col-second\" scope=\"row\"><code><span class=\"member-name-link\">"
                 + "<a href=\"#betaProperty()\">betaProperty</a></span>()</code></th>\n"
-                + "<td class=\"colLast\">&nbsp;</td>\n"
+                + "<td class=\"col-last\">&nbsp;</td>\n"
                 + "</tr>\n"
-                + "<tr class=\"altColor\" id=\"i2\">\n"
-                + "<td class=\"colFirst\"><code>java.util.List&lt;java.util.Set&lt;? super java.lang.Object&gt;&gt;"
+                + "<tr class=\"alt-color\" id=\"i2\">\n"
+                + "<td class=\"col-first\"><code>java.util.List&lt;java.util.Set&lt;? super java.lang.Object&gt;&gt;"
                 + "</code></td>\n"
-                + "<th class=\"colSecond\" scope=\"row\"><code><span class=\"memberNameLink\">"
+                + "<th class=\"col-second\" scope=\"row\"><code><span class=\"member-name-link\">"
                 + "<a href=\"#deltaProperty()\">deltaProperty</a></span>()</code></th>\n"
-                + "<td class=\"colLast\">&nbsp;</td>\n"
+                + "<td class=\"col-last\">&nbsp;</td>\n"
                 + "</tr>\n"
-                + "<tr class=\"rowColor\" id=\"i3\">\n"
-                + "<td class=\"colFirst\"><code>java.util.List&lt;java.lang.String&gt;</code></td>\n"
-                + "<th class=\"colSecond\" scope=\"row\"><code><span class=\"memberNameLink\">"
+                + "<tr class=\"row-color\" id=\"i3\">\n"
+                + "<td class=\"col-first\"><code>java.util.List&lt;java.lang.String&gt;</code></td>\n"
+                + "<th class=\"col-second\" scope=\"row\"><code><span class=\"member-name-link\">"
                 + "<a href=\"#gammaProperty()\">gammaProperty</a></span>()</code></th>\n"
-                + "<td class=\"colLast\">&nbsp;</td>"
+                + "<td class=\"col-last\">&nbsp;</td>"
         );
     }
 
--- a/test/langtools/jdk/javadoc/doclet/testLambdaFeature/TestLambdaFeature.java	Fri Mar 13 18:43:11 2020 +0100
+++ b/test/langtools/jdk/javadoc/doclet/testLambdaFeature/TestLambdaFeature.java	Fri Mar 13 10:57:41 2020 -0700
@@ -55,20 +55,20 @@
         checkExit(Exit.OK);
 
         checkOutput("pkg/A.html", true,
-                "<td class=\"colFirst\"><code>default void</code></td>",
-                "<div class=\"memberSignature\"><span class=\"modifiers\">default</span>&nbsp;"
-                + "<span class=\"returnType\">void</span>&nbsp;<span class=\"memberName\">defaultMethod</span>()</div>\n",
+                "<td class=\"col-first\"><code>default void</code></td>",
+                "<div class=\"member-signature\"><span class=\"modifiers\">default</span>&nbsp;"
+                + "<span class=\"return-type\">void</span>&nbsp;<span class=\"member-name\">defaultMethod</span>()</div>\n",
                 "<div role=\"tablist\" aria-orientation=\"horizontal\"><button role=\"tab\""
-                + " aria-selected=\"true\" aria-controls=\"memberSummary_tabpanel\" tabindex=\"0\""
-                + " onkeydown=\"switchTab(event)\" id=\"t0\" class=\"activeTableTab\">All Methods"
+                + " aria-selected=\"true\" aria-controls=\"member-summary_tabpanel\" tabindex=\"0\""
+                + " onkeydown=\"switchTab(event)\" id=\"t0\" class=\"active-table-tab\">All Methods"
                 + "</button><button role=\"tab\" aria-selected=\"false\""
-                + " aria-controls=\"memberSummary_tabpanel\" tabindex=\"-1\" onkeydown=\"switchTab(event)\""
-                + " id=\"t2\" class=\"tableTab\" onclick=\"show(2);\">Instance Methods</button>"
-                + "<button role=\"tab\" aria-selected=\"false\" aria-controls=\"memberSummary_tabpanel\""
-                + " tabindex=\"-1\" onkeydown=\"switchTab(event)\" id=\"t3\" class=\"tableTab\""
+                + " aria-controls=\"member-summary_tabpanel\" tabindex=\"-1\" onkeydown=\"switchTab(event)\""
+                + " id=\"t2\" class=\"table-tab\" onclick=\"show(2);\">Instance Methods</button>"
+                + "<button role=\"tab\" aria-selected=\"false\" aria-controls=\"member-summary_tabpanel\""
+                + " tabindex=\"-1\" onkeydown=\"switchTab(event)\" id=\"t3\" class=\"table-tab\""
                 + " onclick=\"show(4);\">Abstract Methods</button><button role=\"tab\" aria-selected=\"false\""
-                + " aria-controls=\"memberSummary_tabpanel\" tabindex=\"-1\" onkeydown=\"switchTab(event)\""
-                + " id=\"t5\" class=\"tableTab\" onclick=\"show(16);\">Default Methods</button></div>",
+                + " aria-controls=\"member-summary_tabpanel\" tabindex=\"-1\" onkeydown=\"switchTab(event)\""
+                + " id=\"t5\" class=\"table-tab\" onclick=\"show(16);\">Default Methods</button></div>",
                 "<dl class=\"notes\">\n"
                 + "<dt>Functional Interface:</dt>\n"
                 + "<dd>This is a functional interface and can therefore be used as "
@@ -85,11 +85,11 @@
                 + "</dl>");
 
         checkOutput("pkg/A.html", false,
-                "<td class=\"colFirst\"><code>default default void</code></td>",
+                "<td class=\"col-first\"><code>default default void</code></td>",
                 "<pre>default&nbsp;default&nbsp;void&nbsp;defaultMethod()</pre>");
 
         checkOutput("pkg/B.html", false,
-                "<td class=\"colFirst\"><code>default void</code></td>",
+                "<td class=\"col-first\"><code>default void</code></td>",
                 "<dl class=\"notes\">\n"
                 + "<dt>Functional Interface:</dt>");
 
--- a/test/langtools/jdk/javadoc/doclet/testLinkOption/TestLinkOption.java	Fri Mar 13 18:43:11 2020 +0100
+++ b/test/langtools/jdk/javadoc/doclet/testLinkOption/TestLinkOption.java	Fri Mar 13 10:57:41 2020 -0700
@@ -72,26 +72,26 @@
 
         checkOutput("pkg/C.html", true,
                 "<a href=\"" + url + "java/lang/String.html\" "
-                + "title=\"class or interface in java.lang\" class=\"externalLink\"><code>Link to String Class</code></a>",
+                + "title=\"class or interface in java.lang\" class=\"external-link\"><code>Link to String Class</code></a>",
                 //Make sure the parameters are formatted properly when the -link option is used.
                 "(int&nbsp;p1,\n"
                 + "int&nbsp;p2,\n"
                 + "int&nbsp;p3)",
                 "(int&nbsp;p1,\n"
                 + "int&nbsp;p2,\n"
-                + "<a href=\"" + url + "java/lang/Object.html\" title=\"class or interface in java.lang\" class=\"externalLink\">"
+                + "<a href=\"" + url + "java/lang/Object.html\" title=\"class or interface in java.lang\" class=\"external-link\">"
                 + "Object</a>&nbsp;p3)");
 
         checkOutput("pkg/B.html", true,
                 "<div class=\"block\">A method with html tag the method "
                 + "<a href=\"" + url + "java/lang/ClassLoader.html#getSystemClassLoader()\""
-                + " title=\"class or interface in java.lang\" class=\"externalLink\"><code><b>getSystemClassLoader()</b>"
+                + " title=\"class or interface in java.lang\" class=\"external-link\"><code><b>getSystemClassLoader()</b>"
                 + "</code></a> as the parent class loader.</div>",
                 "<div class=\"block\">is equivalent to invoking <code>"
                 + "<a href=\"#createTempFile(java.lang.String,java.lang.String,java.io.File)\">"
                 + "<code>createTempFile(prefix,&nbsp;suffix,&nbsp;null)</code></a></code>.</div>",
                 "<a href=\"" + url + "java/lang/String.html\" "
-                + "title=\"class or interface in java.lang\" class=\"externalLink\">Link-Plain to String Class</a>",
+                + "title=\"class or interface in java.lang\" class=\"external-link\">Link-Plain to String Class</a>",
                 "<code><b>getSystemClassLoader()</b></code>",
                 "<code>createTempFile(prefix,&nbsp;suffix,&nbsp;null)</code>",
                 "<dd><a href=\"http://www.ietf.org/rfc/rfc2279.txt\"><i>RFC&nbsp;2279: UTF-8, a\n" +
@@ -106,9 +106,9 @@
                 "</dl>");
 
         checkOutput("mylib/lang/StringBuilderChild.html", true,
-                "<pre>public abstract class <span class=\"typeNameLabel\">StringBuilderChild</span>\n"
+                "<pre>public abstract class <span class=\"type-name-label\">StringBuilderChild</span>\n"
                 + "extends <a href=\"" + url + "java/lang/Object.html\" "
-                + "title=\"class or interface in java.lang\" class=\"externalLink\">Object</a></pre>"
+                + "title=\"class or interface in java.lang\" class=\"external-link\">Object</a></pre>"
         );
 
         // Generate the documentation using -linkoffline and a relative path as the first parameter.
@@ -122,7 +122,7 @@
         checkExit(Exit.OK);
         checkOutput("pkg2/C2.html", true,
             "This is a link to <a href=\"../../" + out1 + "/pkg/C.html\" " +
-            "title=\"class or interface in pkg\" class=\"externalLink\"><code>Class C</code></a>."
+            "title=\"class or interface in pkg\" class=\"external-link\"><code>Class C</code></a>."
         );
 
         String out3 = "out3";
@@ -146,15 +146,15 @@
                 "pkg3");
         checkExit(Exit.OK);
         checkOutput("pkg3/A.html", true,
-                "<pre>public class <span class=\"typeNameLabel\">A</span>\n"
+                "<pre>public class <span class=\"type-name-label\">A</span>\n"
                 + "extends java.lang.Object</pre>\n"
                 + "<div class=\"block\">Test links.\n"
                 + " <br>\n"
                 + " <a href=\"../../out2/pkg2/C2.html\" "
-                + "title=\"class or interface in pkg2\" class=\"externalLink\"><code>link to pkg2.C2</code></a>\n"
+                + "title=\"class or interface in pkg2\" class=\"external-link\"><code>link to pkg2.C2</code></a>\n"
                 + " <br>\n"
                 + " <a href=\"../../out1/mylib/lang/StringBuilderChild.html\" "
-                + "title=\"class or interface in mylib.lang\" class=\"externalLink\">"
+                + "title=\"class or interface in mylib.lang\" class=\"external-link\">"
                 + "<code>link to mylib.lang.StringBuilderChild</code></a>.</div>\n"
         );
 
@@ -167,15 +167,15 @@
                 "pkg3");
         checkExit(Exit.OK);
         checkOutput("pkg3/A.html", true,
-                "<pre>public class <span class=\"typeNameLabel\">A</span>\n"
+                "<pre>public class <span class=\"type-name-label\">A</span>\n"
                         + "extends java.lang.Object</pre>\n"
                         + "<div class=\"block\">Test links.\n"
                         + " <br>\n"
                         + " <a href=\"../../copy/out2/pkg2/C2.html\" "
-                        + "title=\"class or interface in pkg2\" class=\"externalLink\"><code>link to pkg2.C2</code></a>\n"
+                        + "title=\"class or interface in pkg2\" class=\"external-link\"><code>link to pkg2.C2</code></a>\n"
                         + " <br>\n"
                         + " <a href=\"../../copy/out1/mylib/lang/StringBuilderChild.html\" "
-                        + "title=\"class or interface in mylib.lang\" class=\"externalLink\">"
+                        + "title=\"class or interface in mylib.lang\" class=\"external-link\">"
                         + "<code>link to mylib.lang.StringBuilderChild</code></a>.</div>\n"
         );
 
--- a/test/langtools/jdk/javadoc/doclet/testLinkOption/TestLinkOptionWithAutomaticModule.java	Fri Mar 13 18:43:11 2020 +0100
+++ b/test/langtools/jdk/javadoc/doclet/testLinkOption/TestLinkOptionWithAutomaticModule.java	Fri Mar 13 10:57:41 2020 -0700
@@ -104,7 +104,7 @@
         checkExit(Exit.OK);
         checkOutput("p/MyClass.html", true,
                 "extends <a href=\"http://myWebsite/lib/LibClass.html\" "
-                + "title=\"class or interface in lib\" class=\"externalLink\">LibClass</a>");
+                + "title=\"class or interface in lib\" class=\"external-link\">LibClass</a>");
     }
 
     @Test
@@ -128,7 +128,7 @@
         checkExit(Exit.OK);
         checkOutput("my.module/p/MyClass.html", true,
                 "extends <a href=\"http://myWebsite/lib/LibClass.html\" "
-                + "title=\"class or interface in lib\" class=\"externalLink\">LibClass</a>");
+                + "title=\"class or interface in lib\" class=\"external-link\">LibClass</a>");
     }
 
     @Test
@@ -152,6 +152,6 @@
         checkExit(Exit.OK);
         checkOutput("my.module/p/MyClass.html", true,
                 "extends <a href=\"http://myWebsite/lib/LibClass.html\" "
-                + "title=\"class or interface in lib\" class=\"externalLink\">LibClass</a>");
+                + "title=\"class or interface in lib\" class=\"external-link\">LibClass</a>");
     }
 }
--- a/test/langtools/jdk/javadoc/doclet/testLinkOption/TestLinkOptionWithModule.java	Fri Mar 13 18:43:11 2020 +0100
+++ b/test/langtools/jdk/javadoc/doclet/testLinkOption/TestLinkOptionWithModule.java	Fri Mar 13 10:57:41 2020 -0700
@@ -77,7 +77,7 @@
         checkExit(Exit.OK);
         checkOutput("com.ex2/com/ex2/B.html", true,
                 "<a href=\"../../../../out1a/com.ex1/com/ex1/A.html\" "
-                + "title=\"class or interface in com.ex1\" class=\"externalLink\">A</a>");
+                + "title=\"class or interface in com.ex1\" class=\"external-link\">A</a>");
     }
 
     @Test
@@ -96,7 +96,7 @@
         checkExit(Exit.OK);
         checkOutput("com/ex2/B.html", true,
                 "<a href=\"../../../out2a/com/ex1/A.html\" title=\"class or interface in com.ex1\" "
-                + "class=\"externalLink\">A</a>");
+                + "class=\"external-link\">A</a>");
     }
 
     @Test
--- a/test/langtools/jdk/javadoc/doclet/testLinkOption/TestOptionOrder.java	Fri Mar 13 18:43:11 2020 +0100
+++ b/test/langtools/jdk/javadoc/doclet/testLinkOption/TestOptionOrder.java	Fri Mar 13 10:57:41 2020 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -116,7 +116,7 @@
                 // Instance in See Also
                 "<dd><a href=\"http://example.com/" + first + "/lib/LibClass.html",
                 // Instance in Field declaration
-                "<td class=\"colFirst\"><code><a href=\"http://example.com/" + first + "/lib/LibClass.html"
+                "<td class=\"col-first\"><code><a href=\"http://example.com/" + first + "/lib/LibClass.html"
                 );
     }
 
--- a/test/langtools/jdk/javadoc/doclet/testLinkOption/TestRedirectLinks.java	Fri Mar 13 18:43:11 2020 +0100
+++ b/test/langtools/jdk/javadoc/doclet/testLinkOption/TestRedirectLinks.java	Fri Mar 13 10:57:41 2020 -0700
@@ -123,10 +123,10 @@
         checkExit(Exit.OK);
         checkOutput("pkg/B.html", true,
                 "<a href=\"" + apiURL + "/java.base/java/lang/String.html\" "
-                        + "title=\"class or interface in java.lang\" class=\"externalLink\">Link-Plain to String Class</a>");
+                        + "title=\"class or interface in java.lang\" class=\"external-link\">Link-Plain to String Class</a>");
         checkOutput("pkg/C.html", true,
                 "<a href=\"" + apiURL + "/java.base/java/lang/Object.html\" "
-                        + "title=\"class or interface in java.lang\" class=\"externalLink\">Object</a>");
+                        + "title=\"class or interface in java.lang\" class=\"external-link\">Object</a>");
     }
 
     private Path libApi = Path.of("libApi");
@@ -217,10 +217,10 @@
                     "javadoc: warning - URL " + oldURL + "/element-list was redirected to " + newURL + "/element-list");
             checkOutput("mC/p5/C5.html", true,
                     "extends <a href=\"" + oldURL + "/mA/p1/C1.html\" " +
-                            "title=\"class or interface in p1\" class=\"externalLink\">C1</a>");
+                            "title=\"class or interface in p1\" class=\"external-link\">C1</a>");
             checkOutput("mC/p6/C6.html", true,
                     "<a href=\"" + oldURL + "/mB/p4/C4.html\" " +
-                            "title=\"class or interface in p4\" class=\"externalLink\">C4</a>");
+                            "title=\"class or interface in p4\" class=\"external-link\">C4</a>");
         } finally {
             if (oldServer != null) {
                 out.println("Stopping old server on " + oldServer.getAddress());
--- a/test/langtools/jdk/javadoc/doclet/testLinkToSerialForm/TestLinkToSerialForm.java	Fri Mar 13 18:43:11 2020 +0100
+++ b/test/langtools/jdk/javadoc/doclet/testLinkToSerialForm/TestLinkToSerialForm.java	Fri Mar 13 10:57:41 2020 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2020, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -49,7 +49,7 @@
         checkExit(Exit.OK);
 
         checkOutput("serialized-form.html", true,
-                "<section class=\"serializedClassDetails\" id=\"pkg.C\">");
+                "<section class=\"serialized-class-details\" id=\"pkg.C\">");
         checkOutput("pkg/C.html", true,
                 "<a href=\"../serialized-form.html#pkg.C\">");
     }
--- a/test/langtools/jdk/javadoc/doclet/testLinksWithNoDeprecatedOption/TestLinksWithNoDeprecatedOption.java	Fri Mar 13 18:43:11 2020 +0100
+++ b/test/langtools/jdk/javadoc/doclet/testLinksWithNoDeprecatedOption/TestLinksWithNoDeprecatedOption.java	Fri Mar 13 10:57:41 2020 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -73,20 +73,20 @@
         checkExit(Exit.OK);
 
         checkOutput("pkg/class-use/A.html", true,
-                "<span class=\"memberNameLink\">"
+                "<span class=\"member-name-link\">"
                 + "<a href=\"../B.html#a2\">a2</a></span>");
 
         //links for deprecated items will not be found
         checkOutput("pkg/class-use/A.html", false,
-                "<span class=\"memberNameLink\">"
+                "<span class=\"member-name-link\">"
                 + "<a href=\"../B.html#deprecatedField\">deprecatedField</a></span>");
 
         checkOutput("pkg/class-use/A.html", false,
-                "<span class=\"memberNameLink\">"
+                "<span class=\"member-name-link\">"
                 + "<a href=\"../B.html#deprecatedMethod(pkg.A)\">deprecatedMethod</a></span>");
 
         checkOutput("pkg/class-use/A.html",false,
-                "<span class=\"memberNameLink\">"
+                "<span class=\"member-name-link\">"
                 + "<a href=\"../B.html#%3Cinit%3E(pkg.A)\">B</a></span>");
 
     }
--- a/test/langtools/jdk/javadoc/doclet/testLiteralCodeInPre/TestLiteralCodeInPre.java	Fri Mar 13 18:43:11 2020 +0100
+++ b/test/langtools/jdk/javadoc/doclet/testLiteralCodeInPre/TestLiteralCodeInPre.java	Fri Mar 13 10:57:41 2020 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2020, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -91,8 +91,8 @@
                 + " <PRE>\n"
                 + " <b>id           </b>\n"
                 + " </PRE></div>",
-                "<div class=\"memberSignature\"><span class=\"modifiers\">public</span>&nbsp;"
-                + "<span class=\"returnType\">void</span>&nbsp;<span class=\"memberName\">htmlAttrInPre1</span>()</div>\n"
+                "<div class=\"member-signature\"><span class=\"modifiers\">public</span>&nbsp;"
+                + "<span class=\"return-type\">void</span>&nbsp;<span class=\"member-name\">htmlAttrInPre1</span>()</div>\n"
                 + "<div class=\"block\">More html tag outliers.\n"
                 + " <pre>\n"
                 + " @Override\n"
--- a/test/langtools/jdk/javadoc/doclet/testMemberInheritance/TestMemberInheritance.java	Fri Mar 13 18:43:11 2020 +0100
+++ b/test/langtools/jdk/javadoc/doclet/testMemberInheritance/TestMemberInheritance.java	Fri Mar 13 10:57:41 2020 -0700
@@ -91,8 +91,8 @@
 
         checkOutput("pkg1/Implementer.html", true,
                 // ensure the method makes it
-                "<td class=\"colFirst\"><code>static java.time.Period</code></td>\n"
-                + "<th class=\"colSecond\" scope=\"row\"><code><span class=\"memberNameLink\">"
+                "<td class=\"col-first\"><code>static java.time.Period</code></td>\n"
+                + "<th class=\"col-second\" scope=\"row\"><code><span class=\"member-name-link\">"
                 + "<a href=\"#between(java.time.LocalDate,java.time.LocalDate)\">"
                 + "between</a></span>&#8203;(java.time.LocalDate&nbsp;startDateInclusive,\n"
                 + "java.time.LocalDate&nbsp;endDateExclusive)</code></th>");
@@ -106,25 +106,25 @@
 
         checkOutput("pkg2/DocumentedNonGenericChild.html", true,
                 "<section class=\"description\">\n<hr>\n"
-                + "<pre>public abstract class <span class=\"typeNameLabel\">"
+                + "<pre>public abstract class <span class=\"type-name-label\">"
                 + "DocumentedNonGenericChild</span>\n"
                 + "extends java.lang.Object</pre>\n"
                 + "</section>");
 
         checkOutput("pkg2/DocumentedNonGenericChild.html", true,
-                "<td class=\"colFirst\"><code>protected abstract java.lang.String</code></td>\n"
-                + "<th class=\"colSecond\" scope=\"row\"><code><span class=\"memberNameLink\">"
+                "<td class=\"col-first\"><code>protected abstract java.lang.String</code></td>\n"
+                + "<th class=\"col-second\" scope=\"row\"><code><span class=\"member-name-link\">"
                 + "<a href=\"#parentMethod(T)\">parentMethod</a></span>&#8203;(java.lang.String&nbsp;t)</code></th>\n"
-                + "<td class=\"colLast\">\n"
+                + "<td class=\"col-last\">\n"
                 + "<div class=\"block\">Returns some value.</div>\n"
                 + "</td>\n");
 
         checkOutput("pkg2/DocumentedNonGenericChild.html", true,
                 "<section class=\"detail\" id=\"parentMethod(T)\">\n"
                 + "<h3 id=\"parentMethod(java.lang.Object)\">parentMethod</h3>\n"
-                + "<div class=\"memberSignature\"><span class=\"modifiers\">protected abstract</span>"
-                + "&nbsp;<span class=\"returnType\">java.lang.String</span>&nbsp;"
-                + "<span class=\"memberName\">parentMethod</span>&#8203;"
+                + "<div class=\"member-signature\"><span class=\"modifiers\">protected abstract</span>"
+                + "&nbsp;<span class=\"return-type\">java.lang.String</span>&nbsp;"
+                + "<span class=\"member-name\">parentMethod</span>&#8203;"
                 + "(<span class=\"arguments\">java.lang.String&nbsp;t)</span>\n"
                 + "                                          "
                 + "throws <span class=\"exceptions\">java.lang.IllegalArgumentException,\n"
@@ -138,27 +138,27 @@
                 + "<dd><code>java.lang.IllegalArgumentException</code></dd>");
 
         checkOutput("pkg2/DocumentedNonGenericChild.html", true,
-                "<td class=\"colFirst\"><code>java.lang.String</code></td>\n"
-                + "<th class=\"colSecond\" scope=\"row\"><code><span class=\"memberNameLink\">"
+                "<td class=\"col-first\"><code>java.lang.String</code></td>\n"
+                + "<th class=\"col-second\" scope=\"row\"><code><span class=\"member-name-link\">"
                 + "<a href=\"#f\">f</a></span></code></th>\n"
-                + "<td class=\"colLast\">\n"
+                + "<td class=\"col-last\">\n"
                 + "<div class=\"block\">A field.</div>",
                 "<section class=\"detail\" id=\"f\">\n"
                 + "<h3>f</h3>\n"
-                + "<div class=\"memberSignature\"><span class=\"modifiers\">public</span>&nbsp;"
-                + "<span class=\"returnType\">java.lang.String</span>&nbsp;<span class=\"memberName\">f</span></div>\n"
+                + "<div class=\"member-signature\"><span class=\"modifiers\">public</span>&nbsp;"
+                + "<span class=\"return-type\">java.lang.String</span>&nbsp;<span class=\"member-name\">f</span></div>\n"
                 + "<div class=\"block\">A field.</div>\n"
                 + "</section>");
 
         checkOutput("pkg3/PrivateGenericParent.PublicChild.html", true,
-                "<td class=\"colFirst\"><code>java.lang.String</code></td>\n"
-                + "<th class=\"colSecond\" scope=\"row\"><code><span class=\"memberNameLink\">"
+                "<td class=\"col-first\"><code>java.lang.String</code></td>\n"
+                + "<th class=\"col-second\" scope=\"row\"><code><span class=\"member-name-link\">"
                 + "<a href=\"#method(T)\">method</a></span>&#8203;(java.lang.String&nbsp;t)</code></th>",
                 "<section class=\"detail\" id=\"method(T)\">\n"
                 + "<h3 id=\"method(java.lang.Object)\">method</h3>\n"
-                + "<div class=\"memberSignature\"><span class=\"modifiers\">public</span>"
-                + "&nbsp;<span class=\"returnType\">java.lang.String</span>&nbsp;"
-                + "<span class=\"memberName\">method</span>&#8203;(<span class=\"arguments\">"
+                + "<div class=\"member-signature\"><span class=\"modifiers\">public</span>"
+                + "&nbsp;<span class=\"return-type\">java.lang.String</span>&nbsp;"
+                + "<span class=\"member-name\">method</span>&#8203;(<span class=\"arguments\">"
                 + "java.lang.String&nbsp;t)</span></div>\n"
                 + "</section>");
     }
--- a/test/langtools/jdk/javadoc/doclet/testMemberSummary/TestMemberSummary.java	Fri Mar 13 18:43:11 2020 +0100
+++ b/test/langtools/jdk/javadoc/doclet/testMemberSummary/TestMemberSummary.java	Fri Mar 13 10:57:41 2020 -0700
@@ -53,18 +53,18 @@
         checkOutput("pkg/PublicChild.html", true,
                 // Check return type in member summary.
                 "<code><a href=\"PublicChild.html\" title=\"class in pkg\">PublicChild</a></code></td>\n"
-                + "<th class=\"colSecond\" scope=\"row\"><code><span class=\"memberNameLink\"><a href=\"#returnTypeTest()\">"
+                + "<th class=\"col-second\" scope=\"row\"><code><span class=\"member-name-link\"><a href=\"#returnTypeTest()\">"
                 + "returnTypeTest</a></span>()</code>",
                 // Check return type in member detail.
-                "<div class=\"memberSignature\"><span class=\"modifiers\">public</span>&nbsp;"
-                + "<span class=\"returnType\"><a href=\"PublicChild.html\" title=\"class in pkg\">"
-                + "PublicChild</a></span>&nbsp;<span class=\"memberName\">returnTypeTest</span>()</div>",
-                "<th class=\"colConstructorName\" scope=\"row\"><code><span class=\"memberNameLink\">"
+                "<div class=\"member-signature\"><span class=\"modifiers\">public</span>&nbsp;"
+                + "<span class=\"return-type\"><a href=\"PublicChild.html\" title=\"class in pkg\">"
+                + "PublicChild</a></span>&nbsp;<span class=\"member-name\">returnTypeTest</span>()</div>",
+                "<th class=\"col-constructor-name\" scope=\"row\"><code><span class=\"member-name-link\">"
                 + "<a href=\"#%3Cinit%3E()\">PublicChild</a></span>()</code></th>");
 
         checkOutput("pkg/PrivateParent.html", true,
-                "<td class=\"colFirst\"><code>private </code></td>\n"
-                + "<th class=\"colConstructorName\" scope=\"row\"><code><span class=\"memberNameLink\">"
+                "<td class=\"col-first\"><code>private </code></td>\n"
+                + "<th class=\"col-constructor-name\" scope=\"row\"><code><span class=\"member-name-link\">"
                 + "<a href=\"#%3Cinit%3E(int)\">PrivateParent</a></span>&#8203;(int&nbsp;i)</code>"
                 + "</th>");
 
--- a/test/langtools/jdk/javadoc/doclet/testMethodSignature/TestMethodSignature.java	Fri Mar 13 18:43:11 2020 +0100
+++ b/test/langtools/jdk/javadoc/doclet/testMethodSignature/TestMethodSignature.java	Fri Mar 13 10:57:41 2020 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2020, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -48,26 +48,26 @@
         checkExit(Exit.OK);
 
         checkOutput("pkg/C.html", true,
-                "<div class=\"memberSignature\"><span class=\"annotations\">"
+                "<div class=\"member-signature\"><span class=\"annotations\">"
                 + "@Generated(\"GeneratedConstructor\")\n"
                 + "</span><span class=\"modifiers\">public</span>&nbsp;"
-                + "<span class=\"memberName\">C</span>()</div>",
+                + "<span class=\"member-name\">C</span>()</div>",
 
-                "<div class=\"memberSignature\"><span class=\"modifiers\">public static</span>"
-                + "&nbsp;<span class=\"returnType\">void</span>&nbsp;<span class=\"memberName\">"
+                "<div class=\"member-signature\"><span class=\"modifiers\">public static</span>"
+                + "&nbsp;<span class=\"return-type\">void</span>&nbsp;<span class=\"member-name\">"
                 + "simpleMethod</span>&#8203;(<span class=\"arguments\">int&nbsp;i,\n"
                 + "java.lang.String&nbsp;s,\nboolean&nbsp;b)</span></div>",
 
-                "<div class=\"memberSignature\"><span class=\"annotations\">@Generated"
+                "<div class=\"member-signature\"><span class=\"annotations\">@Generated"
                 + "(value=\"SomeGeneratedName\",\n           date=\"a date\",\n"
                 + "           comments=\"some comment about the method below\")\n"
                 + "</span><span class=\"modifiers\">public static</span>&nbsp;<span "
-                + "class=\"returnType\">void</span>&nbsp;<span class=\"memberName\">annotatedMethod"
+                + "class=\"return-type\">void</span>&nbsp;<span class=\"member-name\">annotatedMethod"
                 + "</span>&#8203;(<span class=\"arguments\">int&nbsp;i,\n"
                 + "java.lang.String&nbsp;s,\nboolean&nbsp;b)</span></div>",
 
-                "<div class=\"memberSignature\"><span class=\"modifiers\">public static</span>"
-                + "&nbsp;<span class=\"typeParametersLong\">&lt;T1 extends java.lang.AutoCloseable,&#8203;\n"
+                "<div class=\"member-signature\"><span class=\"modifiers\">public static</span>"
+                + "&nbsp;<span class=\"type-parameters-long\">&lt;T1 extends java.lang.AutoCloseable,&#8203;\n"
                 + "T2 extends java.lang.AutoCloseable,&#8203;\n"
                 + "T3 extends java.lang.AutoCloseable,&#8203;\n"
                 + "T4 extends java.lang.AutoCloseable,&#8203;\n"
@@ -75,10 +75,10 @@
                 + "T6 extends java.lang.AutoCloseable,&#8203;\n"
                 + "T7 extends java.lang.AutoCloseable,&#8203;\n"
                 + "T8 extends java.lang.AutoCloseable&gt;</span>\n"
-                + "<span class=\"returnType\"><a href=\"C.With8Types.html\" "
+                + "<span class=\"return-type\"><a href=\"C.With8Types.html\" "
                 + "title=\"class in pkg\">C.With8Types</a>&lt;T1,&#8203;T2,&#8203;T3,"
                 + "&#8203;T4,&#8203;T5,&#8203;T6,&#8203;T7,&#8203;T8&gt;</span>&nbsp;"
-                + "<span class=\"memberName\">bigGenericMethod</span>&#8203;("
+                + "<span class=\"member-name\">bigGenericMethod</span>&#8203;("
                 + "<span class=\"arguments\"><a href=\"C.F0.html\" "
                 + "title=\"interface in pkg\">C.F0</a>&lt;? extends T1&gt;&nbsp;t1,\n"
                 + "<a href=\"C.F0.html\" title=\"interface in pkg\">"
@@ -99,12 +99,12 @@
                 + "throws <span class=\"exceptions\">java.lang.IllegalArgumentException,\n"
                 + "java.lang.IllegalStateException</span></div>",
 
-                "<div class=\"memberSignature\"><span class=\"annotations\">"
+                "<div class=\"member-signature\"><span class=\"annotations\">"
                 + "@Generated(value=\"SomeGeneratedName\",\n"
                 + "           date=\"a date\",\n"
                 + "           comments=\"some comment about the method below\")\n"
                 + "</span><span class=\"modifiers\">public static</span>&nbsp;"
-                + "<span class=\"typeParametersLong\">"
+                + "<span class=\"type-parameters-long\">"
                 + "&lt;T1 extends java.lang.AutoCloseable,&#8203;\n"
                 + "T2 extends java.lang.AutoCloseable,&#8203;\n"
                 + "T3 extends java.lang.AutoCloseable,&#8203;\n"
@@ -113,10 +113,10 @@
                 + "T6 extends java.lang.AutoCloseable,&#8203;\n"
                 + "T7 extends java.lang.AutoCloseable,&#8203;\n"
                 + "T8 extends java.lang.AutoCloseable&gt;</span>\n"
-                + "<span class=\"returnType\"><a href=\"C.With8Types.html\" "
+                + "<span class=\"return-type\"><a href=\"C.With8Types.html\" "
                 + "title=\"class in pkg\">C.With8Types</a>&lt;T1,&#8203;T2,&#8203;T3,"
                 + "&#8203;T4,&#8203;T5,&#8203;T6,&#8203;T7,&#8203;T8&gt;</span>&nbsp;"
-                + "<span class=\"memberName\">bigGenericAnnotatedMethod</span>&#8203;("
+                + "<span class=\"member-name\">bigGenericAnnotatedMethod</span>&#8203;("
                 + "<span class=\"arguments\"><a href=\"C.F0.html\" "
                 + "title=\"interface in pkg\">C.F0</a>&lt;? extends T1&gt;&nbsp;t1,\n"
                 + "<a href=\"C.F0.html\" title=\"interface in pkg\">"
--- a/test/langtools/jdk/javadoc/doclet/testMethodTypes/TestMethodTypes.java	Fri Mar 13 18:43:11 2020 +0100
+++ b/test/langtools/jdk/javadoc/doclet/testMethodTypes/TestMethodTypes.java	Fri Mar 13 10:57:41 2020 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2020, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -50,67 +50,67 @@
         checkOutput("pkg1/A.html", true,
                 "var data = {",
                 "<div role=\"tablist\" aria-orientation=\"horizontal\"><button role=\"tab\""
-                + " aria-selected=\"true\" aria-controls=\"memberSummary_tabpanel\" tabindex=\"0\""
-                + " onkeydown=\"switchTab(event)\" id=\"t0\" class=\"activeTableTab\">All Methods</button>"
-                + "<button role=\"tab\" aria-selected=\"false\" aria-controls=\"memberSummary_tabpanel\""
-                + " tabindex=\"-1\" onkeydown=\"switchTab(event)\" id=\"t1\" class=\"tableTab\""
+                + " aria-selected=\"true\" aria-controls=\"member-summary_tabpanel\" tabindex=\"0\""
+                + " onkeydown=\"switchTab(event)\" id=\"t0\" class=\"active-table-tab\">All Methods</button>"
+                + "<button role=\"tab\" aria-selected=\"false\" aria-controls=\"member-summary_tabpanel\""
+                + " tabindex=\"-1\" onkeydown=\"switchTab(event)\" id=\"t1\" class=\"table-tab\""
                 + " onclick=\"show(1);\">Static Methods</button><button role=\"tab\" aria-selected=\"false\""
-                + " aria-controls=\"memberSummary_tabpanel\" tabindex=\"-1\" onkeydown=\"switchTab(event)\""
-                + " id=\"t2\" class=\"tableTab\" onclick=\"show(2);\">Instance Methods</button>"
-                + "<button role=\"tab\" aria-selected=\"false\" aria-controls=\"memberSummary_tabpanel\""
-                + " tabindex=\"-1\" onkeydown=\"switchTab(event)\" id=\"t4\" class=\"tableTab\""
+                + " aria-controls=\"member-summary_tabpanel\" tabindex=\"-1\" onkeydown=\"switchTab(event)\""
+                + " id=\"t2\" class=\"table-tab\" onclick=\"show(2);\">Instance Methods</button>"
+                + "<button role=\"tab\" aria-selected=\"false\" aria-controls=\"member-summary_tabpanel\""
+                + " tabindex=\"-1\" onkeydown=\"switchTab(event)\" id=\"t4\" class=\"table-tab\""
                 + " onclick=\"show(8);\">Concrete Methods</button><button role=\"tab\""
-                + " aria-selected=\"false\" aria-controls=\"memberSummary_tabpanel\" tabindex=\"-1\""
-                + " onkeydown=\"switchTab(event)\" id=\"t6\" class=\"tableTab\" onclick=\"show(32);\">"
+                + " aria-selected=\"false\" aria-controls=\"member-summary_tabpanel\" tabindex=\"-1\""
+                + " onkeydown=\"switchTab(event)\" id=\"t6\" class=\"table-tab\" onclick=\"show(32);\">"
                 + "Deprecated Methods</button></div>",
-                "<tr class=\"altColor\" id=\"i0\">");
+                "<tr class=\"alt-color\" id=\"i0\">");
 
         checkOutput("pkg1/B.html", true,
                 "var data = {\"i0\":6,\"i1\":18,\"i2\":18,\"i3\":1,\"i4\":1,"
                 + "\"i5\":6,\"i6\":6,\"i7\":6,\"i8\":6};\n",
                 "<div role=\"tablist\" aria-orientation=\"horizontal\"><button role=\"tab\""
-                + " aria-selected=\"true\" aria-controls=\"memberSummary_tabpanel\" tabindex=\"0\""
-                + " onkeydown=\"switchTab(event)\" id=\"t0\" class=\"activeTableTab\">All Methods"
+                + " aria-selected=\"true\" aria-controls=\"member-summary_tabpanel\" tabindex=\"0\""
+                + " onkeydown=\"switchTab(event)\" id=\"t0\" class=\"active-table-tab\">All Methods"
                 + "</button><button role=\"tab\" aria-selected=\"false\""
-                + " aria-controls=\"memberSummary_tabpanel\" tabindex=\"-1\""
-                + " onkeydown=\"switchTab(event)\" id=\"t1\" class=\"tableTab\" onclick=\"show(1);\">"
+                + " aria-controls=\"member-summary_tabpanel\" tabindex=\"-1\""
+                + " onkeydown=\"switchTab(event)\" id=\"t1\" class=\"table-tab\" onclick=\"show(1);\">"
                 + "Static Methods</button><button role=\"tab\" aria-selected=\"false\""
-                + " aria-controls=\"memberSummary_tabpanel\" tabindex=\"-1\" onkeydown=\"switchTab(event)\""
-                + " id=\"t2\" class=\"tableTab\" onclick=\"show(2);\">Instance Methods</button>"
-                + "<button role=\"tab\" aria-selected=\"false\" aria-controls=\"memberSummary_tabpanel\""
-                + " tabindex=\"-1\" onkeydown=\"switchTab(event)\" id=\"t3\" class=\"tableTab\""
+                + " aria-controls=\"member-summary_tabpanel\" tabindex=\"-1\" onkeydown=\"switchTab(event)\""
+                + " id=\"t2\" class=\"table-tab\" onclick=\"show(2);\">Instance Methods</button>"
+                + "<button role=\"tab\" aria-selected=\"false\" aria-controls=\"member-summary_tabpanel\""
+                + " tabindex=\"-1\" onkeydown=\"switchTab(event)\" id=\"t3\" class=\"table-tab\""
                 + " onclick=\"show(4);\">Abstract Methods</button><button role=\"tab\""
-                + " aria-selected=\"false\" aria-controls=\"memberSummary_tabpanel\" tabindex=\"-1\""
-                + " onkeydown=\"switchTab(event)\" id=\"t5\" class=\"tableTab\" onclick=\"show(16);\">"
+                + " aria-selected=\"false\" aria-controls=\"member-summary_tabpanel\" tabindex=\"-1\""
+                + " onkeydown=\"switchTab(event)\" id=\"t5\" class=\"table-tab\" onclick=\"show(16);\">"
                 + "Default Methods</button></div>");
 
         checkOutput("pkg1/D.html", true,
                 "var data = {",
                 "<div role=\"tablist\" aria-orientation=\"horizontal\"><button role=\"tab\""
-                + " aria-selected=\"true\" aria-controls=\"memberSummary_tabpanel\" tabindex=\"0\""
-                + " onkeydown=\"switchTab(event)\" id=\"t0\" class=\"activeTableTab\">All Methods</button>"
-                + "<button role=\"tab\" aria-selected=\"false\" aria-controls=\"memberSummary_tabpanel\""
-                + " tabindex=\"-1\" onkeydown=\"switchTab(event)\" id=\"t2\" class=\"tableTab\""
+                + " aria-selected=\"true\" aria-controls=\"member-summary_tabpanel\" tabindex=\"0\""
+                + " onkeydown=\"switchTab(event)\" id=\"t0\" class=\"active-table-tab\">All Methods</button>"
+                + "<button role=\"tab\" aria-selected=\"false\" aria-controls=\"member-summary_tabpanel\""
+                + " tabindex=\"-1\" onkeydown=\"switchTab(event)\" id=\"t2\" class=\"table-tab\""
                 + " onclick=\"show(2);\">Instance Methods</button><button role=\"tab\" aria-selected=\"false\""
-                + " aria-controls=\"memberSummary_tabpanel\" tabindex=\"-1\" onkeydown=\"switchTab(event)\""
-                + " id=\"t3\" class=\"tableTab\" onclick=\"show(4);\">Abstract Methods</button>"
-                + "<button role=\"tab\" aria-selected=\"false\" aria-controls=\"memberSummary_tabpanel\""
-                + " tabindex=\"-1\" onkeydown=\"switchTab(event)\" id=\"t4\" class=\"tableTab\""
+                + " aria-controls=\"member-summary_tabpanel\" tabindex=\"-1\" onkeydown=\"switchTab(event)\""
+                + " id=\"t3\" class=\"table-tab\" onclick=\"show(4);\">Abstract Methods</button>"
+                + "<button role=\"tab\" aria-selected=\"false\" aria-controls=\"member-summary_tabpanel\""
+                + " tabindex=\"-1\" onkeydown=\"switchTab(event)\" id=\"t4\" class=\"table-tab\""
                 + " onclick=\"show(8);\">Concrete Methods</button><button role=\"tab\" aria-selected=\"false\""
-                + " aria-controls=\"memberSummary_tabpanel\" tabindex=\"-1\" onkeydown=\"switchTab(event)\""
-                + " id=\"t6\" class=\"tableTab\" onclick=\"show(32);\">Deprecated Methods</button></div>",
-                "<tr class=\"altColor\" id=\"i0\">");
+                + " aria-controls=\"member-summary_tabpanel\" tabindex=\"-1\" onkeydown=\"switchTab(event)\""
+                + " id=\"t6\" class=\"table-tab\" onclick=\"show(32);\">Deprecated Methods</button></div>",
+                "<tr class=\"alt-color\" id=\"i0\">");
 
         checkOutput("pkg1/A.html", false,
-                "<caption><span>Methods</span><span class=\"tabEnd\">&nbsp;</span>"
+                "<caption><span>Methods</span><span class=\"tab-end\">&nbsp;</span>"
                 + "</caption>");
 
         checkOutput("pkg1/B.html", false,
-                "<caption><span>Methods</span><span class=\"tabEnd\">&nbsp;</span>"
+                "<caption><span>Methods</span><span class=\"tab-end\">&nbsp;</span>"
                 + "</caption>");
 
         checkOutput("pkg1/D.html", false,
-                "<caption><span>Methods</span><span class=\"tabEnd\">&nbsp;</span>"
+                "<caption><span>Methods</span><span class=\"tab-end\">&nbsp;</span>"
                 + "</caption>");
     }
 }
--- a/test/langtools/jdk/javadoc/doclet/testModifierEx/TestModifierEx.java	Fri Mar 13 18:43:11 2020 +0100
+++ b/test/langtools/jdk/javadoc/doclet/testModifierEx/TestModifierEx.java	Fri Mar 13 10:57:41 2020 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2020, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -46,15 +46,15 @@
                 "-package", "pkg1");
         checkExit(Exit.OK);
         checkOutput("pkg1/Abstract.html", true,
-                "<pre>public abstract class <span class=\"typeNameLabel\">Abstract</span>");
+                "<pre>public abstract class <span class=\"type-name-label\">Abstract</span>");
         checkOutput("pkg1/Interface.html", true,
-                "<pre>interface <span class=\"typeNameLabel\">Interface</span></pre>");
+                "<pre>interface <span class=\"type-name-label\">Interface</span></pre>");
         checkOutput("pkg1/Interface.Kind.html", true,
-                "<pre>public static interface <span class=\"typeNameLabel\">Interface.Kind</span></pre>");
+                "<pre>public static interface <span class=\"type-name-label\">Interface.Kind</span></pre>");
         checkOutput("pkg1/Enum.html", true,
-                "<pre>public enum <span class=\"typeNameLabel\">Enum</span>");
+                "<pre>public enum <span class=\"type-name-label\">Enum</span>");
         checkOutput("pkg1/Klass.StaticEnum.html", true,
-                "<pre>public static enum <span class=\"typeNameLabel\">Klass.StaticEnum</span>");
+                "<pre>public static enum <span class=\"type-name-label\">Klass.StaticEnum</span>");
     }
 
 }
--- a/test/langtools/jdk/javadoc/doclet/testModules/TestIndirectExportsOpens.java	Fri Mar 13 18:43:11 2020 +0100
+++ b/test/langtools/jdk/javadoc/doclet/testModules/TestIndirectExportsOpens.java	Fri Mar 13 10:57:41 2020 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -160,14 +160,14 @@
         // check for minimal expected strings.
         checkOutput("a/module-summary.html", true,
                 "Indirect Exports",
-                "<th class=\"colFirst\" scope=\"row\"><a href=\"../m/module-summary.html\">m</a></th>\n"
-                + "<td class=\"colLast\"><a href=\"../m/exportsto/package-summary.html\">exportsto</a></td>\n"
+                "<th class=\"col-first\" scope=\"row\"><a href=\"../m/module-summary.html\">m</a></th>\n"
+                + "<td class=\"col-last\"><a href=\"../m/exportsto/package-summary.html\">exportsto</a></td>\n"
                 + "</tr>\n");
 
         checkOutput("a/module-summary.html", true,
                 "Indirect Opens",
-                "<th class=\"colFirst\" scope=\"row\"><a href=\"../m/module-summary.html\">m</a></th>\n"
-                + "<td class=\"colLast\">opensto</td>\n"
+                "<th class=\"col-first\" scope=\"row\"><a href=\"../m/module-summary.html\">m</a></th>\n"
+                + "<td class=\"col-last\">opensto</td>\n"
                 + "</tr>\n");
     }
 
@@ -190,19 +190,19 @@
         }
 
         checkOutput("a/module-summary.html", present,
-                "<div class=\"packagesSummary\">\n"
+                "<div class=\"packages-summary\">\n"
                 + "<table>\n"
-                + "<caption><span>" + typeString + "</span><span class=\"tabEnd\">&nbsp;</span></caption>\n"
+                + "<caption><span>" + typeString + "</span><span class=\"tab-end\">&nbsp;</span></caption>\n"
                 + "<thead>\n"
                 + "<tr>\n"
-                + "<th class=\"colFirst\" scope=\"col\">From</th>\n"
-                + "<th class=\"colLast\" scope=\"col\">Packages</th>\n"
+                + "<th class=\"col-first\" scope=\"col\">From</th>\n"
+                + "<th class=\"col-last\" scope=\"col\">Packages</th>\n"
                 + "</tr>\n"
                 + "</thead>\n"
                 + "<tbody>\n"
-                + "<tr class=\"altColor\">\n"
-                + "<th class=\"colFirst\" scope=\"row\"><a href=\"../m/module-summary.html\">m</a></th>\n"
-                + "<td class=\"colLast\"><a href=\"../m/pm/package-summary.html\">pm</a></td>\n"
+                + "<tr class=\"alt-color\">\n"
+                + "<th class=\"col-first\" scope=\"row\"><a href=\"../m/module-summary.html\">m</a></th>\n"
+                + "<td class=\"col-last\"><a href=\"../m/pm/package-summary.html\">pm</a></td>\n"
                 + "</tr>\n"
                 + "</tbody>\n"
                 + "</table>\n"
--- a/test/langtools/jdk/javadoc/doclet/testModules/TestModulePackages.java	Fri Mar 13 18:43:11 2020 +0100
+++ b/test/langtools/jdk/javadoc/doclet/testModules/TestModulePackages.java	Fri Mar 13 10:57:41 2020 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2020, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -73,7 +73,7 @@
         checkExit(Exit.OK);
         checkOutput("m/module-summary.html", false,
                 "<h3>Packages</h3>\n"
-                + "<table class=\"packagesSummary\" summary=\"Packages table, "
+                + "<table class=\"packages-summary\" summary=\"Packages table, "
                 + "listing packages, and an explanation\">");
     }
 
@@ -416,25 +416,25 @@
             StringBuilder sb = new StringBuilder();
             sb.append("<div role=\"tablist\" aria-orientation=\"horizontal\">"
                         + "<button role=\"tab\" aria-selected=\"true\""
-                        + " aria-controls=\"packagesSummary_tabpanel\" tabindex=\"0\""
+                        + " aria-controls=\"packages-summary_tabpanel\" tabindex=\"0\""
                         + " onkeydown=\"switchTab(event)\""
-                        + " id=\"t0\" class=\"activeTableTab\">All Packages</button>");
+                        + " id=\"t0\" class=\"active-table-tab\">All Packages</button>");
             if (kindSet.contains(TabKind.EXPORTS)) {
                 sb.append("<button role=\"tab\" aria-selected=\"false\""
-                        + " aria-controls=\"packagesSummary_tabpanel\" tabindex=\"-1\""
-                        + " onkeydown=\"switchTab(event)\" id=\"t1\" class=\"tableTab\""
+                        + " aria-controls=\"packages-summary_tabpanel\" tabindex=\"-1\""
+                        + " onkeydown=\"switchTab(event)\" id=\"t1\" class=\"table-tab\""
                         + " onclick=\"show(1);\">Exports</button>");
             }
             if (kindSet.contains(TabKind.OPENS)) {
                 sb.append("<button role=\"tab\" aria-selected=\"false\""
-                        + " aria-controls=\"packagesSummary_tabpanel\" tabindex=\"-1\""
-                        + " onkeydown=\"switchTab(event)\" id=\"t2\" class=\"tableTab\""
+                        + " aria-controls=\"packages-summary_tabpanel\" tabindex=\"-1\""
+                        + " onkeydown=\"switchTab(event)\" id=\"t2\" class=\"table-tab\""
                         + " onclick=\"show(2);\">Opens</button>");
             }
             if (kindSet.contains(TabKind.CONCEALED)) {
                 sb.append("<button role=\"tab\" aria-selected=\"false\""
-                        + " aria-controls=\"packagesSummary_tabpanel\" tabindex=\"-1\" "
-                        + "onkeydown=\"switchTab(event)\" id=\"t3\" class=\"tableTab\" "
+                        + " aria-controls=\"packages-summary_tabpanel\" tabindex=\"-1\" "
+                        + "onkeydown=\"switchTab(event)\" id=\"t3\" class=\"table-tab\" "
                         + "onclick=\"show(4);\">Concealed</button>");
             }
             sb.append("</div>");
@@ -444,7 +444,7 @@
             String name = k.toString().charAt(0) + k.toString().substring(1).toLowerCase();
             expect = "<caption>"
                         + "<span>" + name + "</span>"
-                        + "<span class=\"tabEnd\">&nbsp;</span>"
+                        + "<span class=\"tab-end\">&nbsp;</span>"
                         + "</caption>";
         }
 
@@ -456,14 +456,14 @@
         Set<ColKind> kindSet = Set.of(kinds);
         StringBuilder sb = new StringBuilder();
         sb.append("<tr>\n"
-            + "<th class=\"colFirst\" scope=\"col\">Package</th>\n");
+            + "<th class=\"col-first\" scope=\"col\">Package</th>\n");
         if (kindSet.contains(ColKind.EXPORTED_TO)) {
-            sb.append("<th class=\"colSecond\" scope=\"col\">Exported To Modules</th>\n");
+            sb.append("<th class=\"col-second\" scope=\"col\">Exported To Modules</th>\n");
         }
         if (kindSet.contains(ColKind.OPENED_TO)) {
-            sb.append("<th class=\"colSecond\" scope=\"col\">Opened To Modules</th>\n");
+            sb.append("<th class=\"col-second\" scope=\"col\">Opened To Modules</th>\n");
         }
-        sb.append("<th class=\"colLast\" scope=\"col\">Description</th>\n"
+        sb.append("<th class=\"col-last\" scope=\"col\">Description</th>\n"
             + "</tr>");
 
         checkOutput(moduleName + "/module-summary.html", true, sb.toString());
@@ -473,18 +473,18 @@
             String id, String exportedTo, String openedTo, String desc) {
         StringBuilder sb = new StringBuilder();
         int idNum = Integer.parseInt(id.substring(1));
-        String color = (idNum % 2 == 1 ? "rowColor" : "altColor");
+        String color = (idNum % 2 == 1 ? "row-color" : "alt-color");
         sb.append("<tr class=\"" + color + "\" id=\"" + id + "\">\n"
-                + "<th class=\"colFirst\" scope=\"row\">"
+                + "<th class=\"col-first\" scope=\"row\">"
                 + "<a href=\"" + packageName.replace('.', '/') + "/package-summary.html\">"
                 + packageName + "</a></th>\n");
         if (exportedTo != null) {
-            sb.append("<td class=\"colSecond\">" + exportedTo + "</td>\n");
+            sb.append("<td class=\"col-second\">" + exportedTo + "</td>\n");
         }
         if (openedTo != null) {
-            sb.append("<td class=\"colSecond\">" + openedTo + "</td>\n");
+            sb.append("<td class=\"col-second\">" + openedTo + "</td>\n");
         }
-        sb.append("<td class=\"colLast\">" + desc + "</td>");
+        sb.append("<td class=\"col-last\">" + desc + "</td>");
 
         checkOutput(moduleName + "/module-summary.html", true, sb.toString());
     }
--- a/test/langtools/jdk/javadoc/doclet/testModules/TestModuleServices.java	Fri Mar 13 18:43:11 2020 +0100
+++ b/test/langtools/jdk/javadoc/doclet/testModules/TestModuleServices.java	Fri Mar 13 10:57:41 2020 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -128,24 +128,24 @@
         checkExit(Exit.OK);
 
         checkOutput("moduleServiceProvider/module-summary.html", true,
-                "<tr class=\"altColor\">\n"
-                + "<th class=\"colFirst\" scope=\"row\"><a href=\"../moduleService/pkgService/Service.html\" "
+                "<tr class=\"alt-color\">\n"
+                + "<th class=\"col-first\" scope=\"row\"><a href=\"../moduleService/pkgService/Service.html\" "
                 + "title=\"interface in pkgService\">Service</a></th>\n"
-                + "<td class=\"colLast\">\n"
+                + "<td class=\"col-last\">\n"
                 + "<div class=\"block\">Provides a service whose name is ServiceProvider.</div>\n"
                 + "</td>\n"
                 + "</tr>");
         checkOutput("moduleServiceUser/module-summary.html", true,
-                "<tr class=\"altColor\">\n"
-                + "<th class=\"colFirst\" scope=\"row\"><a href=\"../moduleService/pkgService/Service.html\" title=\"interface in pkgService\">Service</a></th>\n"
-                + "<td class=\"colLast\">\n"
+                "<tr class=\"alt-color\">\n"
+                + "<th class=\"col-first\" scope=\"row\"><a href=\"../moduleService/pkgService/Service.html\" title=\"interface in pkgService\">Service</a></th>\n"
+                + "<td class=\"col-last\">\n"
                 + "<div class=\"block\">If no other provider is found, a default internal implementation will be used.</div>\n"
                 + "</td>\n"
                 + "</tr>");
         checkOutput("moduleServiceUserNoDescription/module-summary.html", true,
-                "<tr class=\"altColor\">\n"
-                + "<th class=\"colFirst\" scope=\"row\"><a href=\"../moduleService/pkgService/Service.html\" title=\"interface in pkgService\">Service</a></th>\n"
-                + "<td class=\"colLast\">\n"
+                "<tr class=\"alt-color\">\n"
+                + "<th class=\"col-first\" scope=\"row\"><a href=\"../moduleService/pkgService/Service.html\" title=\"interface in pkgService\">Service</a></th>\n"
+                + "<td class=\"col-last\">\n"
                 + "<div class=\"block\">A service Interface for service providers.</div>\n"
                 + "</td>\n"
                 + "</tr>");
@@ -197,22 +197,22 @@
                 "<h2>Services</h2>");
 
         checkOutput("m/module-summary.html", true,
-                "<div class=\"usesSummary\">\n<table>\n" +
-                "<caption><span>Uses</span><span class=\"tabEnd\">&nbsp;</span></caption>\n" +
+                "<div class=\"uses-summary\">\n<table>\n" +
+                "<caption><span>Uses</span><span class=\"tab-end\">&nbsp;</span></caption>\n" +
                 "<thead>\n" +
                 "<tr>\n" +
-                "<th class=\"colFirst\" scope=\"col\">Type</th>\n" +
-                "<th class=\"colLast\" scope=\"col\">Description</th>\n" +
+                "<th class=\"col-first\" scope=\"col\">Type</th>\n" +
+                "<th class=\"col-last\" scope=\"col\">Description</th>\n" +
                 "</tr>\n" +
                 "</thead>\n" +
                 "<tbody>\n" +
-                "<tr class=\"altColor\">\n" +
-                "<th class=\"colFirst\" scope=\"row\"><a href=\"p1/A.html\" title=\"class in p1\">A</a></th>\n" +
-                "<td class=\"colLast\">&nbsp;</td>\n" +
+                "<tr class=\"alt-color\">\n" +
+                "<th class=\"col-first\" scope=\"row\"><a href=\"p1/A.html\" title=\"class in p1\">A</a></th>\n" +
+                "<td class=\"col-last\">&nbsp;</td>\n" +
                 "</tr>\n" +
-                "<tr class=\"rowColor\">\n" +
-                "<th class=\"colFirst\" scope=\"row\"><a href=\"p1/B.html\" title=\"class in p1\">B</a></th>\n" +
-                "<td class=\"colLast\">&nbsp;</td>\n" +
+                "<tr class=\"row-color\">\n" +
+                "<th class=\"col-first\" scope=\"row\"><a href=\"p1/B.html\" title=\"class in p1\">B</a></th>\n" +
+                "<td class=\"col-last\">&nbsp;</td>\n" +
                 "</tr>\n" +
                 "</tbody>\n" +
                 "</table>\n");
@@ -240,18 +240,18 @@
                 "<h2>Services</h2>");
 
         checkOutput("m/module-summary.html", true,
-                "<div class=\"usesSummary\">\n<table>\n" +
-                "<caption><span>Uses</span><span class=\"tabEnd\">&nbsp;</span></caption>\n" +
+                "<div class=\"uses-summary\">\n<table>\n" +
+                "<caption><span>Uses</span><span class=\"tab-end\">&nbsp;</span></caption>\n" +
                 "<thead>\n" +
                 "<tr>\n" +
-                "<th class=\"colFirst\" scope=\"col\">Type</th>\n" +
-                "<th class=\"colLast\" scope=\"col\">Description</th>\n" +
+                "<th class=\"col-first\" scope=\"col\">Type</th>\n" +
+                "<th class=\"col-last\" scope=\"col\">Description</th>\n" +
                 "</tr>\n" +
                 "</thead>\n" +
                 "<tbody>\n" +
-                "<tr class=\"altColor\">\n" +
-                "<th class=\"colFirst\" scope=\"row\"><a href=\"p1/A.html\" title=\"class in p1\">A</a></th>\n" +
-                "<td class=\"colLast\">&nbsp;</td>\n" +
+                "<tr class=\"alt-color\">\n" +
+                "<th class=\"col-first\" scope=\"row\"><a href=\"p1/A.html\" title=\"class in p1\">A</a></th>\n" +
+                "<td class=\"col-last\">&nbsp;</td>\n" +
                 "</tr>\n" +
                 "</tbody>\n" +
                 "</table>\n");
@@ -309,22 +309,22 @@
                 "<h2>Services</h2>");
 
         checkOutput("m/module-summary.html", true,
-                "<div class=\"providesSummary\">\n<table>\n" +
-                "<caption><span>Provides</span><span class=\"tabEnd\">&nbsp;</span></caption>\n" +
+                "<div class=\"provides-summary\">\n<table>\n" +
+                "<caption><span>Provides</span><span class=\"tab-end\">&nbsp;</span></caption>\n" +
                 "<thead>\n" +
                 "<tr>\n" +
-                "<th class=\"colFirst\" scope=\"col\">Type</th>\n" +
-                "<th class=\"colLast\" scope=\"col\">Description</th>\n" +
+                "<th class=\"col-first\" scope=\"col\">Type</th>\n" +
+                "<th class=\"col-last\" scope=\"col\">Description</th>\n" +
                 "</tr>\n" +
                 "</thead>\n" +
                 "<tbody>\n" +
-                "<tr class=\"altColor\">\n" +
-                "<th class=\"colFirst\" scope=\"row\"><a href=\"p1/A.html\" title=\"interface in p1\">A</a></th>\n" +
-                "<td class=\"colLast\">&nbsp;<br>(<span class=\"implementationLabel\">Implementation(s):</span>&nbsp;<a href=\"p1/B.html\" title=\"class in p1\">B</a>)</td>\n" +
+                "<tr class=\"alt-color\">\n" +
+                "<th class=\"col-first\" scope=\"row\"><a href=\"p1/A.html\" title=\"interface in p1\">A</a></th>\n" +
+                "<td class=\"col-last\">&nbsp;<br>(<span class=\"implementation-label\">Implementation(s):</span>&nbsp;<a href=\"p1/B.html\" title=\"class in p1\">B</a>)</td>\n" +
                 "</tr>\n" +
-                "<tr class=\"rowColor\">\n" +
-                "<th class=\"colFirst\" scope=\"row\"><a href=\"p2/A.html\" title=\"interface in p2\">A</a></th>\n" +
-                "<td class=\"colLast\">&nbsp;<br>(<span class=\"implementationLabel\">Implementation(s):</span>&nbsp;<a href=\"p2/B.html\" title=\"class in p2\">B</a>)</td>\n" +
+                "<tr class=\"row-color\">\n" +
+                "<th class=\"col-first\" scope=\"row\"><a href=\"p2/A.html\" title=\"interface in p2\">A</a></th>\n" +
+                "<td class=\"col-last\">&nbsp;<br>(<span class=\"implementation-label\">Implementation(s):</span>&nbsp;<a href=\"p2/B.html\" title=\"class in p2\">B</a>)</td>\n" +
                 "</tr>\n" +
                 "</tbody>\n");
 
@@ -355,18 +355,18 @@
                 "<h2>Services</h2>");
 
         checkOutput("m/module-summary.html", true,
-                "<div class=\"providesSummary\">\n<table>\n" +
-                "<caption><span>Provides</span><span class=\"tabEnd\">&nbsp;</span></caption>\n" +
+                "<div class=\"provides-summary\">\n<table>\n" +
+                "<caption><span>Provides</span><span class=\"tab-end\">&nbsp;</span></caption>\n" +
                 "<thead>\n" +
                 "<tr>\n" +
-                "<th class=\"colFirst\" scope=\"col\">Type</th>\n" +
-                "<th class=\"colLast\" scope=\"col\">Description</th>\n" +
+                "<th class=\"col-first\" scope=\"col\">Type</th>\n" +
+                "<th class=\"col-last\" scope=\"col\">Description</th>\n" +
                 "</tr>\n" +
                 "</thead>\n" +
                 "<tbody>\n" +
-                "<tr class=\"altColor\">\n" +
-                "<th class=\"colFirst\" scope=\"row\"><a href=\"p1/A.html\" title=\"interface in p1\">A</a></th>\n" +
-                "<td class=\"colLast\">\n" +
+                "<tr class=\"alt-color\">\n" +
+                "<th class=\"col-first\" scope=\"row\"><a href=\"p1/A.html\" title=\"interface in p1\">A</a></th>\n" +
+                "<td class=\"col-last\">\n" +
                 "<div class=\"block\">abc</div>\n</td>\n" +
                 "</tr>\n" +
                 "</tbody>\n" +
@@ -400,34 +400,34 @@
                 "<h2>Services</h2>");
 
         checkOutput("m/module-summary.html", true,
-                "<div class=\"providesSummary\">\n<table>\n" +
-                "<caption><span>Provides</span><span class=\"tabEnd\">&nbsp;</span></caption>\n" +
+                "<div class=\"provides-summary\">\n<table>\n" +
+                "<caption><span>Provides</span><span class=\"tab-end\">&nbsp;</span></caption>\n" +
                 "<thead>\n" +
                 "<tr>\n" +
-                "<th class=\"colFirst\" scope=\"col\">Type</th>\n" +
-                "<th class=\"colLast\" scope=\"col\">Description</th>\n" +
+                "<th class=\"col-first\" scope=\"col\">Type</th>\n" +
+                "<th class=\"col-last\" scope=\"col\">Description</th>\n" +
                 "</tr>\n" +
                 "</thead>\n" +
                 "<tbody>\n" +
-                "<tr class=\"altColor\">\n" +
-                "<th class=\"colFirst\" scope=\"row\"><a href=\"p1/A.html\" title=\"interface in p1\">A</a></th>\n" +
-                "<td class=\"colLast\">\n" +
+                "<tr class=\"alt-color\">\n" +
+                "<th class=\"col-first\" scope=\"row\"><a href=\"p1/A.html\" title=\"interface in p1\">A</a></th>\n" +
+                "<td class=\"col-last\">\n" +
                 "<div class=\"block\">abc</div>\n</td>\n" +
                 "</tr>\n" +
                 "</tbody>\n" +
                 "</table>",
-                "<div class=\"usesSummary\">\n<table>\n" +
-                "<caption><span>Uses</span><span class=\"tabEnd\">&nbsp;</span></caption>\n" +
+                "<div class=\"uses-summary\">\n<table>\n" +
+                "<caption><span>Uses</span><span class=\"tab-end\">&nbsp;</span></caption>\n" +
                 "<thead>\n" +
                 "<tr>\n" +
-                "<th class=\"colFirst\" scope=\"col\">Type</th>\n" +
-                "<th class=\"colLast\" scope=\"col\">Description</th>\n" +
+                "<th class=\"col-first\" scope=\"col\">Type</th>\n" +
+                "<th class=\"col-last\" scope=\"col\">Description</th>\n" +
                 "</tr>\n" +
                 "</thead>\n" +
                 "<tbody>\n" +
-                "<tr class=\"altColor\">\n" +
-                "<th class=\"colFirst\" scope=\"row\"><a href=\"p2/B.html\" title=\"class in p2\">B</a></th>\n" +
-                "<td class=\"colLast\">\n" +
+                "<tr class=\"alt-color\">\n" +
+                "<th class=\"col-first\" scope=\"row\"><a href=\"p2/B.html\" title=\"class in p2\">B</a></th>\n" +
+                "<td class=\"col-last\">\n" +
                 "<div class=\"block\">def</div>\n</td>\n" +
                 "</tr>\n" +
                 "</tbody>\n" +
--- a/test/langtools/jdk/javadoc/doclet/testModules/TestModules.java	Fri Mar 13 18:43:11 2020 +0100
+++ b/test/langtools/jdk/javadoc/doclet/testModules/TestModules.java	Fri Mar 13 10:57:41 2020 -0700
@@ -462,29 +462,29 @@
                 + "<!--   -->\n"
                 + "</a>\n"
                 + "<div class=\"block\">This is a test description for the moduleA module with a Search "
-                + "phrase <span id=\"searchphrase\" class=\"searchTagResult\">search phrase</span>.</div>");
+                + "phrase <span id=\"searchphrase\" class=\"search-tag-result\">search phrase</span>.</div>");
         checkOutput("moduleB/module-summary.html", found,
                 "<!-- ============ MODULE DESCRIPTION =========== -->\n"
                 + "<a name=\"module.description\">\n"
                 + "<!--   -->\n"
                 + "</a>\n"
                 + "<div class=\"block\">This is a test description for the moduleB module. Search "
-                + "word <span id=\"search_word\" class=\"searchTagResult\">search_word</span> with no description.</div>");
+                + "word <span id=\"search_word\" class=\"search-tag-result\">search_word</span> with no description.</div>");
         checkOutput("index.html", found,
                 "</script>\n"
                 + "<div class=\"block\">The overview summary page header.</div>\n"
                 + "</div>\n"
-                + "<div class=\"overviewSummary\">\n"
+                + "<div class=\"overview-summary\">\n"
                 + "<table summary=\"Module Summary table, listing modules, and an explanation\">\n"
-                + "<caption><span>Modules</span><span class=\"tabEnd\">&nbsp;</span></caption>");
+                + "<caption><span>Modules</span><span class=\"tab-end\">&nbsp;</span></caption>");
         checkOutput("index.html", false,
                 "</table>\n"
                 + "</div>\n"
                 + "<div class=\"block\">The overview summary page header.</div>\n"
                 + "</div>\n"
-                + "<div class=\"overviewSummary\">\n"
+                + "<div class=\"overview-summary\">\n"
                 + "<table summary=\"Module Summary table, listing modules, and an explanation\">\n"
-                + "<caption><span>Modules</span><span class=\"tabEnd\">&nbsp;</span></caption>");
+                + "<caption><span>Modules</span><span class=\"tab-end\">&nbsp;</span></caption>");
     }
 
     void checkNoDescription(boolean found) {
@@ -494,42 +494,42 @@
                 + "</p>\n"
                 + "<h1 title=\"Module\" class=\"title\">Module&nbsp;moduleA</h1>\n"
                 + "</div>"
-                + "<ul class=\"blockList\">\n"
-                + "<li class=\"blockList\">\n"
-                + "<ul class=\"blockList\">\n"
-                + "<li class=\"blockList\">\n"
+                + "<ul class=\"block-list\">\n"
+                + "<li class=\"block-list\">\n"
+                + "<ul class=\"block-list\">\n"
+                + "<li class=\"block-list\">\n"
                 + "<!-- ============ PACKAGES SUMMARY =========== -->");
         checkOutput("moduleB/module-summary.html", found,
-                "<ul class=\"blockList\">\n"
-                + "<li class=\"blockList\">\n"
-                + "<ul class=\"blockList\">\n"
-                + "<li class=\"blockList\">\n"
+                "<ul class=\"block-list\">\n"
+                + "<li class=\"block-list\">\n"
+                + "<ul class=\"block-list\">\n"
+                + "<li class=\"block-list\">\n"
                 + "<!-- ============ PACKAGES SUMMARY =========== -->");
     }
 
     void checkHtml5Description(boolean found) {
         checkOutput("moduleA/module-summary.html", found,
-                "<section class=\"moduleDescription\" id=\"module.description\">\n"
-                + "<div class=\"deprecationBlock\"><span class=\"deprecatedLabel\">Deprecated, for removal:"
+                "<section class=\"module-description\" id=\"module.description\">\n"
+                + "<div class=\"deprecation-block\"><span class=\"deprecated-label\">Deprecated, for removal:"
                 + " This API element is subject to removal in a future version.</span>\n"
-                + "<div class=\"deprecationComment\">This module is deprecated.</div>\n"
+                + "<div class=\"deprecation-comment\">This module is deprecated.</div>\n"
                 + "</div>\n"
                 + "<!-- ============ MODULE DESCRIPTION =========== -->\n"
                 + "<div class=\"block\">This is a test description for the moduleA module with a Search "
-                + "phrase <span id=\"searchphrase\" class=\"searchTagResult\">search phrase</span>.</div>");
+                + "phrase <span id=\"searchphrase\" class=\"search-tag-result\">search phrase</span>.</div>");
         checkOutput("moduleB/module-summary.html", found,
-                "<section class=\"moduleDescription\" id=\"module.description\">\n"
+                "<section class=\"module-description\" id=\"module.description\">\n"
                 + "<!-- ============ MODULE DESCRIPTION =========== -->\n"
                 + "<div class=\"block\">This is a test description for the moduleB module. Search "
-                + "word <span id=\"search_word\" class=\"searchTagResult\">search_word</span> with no description.</div>");
+                + "word <span id=\"search_word\" class=\"search-tag-result\">search_word</span> with no description.</div>");
         checkOutput("index.html", found,
                 "</nav>\n"
                 + "</header>\n"
-                + "<div class=\"flexContent\">\n"
+                + "<div class=\"flex-content\">\n"
                 + "<main role=\"main\">\n"
                 + "<div class=\"block\">The overview summary page header.</div>\n"
-                + "<div class=\"overviewSummary\">\n<table>\n"
-                + "<caption><span>Modules</span><span class=\"tabEnd\">&nbsp;</span></caption>");
+                + "<div class=\"overview-summary\">\n<table>\n"
+                + "<caption><span>Modules</span><span class=\"tab-end\">&nbsp;</span></caption>");
         checkOutput("index.html", false,
                 "</table>\n"
                 + "</div>\n"
@@ -537,8 +537,8 @@
                 + "<main role=\"main\">\n"
                 + "<div class=\"block\">The overview summary page header.</div>\n"
                 + "</div>\n"
-                + "<div class=\"overviewSummary\">\n<table>\n"
-                + "<caption><span>Modules</span><span class=\"tabEnd\">&nbsp;</span></caption>");
+                + "<div class=\"overview-summary\">\n<table>\n"
+                + "<caption><span>Modules</span><span class=\"tab-end\">&nbsp;</span></caption>");
     }
 
     void checkHtml5NoDescription(boolean found) {
@@ -549,9 +549,9 @@
                 + "<h1 title=\"Module\" class=\"title\">Module&nbsp;moduleA</h1>\n"
                 + "</div>\n"
                 + "<section class=\"summary\">\n"
-                + "<ul class=\"blockList\">\n"
-                + "<li class=\"blockList\">\n"
-                + "<section class=\"packagesSummary\" id=\"packages.summary\">\n"
+                + "<ul class=\"block-list\">\n"
+                + "<li class=\"block-list\">\n"
+                + "<section class=\"packages-summary\" id=\"packages.summary\">\n"
                 + "<!-- ============ PACKAGES SUMMARY =========== -->");
         checkOutput("moduleB/module-summary.html", found,
                 "<p><a href=\"testpkgmdlB/AnnotationType.html\" title=\"annotation in testpkgmdlB\">@AnnotationType</a>"
@@ -561,9 +561,9 @@
                 + "<h1 title=\"Module\" class=\"title\">Module&nbsp;moduleB</h1>\n"
                 + "</div>\n"
                 + "<section class=\"summary\">\n"
-                + "<ul class=\"blockList\">\n"
-                + "<li class=\"blockList\">\n"
-                + "<section class=\"packagesSummary\" id=\"packages.summary\">\n"
+                + "<ul class=\"block-list\">\n"
+                + "<li class=\"block-list\">\n"
+                + "<section class=\"packages-summary\" id=\"packages.summary\">\n"
                 + "<!-- ============ PACKAGES SUMMARY =========== -->");
     }
 
@@ -571,9 +571,9 @@
         checkOutput("index.html", true,
                 "<li>Module</li>");
         checkOutput("moduleA/module-summary.html", true,
-                "<li class=\"navBarCell1Rev\">Module</li>");
+                "<li class=\"nav-bar-cell1-rev\">Module</li>");
         checkOutput("moduleB/module-summary.html", true,
-                "<li class=\"navBarCell1Rev\">Module</li>");
+                "<li class=\"nav-bar-cell1-rev\">Module</li>");
         checkOutput("moduleA/testpkgmdlA/class-use/TestClassInModuleA.html", true,
                 "<li><a href=\"../../module-summary.html\">Module</a></li>");
         checkOutput("moduleB/testpkgmdlB/package-summary.html", true,
@@ -586,13 +586,13 @@
 
     void checkNoModuleLink() {
         checkOutput("testpkgnomodule/package-summary.html", true,
-                "<ul class=\"navList\" title=\"Navigation\">\n"
+                "<ul class=\"nav-list\" title=\"Navigation\">\n"
                 + "<li><a href=\"../testpkgnomodule/package-summary.html\">Package</a></li>");
         checkOutput("testpkgnomodule/TestClassNoModule.html", true,
-                "<ul class=\"navList\" title=\"Navigation\">\n"
+                "<ul class=\"nav-list\" title=\"Navigation\">\n"
                 + "<li><a href=\"../testpkgnomodule/package-summary.html\">Package</a></li>");
         checkOutput("testpkgnomodule/class-use/TestClassNoModule.html", true,
-                "<ul class=\"navList\" title=\"Navigation\">\n"
+                "<ul class=\"nav-list\" title=\"Navigation\">\n"
                 + "<li><a href=\"../../testpkgnomodule/package-summary.html\">Package</a></li>");
     }
 
@@ -624,95 +624,95 @@
 
     void checkOverviewSummaryModules() {
         checkOutput("index.html", true,
-                "<div class=\"overviewSummary\">\n"
+                "<div class=\"overview-summary\">\n"
                 + "<table summary=\"Module Summary table, listing modules, and an explanation\">\n"
-                + "<caption><span>Modules</span><span class=\"tabEnd\">&nbsp;</span></caption>\n"
+                + "<caption><span>Modules</span><span class=\"tab-end\">&nbsp;</span></caption>\n"
                 + "<thead>\n"
                 + "<tr>\n"
-                + "<th class=\"colFirst\" scope=\"col\">Module</th>\n"
-                + "<th class=\"colLast\" scope=\"col\">Description</th>\n"
+                + "<th class=\"col-first\" scope=\"col\">Module</th>\n"
+                + "<th class=\"col-last\" scope=\"col\">Description</th>\n"
                 + "</tr>\n"
                 + "</thead>");
         checkOutput("overview-summary.html", false,
-                "<div class=\"overviewSummary\">\n"
+                "<div class=\"overview-summary\">\n"
                 + "<table summary=\"Package Summary table, listing packages, and an explanation\">\n"
-                + "<caption><span>Packages</span><span class=\"tabEnd\">&nbsp;</span></caption>\n"
+                + "<caption><span>Packages</span><span class=\"tab-end\">&nbsp;</span></caption>\n"
                 + "<thead>\n"
                 + "<tr>\n"
-                + "<th class=\"colFirst\" scope=\"col\">Package</th>\n"
-                + "<th class=\"colLast\" scope=\"col\">Description</th>\n"
+                + "<th class=\"col-first\" scope=\"col\">Package</th>\n"
+                + "<th class=\"col-last\" scope=\"col\">Description</th>\n"
                 + "</tr>\n"
                 + "</thead>");
     }
 
     void checkOverviewSummaryPackages() {
         checkOutput("index.html", false,
-                "<div class=\"overviewSummary\">\n"
+                "<div class=\"overview-summary\">\n"
                 + "<table summary=\"Module Summary table, listing modules, and an explanation\">\n"
-                + "<caption><span>Modules</span><span class=\"tabEnd\">&nbsp;</span></caption>\n"
+                + "<caption><span>Modules</span><span class=\"tab-end\">&nbsp;</span></caption>\n"
                 + "<thead>\n"
                 + "<tr>\n"
-                + "<th class=\"colFirst\" scope=\"col\">Module</th>\n"
-                + "<th class=\"colLast\" scope=\"col\">Description</th>\n"
+                + "<th class=\"col-first\" scope=\"col\">Module</th>\n"
+                + "<th class=\"col-last\" scope=\"col\">Description</th>\n"
                 + "</tr>\n"
                 + "</thead>",
                 "</table>\n"
                 + "</div>\n"
                 + "<div class=\"block\">The overview summary page header.</div>\n"
                 + "</div>\n"
-                + "<div class=\"overviewSummary\">\n"
+                + "<div class=\"overview-summary\">\n"
                 + "<table summary=\"Package Summary table, listing packages, and an explanation\">\n"
-                + "<caption><span>Packages</span><span class=\"tabEnd\">&nbsp;</span></caption>");
+                + "<caption><span>Packages</span><span class=\"tab-end\">&nbsp;</span></caption>");
         checkOutput("index.html", true,
-                "<div class=\"overviewSummary\">\n"
+                "<div class=\"overview-summary\">\n"
                 + "<table summary=\"Package Summary table, listing packages, and an explanation\">\n"
-                + "<caption><span>Packages</span><span class=\"tabEnd\">&nbsp;</span></caption>\n"
+                + "<caption><span>Packages</span><span class=\"tab-end\">&nbsp;</span></caption>\n"
                 + "<thead>n"
                 + "<tr>\n"
-                + "<th class=\"colFirst\" scope=\"col\">Package</th>\n"
-                + "<th class=\"colLast\" scope=\"col\">Description</th>\n"
+                + "<th class=\"col-first\" scope=\"col\">Package</th>\n"
+                + "<th class=\"col-last\" scope=\"col\">Description</th>\n"
                 + "</tr>\n"
                 + "</thead>\n",
                 "</script>\n"
                 + "<div class=\"block\">The overview summary page header.</div>\n"
                 + "</div>\n"
-                + "<div class=\"overviewSummary\">\n"
+                + "<div class=\"overview-summary\">\n"
                 + "<table summary=\"Package Summary table, listing packages, and an explanation\">\n"
-                + "<caption><span>Packages</span><span class=\"tabEnd\">&nbsp;</span></caption>");
+                + "<caption><span>Packages</span><span class=\"tab-end\">&nbsp;</span></caption>");
     }
 
     void checkHtml5OverviewSummaryModules() {
         checkOutput("index.html", true,
-                "<div class=\"overviewSummary\">\n"
+                "<div class=\"overview-summary\">\n"
                 + "<table>\n"
-                + "<caption><span>Modules</span><span class=\"tabEnd\">&nbsp;</span></caption>\n"
+                + "<caption><span>Modules</span><span class=\"tab-end\">&nbsp;</span></caption>\n"
                 + "<thead>\n"
                 + "<tr>\n"
-                + "<th class=\"colFirst\" scope=\"col\">Module</th>\n"
-                + "<th class=\"colLast\" scope=\"col\">Description</th>\n"
+                + "<th class=\"col-first\" scope=\"col\">Module</th>\n"
+                + "<th class=\"col-last\" scope=\"col\">Description</th>\n"
                 + "</tr>\n"
                 + "</thead>");
         checkOutput("overview-summary.html", false,
-                "<div class=\"overviewSummary\">\n"
+                "<div class=\"overview-summary\">\n"
                 + "<table>\n"
-                + "<caption><span>Packages</span><span class=\"tabEnd\">&nbsp;</span></caption>\n"
+                + "<caption><span>Packages</span><span class=\"tab-end\">&nbsp;</span></caption>\n"
                 + "<thead>\n"
                 + "<tr>\n"
-                + "<th class=\"colFirst\" scope=\"col\">Package</th>\n"
-                + "<th class=\"colLast\" scope=\"col\">Description</th>\n"
+                + "<th class=\"col-first\" scope=\"col\">Package</th>\n"
+                + "<th class=\"col-last\" scope=\"col\">Description</th>\n"
                 + "</tr>\n"
                 + "</thead>");
     }
 
     void checkHtml5OverviewSummaryPackages() {
         checkOutput("index.html", false,
-                "<div class=\"overviewSummary\">\n"
+                "<div class=\"overview-summary\">\n"
                 + "<table>\n"
-                + "<caption><span>Modules</span><span class=\"tabEnd\">&nbsp;</span></caption>\n"
+                + "<caption><span>Modules</span><span class=\"tab-end\">&nbsp;</span></caption>\n"
                 + "<thead>\n"
                 + "<tr>\n"
-                + "<th class=\"colFirst\" scope=\"col\">Module</th>\n"
-                + "<th class=\"colLast\" scope=\"col\">Description</th>\n"
+                + "<th class=\"col-first\" scope=\"col\">Module</th>\n"
+                + "<th class=\"col-last\" scope=\"col\">Description</th>\n"
                 + "</tr>\n"
                 + "</thead>",
                 "</table>\n"
@@ -724,50 +724,50 @@
                 + "<a id=\"Packages\">\n"
                 + "<!--   -->\n"
                 + "</a>\n"
-                + "<div class=\"overviewSummary\">\n"
+                + "<div class=\"overview-summary\">\n"
                 + "<table>\n"
-                + "<caption><span>Packages</span><span class=\"tabEnd\">&nbsp;</span></caption>");
+                + "<caption><span>Packages</span><span class=\"tab-end\">&nbsp;</span></caption>");
         checkOutput("index.html", true,
-                "<div class=\"overviewSummary\">\n<table>\n"
-                + "<caption><span>Packages</span><span class=\"tabEnd\">&nbsp;</span></caption>\n"
+                "<div class=\"overview-summary\">\n<table>\n"
+                + "<caption><span>Packages</span><span class=\"tab-end\">&nbsp;</span></caption>\n"
                 + "<thead>\n"
                 + "<tr>\n"
-                + "<th class=\"colFirst\" scope=\"col\">Package</th>\n"
-                + "<th class=\"colLast\" scope=\"col\">Description</th>\n"
+                + "<th class=\"col-first\" scope=\"col\">Package</th>\n"
+                + "<th class=\"col-last\" scope=\"col\">Description</th>\n"
                 + "</tr>\n"
                 + "</thead>",
                 "</nav>\n"
                 + "</header>\n"
-                + "<div class=\"flexContent\">\n"
+                + "<div class=\"flex-content\">\n"
                 + "<main role=\"main\">\n"
                 + "<div class=\"block\">The overview summary page header.</div>\n"
-                + "<div class=\"overviewSummary\">\n<table>\n"
-                + "<caption><span>Packages</span><span class=\"tabEnd\">&nbsp;</span></caption>");
+                + "<div class=\"overview-summary\">\n<table>\n"
+                + "<caption><span>Packages</span><span class=\"tab-end\">&nbsp;</span></caption>");
     }
 
     void checkModuleSummary() {
         checkOutput("moduleA/module-summary.html", true,
-                "<ul class=\"subNavList\">\n"
+                "<ul class=\"sub-nav-list\">\n"
                 + "<li>Module:&nbsp;</li>\n"
                 + "<li><a href=\"#module.description\">Description</a>&nbsp;|&nbsp;</li>\n"
                 + "<li><a href=\"#modules.summary\">Modules</a>&nbsp;|&nbsp;</li>\n"
                 + "<li><a href=\"#packages.summary\">Packages</a>&nbsp;|&nbsp;</li>\n"
                 + "<li>Services</li>\n"
                 + "</ul>",
-                "<section class=\"modulesSummary\" id=\"modules.summary\">\n"
+                "<section class=\"modules-summary\" id=\"modules.summary\">\n"
                 + "<!-- ============ MODULES SUMMARY =========== -->\n"
                 + "<h2>Modules</h2>",
-                "<tr class=\"altColor\" id=\"i0\">\n"
-                + "<th class=\"colFirst\" scope=\"row\"><a href=\"testpkgmdlA/package-summary.html\">testpkgmdlA</a></th>\n"
-                + "<td class=\"colLast\">&nbsp;</td>\n"
+                "<tr class=\"alt-color\" id=\"i0\">\n"
+                + "<th class=\"col-first\" scope=\"row\"><a href=\"testpkgmdlA/package-summary.html\">testpkgmdlA</a></th>\n"
+                + "<td class=\"col-last\">&nbsp;</td>\n"
                 + "</tr>",
-                "<section class=\"packagesSummary\" id=\"packages.summary\">\n"
+                "<section class=\"packages-summary\" id=\"packages.summary\">\n"
                 + "<!-- ============ PACKAGES SUMMARY =========== -->\n"
                 + "<h2>Packages</h2>",
-                "<tr class=\"altColor\">\n"
-                + "<td class=\"colFirst\">transitive</td>\n"
-                + "<th class=\"colSecond\" scope=\"row\"><a href=\"../moduleB/module-summary.html\">moduleB</a></th>\n"
-                + "<td class=\"colLast\">\n"
+                "<tr class=\"alt-color\">\n"
+                + "<td class=\"col-first\">transitive</td>\n"
+                + "<th class=\"col-second\" scope=\"row\"><a href=\"../moduleB/module-summary.html\">moduleB</a></th>\n"
+                + "<td class=\"col-last\">\n"
                 + "<div class=\"block\">This is a test description for the moduleB module.</div>\n"
                 + "</td>\n"
                 + "</tr>");
@@ -778,38 +778,38 @@
                 + "<li><a href=\"#services.summary\">Services</a></li>",
                 "<!-- ============ PACKAGES SUMMARY =========== -->\n"
                 + "<h2>Packages</h2>",
-                "<tr class=\"altColor\" id=\"i0\">\n"
-                + "<th class=\"colFirst\" scope=\"row\"><a href=\"testpkgmdlB/package-summary.html\">testpkgmdlB</a></th>\n"
-                + "<td class=\"colLast\">&nbsp;</td>\n"
+                "<tr class=\"alt-color\" id=\"i0\">\n"
+                + "<th class=\"col-first\" scope=\"row\"><a href=\"testpkgmdlB/package-summary.html\">testpkgmdlB</a></th>\n"
+                + "<td class=\"col-last\">&nbsp;</td>\n"
                 + "</tr>",
                 "<!-- ============ PACKAGES SUMMARY =========== -->\n"
                 + "<h2>Packages</h2>",
                 "<!-- ============ SERVICES SUMMARY =========== -->\n"
                 + "<h2>Services</h2>",
-                "<tr class=\"altColor\">\n"
-                + "<th class=\"colFirst\" scope=\"row\"><a href=\"testpkgmdlB/TestClassInModuleB.html\" title=\"class in testpkgmdlB\">TestClassInModuleB</a></th>\n"
-                + "<td class=\"colLast\">\n"
+                "<tr class=\"alt-color\">\n"
+                + "<th class=\"col-first\" scope=\"row\"><a href=\"testpkgmdlB/TestClassInModuleB.html\" title=\"class in testpkgmdlB\">TestClassInModuleB</a></th>\n"
+                + "<td class=\"col-last\">\n"
                 + "<div class=\"block\">With a test description for uses.</div>\n</td>\n"
                 + "</tr>",
-                "<caption><span>Opens</span><span class=\"tabEnd\">&nbsp;</span></caption>\n"
+                "<caption><span>Opens</span><span class=\"tab-end\">&nbsp;</span></caption>\n"
                 + "<thead>\n"
                 + "<tr>\n"
-                + "<th class=\"colFirst\" scope=\"col\">Package</th>\n"
-                + "<th class=\"colLast\" scope=\"col\">Description</th>\n"
+                + "<th class=\"col-first\" scope=\"col\">Package</th>\n"
+                + "<th class=\"col-last\" scope=\"col\">Description</th>\n"
                 + "</tr>\n"
                 + "</thead>",
-                "<caption><span>Uses</span><span class=\"tabEnd\">&nbsp;</span></caption>\n"
+                "<caption><span>Uses</span><span class=\"tab-end\">&nbsp;</span></caption>\n"
                 + "<thead>\n"
                 + "<tr>\n"
-                + "<th class=\"colFirst\" scope=\"col\">Type</th>\n"
-                + "<th class=\"colLast\" scope=\"col\">Description</th>\n"
+                + "<th class=\"col-first\" scope=\"col\">Type</th>\n"
+                + "<th class=\"col-last\" scope=\"col\">Description</th>\n"
                 + "</tr>\n"
                 + "</thead>",
-                "<caption><span>Provides</span><span class=\"tabEnd\">&nbsp;</span></caption>\n"
+                "<caption><span>Provides</span><span class=\"tab-end\">&nbsp;</span></caption>\n"
                 + "<thead>\n"
                 + "<tr>\n"
-                + "<th class=\"colFirst\" scope=\"col\">Type</th>\n"
-                + "<th class=\"colLast\" scope=\"col\">Description</th>\n"
+                + "<th class=\"col-first\" scope=\"col\">Type</th>\n"
+                + "<th class=\"col-last\" scope=\"col\">Description</th>\n"
                 + "</tr>\n"
                 + "</thead>");
     }
@@ -820,21 +820,21 @@
                 + "<h1 title=\"Module\" class=\"title\">Module&nbsp;moduleT</h1>\n"
                 + "</div>",
                 "<div class=\"block\">This is a test description for the moduleT module. "
-                + "Search phrase <span id=\"searchphrase\" class=\"searchTagResult\">search phrase</span>. "
+                + "Search phrase <span id=\"searchphrase\" class=\"search-tag-result\">search phrase</span>. "
                 + "Make sure there are no exported packages.</div>",
                 "<tbody>\n"
-                + "<tr class=\"altColor\">\n"
-                + "<td class=\"colFirst\">transitive</td>\n"
-                + "<th class=\"colSecond\" scope=\"row\"><a href=\"../moduleA/module-summary.html\">moduleA</a></th>\n"
-                + "<td class=\"colLast\">\n"
+                + "<tr class=\"alt-color\">\n"
+                + "<td class=\"col-first\">transitive</td>\n"
+                + "<th class=\"col-second\" scope=\"row\"><a href=\"../moduleA/module-summary.html\">moduleA</a></th>\n"
+                + "<td class=\"col-last\">\n"
                 + "<div class=\"block\">This is a test description for the moduleA module with a Search "
                 + "phrase search phrase.</div>\n"
                 + "</td>\n"
                 + "</tr>\n"
-                + "<tr class=\"rowColor\">\n"
-                + "<td class=\"colFirst\">transitive</td>\n"
-                + "<th class=\"colSecond\" scope=\"row\"><a href=\"../moduleB/module-summary.html\">moduleB</a></th>\n"
-                + "<td class=\"colLast\">\n"
+                + "<tr class=\"row-color\">\n"
+                + "<td class=\"col-first\">transitive</td>\n"
+                + "<th class=\"col-second\" scope=\"row\"><a href=\"../moduleB/module-summary.html\">moduleB</a></th>\n"
+                + "<td class=\"col-last\">\n"
                 + "<div class=\"block\">This is a test description for the moduleB module.</div>\n"
                 + "</td>\n"
                 + "</tr>\n"
@@ -850,16 +850,16 @@
     void checkModuleFilesAndLinks(boolean found) {
         checkFileAndOutput("moduleA/testpkgmdlA/package-summary.html", found,
                 "<li><a href=\"../module-summary.html\">Module</a></li>",
-                "<div class=\"subTitle\"><span class=\"moduleLabelInPackage\">Module</span>&nbsp;"
+                "<div class=\"sub-title\"><span class=\"module-label-in-package\">Module</span>&nbsp;"
                 + "<a href=\"../module-summary.html\">moduleA</a></div>");
         checkFileAndOutput("moduleA/testpkgmdlA/TestClassInModuleA.html", found,
                 "<li><a href=\"../module-summary.html\">Module</a></li>",
-                "<div class=\"subTitle\"><span class=\"moduleLabelInType\">Module</span>&nbsp;"
+                "<div class=\"sub-title\"><span class=\"module-label-in-type\">Module</span>&nbsp;"
                 + "<a href=\"../module-summary.html\">moduleA</a></div>");
         checkFileAndOutput("moduleB/testpkgmdlB/AnnotationType.html", found,
-                "<div class=\"subTitle\"><span class=\"moduleLabelInType\">Module</span>&nbsp;"
+                "<div class=\"sub-title\"><span class=\"module-label-in-type\">Module</span>&nbsp;"
                 + "<a href=\"../module-summary.html\">moduleB</a></div>",
-                "<div class=\"subTitle\"><span class=\"packageLabelInType\">"
+                "<div class=\"sub-title\"><span class=\"package-label-in-type\">"
                 + "Package</span>&nbsp;<a href=\"package-summary.html\">testpkgmdlB</a></div>");
         checkFiles(found,
                 "moduleA/module-summary.html");
@@ -879,35 +879,35 @@
                 + "</dd>\n"
                 + "</dl>",
                 "<dl class=\"index\">\n"
-                + "<dt><span class=\"searchTagLink\"><a href=\"moduleB/module-summary.html#search_word\">"
+                + "<dt><span class=\"search-tag-link\"><a href=\"moduleB/module-summary.html#search_word\">"
                 + "search_word</a></span> - Search tag in module moduleB</dt>\n"
                 + "<dd>&nbsp;</dd>\n"
-                + "<dt><span class=\"searchTagLink\"><a href=\"moduleA/module-summary.html#searchphrase\">"
+                + "<dt><span class=\"search-tag-link\"><a href=\"moduleA/module-summary.html#searchphrase\">"
                 + "search phrase</a></span> - Search tag in module moduleA</dt>\n"
                 + "<dd>with description</dd>\n"
                 + "</dl>");
         checkOutput("index-all.html", false,
-                "<dt><span class=\"searchTagLink\"><a href=\"moduleA/module-summary.html#searchphrase\">"
+                "<dt><span class=\"search-tag-link\"><a href=\"moduleA/module-summary.html#searchphrase\">"
                 + "search phrase</a></span> - Search tag in module moduleA</dt>\n"
                 + "<dd>with description</dd>\n"
-                + "<dt><span class=\"searchTagLink\"><a href=\"moduleA/module-summary.html#searchphrase\">"
+                + "<dt><span class=\"search-tag-link\"><a href=\"moduleA/module-summary.html#searchphrase\">"
                 + "search phrase</a></span> - Search tag in module moduleA</dt>\n"
                 + "<dd>with description</dd>");
     }
 
     void checkModuleModeCommon() {
         checkOutput("index.html", true,
-                "<th class=\"colFirst\" scope=\"row\"><a href=\"moduleA/module-summary.html\">moduleA</a></th>\n"
-                + "<td class=\"colLast\">\n"
+                "<th class=\"col-first\" scope=\"row\"><a href=\"moduleA/module-summary.html\">moduleA</a></th>\n"
+                + "<td class=\"col-last\">\n"
                 + "<div class=\"block\">This is a test description for the moduleA module with a Search "
                 + "phrase search phrase.</div>\n"
                 + "</td>",
-                "<th class=\"colFirst\" scope=\"row\"><a href=\"moduleB/module-summary.html\">moduleB</a></th>\n"
-                + "<td class=\"colLast\">\n"
+                "<th class=\"col-first\" scope=\"row\"><a href=\"moduleB/module-summary.html\">moduleB</a></th>\n"
+                + "<td class=\"col-last\">\n"
                 + "<div class=\"block\">This is a test description for the moduleB module.</div>\n"
                 + "</td>",
-                "<th class=\"colFirst\" scope=\"row\"><a href=\"moduletags/module-summary.html\">moduletags</a></th>\n"
-                + "<td class=\"colLast\">\n"
+                "<th class=\"col-first\" scope=\"row\"><a href=\"moduletags/module-summary.html\">moduletags</a></th>\n"
+                + "<td class=\"col-last\">\n"
                 + "<div class=\"block\">This is a test description for the moduletags module.<br>\n"
                 + " Type Link: <a href=\"moduletags/testpkgmdltags/TestClassInModuleTags.html\" title=\"class in testpkgmdltags\"><code>TestClassInModuleTags</code></a>.<br>\n"
                 + " Member Link: <a href=\"moduletags/testpkgmdltags/TestClassInModuleTags.html#testMethod(java.lang.String)\"><code>testMethod(String)</code></a>.<br>\n"
@@ -918,178 +918,178 @@
                 + "<li><a href=\"#modules.summary\">Modules</a>&nbsp;|&nbsp;</li>\n"
                 + "<li><a href=\"#packages.summary\">Packages</a>&nbsp;|&nbsp;</li>\n"
                 + "<li>Services</li>",
-                "<th class=\"colFirst\" scope=\"row\"><a href=\"../moduleB/module-summary.html\">moduleB</a></th>\n"
-                + "<td class=\"colLast\"><a href=\"../moduleB/testpkgmdlB/package-summary.html\">testpkgmdlB</a></td>\n");
+                "<th class=\"col-first\" scope=\"row\"><a href=\"../moduleB/module-summary.html\">moduleB</a></th>\n"
+                + "<td class=\"col-last\"><a href=\"../moduleB/testpkgmdlB/package-summary.html\">testpkgmdlB</a></td>\n");
         checkOutput("moduleB/module-summary.html", true,
-                "<th class=\"colFirst\" scope=\"row\"><a href=\"testpkgmdlB/TestClassInModuleB.html\" title=\"class in testpkgmdlB\">TestClassInModuleB</a></th>\n"
-                + "<td class=\"colLast\">\n"
+                "<th class=\"col-first\" scope=\"row\"><a href=\"testpkgmdlB/TestClassInModuleB.html\" title=\"class in testpkgmdlB\">TestClassInModuleB</a></th>\n"
+                + "<td class=\"col-last\">\n"
                 + "<div class=\"block\">With a test description for uses.</div>\n</td>\n");
         checkOutput("moduletags/module-summary.html", true,
                 "<li><a href=\"#module.description\">Description</a>&nbsp;|&nbsp;</li>\n"
                 + "<li><a href=\"#modules.summary\">Modules</a>&nbsp;|&nbsp;</li>\n"
                 + "<li><a href=\"#packages.summary\">Packages</a>&nbsp;|&nbsp;</li>\n"
                 + "<li>Services</li>",
-                "<div class=\"requiresSummary\">\n<table>\n"
-                + "<caption><span>Indirect Requires</span><span class=\"tabEnd\">&nbsp;</span></caption>",
-                "<td class=\"colFirst\">transitive</td>\n"
-                + "<th class=\"colSecond\" scope=\"row\"><a href=\"../moduleB/module-summary.html\">moduleB</a></th>\n"
-                + "<td class=\"colLast\">\n"
+                "<div class=\"requires-summary\">\n<table>\n"
+                + "<caption><span>Indirect Requires</span><span class=\"tab-end\">&nbsp;</span></caption>",
+                "<td class=\"col-first\">transitive</td>\n"
+                + "<th class=\"col-second\" scope=\"row\"><a href=\"../moduleB/module-summary.html\">moduleB</a></th>\n"
+                + "<td class=\"col-last\">\n"
                 + "<div class=\"block\">This is a test description for the moduleB module.</div>\n"
                 + "</td>",
-                "<div class=\"packagesSummary\">\n<table>\n"
-                + "<caption><span>Indirect Exports</span><span class=\"tabEnd\">&nbsp;</span></caption>",
-                "<td class=\"colFirst\">transitive static</td>\n"
-                + "<th class=\"colSecond\" scope=\"row\"><a href=\"../moduleA/module-summary.html\">moduleA</a></th>\n"
-                + "<td class=\"colLast\">\n"
+                "<div class=\"packages-summary\">\n<table>\n"
+                + "<caption><span>Indirect Exports</span><span class=\"tab-end\">&nbsp;</span></caption>",
+                "<td class=\"col-first\">transitive static</td>\n"
+                + "<th class=\"col-second\" scope=\"row\"><a href=\"../moduleA/module-summary.html\">moduleA</a></th>\n"
+                + "<td class=\"col-last\">\n"
                 + "<div class=\"block\">This is a test description for the moduleA module with a Search "
                 + "phrase search phrase.</div>\n"
                 + "</td>",
-                "<div class=\"requiresSummary\">\n<table>\n"
-                + "<caption><span>Requires</span><span class=\"tabEnd\">&nbsp;</span></caption>\n"
+                "<div class=\"requires-summary\">\n<table>\n"
+                + "<caption><span>Requires</span><span class=\"tab-end\">&nbsp;</span></caption>\n"
                 + "<thead>\n"
                 + "<tr>\n"
-                + "<th class=\"colFirst\" scope=\"col\">Modifier</th>\n"
-                + "<th class=\"colSecond\" scope=\"col\">Module</th>\n"
-                + "<th class=\"colLast\" scope=\"col\">Description</th>",
-                "<div class=\"requiresSummary\">\n<table>\n"
-                + "<caption><span>Indirect Requires</span><span class=\"tabEnd\">&nbsp;</span></caption>\n"
+                + "<th class=\"col-first\" scope=\"col\">Modifier</th>\n"
+                + "<th class=\"col-second\" scope=\"col\">Module</th>\n"
+                + "<th class=\"col-last\" scope=\"col\">Description</th>",
+                "<div class=\"requires-summary\">\n<table>\n"
+                + "<caption><span>Indirect Requires</span><span class=\"tab-end\">&nbsp;</span></caption>\n"
                 + "<thead>\n"
                 + "<tr>\n"
-                + "<th class=\"colFirst\" scope=\"col\">Modifier</th>\n"
-                + "<th class=\"colSecond\" scope=\"col\">Module</th>\n"
-                + "<th class=\"colLast\" scope=\"col\">Description</th>",
-                "<div class=\"packagesSummary\">\n<table>\n"
-                + "<caption><span>Indirect Opens</span><span class=\"tabEnd\">&nbsp;</span></caption>\n"
+                + "<th class=\"col-first\" scope=\"col\">Modifier</th>\n"
+                + "<th class=\"col-second\" scope=\"col\">Module</th>\n"
+                + "<th class=\"col-last\" scope=\"col\">Description</th>",
+                "<div class=\"packages-summary\">\n<table>\n"
+                + "<caption><span>Indirect Opens</span><span class=\"tab-end\">&nbsp;</span></caption>\n"
                 + "<thead>\n"
                 + "<tr>\n"
-                + "<th class=\"colFirst\" scope=\"col\">From</th>\n"
-                + "<th class=\"colLast\" scope=\"col\">Packages</th>\n"
+                + "<th class=\"col-first\" scope=\"col\">From</th>\n"
+                + "<th class=\"col-last\" scope=\"col\">Packages</th>\n"
                 + "</tr>\n",
-                "<th class=\"colFirst\" scope=\"row\"><a href=\"../moduleB/module-summary.html\">moduleB</a></th>\n"
-                + "<td class=\"colLast\"><a href=\"../moduleB/testpkgmdlB/package-summary.html\">testpkgmdlB</a></td>\n");
+                "<th class=\"col-first\" scope=\"row\"><a href=\"../moduleB/module-summary.html\">moduleB</a></th>\n"
+                + "<td class=\"col-last\"><a href=\"../moduleB/testpkgmdlB/package-summary.html\">testpkgmdlB</a></td>\n");
     }
 
     void checkModuleModeApi(boolean found) {
         checkOutput("moduleA/module-summary.html", found,
-                "<th class=\"colFirst\" scope=\"row\"><a href=\"testpkgmdlA/package-summary.html\">testpkgmdlA</a></th>\n"
-                + "<td class=\"colLast\">&nbsp;</td>");
+                "<th class=\"col-first\" scope=\"row\"><a href=\"testpkgmdlA/package-summary.html\">testpkgmdlA</a></th>\n"
+                + "<td class=\"col-last\">&nbsp;</td>");
         checkOutput("moduleB/module-summary.html", found,
                 "<li><a href=\"#module.description\">Description</a>&nbsp;|&nbsp;</li>\n"
                 + "<li>Modules&nbsp;|&nbsp;</li>\n"
                 + "<li><a href=\"#packages.summary\">Packages</a>&nbsp;|&nbsp;</li>\n"
                 + "<li><a href=\"#services.summary\">Services</a></li>",
-                "<th class=\"colFirst\" scope=\"row\"><a href=\"testpkgmdlB/package-summary.html\">testpkgmdlB</a></th>\n"
-                + "<td class=\"colLast\">&nbsp;</td>",
-                "<div class=\"packagesSummary\">\n<table>\n"
-                + "<caption><span>Opens</span><span class=\"tabEnd\">&nbsp;</span></caption>\n"
+                "<th class=\"col-first\" scope=\"row\"><a href=\"testpkgmdlB/package-summary.html\">testpkgmdlB</a></th>\n"
+                + "<td class=\"col-last\">&nbsp;</td>",
+                "<div class=\"packages-summary\">\n<table>\n"
+                + "<caption><span>Opens</span><span class=\"tab-end\">&nbsp;</span></caption>\n"
                 + "<thead>\n"
                 + "<tr>\n"
-                + "<th class=\"colFirst\" scope=\"col\">Package</th>\n"
-                + "<th class=\"colLast\" scope=\"col\">Description</th>\n"
+                + "<th class=\"col-first\" scope=\"col\">Package</th>\n"
+                + "<th class=\"col-last\" scope=\"col\">Description</th>\n"
                 + "</tr>\n"
                 + "</thead>\n"
                 + "<tbody>\n"
-                + "<tr class=\"altColor\" id=\"i0\">\n"
-                + "<th class=\"colFirst\" scope=\"row\"><a href=\"testpkgmdlB/package-summary.html\">testpkgmdlB</a></th>\n"
-                + "<td class=\"colLast\">&nbsp;</td>\n"
+                + "<tr class=\"alt-color\" id=\"i0\">\n"
+                + "<th class=\"col-first\" scope=\"row\"><a href=\"testpkgmdlB/package-summary.html\">testpkgmdlB</a></th>\n"
+                + "<td class=\"col-last\">&nbsp;</td>\n"
                 + "</tr>\n"
                 + "</tbody>\n"
                 + "</table>");
         checkOutput("moduletags/module-summary.html", true,
-                "<th class=\"colFirst\" scope=\"row\"><a href=\"testpkgmdltags/package-summary.html\">testpkgmdltags</a></th>\n"
-                + "<td class=\"colLast\">&nbsp;</td>");
+                "<th class=\"col-first\" scope=\"row\"><a href=\"testpkgmdltags/package-summary.html\">testpkgmdltags</a></th>\n"
+                + "<td class=\"col-last\">&nbsp;</td>");
     }
 
     void checkModuleModeAll(boolean found) {
         checkOutput("moduleA/module-summary.html", found,
-                "<td class=\"colFirst\"> </td>\n"
-                + "<th class=\"colSecond\" scope=\"row\">java.base</th>\n"
-                + "<td class=\"colLast\">&nbsp;</td>",
-                "<td class=\"colFirst\"> </td>\n"
-                + "<th class=\"colSecond\" scope=\"row\"><a href=\"../moduleC/module-summary.html\">moduleC</a></th>\n"
-                + "<td class=\"colLast\">\n"
+                "<td class=\"col-first\"> </td>\n"
+                + "<th class=\"col-second\" scope=\"row\">java.base</th>\n"
+                + "<td class=\"col-last\">&nbsp;</td>",
+                "<td class=\"col-first\"> </td>\n"
+                + "<th class=\"col-second\" scope=\"row\"><a href=\"../moduleC/module-summary.html\">moduleC</a></th>\n"
+                + "<td class=\"col-last\">\n"
                 + "<div class=\"block\">This is a test description for the moduleC module.</div>\n"
                 + "</td>",
-                "<th class=\"colFirst\" scope=\"row\"><a href=\"../moduleC/module-summary.html\">moduleC</a></th>\n"
-                + "<td class=\"colLast\"><a href=\"../moduleC/testpkgmdlC/package-summary.html\">testpkgmdlC</a></td>",
-                "<th class=\"colFirst\" scope=\"row\"><a href=\"testpkgmdlA/package-summary.html\">testpkgmdlA</a></th>\n"
-                + "<td class=\"colSecond\">All Modules</td>\n"
-                + "<td class=\"colLast\">&nbsp;</td>",
+                "<th class=\"col-first\" scope=\"row\"><a href=\"../moduleC/module-summary.html\">moduleC</a></th>\n"
+                + "<td class=\"col-last\"><a href=\"../moduleC/testpkgmdlC/package-summary.html\">testpkgmdlC</a></td>",
+                "<th class=\"col-first\" scope=\"row\"><a href=\"testpkgmdlA/package-summary.html\">testpkgmdlA</a></th>\n"
+                + "<td class=\"col-second\">All Modules</td>\n"
+                + "<td class=\"col-last\">&nbsp;</td>",
                 "<div role=\"tablist\" aria-orientation=\"horizontal\"><button role=\"tab\" aria-selected=\"true\""
-                + " aria-controls=\"packagesSummary_tabpanel\" tabindex=\"0\" onkeydown=\"switchTab(event)\" id=\"t0\""
-                + " class=\"activeTableTab\">All Packages</button><button role=\"tab\" aria-selected=\"false\""
-                + " aria-controls=\"packagesSummary_tabpanel\" tabindex=\"-1\" onkeydown=\"switchTab(event)\" id=\"t1\""
-                + " class=\"tableTab\" onclick=\"show(1);\">Exports</button><button role=\"tab\" aria-selected=\"false\""
-                + " aria-controls=\"packagesSummary_tabpanel\" tabindex=\"-1\" onkeydown=\"switchTab(event)\" id=\"t3\""
-                + " class=\"tableTab\" onclick=\"show(4);\">Concealed</button></div>",
-                "<th class=\"colFirst\" scope=\"row\"><a href=\"concealedpkgmdlA/package-summary.html\">concealedpkgmdlA</a></th>\n"
-                + "<td class=\"colSecond\">None</td>\n"
-                + "<td class=\"colLast\">&nbsp;</td>");
+                + " aria-controls=\"packages-summary_tabpanel\" tabindex=\"0\" onkeydown=\"switchTab(event)\" id=\"t0\""
+                + " class=\"active-table-tab\">All Packages</button><button role=\"tab\" aria-selected=\"false\""
+                + " aria-controls=\"packages-summary_tabpanel\" tabindex=\"-1\" onkeydown=\"switchTab(event)\" id=\"t1\""
+                + " class=\"table-tab\" onclick=\"show(1);\">Exports</button><button role=\"tab\" aria-selected=\"false\""
+                + " aria-controls=\"packages-summary_tabpanel\" tabindex=\"-1\" onkeydown=\"switchTab(event)\" id=\"t3\""
+                + " class=\"table-tab\" onclick=\"show(4);\">Concealed</button></div>",
+                "<th class=\"col-first\" scope=\"row\"><a href=\"concealedpkgmdlA/package-summary.html\">concealedpkgmdlA</a></th>\n"
+                + "<td class=\"col-second\">None</td>\n"
+                + "<td class=\"col-last\">&nbsp;</td>");
         checkOutput("moduleB/module-summary.html", found,
                 "<li><a href=\"#module.description\">Description</a>&nbsp;|&nbsp;</li>\n"
                 + "<li><a href=\"#modules.summary\">Modules</a>&nbsp;|&nbsp;</li>\n"
                 + "<li><a href=\"#packages.summary\">Packages</a>&nbsp;|&nbsp;</li>\n"
                 + "<li><a href=\"#services.summary\">Services</a></li>",
-                "<th class=\"colFirst\" scope=\"row\"><a href=\"testpkgmdlB/package-summary.html\">testpkgmdlB</a></th>\n"
-                + "<td class=\"colSecond\">None</td>\n"
-                + "<td class=\"colSecond\">All Modules</td>\n"
-                + "<td class=\"colLast\">&nbsp;</td>",
-                "<td class=\"colFirst\"> </td>\n"
-                + "<th class=\"colSecond\" scope=\"row\">java.base</th>\n"
-                + "<td class=\"colLast\">&nbsp;</td>",
-                "<th class=\"colFirst\" scope=\"row\"><a href=\"testpkgmdlB/TestClass2InModuleB.html\" title=\"class in testpkgmdlB\">TestClass2InModuleB</a></th>\n"
-                + "<td class=\"colLast\">&nbsp;</td>",
-                "<th class=\"colFirst\" scope=\"row\"><a href=\"testpkg2mdlB/TestInterface2InModuleB.html\" title=\"interface in testpkg2mdlB\">TestInterface2InModuleB</a></th>\n"
-                + "<td class=\"colLast\">&nbsp;<br>(<span class=\"implementationLabel\">Implementation(s):</span>&nbsp;<a href=\"testpkgmdlB/TestClass2InModuleB.html\" "
+                "<th class=\"col-first\" scope=\"row\"><a href=\"testpkgmdlB/package-summary.html\">testpkgmdlB</a></th>\n"
+                + "<td class=\"col-second\">None</td>\n"
+                + "<td class=\"col-second\">All Modules</td>\n"
+                + "<td class=\"col-last\">&nbsp;</td>",
+                "<td class=\"col-first\"> </td>\n"
+                + "<th class=\"col-second\" scope=\"row\">java.base</th>\n"
+                + "<td class=\"col-last\">&nbsp;</td>",
+                "<th class=\"col-first\" scope=\"row\"><a href=\"testpkgmdlB/TestClass2InModuleB.html\" title=\"class in testpkgmdlB\">TestClass2InModuleB</a></th>\n"
+                + "<td class=\"col-last\">&nbsp;</td>",
+                "<th class=\"col-first\" scope=\"row\"><a href=\"testpkg2mdlB/TestInterface2InModuleB.html\" title=\"interface in testpkg2mdlB\">TestInterface2InModuleB</a></th>\n"
+                + "<td class=\"col-last\">&nbsp;<br>(<span class=\"implementation-label\">Implementation(s):</span>&nbsp;<a href=\"testpkgmdlB/TestClass2InModuleB.html\" "
                 + "title=\"class in testpkgmdlB\">TestClass2InModuleB</a>)</td>",
-                "<th class=\"colFirst\" scope=\"row\"><a href=\"testpkg2mdlB/TestInterfaceInModuleB.html\" title=\"interface in testpkg2mdlB\">TestInterfaceInModuleB</a></th>\n"
-                + "<td class=\"colLast\">&nbsp;<br>(<span class=\"implementationLabel\">Implementation(s):</span>&nbsp;<a href=\"testpkgmdlB/TestClassInModuleB.html\" "
+                "<th class=\"col-first\" scope=\"row\"><a href=\"testpkg2mdlB/TestInterfaceInModuleB.html\" title=\"interface in testpkg2mdlB\">TestInterfaceInModuleB</a></th>\n"
+                + "<td class=\"col-last\">&nbsp;<br>(<span class=\"implementation-label\">Implementation(s):</span>&nbsp;<a href=\"testpkgmdlB/TestClassInModuleB.html\" "
                 + "title=\"class in testpkgmdlB\">TestClassInModuleB</a>)</td>",
                 "<div role=\"tablist\" aria-orientation=\"horizontal\"><button role=\"tab\" aria-selected=\"true\""
-                + " aria-controls=\"packagesSummary_tabpanel\" tabindex=\"0\" onkeydown=\"switchTab(event)\" id=\"t0\""
-                + " class=\"activeTableTab\">All Packages</button><button role=\"tab\" aria-selected=\"false\""
-                + " aria-controls=\"packagesSummary_tabpanel\" tabindex=\"-1\" onkeydown=\"switchTab(event)\" id=\"t1\""
-                + " class=\"tableTab\" onclick=\"show(1);\">Exports</button><button role=\"tab\" aria-selected=\"false\""
-                + " aria-controls=\"packagesSummary_tabpanel\" tabindex=\"-1\" onkeydown=\"switchTab(event)\" id=\"t2\""
-                + " class=\"tableTab\" onclick=\"show(2);\">Opens</button></div>");
+                + " aria-controls=\"packages-summary_tabpanel\" tabindex=\"0\" onkeydown=\"switchTab(event)\" id=\"t0\""
+                + " class=\"active-table-tab\">All Packages</button><button role=\"tab\" aria-selected=\"false\""
+                + " aria-controls=\"packages-summary_tabpanel\" tabindex=\"-1\" onkeydown=\"switchTab(event)\" id=\"t1\""
+                + " class=\"table-tab\" onclick=\"show(1);\">Exports</button><button role=\"tab\" aria-selected=\"false\""
+                + " aria-controls=\"packages-summary_tabpanel\" tabindex=\"-1\" onkeydown=\"switchTab(event)\" id=\"t2\""
+                + " class=\"table-tab\" onclick=\"show(2);\">Opens</button></div>");
         checkOutput("moduleC/module-summary.html", found,
-                "<caption><span>Exports</span><span class=\"tabEnd\">&nbsp;</span></caption>\n"
+                "<caption><span>Exports</span><span class=\"tab-end\">&nbsp;</span></caption>\n"
                 + "<thead>\n"
                 + "<tr>\n"
-                + "<th class=\"colFirst\" scope=\"col\">Package</th>\n"
-                + "<th class=\"colSecond\" scope=\"col\">Exported To Modules</th>\n"
-                + "<th class=\"colLast\" scope=\"col\">Description</th>\n"
+                + "<th class=\"col-first\" scope=\"col\">Package</th>\n"
+                + "<th class=\"col-second\" scope=\"col\">Exported To Modules</th>\n"
+                + "<th class=\"col-last\" scope=\"col\">Description</th>\n"
                 + "</tr>\n"
                 + "</thead>");
         checkOutput("moduletags/module-summary.html", true,
-                "<th class=\"colFirst\" scope=\"row\"><a href=\"testpkgmdltags/package-summary.html\">testpkgmdltags</a></th>\n"
-                + "<td class=\"colLast\">&nbsp;</td>");
+                "<th class=\"col-first\" scope=\"row\"><a href=\"testpkgmdltags/package-summary.html\">testpkgmdltags</a></th>\n"
+                + "<td class=\"col-last\">&nbsp;</td>");
     }
 
     void checkModuleDeprecation(boolean found) {
         checkOutput("moduleA/module-summary.html", found,
-                "<div class=\"deprecationBlock\"><span class=\"deprecatedLabel\">Deprecated, for removal:"
+                "<div class=\"deprecation-block\"><span class=\"deprecated-label\">Deprecated, for removal:"
                 + " This API element is subject to removal in a future version.</span>\n"
-                + "<div class=\"deprecationComment\">This module is deprecated.</div>\n"
+                + "<div class=\"deprecation-comment\">This module is deprecated.</div>\n"
                 + "</div>");
         checkOutput("deprecated-list.html", found,
                 "<ul>\n"
                 + "<li><a href=\"#forRemoval\">For Removal</a></li>\n"
                 + "<li><a href=\"#module\">Modules</a></li>\n"
                 + "</ul>",
-                "<tr class=\"altColor\">\n"
-                + "<th class=\"colDeprecatedItemName\" scope=\"row\"><a href=\"moduleA/module-summary.html\">moduleA</a></th>\n"
-                + "<td class=\"colLast\">\n"
-                + "<div class=\"deprecationComment\">This module is deprecated.</div>\n"
+                "<tr class=\"alt-color\">\n"
+                + "<th class=\"col-deprecated-item-name\" scope=\"row\"><a href=\"moduleA/module-summary.html\">moduleA</a></th>\n"
+                + "<td class=\"col-last\">\n"
+                + "<div class=\"deprecation-comment\">This module is deprecated.</div>\n"
                 + "</td>\n"
                 + "</tr>");
         checkOutput("moduleB/module-summary.html", !found,
-                "<div class=\"deprecationBlock\"><span class=\"deprecatedLabel\">Deprecated.</span>\n"
-                + "<div class=\"deprecationComment\">This module is deprecated using just the javadoc tag.</div>\n");
+                "<div class=\"deprecation-block\"><span class=\"deprecated-label\">Deprecated.</span>\n"
+                + "<div class=\"deprecation-comment\">This module is deprecated using just the javadoc tag.</div>\n");
         checkOutput("moduletags/module-summary.html", found,
                 "<p>@Deprecated\n"
                 + "</p>",
-                "<div class=\"deprecationBlock\"><span class=\"deprecatedLabel\">Deprecated.</span></div>");
+                "<div class=\"deprecation-block\"><span class=\"deprecated-label\">Deprecated.</span></div>");
     }
 
     void checkModuleAnnotation() {
@@ -1105,67 +1105,67 @@
         checkOutput("moduleNoExport/module-summary.html", found,
                 "<!-- ============ PACKAGES SUMMARY =========== -->\n"
                 + "<h2>Packages</h2>",
-                "<caption><span>Concealed</span><span class=\"tabEnd\">&nbsp;</span></caption>");
+                "<caption><span>Concealed</span><span class=\"tab-end\">&nbsp;</span></caption>");
     }
 
     void checkGroupOption() {
         checkOutput("index.html", true,
-                "<div class=\"overviewSummary\">\n"
+                "<div class=\"overview-summary\">\n"
                 + "<div role=\"tablist\" aria-orientation=\"horizontal\"><button role=\"tab\""
-                + " aria-selected=\"true\" aria-controls=\"overviewSummary_tabpanel\" tabindex=\"0\""
-                + " onkeydown=\"switchTab(event)\" id=\"t0\" class=\"activeTableTab\">All Modules</button>"
-                + "<button role=\"tab\" aria-selected=\"false\" aria-controls=\"overviewSummary_tabpanel\""
-                + " tabindex=\"-1\" onkeydown=\"switchTab(event)\" id=\"t1\" class=\"tableTab\""
+                + " aria-selected=\"true\" aria-controls=\"overview-summary_tabpanel\" tabindex=\"0\""
+                + " onkeydown=\"switchTab(event)\" id=\"t0\" class=\"active-table-tab\">All Modules</button>"
+                + "<button role=\"tab\" aria-selected=\"false\" aria-controls=\"overview-summary_tabpanel\""
+                + " tabindex=\"-1\" onkeydown=\"switchTab(event)\" id=\"t1\" class=\"table-tab\""
                 + " onclick=\"show(1);\">Module Group A</button><button role=\"tab\" aria-selected=\"false\""
-                + " aria-controls=\"overviewSummary_tabpanel\" tabindex=\"-1\" onkeydown=\"switchTab(event)\""
-                + " id=\"t2\" class=\"tableTab\" onclick=\"show(2);\">Module Group B &amp; C</button><button"
-                + " role=\"tab\" aria-selected=\"false\" aria-controls=\"overviewSummary_tabpanel\" tabindex=\"-1\""
-                + " onkeydown=\"switchTab(event)\" id=\"t4\" class=\"tableTab\" onclick=\"show(4);\">"
+                + " aria-controls=\"overview-summary_tabpanel\" tabindex=\"-1\" onkeydown=\"switchTab(event)\""
+                + " id=\"t2\" class=\"table-tab\" onclick=\"show(2);\">Module Group B &amp; C</button><button"
+                + " role=\"tab\" aria-selected=\"false\" aria-controls=\"overview-summary_tabpanel\" tabindex=\"-1\""
+                + " onkeydown=\"switchTab(event)\" id=\"t4\" class=\"table-tab\" onclick=\"show(4);\">"
                 + "Other Modules</button></div>\n"
-                + "<div id=\"overviewSummary_tabpanel\" role=\"tabpanel\">\n"
+                + "<div id=\"overview-summary_tabpanel\" role=\"tabpanel\">\n"
                 + "<table aria-labelledby=\"t0\">",
                 "var data = {\"i0\":1,\"i1\":2,\"i2\":2,\"i3\":4};\n"
                 + "var tabs = {65535:[\"t0\",\"All Modules\"],1:[\"t1\",\"Module Group A\"],2:[\"t2\",\"Module Group B & C\"],4:[\"t4\",\"Other Modules\"]};\n"
-                + "var altColor = \"altColor\";\n"
-                + "var rowColor = \"rowColor\";\n"
-                + "var tableTab = \"tableTab\";\n"
-                + "var activeTableTab = \"activeTableTab\";");
+                + "var altColor = \"alt-color\";\n"
+                + "var rowColor = \"row-color\";\n"
+                + "var tableTab = \"table-tab\";\n"
+                + "var activeTableTab = \"active-table-tab\";");
         checkOutput("index.html", false,
-                "<div class=\"overviewSummary\">\n<table>\n"
-                + "<caption><span>Modules</span><span class=\"tabEnd\">&nbsp;</span></caption>",
+                "<div class=\"overview-summary\">\n<table>\n"
+                + "<caption><span>Modules</span><span class=\"tab-end\">&nbsp;</span></caption>",
                 "Java SE Modules");
     }
 
     void checkGroupOptionOrdering() {
         checkOutput("index.html", true,
                 "<div role=\"tablist\" aria-orientation=\"horizontal\"><button role=\"tab\""
-                + " aria-selected=\"true\" aria-controls=\"overviewSummary_tabpanel\" tabindex=\"0\""
-                + " onkeydown=\"switchTab(event)\" id=\"t0\" class=\"activeTableTab\">All Modules</button>"
-                + "<button role=\"tab\" aria-selected=\"false\" aria-controls=\"overviewSummary_tabpanel\""
-                + " tabindex=\"-1\" onkeydown=\"switchTab(event)\" id=\"t1\" class=\"tableTab\""
+                + " aria-selected=\"true\" aria-controls=\"overview-summary_tabpanel\" tabindex=\"0\""
+                + " onkeydown=\"switchTab(event)\" id=\"t0\" class=\"active-table-tab\">All Modules</button>"
+                + "<button role=\"tab\" aria-selected=\"false\" aria-controls=\"overview-summary_tabpanel\""
+                + " tabindex=\"-1\" onkeydown=\"switchTab(event)\" id=\"t1\" class=\"table-tab\""
                 + " onclick=\"show(1);\">B Group</button><button role=\"tab\" aria-selected=\"false\""
-                + " aria-controls=\"overviewSummary_tabpanel\" tabindex=\"-1\" onkeydown=\"switchTab(event)\""
-                + " id=\"t2\" class=\"tableTab\" onclick=\"show(2);\">C Group</button><button role=\"tab\""
-                + " aria-selected=\"false\" aria-controls=\"overviewSummary_tabpanel\" tabindex=\"-1\""
-                + " onkeydown=\"switchTab(event)\" id=\"t4\" class=\"tableTab\" onclick=\"show(4);\">A Group"
-                + "</button><button role=\"tab\" aria-selected=\"false\" aria-controls=\"overviewSummary_tabpanel\""
-                + " tabindex=\"-1\" onkeydown=\"switchTab(event)\" id=\"t8\" class=\"tableTab\" onclick=\"show(8);\">"
+                + " aria-controls=\"overview-summary_tabpanel\" tabindex=\"-1\" onkeydown=\"switchTab(event)\""
+                + " id=\"t2\" class=\"table-tab\" onclick=\"show(2);\">C Group</button><button role=\"tab\""
+                + " aria-selected=\"false\" aria-controls=\"overview-summary_tabpanel\" tabindex=\"-1\""
+                + " onkeydown=\"switchTab(event)\" id=\"t4\" class=\"table-tab\" onclick=\"show(4);\">A Group"
+                + "</button><button role=\"tab\" aria-selected=\"false\" aria-controls=\"overview-summary_tabpanel\""
+                + " tabindex=\"-1\" onkeydown=\"switchTab(event)\" id=\"t8\" class=\"table-tab\" onclick=\"show(8);\">"
                 + "Other Modules</button></div>",
                 "var tabs = {65535:[\"t0\",\"All Modules\"],1:[\"t1\",\"B Group\"],2:[\"t2\",\"C Group\"],"
                 + "4:[\"t4\",\"A Group\"],8:[\"t8\",\"Other Modules\"]};");
         checkOutput("index.html", false,
                 "<div role=\"tablist\" aria-orientation=\"horizontal\"><button role=\"tab\""
-                + " aria-selected=\"true\" aria-controls=\"overviewSummary_tabpanel\" tabindex=\"0\""
-                + " onkeydown=\"switchTab(event)\" id=\"t0\" class=\"activeTableTab\">All Modules</button>"
-                + "<button role=\"tab\" aria-selected=\"false\" aria-controls=\"overviewSummary_tabpanel\""
-                + " tabindex=\"-1\" onkeydown=\"switchTab(event)\" id=\"t1\" class=\"tableTab\""
+                + " aria-selected=\"true\" aria-controls=\"overview-summary_tabpanel\" tabindex=\"0\""
+                + " onkeydown=\"switchTab(event)\" id=\"t0\" class=\"active-table-tab\">All Modules</button>"
+                + "<button role=\"tab\" aria-selected=\"false\" aria-controls=\"overview-summary_tabpanel\""
+                + " tabindex=\"-1\" onkeydown=\"switchTab(event)\" id=\"t1\" class=\"table-tab\""
                 + " onclick=\"show(1);\">A Group</button><button role=\"tab\" aria-selected=\"false\""
-                + " aria-controls=\"overviewSummary_tabpanel\" tabindex=\"-1\" onkeydown=\"switchTab(event)\""
-                + " id=\"t2\" class=\"tableTab\" onclick=\"show(2);\">B Group</button><button role=\"tab\""
-                + " aria-selected=\"false\" aria-controls=\"overviewSummary_tabpanel\" tabindex=\"-1\""
-                + " onkeydown=\"switchTab(event)\" id=\"t4\" class=\"tableTab\" onclick=\"show(4);\">C Group"
-                + "</button><button role=\"tab\" aria-selected=\"false\" aria-controls=\"overviewSummary_tabpanel\""
-                + " tabindex=\"-1\" onkeydown=\"switchTab(event)\" id=\"t8\" class=\"tableTab\""
+                + " aria-controls=\"overview-summary_tabpanel\" tabindex=\"-1\" onkeydown=\"switchTab(event)\""
+                + " id=\"t2\" class=\"table-tab\" onclick=\"show(2);\">B Group</button><button role=\"tab\""
+                + " aria-selected=\"false\" aria-controls=\"overview-summary_tabpanel\" tabindex=\"-1\""
+                + " onkeydown=\"switchTab(event)\" id=\"t4\" class=\"table-tab\" onclick=\"show(4);\">C Group"
+                + "</button><button role=\"tab\" aria-selected=\"false\" aria-controls=\"overview-summary_tabpanel\""
+                + " tabindex=\"-1\" onkeydown=\"switchTab(event)\" id=\"t8\" class=\"table-tab\""
                 + " onclick=\"show(8);\">Other Modules</button></div>",
                 "Java SE Modules");
     }
@@ -1173,35 +1173,35 @@
     void checkUnnamedModuleGroupOption() {
         checkOutput("index.html", true,
                 "<div class=\"block\">The overview summary page header.</div>\n"
-                + "<div class=\"overviewSummary\">\n"
+                + "<div class=\"overview-summary\">\n"
                 + "<div role=\"tablist\" aria-orientation=\"horizontal\"><button role=\"tab\""
-                + " aria-selected=\"true\" aria-controls=\"overviewSummary_tabpanel\" tabindex=\"0\""
-                + " onkeydown=\"switchTab(event)\" id=\"t0\" class=\"activeTableTab\">All Packages</button>"
-                + "<button role=\"tab\" aria-selected=\"false\" aria-controls=\"overviewSummary_tabpanel\""
-                + " tabindex=\"-1\" onkeydown=\"switchTab(event)\" id=\"t1\" class=\"tableTab\""
+                + " aria-selected=\"true\" aria-controls=\"overview-summary_tabpanel\" tabindex=\"0\""
+                + " onkeydown=\"switchTab(event)\" id=\"t0\" class=\"active-table-tab\">All Packages</button>"
+                + "<button role=\"tab\" aria-selected=\"false\" aria-controls=\"overview-summary_tabpanel\""
+                + " tabindex=\"-1\" onkeydown=\"switchTab(event)\" id=\"t1\" class=\"table-tab\""
                 + " onclick=\"show(1);\">Package Group 0</button><button role=\"tab\" aria-selected=\"false\""
-                + " aria-controls=\"overviewSummary_tabpanel\" tabindex=\"-1\" onkeydown=\"switchTab(event)\""
-                + " id=\"t2\" class=\"tableTab\" onclick=\"show(2);\">Package Group 1</button></div>\n"
-                + "<div id=\"overviewSummary_tabpanel\" role=\"tabpanel\">\n"
+                + " aria-controls=\"overview-summary_tabpanel\" tabindex=\"-1\" onkeydown=\"switchTab(event)\""
+                + " id=\"t2\" class=\"table-tab\" onclick=\"show(2);\">Package Group 1</button></div>\n"
+                + "<div id=\"overview-summary_tabpanel\" role=\"tabpanel\">\n"
                 + "<table aria-labelledby=\"t0\">",
                 "var data = {\"i0\":1,\"i1\":2};\n"
                 + "var tabs = {65535:[\"t0\",\"All Packages\"],1:[\"t1\",\"Package Group 0\"],2:[\"t2\",\"Package Group 1\"]};\n"
-                + "var altColor = \"altColor\";\n"
-                + "var rowColor = \"rowColor\";\n"
-                + "var tableTab = \"tableTab\";\n"
-                + "var activeTableTab = \"activeTableTab\";");
+                + "var altColor = \"alt-color\";\n"
+                + "var rowColor = \"row-color\";\n"
+                + "var tableTab = \"table-tab\";\n"
+                + "var activeTableTab = \"active-table-tab\";");
     }
 
     void checkGroupOptionPackageOrdering() {
         checkOutput("index.html", true,
                 "<div role=\"tablist\" aria-orientation=\"horizontal\"><button role=\"tab\""
-                + " aria-selected=\"true\" aria-controls=\"overviewSummary_tabpanel\" tabindex=\"0\""
-                + " onkeydown=\"switchTab(event)\" id=\"t0\" class=\"activeTableTab\">All Packages</button>"
-                + "<button role=\"tab\" aria-selected=\"false\" aria-controls=\"overviewSummary_tabpanel\""
-                + " tabindex=\"-1\" onkeydown=\"switchTab(event)\" id=\"t1\" class=\"tableTab\""
+                + " aria-selected=\"true\" aria-controls=\"overview-summary_tabpanel\" tabindex=\"0\""
+                + " onkeydown=\"switchTab(event)\" id=\"t0\" class=\"active-table-tab\">All Packages</button>"
+                + "<button role=\"tab\" aria-selected=\"false\" aria-controls=\"overview-summary_tabpanel\""
+                + " tabindex=\"-1\" onkeydown=\"switchTab(event)\" id=\"t1\" class=\"table-tab\""
                 + " onclick=\"show(1);\">Z Group</button><button role=\"tab\" aria-selected=\"false\""
-                + " aria-controls=\"overviewSummary_tabpanel\" tabindex=\"-1\" onkeydown=\"switchTab(event)\""
-                + " id=\"t2\" class=\"tableTab\" onclick=\"show(2);\">A Group</button></div>",
+                + " aria-controls=\"overview-summary_tabpanel\" tabindex=\"-1\" onkeydown=\"switchTab(event)\""
+                + " id=\"t2\" class=\"table-tab\" onclick=\"show(2);\">A Group</button></div>",
                 "var tabs = {65535:[\"t0\",\"All Packages\"],1:[\"t1\",\"Z Group\"],2:[\"t2\",\"A Group\"]};");
     }
 
@@ -1238,78 +1238,78 @@
     void checkLinkOffline() {
         checkOutput("moduleB/testpkg3mdlB/package-summary.html", true,
                 "<a href=\"https://docs.oracle.com/javase/9/docs/api/java.base/java/lang/String.html\" "
-                + "title=\"class or interface in java.lang\" class=\"externalLink\"><code>Link to String Class</code></a>");
+                + "title=\"class or interface in java.lang\" class=\"external-link\"><code>Link to String Class</code></a>");
         checkOutput("moduleB/testpkg3mdlB/package-summary.html", true,
                 "<a href=\"https://docs.oracle.com/javase/9/docs/api/java.base/java/lang/package-summary.html\" "
-                + "class=\"externalLink\"><code>Link to java.lang package</code></a>");
+                + "class=\"external-link\"><code>Link to java.lang package</code></a>");
         checkOutput("moduleB/testpkg3mdlB/package-summary.html", true,
                 "<a href=\"https://docs.oracle.com/javase/9/docs/api/java.base/module-summary.html\" "
-                + "class=\"externalLink\"><code>Link to java.base module</code></a>");
+                + "class=\"external-link\"><code>Link to java.base module</code></a>");
     }
 
     void checkLinkSource(boolean includePrivate) {
         checkOutput("moduleA/module-summary.html", !includePrivate,
-                "<table>\n<caption><span>Exports</span><span class=\"tabEnd\">&nbsp;</span></caption>\n"
-                + "<thead>\n<tr>\n<th class=\"colFirst\" scope=\"col\">Package</th>\n"
-                + "<th class=\"colLast\" scope=\"col\">Description</th>\n</tr>\n</thead>\n"
-                + "<tbody>\n<tr class=\"altColor\" id=\"i0\">\n"
-                + "<th class=\"colFirst\" scope=\"row\"><a href=\"testpkgmdlA/package-summary.html\">testpkgmdlA</a></th>\n"
-                + "<td class=\"colLast\">&nbsp;</td>\n</tr>\n</tbody>\n</table>");
+                "<table>\n<caption><span>Exports</span><span class=\"tab-end\">&nbsp;</span></caption>\n"
+                + "<thead>\n<tr>\n<th class=\"col-first\" scope=\"col\">Package</th>\n"
+                + "<th class=\"col-last\" scope=\"col\">Description</th>\n</tr>\n</thead>\n"
+                + "<tbody>\n<tr class=\"alt-color\" id=\"i0\">\n"
+                + "<th class=\"col-first\" scope=\"row\"><a href=\"testpkgmdlA/package-summary.html\">testpkgmdlA</a></th>\n"
+                + "<td class=\"col-last\">&nbsp;</td>\n</tr>\n</tbody>\n</table>");
         checkOutput("moduleA/testpkgmdlA/TestClassInModuleA.html", true,
                 "<section class=\"description\">\n<hr>\n"
                 + "<pre>public class <a href=\"../../src-html/moduleA/testpkgmdlA/TestClassInModuleA.html#line.25\">"
                 + "TestClassInModuleA</a>\nextends java.lang.Object</pre>\n</section>");
         checkOutput("src-html/moduleA/testpkgmdlA/TestClassInModuleA.html", true,
-                "<span class=\"sourceLineNo\">019</span><span id=\"line.19\"> * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA</span>\n"
-                + "<span class=\"sourceLineNo\">020</span><span id=\"line.20\"> * or visit www.oracle.com if you need additional information or have any</span>\n"
-                + "<span class=\"sourceLineNo\">021</span><span id=\"line.21\"> * questions.</span>\n"
-                + "<span class=\"sourceLineNo\">022</span><span id=\"line.22\"> */</span>\n"
-                + "<span class=\"sourceLineNo\">023</span><span id=\"line.23\">package testpkgmdlA;</span>\n"
-                + "<span class=\"sourceLineNo\">024</span><span id=\"line.24\"></span>\n"
-                + "<span class=\"sourceLineNo\">025</span><span id=\"line.25\">public class TestClassInModuleA {</span>\n"
-                + "<span class=\"sourceLineNo\">026</span><span id=\"line.26\">}</span>");
+                "<span class=\"source-line-no\">019</span><span id=\"line.19\"> * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA</span>\n"
+                + "<span class=\"source-line-no\">020</span><span id=\"line.20\"> * or visit www.oracle.com if you need additional information or have any</span>\n"
+                + "<span class=\"source-line-no\">021</span><span id=\"line.21\"> * questions.</span>\n"
+                + "<span class=\"source-line-no\">022</span><span id=\"line.22\"> */</span>\n"
+                + "<span class=\"source-line-no\">023</span><span id=\"line.23\">package testpkgmdlA;</span>\n"
+                + "<span class=\"source-line-no\">024</span><span id=\"line.24\"></span>\n"
+                + "<span class=\"source-line-no\">025</span><span id=\"line.25\">public class TestClassInModuleA {</span>\n"
+                + "<span class=\"source-line-no\">026</span><span id=\"line.26\">}</span>");
         if (includePrivate) {
             checkOutput("src-html/moduleA/concealedpkgmdlA/ConcealedClassInModuleA.html", true,
-                    "<span class=\"sourceLineNo\">024</span><span id=\"line.24\">package concealedpkgmdlA;</span>\n"
-                    + "<span class=\"sourceLineNo\">025</span><span id=\"line.25\"></span>\n"
-                    + "<span class=\"sourceLineNo\">026</span><span id=\"line.26\">public class ConcealedClassInModuleA {</span>\n"
-                    + "<span class=\"sourceLineNo\">027</span><span id=\"line.27\">    public void testMethodConcealedClass() { }</span>\n"
-                    + "<span class=\"sourceLineNo\">028</span><span id=\"line.28\">}</span>");
+                    "<span class=\"source-line-no\">024</span><span id=\"line.24\">package concealedpkgmdlA;</span>\n"
+                    + "<span class=\"source-line-no\">025</span><span id=\"line.25\"></span>\n"
+                    + "<span class=\"source-line-no\">026</span><span id=\"line.26\">public class ConcealedClassInModuleA {</span>\n"
+                    + "<span class=\"source-line-no\">027</span><span id=\"line.27\">    public void testMethodConcealedClass() { }</span>\n"
+                    + "<span class=\"source-line-no\">028</span><span id=\"line.28\">}</span>");
         }
     }
 
     void checkAllPkgsAllClasses(boolean found) {
         checkOutput("allclasses-index.html", true,
                 "<div role=\"tablist\" aria-orientation=\"horizontal\"><button role=\"tab\""
-                + " aria-selected=\"true\" aria-controls=\"typeSummary_tabpanel\" tabindex=\"0\""
-                + " onkeydown=\"switchTab(event)\" id=\"t0\" class=\"activeTableTab\">All Classes</button>"
-                + "<button role=\"tab\" aria-selected=\"false\" aria-controls=\"typeSummary_tabpanel\""
-                + " tabindex=\"-1\" onkeydown=\"switchTab(event)\" id=\"t2\" class=\"tableTab\""
+                + " aria-selected=\"true\" aria-controls=\"type-summary_tabpanel\" tabindex=\"0\""
+                + " onkeydown=\"switchTab(event)\" id=\"t0\" class=\"active-table-tab\">All Classes</button>"
+                + "<button role=\"tab\" aria-selected=\"false\" aria-controls=\"type-summary_tabpanel\""
+                + " tabindex=\"-1\" onkeydown=\"switchTab(event)\" id=\"t2\" class=\"table-tab\""
                 + " onclick=\"show(2);\">Class Summary</button><button role=\"tab\" aria-selected=\"false\""
-                + " aria-controls=\"typeSummary_tabpanel\" tabindex=\"-1\" onkeydown=\"switchTab(event)\""
-                + " id=\"t6\" class=\"tableTab\" onclick=\"show(32);\">Annotation Types Summary</button></div>\n",
+                + " aria-controls=\"type-summary_tabpanel\" tabindex=\"-1\" onkeydown=\"switchTab(event)\""
+                + " id=\"t6\" class=\"table-tab\" onclick=\"show(32);\">Annotation Types Summary</button></div>\n",
                 "<thead>\n"
                 + "<tr>\n"
-                + "<th class=\"colFirst\" scope=\"col\">Class</th>\n"
-                + "<th class=\"colLast\" scope=\"col\">Description</th>\n"
+                + "<th class=\"col-first\" scope=\"col\">Class</th>\n"
+                + "<th class=\"col-last\" scope=\"col\">Description</th>\n"
                 + "</tr>\n"
                 + "</thead>\n");
         checkOutput("allpackages-index.html", true,
-                "<caption><span>Package Summary</span><span class=\"tabEnd\">&nbsp;</span></caption>\n"
+                "<caption><span>Package Summary</span><span class=\"tab-end\">&nbsp;</span></caption>\n"
                 + "<thead>\n"
                 + "<tr>\n"
-                + "<th class=\"colFirst\" scope=\"col\">Package</th>\n"
-                + "<th class=\"colLast\" scope=\"col\">Description</th>\n"
+                + "<th class=\"col-first\" scope=\"col\">Package</th>\n"
+                + "<th class=\"col-last\" scope=\"col\">Description</th>\n"
                 + "</tr>\n"
                 + "</thead>");
         checkOutput("allclasses-index.html", found,
                 "<table aria-labelledby=\"t0\">\n");
         checkOutput("allpackages-index.html", found,
-                "<div class=\"packagesSummary\">\n<table>\n");
+                "<div class=\"packages-summary\">\n<table>\n");
         checkOutput("allclasses-index.html", !found,
                 "<table summary=\"Class Summary table, listing classes, and an explanation\" aria-labelledby=\"t0\">");
         checkOutput("allpackages-index.html", !found,
-                "<div class=\"packagesSummary\">\n"
+                "<div class=\"packages-summary\">\n"
                 + "<table summary=\"Package Summary table, listing packages, and an explanation\">");
         checkOutput("type-search-index.js", true,
                 "{\"l\":\"All Classes\",\"u\":\"allclasses-index.html\"}");
@@ -1317,7 +1317,7 @@
                 "{\"l\":\"All Packages\",\"u\":\"allpackages-index.html\"}");
         checkOutput("index-all.html", true,
                 "<br><a href=\"allclasses-index.html\">All&nbsp;Classes</a>"
-                + "<span class=\"verticalSeparator\">|</span>"
+                + "<span class=\"vertical-separator\">|</span>"
                 + "<a href=\"allpackages-index.html\">All&nbsp;Packages</a>");
     }
 }
--- a/test/langtools/jdk/javadoc/doclet/testNavigation/TestNavigation.java	Fri Mar 13 18:43:11 2020 +0100
+++ b/test/langtools/jdk/javadoc/doclet/testNavigation/TestNavigation.java	Fri Mar 13 10:57:41 2020 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -62,41 +62,41 @@
         checkSubNav();
 
         checkOutput("pkg/A.html", true,
-                "<ul id=\"navbar.top.firstrow\" class=\"navList\" title=\"Navigation\">\n" +
+                "<ul id=\"navbar.top.firstrow\" class=\"nav-list\" title=\"Navigation\">\n" +
                 "<li><a href=\"../index.html\">Overview</a></li>");
 
         checkOutput("pkg/C.html", true,
-                "<ul id=\"navbar.top.firstrow\" class=\"navList\" title=\"Navigation\">\n" +
+                "<ul id=\"navbar.top.firstrow\" class=\"nav-list\" title=\"Navigation\">\n" +
                 "<li><a href=\"../index.html\">Overview</a></li>");
 
         checkOutput("pkg/E.html", true,
-                "<ul id=\"navbar.top.firstrow\" class=\"navList\" title=\"Navigation\">\n" +
+                "<ul id=\"navbar.top.firstrow\" class=\"nav-list\" title=\"Navigation\">\n" +
                 "<li><a href=\"../index.html\">Overview</a></li>");
 
         checkOutput("pkg/I.html", true,
                 // Test for 4664607
-                "<div class=\"skipNav\"><a href=\"#skip.navbar.top\" title=\"Skip navigation links\">Skip navigation links</a></div>\n"
-                + "<ul id=\"navbar.top.firstrow\" class=\"navList\" title=\"Navigation\">\n",
+                "<div class=\"skip-nav\"><a href=\"#skip.navbar.top\" title=\"Skip navigation links\">Skip navigation links</a></div>\n"
+                + "<ul id=\"navbar.top.firstrow\" class=\"nav-list\" title=\"Navigation\">\n",
                 "<li><a href=\"../index.html\">Overview</a></li>");
 
         // Remaining tests check for additional padding to offset the fixed navigation bar.
         checkOutput("pkg/A.html", true,
                 "<!-- ========= END OF TOP NAVBAR ========= -->\n"
-                + "<span class=\"skipNav\" id=\"skip.navbar.top\">\n"
+                + "<span class=\"skip-nav\" id=\"skip.navbar.top\">\n"
                 + "<!--   -->\n"
                 + "</span></nav>\n"
                 + "</header>\n"
-                + "<div class=\"flexContent\">\n"
+                + "<div class=\"flex-content\">\n"
                 + "<main role=\"main\">\n"
                 + "<!-- ======== START OF CLASS DATA ======== -->");
 
         checkOutput("pkg/package-summary.html", true,
                 "<!-- ========= END OF TOP NAVBAR ========= -->\n"
-                + "<span class=\"skipNav\" id=\"skip.navbar.top\">\n"
+                + "<span class=\"skip-nav\" id=\"skip.navbar.top\">\n"
                 + "<!--   -->\n"
                 + "</span></nav>\n"
                 + "</header>\n"
-                + "<div class=\"flexContent\">\n"
+                + "<div class=\"flex-content\">\n"
                 + "<main role=\"main\">\n"
                 + "<div class=\"header\">");
     }
@@ -113,17 +113,17 @@
 
         checkOutput("pkg/A.html", true,
                 "<!-- ========= END OF TOP NAVBAR ========= -->\n"
-                + "<span class=\"skipNav\" id=\"skip.navbar.top\">\n"
+                + "<span class=\"skip-nav\" id=\"skip.navbar.top\">\n"
                 + "<!--   -->\n"
                 + "</span></nav>\n"
                 + "</header>\n"
-                + "<div class=\"flexContent\">\n"
+                + "<div class=\"flex-content\">\n"
                 + "<main role=\"main\">\n"
                 + "<!-- ======== START OF CLASS DATA ======== -->");
 
         checkOutput("pkg/package-summary.html", true,
                 "<!-- ========= END OF TOP NAVBAR ========= -->\n"
-                + "<span class=\"skipNav\" id=\"skip.navbar.top\">\n"
+                + "<span class=\"skip-nav\" id=\"skip.navbar.top\">\n"
                 + "<!--   -->\n"
                 + "</span></nav>\n");
     }
@@ -141,7 +141,7 @@
         checkOutput("pkg/A.html", false,
                 "<!-- ========= END OF TOP NAVBAR ========= -->\n"
                 + "</div>\n"
-                + "<div class=\"skipNav\"><a id=\"skip.navbar.top\">\n"
+                + "<div class=\"skip-nav\"><a id=\"skip.navbar.top\">\n"
                 + "<!--   -->\n"
                 + "</a></div>\n"
                 + "</nav>\n"
@@ -151,7 +151,7 @@
         checkOutput("pkg/package-summary.html", false,
                 "<!-- ========= END OF TOP NAVBAR ========= -->\n"
                 + "</div>\n"
-                + "<div class=\"skipNav\"><a id=\"skip.navbar.top\">\n"
+                + "<div class=\"skip-nav\"><a id=\"skip.navbar.top\">\n"
                 + "<!--   -->\n"
                 + "</a></div>\n"
                 + "</nav>");
--- a/test/langtools/jdk/javadoc/doclet/testNewLanguageFeatures/TestNewLanguageFeatures.java	Fri Mar 13 18:43:11 2020 +0100
+++ b/test/langtools/jdk/javadoc/doclet/testNewLanguageFeatures/TestNewLanguageFeatures.java	Fri Mar 13 10:57:41 2020 -0700
@@ -67,22 +67,22 @@
                 "Enum Coin</h1>",
                 // Make sure enum signature is correct.
                 "<pre>public enum "
-                + "<span class=\"typeNameLabel\">Coin</span>\n"
+                + "<span class=\"type-name-label\">Coin</span>\n"
                 + "extends java.lang.Enum&lt;<a href=\"Coin.html\" "
                 + "title=\"enum in pkg\">Coin</a>&gt;</pre>",
                 // Check for enum constant section
                 "<caption><span>Enum Constants"
-                + "</span><span class=\"tabEnd\">&nbsp;</span></caption>",
+                + "</span><span class=\"tab-end\">&nbsp;</span></caption>",
                 // Detail for enum constant
-                "<span class=\"memberNameLink\"><a href=\"#Dime\">Dime</a></span>",
+                "<span class=\"member-name-link\"><a href=\"#Dime\">Dime</a></span>",
                 // Automatically insert documentation for values() and valueOf().
                 "Returns an array containing the constants of this enum type,",
                 "Returns the enum constant of this type with the specified name",
                 "Overloaded valueOf() method has correct documentation.",
                 "Overloaded values method  has correct documentation.",
-                "<div class=\"memberSignature\"><span class=\"modifiers\">public static</span>&nbsp;"
-                + "<span class=\"returnType\"><a href=\"Coin.html\" title=\"enum in pkg\">Coin</a></span>&nbsp;"
-                + "<span class=\"memberName\">valueOf</span>&#8203;("
+                "<div class=\"member-signature\"><span class=\"modifiers\">public static</span>&nbsp;"
+                + "<span class=\"return-type\"><a href=\"Coin.html\" title=\"enum in pkg\">Coin</a></span>&nbsp;"
+                + "<span class=\"member-name\">valueOf</span>&#8203;("
                 + "<span class=\"arguments\">java.lang.String&nbsp;name)</span></div>\n" +
                 "<div class=\"block\">Returns the enum constant of this type with the specified name.\n" +
                 "The string must match <i>exactly</i> an identifier used to declare an\n" +
@@ -132,34 +132,34 @@
                 + "<dd><code>V</code> - This is the second type "
                 + "parameter.",
                 // Signature of method with type parameters
-                "<div class=\"memberSignature\"><span class=\"modifiers\">public</span>&nbsp;"
-                + "<span class=\"typeParameters\">&lt;T extends java.util.List,&#8203;\nV&gt;</span>\n"
-                + "<span class=\"returnType\">java.lang.String[]</span>&nbsp;<span class=\"memberName\">"
+                "<div class=\"member-signature\"><span class=\"modifiers\">public</span>&nbsp;"
+                + "<span class=\"type-parameters\">&lt;T extends java.util.List,&#8203;\nV&gt;</span>\n"
+                + "<span class=\"return-type\">java.lang.String[]</span>&nbsp;<span class=\"member-name\">"
                 + "methodThatHasTypeParameters</span>&#8203;(<span class=\"arguments\">T&nbsp;param1,\n"
                 + "V&nbsp;param2)</span></div>",
                 // Method that returns TypeParameters
-                "<td class=\"colFirst\"><code><a href=\"TypeParameters.html\" "
+                "<td class=\"col-first\"><code><a href=\"TypeParameters.html\" "
                 + "title=\"type parameter in TypeParameters\">E</a>[]</code></td>\n"
-                + "<th class=\"colSecond\" scope=\"row\"><code><span class=\"memberNameLink\">"
+                + "<th class=\"col-second\" scope=\"row\"><code><span class=\"member-name-link\">"
                 + "<a href=\"#methodThatReturnsTypeParameterA(E%5B%5D)\">"
                 + "methodThatReturnsTypeParameterA</a></span>&#8203;(<a href=\"TypeParameters.html\" "
                 + "title=\"type parameter in TypeParameters\">E</a>[]&nbsp;e)</code>",
-                "<div class=\"memberSignature\"><span class=\"modifiers\">public</span>&nbsp;<span "
-                + "class=\"returnType\"><a href=\"TypeParameters.html\" title=\"type parameter in TypeParameters\">"
-                + "E</a>[]</span>&nbsp;<span class=\"memberName\">methodThatReturnsTypeParameterA</span>&#8203;("
+                "<div class=\"member-signature\"><span class=\"modifiers\">public</span>&nbsp;<span "
+                + "class=\"return-type\"><a href=\"TypeParameters.html\" title=\"type parameter in TypeParameters\">"
+                + "E</a>[]</span>&nbsp;<span class=\"member-name\">methodThatReturnsTypeParameterA</span>&#8203;("
                 + "<span class=\"arguments\"><a href=\"TypeParameters.html\" title=\"type parameter in TypeParameters\">"
                 + "E</a>[]&nbsp;e)</span></div>\n",
-                "<td class=\"colFirst\"><code>&lt;T extends java.lang.Object &amp; java.lang.Comparable&lt;? super T&gt;&gt;"
+                "<td class=\"col-first\"><code>&lt;T extends java.lang.Object &amp; java.lang.Comparable&lt;? super T&gt;&gt;"
                 + "<br>T</code></td>\n"
-                + "<th class=\"colSecond\" scope=\"row\"><code><span class=\"memberNameLink\">"
+                + "<th class=\"col-second\" scope=\"row\"><code><span class=\"member-name-link\">"
                 + "<a href=\"#methodtThatReturnsTypeParametersB(java.util.Collection)\">"
                 + "methodtThatReturnsTypeParametersB</a></span>&#8203;(java.util.Collection&lt;? extends T&gt;&nbsp;coll)</code>",
                 "<div class=\"block\">Returns TypeParameters</div>\n",
                 // Method takes a TypeVariable
-                "<td class=\"colFirst\"><code>&lt;X extends java.lang.Throwable&gt;<br>"
+                "<td class=\"col-first\"><code>&lt;X extends java.lang.Throwable&gt;<br>"
                 + "<a href=\"TypeParameters.html\" title=\"type parameter in TypeParameters\">E</a>"
                 + "</code></td>\n"
-                + "<th class=\"colSecond\" scope=\"row\"><code><span class=\"memberNameLink\">"
+                + "<th class=\"col-second\" scope=\"row\"><code><span class=\"member-name-link\">"
                 + "<a href=\"#orElseThrow(java.util.function.Supplier)\">"
                 + "orElseThrow</a></span>&#8203;(java.util.function.Supplier&lt;? extends X&gt;&nbsp;exceptionSupplier)</code>"
                 );
@@ -182,7 +182,7 @@
 
         // Signature of subclass that has type parameters.
         checkOutput("pkg/TypeParameterSubClass.html", true,
-                "<pre>public class <span class=\"typeNameLabel\">TypeParameterSubClass&lt;T extends "
+                "<pre>public class <span class=\"type-name-label\">TypeParameterSubClass&lt;T extends "
                 + "java.lang.String&gt;</span>\n"
                 + "extends "
                 + "<a href=\"TypeParameterSuperClass.html\" title=\"class in pkg\">"
@@ -215,9 +215,9 @@
         // Handle multiple bounds.
         //==============================================================
         checkOutput("pkg/MultiTypeParameters.html", true,
-                "<div class=\"memberSignature\"><span class=\"modifiers\">public</span>&nbsp;"
-                + "<span class=\"typeParameters\">&lt;T extends java.lang.Number &amp; java.lang.Runnable&gt;</span>\n"
-                + "<span class=\"returnType\">T</span>&nbsp;<span class=\"memberName\">foo</span>&#8203;"
+                "<div class=\"member-signature\"><span class=\"modifiers\">public</span>&nbsp;"
+                + "<span class=\"type-parameters\">&lt;T extends java.lang.Number &amp; java.lang.Runnable&gt;</span>\n"
+                + "<span class=\"return-type\">T</span>&nbsp;<span class=\"member-name\">foo</span>&#8203;"
                 + "(<span class=\"arguments\">T&nbsp;t)</span></div>");
 
         //==============================================================
@@ -228,8 +228,8 @@
                 "<caption><span>Classes in <a href=\"../"
                 + "package-summary.html\">pkg2</a> with type parameters of "
                 + "type <a href=\"../Foo.html\" title=\"class in pkg2\">"
-                + "Foo</a></span><span class=\"tabEnd\">&nbsp;</span></caption>",
-                "<th class=\"colSecond\" scope=\"row\"><code><span class=\"memberNameLink\"><a href=\"../ClassUseTest1.html\" "
+                + "Foo</a></span><span class=\"tab-end\">&nbsp;</span></caption>",
+                "<th class=\"col-second\" scope=\"row\"><code><span class=\"member-name-link\"><a href=\"../ClassUseTest1.html\" "
                 + "title=\"class in pkg2\">ClassUseTest1</a>&lt;T extends "
                 + "<a href=\"../Foo.html\" title=\"class in pkg2\">Foo"
                 + "</a> &amp; <a href=\"../Foo2.html\" title=\"interface in pkg2\">"
@@ -237,16 +237,16 @@
                 "<caption><span>Methods in <a href=\"../"
                 + "package-summary.html\">pkg2</a> with type parameters of "
                 + "type <a href=\"../Foo.html\" title=\"class in "
-                + "pkg2\">Foo</a></span><span class=\"tabEnd\">&nbsp;</span></caption>",
-                "<th class=\"colSecond\" scope=\"row\"><span class=\"typeNameLabel\">ClassUseTest1."
-                + "</span><code><span class=\"memberNameLink\"><a href=\"../"
+                + "pkg2\">Foo</a></span><span class=\"tab-end\">&nbsp;</span></caption>",
+                "<th class=\"col-second\" scope=\"row\"><span class=\"type-name-label\">ClassUseTest1."
+                + "</span><code><span class=\"member-name-link\"><a href=\"../"
                 + "ClassUseTest1.html#method(T)\">method</a></span>"
                 + "&#8203;(T&nbsp;t)</code></th>",
                 "<caption><span>Fields in <a href=\"../"
                 + "package-summary.html\">pkg2</a> with type parameters of "
                 + "type <a href=\"../Foo.html\" title=\"class in pkg2\">"
-                + "Foo</a></span><span class=\"tabEnd\">&nbsp;</span></caption>",
-                "td class=\"colFirst\"><code><a href=\"../"
+                + "Foo</a></span><span class=\"tab-end\">&nbsp;</span></caption>",
+                "td class=\"col-first\"><code><a href=\"../"
                 + "ParamTest.html\" title=\"class in pkg2\">ParamTest</a>"
                 + "&lt;<a href=\"../Foo.html\" title=\"class in pkg2\""
                 + ">Foo</a>&gt;</code></td>"
@@ -256,8 +256,8 @@
                 "<caption><span>Fields in <a href=\"../"
                 + "package-summary.html\">pkg2</a> declared as <a href=\"../"
                 + "ParamTest.html\" title=\"class in pkg2\">ParamTest"
-                + "</a></span><span class=\"tabEnd\">&nbsp;</span></caption>",
-                "<td class=\"colFirst\"><code><a href=\"../"
+                + "</a></span><span class=\"tab-end\">&nbsp;</span></caption>",
+                "<td class=\"col-first\"><code><a href=\"../"
                 + "ParamTest.html\" title=\"class in pkg2\">ParamTest</a>&lt;<a "
                 + "href=\"../Foo.html\" title=\"class in pkg2\">Foo</a"
                 + ">&gt;</code></td>"
@@ -267,9 +267,9 @@
                 "<caption><span>Classes in <a href=\"../"
                 + "package-summary.html\">pkg2</a> with type parameters of "
                 + "type <a href=\"../Foo2.html\" title=\"interface "
-                + "in pkg2\">Foo2</a></span><span class=\"tabEnd\">&nbsp;"
+                + "in pkg2\">Foo2</a></span><span class=\"tab-end\">&nbsp;"
                 + "</span></caption>",
-                "<th class=\"colSecond\" scope=\"row\"><code><span class=\"memberNameLink\"><a href=\"../ClassUseTest1.html\" "
+                "<th class=\"col-second\" scope=\"row\"><code><span class=\"member-name-link\"><a href=\"../ClassUseTest1.html\" "
                 + "title=\"class in pkg2\">ClassUseTest1</a>&lt;T extends "
                 + "<a href=\"../Foo.html\" title=\"class in pkg2\">Foo"
                 + "</a> &amp; <a href=\"../Foo2.html\" title=\"interface in pkg2\">"
@@ -277,10 +277,10 @@
                 "<caption><span>Methods in <a href=\"../"
                 + "package-summary.html\">pkg2</a> with type parameters of "
                 + "type <a href=\"../Foo2.html\" title=\"interface "
-                + "in pkg2\">Foo2</a></span><span class=\"tabEnd\">&nbsp;"
+                + "in pkg2\">Foo2</a></span><span class=\"tab-end\">&nbsp;"
                 + "</span></caption>",
-                "<th class=\"colSecond\" scope=\"row\"><span class=\"typeNameLabel\">"
-                + "ClassUseTest1.</span><code><span class=\"memberNameLink\"><a href=\"../"
+                "<th class=\"col-second\" scope=\"row\"><span class=\"type-name-label\">"
+                + "ClassUseTest1.</span><code><span class=\"member-name-link\"><a href=\"../"
                 + "ClassUseTest1.html#method(T)\">method</a></span>"
                 + "&#8203;(T&nbsp;t)</code></th>"
         );
@@ -290,9 +290,9 @@
                 "<caption><span>Classes in <a href=\"../"
                 + "package-summary.html\">pkg2</a> with type parameters of "
                 + "type <a href=\"../ParamTest.html\" title=\"class "
-                + "in pkg2\">ParamTest</a></span><span class=\"tabEnd\">"
+                + "in pkg2\">ParamTest</a></span><span class=\"tab-end\">"
                 + "&nbsp;</span></caption>",
-                "<th class=\"colSecond\" scope=\"row\"><code><span class=\"memberNameLink\"><a href=\"../ClassUseTest2.html\" "
+                "<th class=\"col-second\" scope=\"row\"><code><span class=\"member-name-link\"><a href=\"../ClassUseTest2.html\" "
                 + "title=\"class in pkg2\">ClassUseTest2</a>&lt;T extends "
                 + "<a href=\"../ParamTest.html\" title=\"class in pkg2\">"
                 + "ParamTest</a>&lt;<a href=\"../Foo3.html\" title=\"class in pkg2\">"
@@ -300,26 +300,26 @@
                 "<caption><span>Methods in <a href=\"../"
                 + "package-summary.html\">pkg2</a> with type parameters of "
                 + "type <a href=\"../ParamTest.html\" title=\"class "
-                + "in pkg2\">ParamTest</a></span><span class=\"tabEnd\">"
+                + "in pkg2\">ParamTest</a></span><span class=\"tab-end\">"
                 + "&nbsp;</span></caption>",
-                "<th class=\"colSecond\" scope=\"row\"><span class=\"typeNameLabel\">ClassUseTest2."
-                + "</span><code><span class=\"memberNameLink\"><a href=\"../"
+                "<th class=\"col-second\" scope=\"row\"><span class=\"type-name-label\">ClassUseTest2."
+                + "</span><code><span class=\"member-name-link\"><a href=\"../"
                 + "ClassUseTest2.html#method(T)\">method</a></span>"
                 + "&#8203;(T&nbsp;t)</code></th>",
                 "<caption><span>Fields in <a href=\"../"
                 + "package-summary.html\">pkg2</a> declared as <a href=\"../"
                 + "ParamTest.html\" title=\"class in pkg2\">ParamTest"
-                + "</a></span><span class=\"tabEnd\">&nbsp;</span></caption>",
-                "<td class=\"colFirst\"><code><a href=\"../"
+                + "</a></span><span class=\"tab-end\">&nbsp;</span></caption>",
+                "<td class=\"col-first\"><code><a href=\"../"
                 + "ParamTest.html\" title=\"class in pkg2\">ParamTest</a>"
                 + "&lt;<a href=\"../Foo.html\" title=\"class in pkg2\">"
                 + "Foo</a>&gt;</code></td>",
                 "<caption><span>Methods in <a href=\"../"
                 + "package-summary.html\">pkg2</a> with type parameters of "
                 + "type <a href=\"../ParamTest.html\" title=\"class "
-                + "in pkg2\">ParamTest</a></span><span class=\"tabEnd\">"
+                + "in pkg2\">ParamTest</a></span><span class=\"tab-end\">"
                 + "&nbsp;</span></caption>",
-                "<td class=\"colFirst\"><code>&lt;T extends <a href=\"../"
+                "<td class=\"col-first\"><code>&lt;T extends <a href=\"../"
                 + "ParamTest.html\" title=\"class in pkg2\">ParamTest"
                 + "</a>&lt;<a href=\"../Foo3.html\" title=\"class in "
                 + "pkg2\">Foo3</a>&gt;&gt;<br><a href=\"../"
@@ -332,8 +332,8 @@
                 "<caption><span>Classes in <a href=\"../"
                 + "package-summary.html\">pkg2</a> with type parameters of "
                 + "type <a href=\"../Foo3.html\" title=\"class in pkg2\">"
-                + "Foo3</a></span><span class=\"tabEnd\">&nbsp;</span></caption>",
-                "<th class=\"colSecond\" scope=\"row\"><code><span class=\"memberNameLink\"><a href=\"../ClassUseTest2.html\" "
+                + "Foo3</a></span><span class=\"tab-end\">&nbsp;</span></caption>",
+                "<th class=\"col-second\" scope=\"row\"><code><span class=\"member-name-link\"><a href=\"../ClassUseTest2.html\" "
                 + "title=\"class in pkg2\">ClassUseTest2</a>&lt;T extends "
                 + "<a href=\"../ParamTest.html\" title=\"class in pkg2\">"
                 + "ParamTest</a>&lt;<a href=\"../Foo3.html\" title=\"class in pkg2\">"
@@ -341,18 +341,18 @@
                 "<caption><span>Methods in <a href=\"../"
                 + "package-summary.html\">pkg2</a> with type parameters of "
                 + "type <a href=\"../Foo3.html\" title=\"class in "
-                + "pkg2\">Foo3</a></span><span class=\"tabEnd\">&nbsp;"
+                + "pkg2\">Foo3</a></span><span class=\"tab-end\">&nbsp;"
                 + "</span></caption>",
-                "<th class=\"colSecond\" scope=\"row\"><span class=\"typeNameLabel\">ClassUseTest2."
-                + "</span><code><span class=\"memberNameLink\"><a href=\"../"
+                "<th class=\"col-second\" scope=\"row\"><span class=\"type-name-label\">ClassUseTest2."
+                + "</span><code><span class=\"member-name-link\"><a href=\"../"
                 + "ClassUseTest2.html#method(T)\">method</a></span>"
                 + "&#8203;(T&nbsp;t)</code></th>",
                 "<caption><span>Methods in <a href=\"../"
                 + "package-summary.html\">pkg2</a> that return types with "
                 + "arguments of type <a href=\"../Foo3.html\" title"
-                + "=\"class in pkg2\">Foo3</a></span><span class=\"tabEnd\">"
+                + "=\"class in pkg2\">Foo3</a></span><span class=\"tab-end\">"
                 + "&nbsp;</span></caption>",
-                "<td class=\"colFirst\"><code>&lt;T extends <a href=\"../"
+                "<td class=\"col-first\"><code>&lt;T extends <a href=\"../"
                 + "ParamTest.html\" title=\"class in pkg2\">ParamTest</a>&lt;"
                 + "<a href=\"../Foo3.html\" title=\"class in pkg2\">Foo3"
                 + "</a>&gt;&gt;<br><a href=\"../ParamTest.html\" "
@@ -365,9 +365,9 @@
                 "<caption><span>Classes in <a href=\"../"
                 + "package-summary.html\">pkg2</a> with type parameters of "
                 + "type <a href=\"../ParamTest2.html\" title=\"class "
-                + "in pkg2\">ParamTest2</a></span><span class=\"tabEnd\">"
+                + "in pkg2\">ParamTest2</a></span><span class=\"tab-end\">"
                 + "&nbsp;</span></caption>",
-                "<th class=\"colSecond\" scope=\"row\"><code><span class=\"memberNameLink\"><a href=\"../ClassUseTest3.html\" "
+                "<th class=\"col-second\" scope=\"row\"><code><span class=\"member-name-link\"><a href=\"../ClassUseTest3.html\" "
                 + "title=\"class in pkg2\">ClassUseTest3</a>&lt;T extends "
                 + "<a href=\"../ParamTest2.html\" title=\"class in pkg2\">"
                 + "ParamTest2</a>&lt;java.util.List&lt;? extends "
@@ -376,12 +376,12 @@
                 "<caption><span>Methods in <a href=\"../"
                 + "package-summary.html\">pkg2</a> with type parameters of "
                 + "type <a href=\"../ParamTest2.html\" title=\"class "
-                + "in pkg2\">ParamTest2</a></span><span class=\"tabEnd\">"
+                + "in pkg2\">ParamTest2</a></span><span class=\"tab-end\">"
                 + "&nbsp;</span></caption>",
-                "<th class=\"colSecond\" scope=\"row\"><span class=\"typeNameLabel\">ClassUseTest3"
-                + ".</span><code><span class=\"memberNameLink\"><a href=\"../ClassUseTest3."
+                "<th class=\"col-second\" scope=\"row\"><span class=\"type-name-label\">ClassUseTest3"
+                + ".</span><code><span class=\"member-name-link\"><a href=\"../ClassUseTest3."
                 + "html#method(T)\">method</a></span>&#8203;(T&nbsp;t)</code></th>",
-                "<td class=\"colFirst\"><code>&lt;T extends <a href=\"../"
+                "<td class=\"col-first\"><code>&lt;T extends <a href=\"../"
                 + "ParamTest2.html\" title=\"class in pkg2\">"
                 + "ParamTest2</a>&lt;java.util.List&lt;? extends <a href=\".."
                 + "/Foo4.html\" title=\"class in pkg2\">Foo4</a>&gt;"
@@ -395,9 +395,9 @@
                 "<caption><span>Classes in <a href=\"../"
                 + "package-summary.html\">pkg2</a> with type parameters of "
                 + "type <a href=\"../Foo4.html\" title=\"class in "
-                + "pkg2\">Foo4</a></span><span class=\"tabEnd\">&nbsp;"
+                + "pkg2\">Foo4</a></span><span class=\"tab-end\">&nbsp;"
                 + "</span></caption>",
-                "<th class=\"colSecond\" scope=\"row\"><code><span class=\"memberNameLink\"><a href=\"../ClassUseTest3.html\" "
+                "<th class=\"col-second\" scope=\"row\"><code><span class=\"member-name-link\"><a href=\"../ClassUseTest3.html\" "
                 + "title=\"class in pkg2\">ClassUseTest3</a>&lt;T extends "
                 + "<a href=\"../ParamTest2.html\" title=\"class in pkg2\">"
                 + "ParamTest2</a>&lt;java.util.List&lt;? extends "
@@ -406,17 +406,17 @@
                 "<caption><span>Methods in <a href=\"../"
                 + "package-summary.html\">pkg2</a> with type parameters of "
                 + "type <a href=\"../Foo4.html\" title=\"class in "
-                + "pkg2\">Foo4</a></span><span class=\"tabEnd\">&nbsp;</span></caption>",
-                "<th class=\"colSecond\" scope=\"row\"><span class=\"typeNameLabel\">ClassUseTest3."
-                + "</span><code><span class=\"memberNameLink\"><a href=\"../ClassUseTest3."
+                + "pkg2\">Foo4</a></span><span class=\"tab-end\">&nbsp;</span></caption>",
+                "<th class=\"col-second\" scope=\"row\"><span class=\"type-name-label\">ClassUseTest3."
+                + "</span><code><span class=\"member-name-link\"><a href=\"../ClassUseTest3."
                 + "html#method(T)\">method</a></span>&#8203;(T&nbsp;t)</code>"
                 + "</th>",
                 "<caption><span>Methods in <a href=\"../"
                 + "package-summary.html\">pkg2</a> that return types with "
                 + "arguments of type <a href=\"../Foo4.html\" "
                 + "title=\"class in pkg2\">Foo4</a></span><span class=\""
-                + "tabEnd\">&nbsp;</span></caption>",
-                "<td class=\"colFirst\"><code>&lt;T extends <a href=\"../"
+                + "tab-end\">&nbsp;</span></caption>",
+                "<td class=\"col-first\"><code>&lt;T extends <a href=\"../"
                 + "ParamTest2.html\" title=\"class in pkg2\">"
                 + "ParamTest2</a>&lt;java.util.List&lt;? extends <a href=\".."
                 + "/Foo4.html\" title=\"class in pkg2\">Foo4</a>&gt;"
@@ -431,27 +431,27 @@
                 "<caption><span>Method parameters in <a href=\"../"
                 + "package-summary.html\">pkg2</a> with type arguments of "
                 + "type <a href=\"../Foo4.html\" title=\"class in "
-                + "pkg2\">Foo4</a></span><span class=\"tabEnd\">&nbsp;"
+                + "pkg2\">Foo4</a></span><span class=\"tab-end\">&nbsp;"
                 + "</span></caption>\n"
                 + "<thead>\n"
                 + "<tr>\n"
-                + "<th class=\"colFirst\" scope=\"col\">Modifier and Type</th>\n"
-                + "<th class=\"colSecond\" scope=\"col\">Method</th>\n"
-                + "<th class=\"colLast\" scope=\"col\">Description</th>\n"
+                + "<th class=\"col-first\" scope=\"col\">Modifier and Type</th>\n"
+                + "<th class=\"col-second\" scope=\"col\">Method</th>\n"
+                + "<th class=\"col-last\" scope=\"col\">Description</th>\n"
                 + "</tr>\n"
                 + "</thead>\n"
                 + "<tbody>\n"
-                + "<tr class=\"altColor\">\n"
-                + "<td class=\"colFirst\"><code>void</code></td>\n"
-                + "<th class=\"colSecond\" scope=\"row\"><span class=\"typeNameLabel\">ClassUseTest3."
-                + "</span><code><span class=\"memberNameLink\"><a href=\"../ClassUseTest3."
+                + "<tr class=\"alt-color\">\n"
+                + "<td class=\"col-first\"><code>void</code></td>\n"
+                + "<th class=\"col-second\" scope=\"row\"><span class=\"type-name-label\">ClassUseTest3."
+                + "</span><code><span class=\"member-name-link\"><a href=\"../ClassUseTest3."
                 + "html#method(java.util.Set)\">method</a></span>&#8203;(java."
                 + "util.Set&lt;<a href=\"../Foo4.html\" title=\""
                 + "class in pkg2\">Foo4</a>&gt;&nbsp;p)</code></th>",
                 "<caption><span>Constructor parameters in <a href=\"../"
                 + "package-summary.html\">pkg2</a> with type arguments "
                 + "of type <a href=\"../Foo4.html\" title=\"class in "
-                + "pkg2\">Foo4</a></span><span class=\"tabEnd\">&nbsp;"
+                + "pkg2\">Foo4</a></span><span class=\"tab-end\">&nbsp;"
                 + "</span></caption>"
         );
 
@@ -459,7 +459,7 @@
         // TYPE PARAMETER IN INDEX
         //=================================
         checkOutput("index-all.html", true,
-                "<span class=\"memberNameLink\"><a href=\"pkg2/Foo.html#method(java.util.Vector)\">"
+                "<span class=\"member-name-link\"><a href=\"pkg2/Foo.html#method(java.util.Vector)\">"
                 + "method(Vector&lt;Object&gt;)</a></span>"
         );
 
@@ -468,7 +468,7 @@
         // TYPE PARAMETER IN INDEX
         //=================================
         checkOutput("index-all.html", true,
-                "<span class=\"memberNameLink\"><a href=\"pkg2/Foo.html#method(java.util.Vector)\">"
+                "<span class=\"member-name-link\"><a href=\"pkg2/Foo.html#method(java.util.Vector)\">"
                 + "method(Vector&lt;Object&gt;)</a></span>"
         );
 
@@ -505,7 +505,7 @@
                 // Make sure the heading is correct.
                 "Annotation Type AnnotationType</h2>",
                 // Make sure the signature is correct.
-                "public @interface <span class=\"memberNameLabel\">AnnotationType</span>",
+                "public @interface <span class=\"member-name-label\">AnnotationType</span>",
                 // Make sure member summary headings are correct.
                 "<h3>Required Element Summary</h3>",
                 "<h3>Optional Element Summary</h3>",
@@ -535,41 +535,41 @@
                 + "=\"Class Annotation\",\n"
                 + "                <a href=\"AnnotationType.html#required()\">"
                 + "required</a>=1994)\n"
-                + "public class <span class=\"typeNameLabel\">"
+                + "public class <span class=\"type-name-label\">"
                 + "AnnotationTypeUsage</span>\n"
                 + "extends java.lang.Object</pre>",
                 // FIELD
-                "<div class=\"memberSignature\"><span class=\"annotations\"><a href=\"AnnotationType.html\" "
+                "<div class=\"member-signature\"><span class=\"annotations\"><a href=\"AnnotationType.html\" "
                 + "title=\"annotation in pkg\">@AnnotationType</a>(<a href=\"AnnotationType.html#optional()\">"
                 + "optional</a>=\"Field Annotation\",\n"
                 + "                <a href=\"AnnotationType.html#required()\">required</a>=1994)\n"
-                + "</span><span class=\"modifiers\">public</span>&nbsp;<span class=\"returnType\">int</span>"
-                + "&nbsp;<span class=\"memberName\">field</span></div>",
+                + "</span><span class=\"modifiers\">public</span>&nbsp;<span class=\"return-type\">int</span>"
+                + "&nbsp;<span class=\"member-name\">field</span></div>",
                 // CONSTRUCTOR
-                "<div class=\"memberSignature\"><span class=\"annotations\"><a href=\"AnnotationType.html\" "
+                "<div class=\"member-signature\"><span class=\"annotations\"><a href=\"AnnotationType.html\" "
                 + "title=\"annotation in pkg\">@AnnotationType</a>(<a href=\"AnnotationType.html#optional()\">"
                 + "optional</a>=\"Constructor Annotation\",\n"
                 + "                <a href=\"AnnotationType.html#required()\">required</a>=1994)\n"
                 + "</span><span class=\"modifiers\">public</span>&nbsp;"
-                + "<span class=\"memberName\">AnnotationTypeUsage</span>()</div>",
+                + "<span class=\"member-name\">AnnotationTypeUsage</span>()</div>",
                 // METHOD
-                "<div class=\"memberSignature\"><span class=\"annotations\"><a href=\"AnnotationType.html\" "
+                "<div class=\"member-signature\"><span class=\"annotations\"><a href=\"AnnotationType.html\" "
                 + "title=\"annotation in pkg\">@AnnotationType</a>(<a href=\"AnnotationType.html#optional()\">"
                 + "optional</a>=\"Method Annotation\",\n"
                 + "                <a href=\"AnnotationType.html#required()\">required</a>=1994)\n"
-                + "</span><span class=\"modifiers\">public</span>&nbsp;<span class=\"returnType\">"
-                + "void</span>&nbsp;<span class=\"memberName\">method</span>()</div>",
+                + "</span><span class=\"modifiers\">public</span>&nbsp;<span class=\"return-type\">"
+                + "void</span>&nbsp;<span class=\"member-name\">method</span>()</div>",
                 // METHOD PARAMS
-                "<div class=\"memberSignature\"><span class=\"modifiers\">public</span>&nbsp;<span "
-                + "class=\"returnType\">void</span>&nbsp;<span class=\"memberName\">methodWithParams</span>"
+                "<div class=\"member-signature\"><span class=\"modifiers\">public</span>&nbsp;<span "
+                + "class=\"return-type\">void</span>&nbsp;<span class=\"member-name\">methodWithParams</span>"
                 + "&#8203;(<span class=\"arguments\"><a href=\"AnnotationType.html\" title=\"annotation in pkg\">"
                 + "@AnnotationType</a>(<a href=\"AnnotationType.html#optional()\">optional</a>"
                 + "=\"Parameter Annotation\",<a href=\"AnnotationType.html#required()\">required</a>=1994)\n"
                 + "int&nbsp;documented,\n"
                 + "int&nbsp;undocmented)</span></div>",
                 // CONSTRUCTOR PARAMS
-                "<div class=\"memberSignature\"><span class=\"modifiers\">public</span>&nbsp;"
-                + "<span class=\"memberName\">AnnotationTypeUsage</span>&#8203;(<span class=\"arguments\">"
+                "<div class=\"member-signature\"><span class=\"modifiers\">public</span>&nbsp;"
+                + "<span class=\"member-name\">AnnotationTypeUsage</span>&#8203;(<span class=\"arguments\">"
                 + "<a href=\"AnnotationType.html\" title=\"annotation in pkg\">@AnnotationType</a>("
                 + "<a href=\"AnnotationType.html#optional()\">optional</a>=\"Constructor Param Annotation\","
                 + "<a href=\"AnnotationType.html#required()\">required</a>=1994)\n"
@@ -582,38 +582,38 @@
         checkOutput("pkg/class-use/AnnotationType.html", true,
                 "<caption><span>Packages with annotations of type <a href=\""
                 + "../AnnotationType.html\" title=\"annotation in pkg\">"
-                + "AnnotationType</a></span><span class=\"tabEnd\">&nbsp;"
+                + "AnnotationType</a></span><span class=\"tab-end\">&nbsp;"
                 + "</span></caption>",
                 "<caption><span>Classes in <a href=\"../"
                 + "package-summary.html\">pkg</a> with annotations of type "
                 + "<a href=\"../AnnotationType.html\" title=\""
                 + "annotation in pkg\">AnnotationType</a></span><span class"
-                + "=\"tabEnd\">&nbsp;</span></caption>",
+                + "=\"tab-end\">&nbsp;</span></caption>",
                 "<caption><span>Fields in <a href=\"../"
                 + "package-summary.html\">pkg</a> with annotations of type "
                 + "<a href=\"../AnnotationType.html\" title=\"annotation "
-                + "in pkg\">AnnotationType</a></span><span class=\"tabEnd\">"
+                + "in pkg\">AnnotationType</a></span><span class=\"tab-end\">"
                 + "&nbsp;</span></caption>",
                 "<caption><span>Methods in <a href=\"../"
                 + "package-summary.html\">pkg</a> with annotations of type "
                 + "<a href=\"../AnnotationType.html\" title=\"annotation "
-                + "in pkg\">AnnotationType</a></span><span class=\"tabEnd\">"
+                + "in pkg\">AnnotationType</a></span><span class=\"tab-end\">"
                 + "&nbsp;</span></caption>",
                 "<caption><span>Method parameters in <a href=\"../"
                 + "package-summary.html\">pkg</a> with annotations of type "
                 + "<a href=\"../AnnotationType.html\" title=\"annotation "
-                + "in pkg\">AnnotationType</a></span><span class=\"tabEnd\">"
+                + "in pkg\">AnnotationType</a></span><span class=\"tab-end\">"
                 + "&nbsp;</span></caption>",
                 "<caption><span>Constructors in <a href=\"../"
                 + "package-summary.html\">pkg</a> with annotations of type "
                 + "<a href=\"../AnnotationType.html\" title=\"annotation "
-                + "in pkg\">AnnotationType</a></span><span class=\"tabEnd\">"
+                + "in pkg\">AnnotationType</a></span><span class=\"tab-end\">"
                 + "&nbsp;</span></caption>",
                 "<caption><span>Constructor parameters in <a href=\"../"
                 + "package-summary.html\">pkg</a> with annotations of "
                 + "type <a href=\"../AnnotationType.html\" title=\""
                 + "annotation in pkg\">AnnotationType</a></span><span class=\""
-                + "tabEnd\">&nbsp;</span></caption>"
+                + "tab-end\">&nbsp;</span></caption>"
         );
 
         //==============================================================
@@ -623,19 +623,19 @@
                 // CLASS
                 "<a href=\"AnnotationTypeUndocumented.html\" title=\"annotation in pkg\">@AnnotationTypeUndocumented</a>(<a href=\"AnnotationType.html#optional\">optional</a>=\"Class Annotation\",\n"
                 + "                <a href=\"AnnotationType.html#required\">required</a>=1994)\n"
-                + "public class <span class=\"typeNameLabel\">AnnotationTypeUsage</span></dt><dt>extends java.lang.Object</dt>",
+                + "public class <span class=\"type-name-label\">AnnotationTypeUsage</span></dt><dt>extends java.lang.Object</dt>",
                 // FIELD
                 "<a href=\"AnnotationTypeUndocumented.html\" title=\"annotation in pkg\">@AnnotationTypeUndocumented</a>(<a href=\"AnnotationType.html#optional\">optional</a>=\"Field Annotation\",\n"
                 + "                <a href=\"AnnotationType.html#required\">required</a>=1994)\n"
-                + "public int <span class=\"memberNameLabel\">field</span>",
+                + "public int <span class=\"member-name-label\">field</span>",
                 // CONSTRUCTOR
                 "<a href=\"AnnotationTypeUndocumented.html\" title=\"annotation in pkg\">@AnnotationTypeUndocumented</a>(<a href=\"AnnotationType.html#optional\">optional</a>=\"Constructor Annotation\",\n"
                 + "                <a href=\"AnnotationType.html#required\">required</a>=1994)\n"
-                + "public <span class=\"typeNameLabel\">AnnotationTypeUsage</span>()",
+                + "public <span class=\"type-name-label\">AnnotationTypeUsage</span>()",
                 // METHOD
                 "<a href=\"AnnotationTypeUndocumented.html\" title=\"annotation in pkg\">@AnnotationTypeUndocumented</a>(<a href=\"AnnotationType.html#optional\">optional</a>=\"Method Annotation\",\n"
                 + "                <a href=\"AnnotationType.html#required\">required</a>=1994)\n"
-                + "public void <span class=\"memberNameLabel\">method</span>()");
+                + "public void <span class=\"member-name-label\">method</span>()");
 
         //=================================
         // Make sure annotation types do not
@@ -674,7 +674,7 @@
         // Make sure that annotations are surrounded by <pre> and </pre>
         checkOutput("pkg1/B.html", true,
                 "<pre><a href=\"A.html\" title=\"annotation in pkg1\">@A</a>",
-                "public interface <span class=\"typeNameLabel\">B</span></pre>");
+                "public interface <span class=\"type-name-label\">B</span></pre>");
 
     }
 }
--- a/test/langtools/jdk/javadoc/doclet/testOptions/TestOptions.java	Fri Mar 13 18:43:11 2020 +0100
+++ b/test/langtools/jdk/javadoc/doclet/testOptions/TestOptions.java	Fri Mar 13 10:57:41 2020 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2020, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -53,8 +53,8 @@
         checkExit(Exit.OK);
 
         checkOutput("pkg/package-summary.html", true,
-                "<div class=\"aboutLanguage\">Test header</div>",
-                "<div class=\"aboutLanguage\">Test footer</div>");
+                "<div class=\"about-language\">Test header</div>",
+                "<div class=\"about-language\">Test footer</div>");
     }
 
     @Test
@@ -194,69 +194,69 @@
                 + "AnnotationTypeField</a></pre>",
                 "<section class=\"detail\" id=\"DEFAULT_NAME\">\n"
                 + "<h3>DEFAULT_NAME</h3>\n"
-                + "<div class=\"memberSignature\"><span class=\"modifiers\">static final</span>&nbsp;"
-                + "<span class=\"returnType\">java.lang.String</span>&nbsp;<span class=\"memberName\">"
+                + "<div class=\"member-signature\"><span class=\"modifiers\">static final</span>&nbsp;"
+                + "<span class=\"return-type\">java.lang.String</span>&nbsp;<span class=\"member-name\">"
                 + "<a href=\"../src-html/linksource/AnnotationTypeField.html#line.32\">DEFAULT_NAME</a></span></div>",
                 "<section class=\"detail\" id=\"name()\">\n"
                 + "<h3>name</h3>\n"
-                + "<div class=\"memberSignature\"><span class=\"returnType\">java.lang.String</span>&nbsp;"
-                + "<span class=\"memberName\"><a href=\"../src-html/linksource/AnnotationTypeField.html#line.34\">"
+                + "<div class=\"member-signature\"><span class=\"return-type\">java.lang.String</span>&nbsp;"
+                + "<span class=\"member-name\"><a href=\"../src-html/linksource/AnnotationTypeField.html#line.34\">"
                 + "name</a></span></div>");
 
         checkOutput("src-html/linksource/AnnotationTypeField.html", true,
                 "<title>Source code</title>",
-                "<span class=\"sourceLineNo\">031</span><span id=\"line.31\">"
+                "<span class=\"source-line-no\">031</span><span id=\"line.31\">"
                 + "@Documented public @interface AnnotationTypeField {</span>");
 
         checkOutput("linksource/Properties.html", true,
                 "<pre>public class <a href=\"../src-html/linksource/Properties.html#line.29\">"
                 + "Properties</a>",
-                "<div class=\"memberSignature\"><span class=\"modifiers\">public</span>&nbsp;"
-                + "<span class=\"returnType\">java.lang.Object</span>&nbsp;<span class=\"memberName\">"
+                "<div class=\"member-signature\"><span class=\"modifiers\">public</span>&nbsp;"
+                + "<span class=\"return-type\">java.lang.Object</span>&nbsp;<span class=\"member-name\">"
                 + "<a href=\"../src-html/linksource/Properties.html#line.31\">someProperty</a></span></div>");
 
         checkOutput("src-html/linksource/Properties.html", true,
                 "<title>Source code</title>",
-                "<span class=\"sourceLineNo\">031</span><span id=\"line.31\">    "
+                "<span class=\"source-line-no\">031</span><span id=\"line.31\">    "
                 + "public Object someProperty() {</span>");
 
         checkOutput("linksource/SomeClass.html", true,
                 "<pre>public class <a href=\"../src-html/linksource/SomeClass.html#line.29\">"
                 + "SomeClass</a>\nextends java.lang.Object</pre>",
-                "<div class=\"memberSignature\"><span class=\"modifiers\">public</span>&nbsp;"
-                + "<span class=\"returnType\">int</span>&nbsp;<span class=\"memberName\">"
+                "<div class=\"member-signature\"><span class=\"modifiers\">public</span>&nbsp;"
+                + "<span class=\"return-type\">int</span>&nbsp;<span class=\"member-name\">"
                 + "<a href=\"../src-html/linksource/SomeClass.html#line.31\">field</a></span></div>",
-                "<div class=\"memberSignature\"><span class=\"modifiers\">public</span>&nbsp;"
-                + "<span class=\"memberName\"><a href=\"../src-html/linksource/SomeClass.html#line.33\">"
+                "<div class=\"member-signature\"><span class=\"modifiers\">public</span>&nbsp;"
+                + "<span class=\"member-name\"><a href=\"../src-html/linksource/SomeClass.html#line.33\">"
                 + "SomeClass</a></span>()</div>",
-                "<div class=\"memberSignature\"><span class=\"modifiers\">public</span>&nbsp;"
-                + "<span class=\"returnType\">int</span>&nbsp;<span class=\"memberName\">"
+                "<div class=\"member-signature\"><span class=\"modifiers\">public</span>&nbsp;"
+                + "<span class=\"return-type\">int</span>&nbsp;<span class=\"member-name\">"
                 + "<a href=\"../src-html/linksource/SomeClass.html#line.36\">method</a></span>()</div>");
 
         checkOutput("src-html/linksource/SomeClass.html", true,
                 "<title>Source code</title>",
-                "<span class=\"sourceLineNo\">029</span><span id=\"line.29\">"
+                "<span class=\"source-line-no\">029</span><span id=\"line.29\">"
                 + "public class SomeClass {</span>",
-                "<span class=\"sourceLineNo\">031</span><span id=\"line.31\">    "
+                "<span class=\"source-line-no\">031</span><span id=\"line.31\">    "
                 + "public int field;</span>",
-                "<span class=\"sourceLineNo\">033</span><span id=\"line.33\">    "
+                "<span class=\"source-line-no\">033</span><span id=\"line.33\">    "
                 + "public SomeClass() {</span>",
-                "<span class=\"sourceLineNo\">036</span><span id=\"line.36\">    "
+                "<span class=\"source-line-no\">036</span><span id=\"line.36\">    "
                 + "public int method() {</span>");
 
         checkOutput("linksource/SomeEnum.html", true,
-                "<div class=\"memberSignature\"><span class=\"modifiers\">public static final</span>&nbsp;"
-                + "<span class=\"returnType\"><a href=\"SomeEnum.html\" title=\"enum in linksource\">"
-                + "SomeEnum</a></span>&nbsp;<span class=\"memberName\">"
+                "<div class=\"member-signature\"><span class=\"modifiers\">public static final</span>&nbsp;"
+                + "<span class=\"return-type\"><a href=\"SomeEnum.html\" title=\"enum in linksource\">"
+                + "SomeEnum</a></span>&nbsp;<span class=\"member-name\">"
                 + "<a href=\"../src-html/linksource/SomeEnum.html#line.29\">VALUE1</a></span></div>",
-                "<div class=\"memberSignature\"><span class=\"modifiers\">public static final</span>&nbsp;"
-                + "<span class=\"returnType\"><a href=\"SomeEnum.html\" title=\"enum in linksource\">"
-                + "SomeEnum</a></span>&nbsp;<span class=\"memberName\">"
+                "<div class=\"member-signature\"><span class=\"modifiers\">public static final</span>&nbsp;"
+                + "<span class=\"return-type\"><a href=\"SomeEnum.html\" title=\"enum in linksource\">"
+                + "SomeEnum</a></span>&nbsp;<span class=\"member-name\">"
                 + "<a href=\"../src-html/linksource/SomeEnum.html#line.30\">VALUE2</a></span></div>");
 
         checkOutput("src-html/linksource/SomeEnum.html", true,
-                "<span class=\"sourceLineNo\">029</span><span id=\"line.29\">    VALUE1,</span>",
-                "<span class=\"sourceLineNo\">030</span><span id=\"line.30\">    VALUE2</span>");
+                "<span class=\"source-line-no\">029</span><span id=\"line.29\">    VALUE1,</span>",
+                "<span class=\"source-line-no\">030</span><span id=\"line.30\">    VALUE2</span>");
     }
 
     @Test
--- a/test/langtools/jdk/javadoc/doclet/testOrdering/TestOrdering.java	Fri Mar 13 18:43:11 2020 +0100
+++ b/test/langtools/jdk/javadoc/doclet/testOrdering/TestOrdering.java	Fri Mar 13 10:57:41 2020 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2020, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -516,14 +516,14 @@
 
             checkOrder("pkg5/AnnoFieldTest.html",
                     "<h2>Field Details</h2>",
-                    "<div class=\"memberSignature\"><span class=\"modifiers\">static final</span>&nbsp;"
-                    + "<span class=\"returnType\">int</span>&nbsp;<span class=\"memberName\">one</span></div>",
-                    "<div class=\"memberSignature\"><span class=\"modifiers\">static final</span>&nbsp;"
-                    + "<span class=\"returnType\">int</span>&nbsp;<span class=\"memberName\">two</span></div>",
-                    "<div class=\"memberSignature\"><span class=\"modifiers\">static final</span>&nbsp;"
-                    + "<span class=\"returnType\">int</span>&nbsp;<span class=\"memberName\">three</span></div>",
-                    "<div class=\"memberSignature\"><span class=\"modifiers\">static final</span>&nbsp;"
-                    + "<span class=\"returnType\">int</span>&nbsp;<span class=\"memberName\">four</span></div>");
+                    "<div class=\"member-signature\"><span class=\"modifiers\">static final</span>&nbsp;"
+                    + "<span class=\"return-type\">int</span>&nbsp;<span class=\"member-name\">one</span></div>",
+                    "<div class=\"member-signature\"><span class=\"modifiers\">static final</span>&nbsp;"
+                    + "<span class=\"return-type\">int</span>&nbsp;<span class=\"member-name\">two</span></div>",
+                    "<div class=\"member-signature\"><span class=\"modifiers\">static final</span>&nbsp;"
+                    + "<span class=\"return-type\">int</span>&nbsp;<span class=\"member-name\">three</span></div>",
+                    "<div class=\"member-signature\"><span class=\"modifiers\">static final</span>&nbsp;"
+                    + "<span class=\"return-type\">int</span>&nbsp;<span class=\"member-name\">four</span></div>");
 
             checkOrder("pkg5/AnnoOptionalTest.html",
                     "<h2>Optional Element Summary</h2>",
--- a/test/langtools/jdk/javadoc/doclet/testOverriddenMethods/TestBadOverride.java	Fri Mar 13 18:43:11 2020 +0100
+++ b/test/langtools/jdk/javadoc/doclet/testOverriddenMethods/TestBadOverride.java	Fri Mar 13 10:57:41 2020 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -54,8 +54,8 @@
         checkOutput("pkg4/Foo.html", true,
                 "<section class=\"detail\" id=\"toString()\">\n"
                 + "<h3>toString</h3>\n"
-                + "<div class=\"memberSignature\"><span class=\"modifiers\">public</span>&nbsp;"
-                + "<span class=\"returnType\">void</span>&nbsp;<span class=\"memberName\">toString</span>()</div>\n"
+                + "<div class=\"member-signature\"><span class=\"modifiers\">public</span>&nbsp;"
+                + "<span class=\"return-type\">void</span>&nbsp;<span class=\"member-name\">toString</span>()</div>\n"
                 + "<div class=\"block\">Why can't I do this ?</div>\n"
                 + "</section>");
     }
--- a/test/langtools/jdk/javadoc/doclet/testOverriddenMethods/TestOverriddenDeprecatedMethods.java	Fri Mar 13 18:43:11 2020 +0100
+++ b/test/langtools/jdk/javadoc/doclet/testOverriddenMethods/TestOverriddenDeprecatedMethods.java	Fri Mar 13 10:57:41 2020 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -58,11 +58,11 @@
         checkOrder("pkg1/SubClass.html",
                 "Method Detail",
                 "<span class=\"annotations\">@Deprecated\n</span><span class=\"modifiers\">public</span>&nbsp;"
-                + "<span class=\"returnType\">void</span>&nbsp;<span class=\"memberName\">func1</span>()",
-                "<div class=\"deprecationBlock\"><span class=\"deprecatedLabel\">Deprecated.</span></div>",
+                + "<span class=\"return-type\">void</span>&nbsp;<span class=\"member-name\">func1</span>()",
+                "<div class=\"deprecation-block\"><span class=\"deprecated-label\">Deprecated.</span></div>",
                 "<span class=\"annotations\">@Deprecated\n</span><span class=\"modifiers\">public</span>&nbsp;"
-                + "<span class=\"returnType\">void</span>&nbsp;<span class=\"memberName\">func2</span>()",
-                "<div class=\"deprecationBlock\"><span class=\"deprecatedLabel\">Deprecated.</span></div>",
+                + "<span class=\"return-type\">void</span>&nbsp;<span class=\"member-name\">func2</span>()",
+                "<div class=\"deprecation-block\"><span class=\"deprecated-label\">Deprecated.</span></div>",
                 "<div class=\"block\">deprecated with comments</div>");
     }
 }
--- a/test/langtools/jdk/javadoc/doclet/testOverriddenMethods/TestOverriddenMethodDocCopy.java	Fri Mar 13 18:43:11 2020 +0100
+++ b/test/langtools/jdk/javadoc/doclet/testOverriddenMethods/TestOverriddenMethodDocCopy.java	Fri Mar 13 10:57:41 2020 -0700
@@ -53,7 +53,7 @@
         checkExit(Exit.OK);
 
         checkOutput("pkg1/SubClass.html", true,
-                "<span class=\"descfrmTypeLabel\">Description copied from class:&nbsp;<code>"
+                "<span class=\"descfrm-type-label\">Description copied from class:&nbsp;<code>"
                 + "<a href=\"BaseClass.html#overriddenMethodWithDocsToCopy()\">"
                 + "BaseClass</a></code></span>");
     }
--- a/test/langtools/jdk/javadoc/doclet/testOverriddenMethods/TestOverrideMethods.java	Fri Mar 13 18:43:11 2020 +0100
+++ b/test/langtools/jdk/javadoc/doclet/testOverriddenMethods/TestOverrideMethods.java	Fri Mar 13 10:57:41 2020 -0700
@@ -263,22 +263,22 @@
                 "<table aria-labelledby=\"t0\">\n"
                 + "<thead>\n"
                 + "<tr>\n"
-                + "<th class=\"colFirst\" scope=\"col\">Modifier and Type</th>\n"
-                + "<th class=\"colSecond\" scope=\"col\">Method</th>\n"
-                + "<th class=\"colLast\" scope=\"col\">Description</th>\n"
+                + "<th class=\"col-first\" scope=\"col\">Modifier and Type</th>\n"
+                + "<th class=\"col-second\" scope=\"col\">Method</th>\n"
+                + "<th class=\"col-last\" scope=\"col\">Description</th>\n"
                 + "</tr>\n"
                 + "</thead>\n"
                 + "<tbody>\n"
-                + "<tr class=\"altColor\" id=\"i0\">\n"
-                + "<td class=\"colFirst\"><code>java.lang.String</code></td>\n"
-                + "<th class=\"colSecond\" scope=\"row\"><code><span class=\"memberNameLink\"><a href=\"#m2()\">m2</a></span>()</code></th>\n"
-                + "<td class=\"colLast\">\n"
+                + "<tr class=\"alt-color\" id=\"i0\">\n"
+                + "<td class=\"col-first\"><code>java.lang.String</code></td>\n"
+                + "<th class=\"col-second\" scope=\"row\"><code><span class=\"member-name-link\"><a href=\"#m2()\">m2</a></span>()</code></th>\n"
+                + "<td class=\"col-last\">\n"
                 + "<div class=\"block\">This is Base::m2.</div>\n"
                 + "</td>\n"
                 + "</tr>\n"
                 + "</tbody>\n"
                 + "</table>\n",
-                "<div class=\"inheritedList\">\n"
+                "<div class=\"inherited-list\">\n"
                 + "<h3 id=\"methods.inherited.from.class.pkg6.Base\">Methods declared in class&nbsp;pkg6."
                 + "<a href=\"Base.html\" title=\"class in pkg6\">Base</a></h3>\n"
                 + "<code><a href=\"Base.html#m1()\">m1</a>, <a href=\"Base.html#m3()\">m3</a></code></div>\n");
--- a/test/langtools/jdk/javadoc/doclet/testPackageAnnotation/TestPackageAnnotation.java	Fri Mar 13 18:43:11 2020 +0100
+++ b/test/langtools/jdk/javadoc/doclet/testPackageAnnotation/TestPackageAnnotation.java	Fri Mar 13 10:57:41 2020 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2020, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -63,8 +63,8 @@
                 "pkg2");
         checkExit(Exit.OK);
         checkOutput("pkg2/package-summary.html", true,
-                "<div class=\"deprecationBlock\"><span class=\"deprecatedLabel\">Deprecated.</span>\n"
-                + "<div class=\"deprecationComment\">This package is deprecated.</div>\n"
+                "<div class=\"deprecation-block\"><span class=\"deprecated-label\">Deprecated.</span>\n"
+                + "<div class=\"deprecation-comment\">This package is deprecated.</div>\n"
                 + "</div>\n"
                 + "<div class=\"block\">This is the description of package pkg2.</div>\n"
                 + "</section>");
--- a/test/langtools/jdk/javadoc/doclet/testPackageDeprecation/TestPackageDeprecation.java	Fri Mar 13 18:43:11 2020 +0100
+++ b/test/langtools/jdk/javadoc/doclet/testPackageDeprecation/TestPackageDeprecation.java	Fri Mar 13 10:57:41 2020 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2020, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -49,8 +49,8 @@
         checkExit(Exit.OK);
 
         checkOutput("pkg1/package-summary.html", true,
-                "<div class=\"deprecationBlock\"><span class=\"deprecatedLabel\">Deprecated.</span>\n"
-                + "<div class=\"deprecationComment\">This package is Deprecated.</div>"
+                "<div class=\"deprecation-block\"><span class=\"deprecated-label\">Deprecated.</span>\n"
+                + "<div class=\"deprecation-comment\">This package is Deprecated.</div>"
         );
 
         checkOutput("deprecated-list.html", true,
@@ -70,7 +70,7 @@
         checkOutput("index.html", false,
                 "pkg1");
         checkOutput("class-use/C2.ModalExclusionType.html", true,
-                "<th class=\"colFirst\" scope=\"row\"><a href=\"#unnamed.package\">&lt;Unnamed&gt;</a></th>");
+                "<th class=\"col-first\" scope=\"row\"><a href=\"#unnamed.package\">&lt;Unnamed&gt;</a></th>");
 
         checkFiles(false,
                 "pkg1/package-summary.html",
--- a/test/langtools/jdk/javadoc/doclet/testPackageDescription/TestPackageDescription.java	Fri Mar 13 18:43:11 2020 +0100
+++ b/test/langtools/jdk/javadoc/doclet/testPackageDescription/TestPackageDescription.java	Fri Mar 13 10:57:41 2020 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -48,7 +48,7 @@
         checkExit(Exit.OK);
 
         checkOutput("pkg/package-summary.html", true,
-                "<section class=\"packageDescription\" id=\"package.description\">\n"
+                "<section class=\"package-description\" id=\"package.description\">\n"
                 + "<div class=\"block\">package description</div>\n");
     }
 }
--- a/test/langtools/jdk/javadoc/doclet/testPackagePage/TestPackagePage.java	Fri Mar 13 18:43:11 2020 +0100
+++ b/test/langtools/jdk/javadoc/doclet/testPackagePage/TestPackagePage.java	Fri Mar 13 10:57:41 2020 -0700
@@ -84,21 +84,21 @@
         checkOutput("help-doc.html", true,
             "<li>Package</li>");
         checkOutput("allclasses-index.html", true,
-                "<div class=\"typeSummary\">\n<table>\n"
-                + "<caption><span>Class Summary</span><span class=\"tabEnd\">&nbsp;</span></caption>\n"
+                "<div class=\"type-summary\">\n<table>\n"
+                + "<caption><span>Class Summary</span><span class=\"tab-end\">&nbsp;</span></caption>\n"
                 + "<thead>\n"
                 + "<tr>\n"
-                + "<th class=\"colFirst\" scope=\"col\">Class</th>\n"
-                + "<th class=\"colLast\" scope=\"col\">Description</th>\n"
+                + "<th class=\"col-first\" scope=\"col\">Class</th>\n"
+                + "<th class=\"col-last\" scope=\"col\">Description</th>\n"
                 + "</tr>\n"
                 + "</thead>\n");
         checkOutput("allpackages-index.html", true,
-                "<div class=\"packagesSummary\">\n<table>\n"
-                + "<caption><span>Package Summary</span><span class=\"tabEnd\">&nbsp;</span></caption>\n"
+                "<div class=\"packages-summary\">\n<table>\n"
+                + "<caption><span>Package Summary</span><span class=\"tab-end\">&nbsp;</span></caption>\n"
                 + "<thead>\n"
                 + "<tr>\n"
-                + "<th class=\"colFirst\" scope=\"col\">Package</th>\n"
-                + "<th class=\"colLast\" scope=\"col\">Description</th>\n"
+                + "<th class=\"col-first\" scope=\"col\">Package</th>\n"
+                + "<th class=\"col-last\" scope=\"col\">Description</th>\n"
                 + "</tr>\n"
                 + "</thead>\n");
         checkOutput("type-search-index.js", true,
@@ -107,7 +107,7 @@
                 "{\"l\":\"All Packages\",\"u\":\"allpackages-index.html\"}");
         checkOutput("index-all.html", true,
                 "<br><a href=\"allclasses-index.html\">All&nbsp;Classes</a>"
-                + "<span class=\"verticalSeparator\">|</span>"
+                + "<span class=\"vertical-separator\">|</span>"
                 + "<a href=\"allpackages-index.html\">All&nbsp;Packages</a>");
     }
 }
--- a/test/langtools/jdk/javadoc/doclet/testPackageSummary/TestPackageSummary.java	Fri Mar 13 18:43:11 2020 +0100
+++ b/test/langtools/jdk/javadoc/doclet/testPackageSummary/TestPackageSummary.java	Fri Mar 13 10:57:41 2020 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -50,25 +50,25 @@
 
         checkOutput("pkg/package-summary.html", true,
                 "<tbody>\n"
-                + "<tr class=\"altColor\">\n"
-                + "<th class=\"colFirst\" scope=\"row\"><a href=\"C0.html\" title=\"class in pkg\">C0</a></th>\n"
-                + "<td class=\"colLast\">&nbsp;</td>\n"
+                + "<tr class=\"alt-color\">\n"
+                + "<th class=\"col-first\" scope=\"row\"><a href=\"C0.html\" title=\"class in pkg\">C0</a></th>\n"
+                + "<td class=\"col-last\">&nbsp;</td>\n"
                 + "</tr>\n"
-                + "<tr class=\"rowColor\">\n"
-                + "<th class=\"colFirst\" scope=\"row\"><a href=\"C1.html\" title=\"class in pkg\">C1</a></th>\n"
-                + "<td class=\"colLast\">&nbsp;</td>\n"
+                + "<tr class=\"row-color\">\n"
+                + "<th class=\"col-first\" scope=\"row\"><a href=\"C1.html\" title=\"class in pkg\">C1</a></th>\n"
+                + "<td class=\"col-last\">&nbsp;</td>\n"
                 + "</tr>\n"
-                + "<tr class=\"altColor\">\n"
-                + "<th class=\"colFirst\" scope=\"row\"><a href=\"C2.html\" title=\"class in pkg\">C2</a></th>\n"
-                + "<td class=\"colLast\">&nbsp;</td>\n"
+                + "<tr class=\"alt-color\">\n"
+                + "<th class=\"col-first\" scope=\"row\"><a href=\"C2.html\" title=\"class in pkg\">C2</a></th>\n"
+                + "<td class=\"col-last\">&nbsp;</td>\n"
                 + "</tr>\n"
-                + "<tr class=\"rowColor\">\n"
-                + "<th class=\"colFirst\" scope=\"row\"><a href=\"C3.html\" title=\"class in pkg\">C3</a></th>\n"
-                + "<td class=\"colLast\">&nbsp;</td>\n"
+                + "<tr class=\"row-color\">\n"
+                + "<th class=\"col-first\" scope=\"row\"><a href=\"C3.html\" title=\"class in pkg\">C3</a></th>\n"
+                + "<td class=\"col-last\">&nbsp;</td>\n"
                 + "</tr>\n"
-                + "<tr class=\"altColor\">\n"
-                + "<th class=\"colFirst\" scope=\"row\"><a href=\"C4.html\" title=\"class in pkg\">C4</a></th>\n"
-                + "<td class=\"colLast\">&nbsp;</td>\n"
+                + "<tr class=\"alt-color\">\n"
+                + "<th class=\"col-first\" scope=\"row\"><a href=\"C4.html\" title=\"class in pkg\">C4</a></th>\n"
+                + "<td class=\"col-last\">&nbsp;</td>\n"
                 + "</tr>\n"
                 + "</tbody>\n"
         );
--- a/test/langtools/jdk/javadoc/doclet/testPrivateClasses/TestPrivateClasses.java	Fri Mar 13 18:43:11 2020 +0100
+++ b/test/langtools/jdk/javadoc/doclet/testPrivateClasses/TestPrivateClasses.java	Fri Mar 13 10:57:41 2020 -0700
@@ -69,8 +69,8 @@
                 + "<div class=\"inheritance\">pkg.PublicChild</div>\n"
                 + "</div>",
                 // Method is documented as though it is declared in the inheriting method.
-                "<div class=\"memberSignature\"><span class=\"modifiers\">public</span>&nbsp;"
-                + "<span class=\"returnType\">void</span>&nbsp;<span class=\"memberName\">"
+                "<div class=\"member-signature\"><span class=\"modifiers\">public</span>&nbsp;"
+                + "<span class=\"return-type\">void</span>&nbsp;<span class=\"member-name\">"
                 + "methodInheritedFromParent</span>&#8203;(<span class=\"arguments\">int&nbsp;p1)</span>\n"
                 + "                               throws <span class=\"exceptions\">java.lang.Exception</span></div>",
                 "<dl class=\"notes\">\n"
@@ -92,12 +92,12 @@
 
         checkOutput("pkg/PublicChild.html", false,
                 // Should not document comments from private inherited interfaces
-                "<td class=\"colLast\"><code><span class=\"memberNameLink\">"
+                "<td class=\"col-last\"><code><span class=\"member-name-link\">"
                 + "<a href=\"#methodInterface(int)\">"
                 + "methodInterface</a></span>&#8203;(int&nbsp;p1)</code>\n"
                 + "<div class=\"block\">Comment from interface.</div>\n</td>",
                 // and similarly one more
-                "<td class=\"colLast\"><code><span class=\"memberNameLink\">"
+                "<td class=\"col-last\"><code><span class=\"member-name-link\">"
                 + "<a href=\"#methodInterface2(int)\">"
                 + "methodInterface2</a></span>&#8203;(int&nbsp;p1)</code>\n"
                 + "<div class=\"block\">Comment from interface.</div>\n</td>"
@@ -130,7 +130,7 @@
         checkOutput("pkg2/C.html", false,
                 //Do not inherit private interface method with generic parameters.
                 //This method has been implemented.
-                "<span class=\"memberNameLink\"><a href=\"I.html#hello(T)\">hello</a></span>");
+                "<span class=\"member-name-link\"><a href=\"I.html#hello(T)\">hello</a></span>");
 
         checkOutput("constant-values.html", false,
                 // Make inherited constant are documented correctly.
@@ -181,7 +181,7 @@
                 + "<code><a href=\"PublicInterface.html\" title=\"interface in pkg\">"
                 + "PublicInterface</a></code></dd>\n"
                 + "</dl>",
-                "<pre>public class <span class=\"typeNameLabel\">PublicChild</span>");
+                "<pre>public class <span class=\"type-name-label\">PublicChild</span>");
 
         checkOutput("pkg/PublicInterface.html", true,
                 // Field inheritence from non-public superinterface.
@@ -214,7 +214,7 @@
         checkOutput("pkg2/C.html", true,
                 //Since private flag is used, we can document that private interface method
                 //with generic parameters has been implemented.
-                "<span class=\"descfrmTypeLabel\">Description copied from interface:&nbsp;<code>"
+                "<span class=\"descfrm-type-label\">Description copied from interface:&nbsp;<code>"
                 + "<a href=\"I.html#hello(T)\">I</a></code></span>",
                 "<dt>Specified by:</dt>\n"
                 + "<dd><code><a href=\"I.html#hello(T)\">hello</a></code>"
@@ -225,9 +225,9 @@
         checkOutput("pkg/PrivateParent.html", true,
                 //Make sure when no modifier appear in the class signature, the
                 //signature is displayed correctly without extra space at the beginning.
-                "<pre>class <span class=\"typeNameLabel\">PrivateParent</span>");
+                "<pre>class <span class=\"type-name-label\">PrivateParent</span>");
 
         checkOutput("pkg/PrivateParent.html", false,
-                "<pre> class <span class=\"typeNameLabel\">PrivateParent</span>");
+                "<pre> class <span class=\"type-name-label\">PrivateParent</span>");
     }
 }
--- a/test/langtools/jdk/javadoc/doclet/testProperty/TestProperty.java	Fri Mar 13 18:43:11 2020 +0100
+++ b/test/langtools/jdk/javadoc/doclet/testProperty/TestProperty.java	Fri Mar 13 10:57:41 2020 -0700
@@ -50,10 +50,10 @@
         checkExit(Exit.OK);
 
         checkOutput("pkg/MyClass.html", true,
-                "<div class=\"memberSignature\"><span class=\"modifiers\">public final</span>&nbsp;"
-                + "<span class=\"returnType\"><a href=\"ObjectProperty.html\" title=\"class in pkg\">"
+                "<div class=\"member-signature\"><span class=\"modifiers\">public final</span>&nbsp;"
+                + "<span class=\"return-type\"><a href=\"ObjectProperty.html\" title=\"class in pkg\">"
                 + "ObjectProperty</a>&lt;<a href=\"MyObj.html\" title=\"class in pkg\">MyObj</a>&gt;</span>"
-                + "&nbsp;<span class=\"memberName\">goodProperty</span></div>\n"
+                + "&nbsp;<span class=\"member-name\">goodProperty</span></div>\n"
                 + "<div class=\"block\">This is an Object property where the "
                 + "Object is a single Object.</div>\n"
                 + "<dl class=\"notes\">\n"
@@ -63,10 +63,10 @@
                 + "<code>setGood(MyObj)</code></a></dd>\n"
                 + "</dl>",
 
-                "<div class=\"memberSignature\"><span class=\"modifiers\">public final</span>&nbsp;"
-                + "<span class=\"returnType\"><a href=\"ObjectProperty.html\" title=\"class in pkg\">"
+                "<div class=\"member-signature\"><span class=\"modifiers\">public final</span>&nbsp;"
+                + "<span class=\"return-type\"><a href=\"ObjectProperty.html\" title=\"class in pkg\">"
                 + "ObjectProperty</a>&lt;<a href=\"MyObj.html\" title=\"class in pkg\">MyObj</a>[]&gt;</span>"
-                + "&nbsp;<span class=\"memberName\">badProperty</span></div>\n"
+                + "&nbsp;<span class=\"member-name\">badProperty</span></div>\n"
                 + "<div class=\"block\">This is an Object property where the "
                 + "Object is an array.</div>\n"
                 + "<dl class=\"notes\">\n"
@@ -77,28 +77,28 @@
                 + "</dl>",
 
                 // id should not be used in the property table
-                "<tr class=\"altColor\">\n"
-                + "<td class=\"colFirst\"><code><a href=\"ObjectProperty.html\" "
+                "<tr class=\"alt-color\">\n"
+                + "<td class=\"col-first\"><code><a href=\"ObjectProperty.html\" "
                 + "title=\"class in pkg\">ObjectProperty</a>&lt;<a href=\"MyObj.html\" "
                 + "title=\"class in pkg\">MyObj</a>[]&gt;</code></td>\n"
-                + "<th class=\"colSecond\" scope=\"row\"><code><span class=\"memberNameLink\">"
+                + "<th class=\"col-second\" scope=\"row\"><code><span class=\"member-name-link\">"
                 + "<a href=\"#badProperty\">bad</a></span></code></th>",
 
                 // id should be used in the method table
-                "<tr class=\"altColor\" id=\"i0\">\n"
-                + "<td class=\"colFirst\"&g