--- old/test/langtools/jdk/javadoc/doclet/testCopyFiles/TestCopyFiles.java	2018-02-02 13:16:40.084805182 -0800
+++ new/test/langtools/jdk/javadoc/doclet/testCopyFiles/TestCopyFiles.java	2018-02-02 13:16:39.724789418 -0800
@@ -49,26 +49,26 @@
                 "--module-source-path", testSrc("modules"),
                 "--module", "acme.mdle");
         checkExit(Exit.OK);
-        checkOrder("p/doc-files/inpackage.html",
+        checkOrder("acme.mdle/p/doc-files/inpackage.html",
                 "\"Hello World\" (phi-WINDOW-TITLE-phi)",
                 "phi-TOP-phi",
                 // check top navbar
-                "<a href=\"../../acme.mdle-summary.html\">Module</a>",
+                "<a href=\"../../module-summary.html\">Module</a>",
                 "<a href=\"../package-summary.html\">Package</a>",
-                "<a href=\"../../overview-tree.html\">Tree</a>",
-                "<a href=\"../../deprecated-list.html\">Deprecated</a>",
-                "<a href=\"../../index-all.html\">Index</a>",
+                "<a href=\"../../../overview-tree.html\">Tree</a>",
+                "<a href=\"../../../deprecated-list.html\">Deprecated</a>",
+                "<a href=\"../../../index-all.html\">Index</a>",
                 "phi-HEADER-phi",
                 "In a named module acme.module and named package "
                         + "<a href=\"../package-summary.html\"><code>p</code></a>.",
                 "\"simpleTagLabel\">Since:</",
                 "1940",
                 // check bottom navbar
-                "<a href=\"../../acme.mdle-summary.html\">Module</a>",
+                "<a href=\"../../module-summary.html\">Module</a>",
                 "<a href=\"../package-summary.html\">Package</a>",
-                "<a href=\"../../overview-tree.html\">Tree</a>",
-                "<a href=\"../../deprecated-list.html\">Deprecated</a>",
-                "<a href=\"../../index-all.html\">Index</a>",
+                "<a href=\"../../../overview-tree.html\">Tree</a>",
+                "<a href=\"../../../deprecated-list.html\">Deprecated</a>",
+                "<a href=\"../../../index-all.html\">Index</a>",
                 "phi-FOOTER-phi",
                 "phi-BOTTOM-phi"
         );
@@ -86,52 +86,53 @@
                 "--module-source-path", testSrc("modules"),
                 "--module", "acme.mdle,acme2.mdle");
         checkExit(Exit.OK);
-        checkOrder("p/doc-files/inpackage.html",
+        checkOrder("acme.mdle/p/doc-files/inpackage.html",
                 "\"Hello World\" (phi-WINDOW-TITLE-phi)",
                 "phi-TOP-phi",
                 // check top navbar
-                "<a href=\"../../acme.mdle-summary.html\">Module</a>",
+                "<a href=\"../../module-summary.html\">Module</a>",
                 "<a href=\"../package-summary.html\">Package</a>",
-                "<a href=\"../../overview-tree.html\">Tree</a>",
-                "<a href=\"../../deprecated-list.html\">Deprecated</a>",
-                "<a href=\"../../index-all.html\">Index</a>",
+                "<a href=\"../../../overview-tree.html\">Tree</a>",
+                "<a href=\"../../../deprecated-list.html\">Deprecated</a>",
+                "<a href=\"../../../index-all.html\">Index</a>",
                 "phi-HEADER-phi",
                 "In a named module acme.module and named package "
                         + "<a href=\"../package-summary.html\"><code>p</code></a>.",
                 "\"simpleTagLabel\">Since:</",
                 "1940",
                 // check bottom navbar
-                "<a href=\"../../acme.mdle-summary.html\">Module</a>",
+                "<a href=\"../../module-summary.html\">Module</a>",
                 "<a href=\"../package-summary.html\">Package</a>",
-                "<a href=\"../../overview-tree.html\">Tree</a>",
-                "<a href=\"../../deprecated-list.html\">Deprecated</a>",
-                "<a href=\"../../index-all.html\">Index</a>",
+                "<a href=\"../../../overview-tree.html\">Tree</a>",
+                "<a href=\"../../../deprecated-list.html\">Deprecated</a>",
+                "<a href=\"../../../index-all.html\">Index</a>",
                 "phi-FOOTER-phi",
                 "phi-BOTTOM-phi"
         );
 
         // check the bottom most doc file
-        checkOrder("p2/doc-files/sub-dir/sub-dir-1/SubSubReadme.html",
+        checkOrder("acme2.mdle/p2/doc-files/sub-dir/sub-dir-1/SubSubReadme.html",
                 "SubSubReadme (phi-WINDOW-TITLE-phi)",
                 "phi-TOP-phi",
                 // check top navbar
-                "<a href=\"../../../../acme2.mdle-summary.html\">Module</a>",
+                "<a href=\"../../../../module-summary.html\">Module</a>",
                 "<a href=\"../../../package-summary.html\">Package</a>",
-                "<a href=\"../../../../overview-tree.html\">Tree</a>",
-                "<a href=\"../../../../deprecated-list.html\">Deprecated</a>",
-                "<a href=\"../../../../index-all.html\">Index</a>",
+                "<a href=\"../../../../../overview-tree.html\">Tree</a>",
+                "<a href=\"../../../../../deprecated-list.html\">Deprecated</a>",
+                "<a href=\"../../../../../index-all.html\">Index</a>",
                 "phi-HEADER-phi",
                 "SubSubReadme.html at third level of doc-file directory.",
                 // check bottom navbar
-                "<a href=\"../../../../acme2.mdle-summary.html\">Module</a>",
+                "<a href=\"../../../../module-summary.html\">Module</a>",
                 "<a href=\"../../../package-summary.html\">Package</a>",
-                "<a href=\"../../../../overview-tree.html\">Tree</a>",
-                "<a href=\"../../../../deprecated-list.html\">Deprecated</a>",
-                "<a href=\"../../../../index-all.html\">Index</a>",
+                "<a href=\"../../../../../overview-tree.html\">Tree</a>",
+                "<a href=\"../../../../../deprecated-list.html\">Deprecated</a>",
+                "<a href=\"../../../../../index-all.html\">Index</a>",
                 "phi-FOOTER-phi",
                 "phi-BOTTOM-phi"
         );
     }
+
     @Test
     void testDocFilesInModulePackagesWithRecursiveCopy() {
         javadoc("-d", "modules-out-recursive",
@@ -139,7 +140,7 @@
                 "--module-source-path", testSrc("modules"),
                 "--module", "acme.mdle");
         checkExit(Exit.OK);
-        checkOutput("p/doc-files/inpackage.html", true,
+        checkOutput("acme.mdle/p/doc-files/inpackage.html", true,
                 "In a named module acme.module and named package "
                 + "<a href=\"../package-summary.html\"><code>p</code></a>."
         );
@@ -153,7 +154,7 @@
                 "--module-source-path", testSrc("modules"),
                 "--module", "acme.mdle");
         checkExit(Exit.OK);
-        checkOutput("p/doc-files/inpackage.html", true,
+        checkOutput("acme.mdle/p/doc-files/inpackage.html", true,
                 "In a named module acme.module and named package "
                 + "<a href=\"../package-summary.html\"><code>p</code></a>."
         );