diff --git a/src/java.naming/share/classes/javax/naming/directory/package.html b/src/java.naming/share/classes/javax/naming/directory/package.html
index c339eb2f043..2383b9f9f18 100644
--- a/src/java.naming/share/classes/javax/naming/directory/package.html
+++ b/src/java.naming/share/classes/javax/naming/directory/package.html
@@ -2,7 +2,7 @@
 <html>
 <head>
 <!--
-Copyright (c) 1999, 2006, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 1999, 2019, 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
@@ -45,7 +45,7 @@ This package allows applications to retrieve and update attributes
 associated with objects stored in a directory, and to search for
 objects using specified attributes.
 
-<h3>The Directory Context</h3>
+<h2>The Directory Context</h2>
 
 The <code>DirContext</code>
 interface represents a <em>directory context</em>.
@@ -68,7 +68,7 @@ the attributes of that person, and at the same time provide
 a context for naming objects relative to that person
 such as his printers and home directory.
 
-<h4>Searches</h4>
+<h3>Searches</h3>
 <code>DirContext</code> contains methods for
 performing content-based searching of the directory.
 In the simplest and most common form of usage, the application
diff --git a/src/java.naming/share/classes/javax/naming/event/package.html b/src/java.naming/share/classes/javax/naming/event/package.html
index 899981e77f9..bf868b50a49 100644
--- a/src/java.naming/share/classes/javax/naming/event/package.html
+++ b/src/java.naming/share/classes/javax/naming/event/package.html
@@ -2,7 +2,7 @@
 <html>
 <head>
 <!--
-Copyright (c) 1999, 2006, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 1999, 2019, 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
@@ -40,7 +40,7 @@ independent of any specific naming or directory service
 implementation.  Thus a variety of services--new, emerging, and
 already deployed ones--can be accessed in a common way.
 
-<h3>Naming Events</h3>
+<h2>Naming Events</h2>
 <p>
 This package defines a <code>NamingEvent</code> class to represent an event
 that is generated by a naming/directory service.
@@ -79,7 +79,7 @@ class ChangeHandler implements ObjectChangeListener {
 </blockquote>
 
 <a id=THREADING></a>
-<h4>Threading Issues</h4>
+<h3>Threading Issues</h3>
 
 When an event is dispatched to a listener, the listener method (such
 as <code>objectChanged()</code>) may be executed in a thread other than the
@@ -98,7 +98,7 @@ will later invoke the listeners in newly-created threads.  As <code>Context</cod
 instances are not guaranteed to be thread-safe in general, all context
 operations must be synchronized as needed.
 
-<h4>Exception Handling</h4>
+<h3>Exception Handling</h3>
 
 When a listener registers for events with a context, the context might
 need to do some internal processing in order to collect information
diff --git a/src/java.naming/share/classes/javax/naming/ldap/InitialLdapContext.java b/src/java.naming/share/classes/javax/naming/ldap/InitialLdapContext.java
index ad64f232b1f..fb3c612325e 100644
--- a/src/java.naming/share/classes/javax/naming/ldap/InitialLdapContext.java
+++ b/src/java.naming/share/classes/javax/naming/ldap/InitialLdapContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, 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
@@ -38,7 +38,7 @@ import java.util.Hashtable;
   * {@code javax.naming.InitialDirContext} for details on synchronization,
   * and the policy for how an initial context is created.
   *
-  * <h1>Request Controls</h1>
+  * <h2>Request Controls</h2>
   * When you create an initial context ({@code InitialLdapContext}),
   * you can specify a list of request controls.
   * These controls will be used as the request controls for any
diff --git a/src/java.naming/share/classes/javax/naming/ldap/package.html b/src/java.naming/share/classes/javax/naming/ldap/package.html
index e43cdc54670..7bcb61b0730 100644
--- a/src/java.naming/share/classes/javax/naming/ldap/package.html
+++ b/src/java.naming/share/classes/javax/naming/ldap/package.html
@@ -2,7 +2,7 @@
 <html>
 <head>
 <!--
-Copyright (c) 1999, 2006, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 1999, 2019, 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 @@ The core interface in this package is <code>LdapContext</code>, which defines
 methods on a context for performing extended operations and handling
 controls.
 
-<h3>Extended Operations</h3>
+<h2>Extended Operations</h2>
 <p>
 This package defines the interface <code>ExtendedRequest</code>
 to represent the argument to an extended operation,
@@ -125,7 +125,7 @@ public class GetTimeResponse() implements ExtendedResponse {
 }
 </pre></blockquote>
 
-<h3>Controls</h3>
+<h2>Controls</h2>
 
 This package defines the interface <code>Control</code> to represent an LDAPv3
 control. It can be a control that is sent to an LDAP server
diff --git a/src/java.naming/share/classes/javax/naming/package.html b/src/java.naming/share/classes/javax/naming/package.html
index 817720fdbb2..50ea7ad142c 100644
--- a/src/java.naming/share/classes/javax/naming/package.html
+++ b/src/java.naming/share/classes/javax/naming/package.html
@@ -2,7 +2,7 @@
 <html>
 <head>
 <!--
-Copyright (c) 1999, 2006, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 1999, 2019, 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
@@ -40,7 +40,7 @@ implementation.  Thus a variety of services--new, emerging, and
 already deployed ones--can be accessed in a common way.
 
 
-<h3>Context</h3>
+<h2>Context</h2>
 <p>
 This package defines the notion of a <em>context</em>, represented
 by the <code>Context</code> interface.
@@ -63,7 +63,7 @@ printer.print(report);
 </pre>
 </blockquote>
 
-<h3>Names</h3>
+<h2>Names</h2>
 <p>
 Every naming method in the <code>Context</code>
 interface has two
@@ -82,7 +82,7 @@ The overloads that accept string names are likely to be more useful
 for simple applications, such as those that simply read in a name
 and look up the corresponding object.
 
-<h3>Bindings</h3>
+<h2>Bindings</h2>
 
 The <code>Binding</code> class represents a name-to-object binding.
 It is a tuple containing the name of the bound object,
@@ -95,7 +95,7 @@ The <code>NameClassPair</code> is useful when you only want
 information about the object's class and do not want to
 pay the extra cost of getting the object.
 
-<h3>References</h3>
+<h2>References</h2>
 Objects are stored in naming and directory services in different ways.
 If an object store supports storing Java objects, 
 it might support storing an object in its serialized form.
@@ -112,7 +112,7 @@ JNDI clients have the illusion that what
 is stored in the directory are Java objects. 
 
 
-<h3>The Initial Context</h3>
+<h2>The Initial Context</h2>
 
 In JNDI, all naming and directory operations are performed relative
 to a context. There are no absolute roots.
@@ -122,7 +122,7 @@ which provides a starting point for naming and directory operations.
 Once you have an initial context, you can use it to
 look up other contexts and objects.
 
-<h3>Exceptions</h3>
+<h2>Exceptions</h2>
 
 JNDI defines a class hierarchy for exceptions that can be thrown in
 the course of performing naming and directory operations.  The root of
diff --git a/src/java.naming/share/classes/javax/naming/spi/package.html b/src/java.naming/share/classes/javax/naming/spi/package.html
index 73ee0f9d30e..47dae75882a 100644
--- a/src/java.naming/share/classes/javax/naming/spi/package.html
+++ b/src/java.naming/share/classes/javax/naming/spi/package.html
@@ -2,7 +2,7 @@
 <html>
 <head>
 <!--
-Copyright (c) 1999, 2015, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 1999, 2019, 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
@@ -47,7 +47,7 @@ through which JNDI applications access different naming and
 directory services.
 
 
-<h3>Plug-in Architecture</h3>
+<h2>Plug-in Architecture</h2>
 
 The service provider package allows different implementations to be plugged in
 dynamically.
@@ -56,7 +56,7 @@ These different implementations include those for the
 and implementations for contexts that can be reached 
 from the initial context.
 
-<h3>Java Object Support</h3>
+<h2>Java Object Support</h2>
 
 The service provider package provides support
 for implementors of the
@@ -68,7 +68,7 @@ it is natural for you to expect to get
 back a printer object on which to operate.
 
 
-<h3>Multiple Naming Systems (Federation)</h3>
+<h2>Multiple Naming Systems (Federation)</h2>
 
 JNDI operations allow applications to supply names that span multiple
 naming systems.  So in the process of completing
