--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/Navigation.java	Wed Nov 21 15:06:13 2018 -0500
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/Navigation.java	Wed Nov 21 12:36:16 2018 -0800
@@ -147,8 +147,8 @@
         this.pathToRoot = path.parent().invert();
         this.links = new Links(path, configuration.htmlVersion);
         this.topBottomNavContents = new HashMap<>();
-        this.rowListTitle = configuration.getText("doclet.Navigation");
-        this.searchLabel = configuration.getContent("doclet.search");
+        this.rowListTitle = configuration.getResources().getText("doclet.Navigation");
+        this.searchLabel = contents.getContent("doclet.search");
         populateNavContents(Position.TOP);
         populateNavContents(Position.BOTTOM);
     }
@@ -160,7 +160,7 @@
      */
     private void populateNavContents(Position position) {
         Deque<Content> queue = new ArrayDeque<>();
-        Content skipNavLinks = configuration.getContent("doclet.Skip_navigation_links");
+        Content skipNavLinks = contents.getContent("doclet.Skip_navigation_links");
         switch (position) {
             case TOP:
                 queue.addLast(links.createAnchor(SectionName.NAVBAR_TOP));