--- old/test/com/sun/jdi/DoubleAgentTest.java	2015-11-23 13:36:04.000000000 +0800
+++ new/test/com/sun/jdi/DoubleAgentTest.java	2015-11-23 13:36:04.000000000 +0800
@@ -31,7 +31,7 @@
  *
  * @library /lib/testlibrary
  * @modules java.management
- * @build jdk.testlibarary.*
+ * @build jdk.testlibrary.*
  * @build DoubleAgentTest Exit0
  * @run driver DoubleAgentTest
  */
--- old/test/com/sun/jdi/SuspendNoFlagTest.java	2015-11-23 13:36:06.000000000 +0800
+++ new/test/com/sun/jdi/SuspendNoFlagTest.java	2015-11-23 13:36:05.000000000 +0800
@@ -29,7 +29,7 @@
  * @summary Test for JDWP: -agentlib:jdwp=suspend=n hanging
  * @library /lib/testlibrary
  * @modules java.management
- * @build jdk.testlibarary.*
+ * @build jdk.testlibrary.*
  * @compile -g HelloWorld.java
  * @run driver SuspendNoFlagTest
  */
--- old/test/com/sun/management/HotSpotDiagnosticMXBean/DumpHeap.java	2015-11-23 13:36:07.000000000 +0800
+++ new/test/com/sun/management/HotSpotDiagnosticMXBean/DumpHeap.java	2015-11-23 13:36:07.000000000 +0800
@@ -41,9 +41,9 @@
  * @library /test/lib/share/classes
  * @build jdk.testlibrary.*
  * @build jdk.test.lib.hprof.*
- * @build jdk.test.lib.hprof.module.*
+ * @build jdk.test.lib.hprof.model.*
  * @build jdk.test.lib.hprof.parser.*
- * @build jdk.test.lib.hprof.utils.*
+ * @build jdk.test.lib.hprof.util.*
  * @run main DumpHeap
  */
 public class DumpHeap {
--- old/test/sun/tools/jmap/BasicJMapTest.java	2015-11-23 13:36:08.000000000 +0800
+++ new/test/sun/tools/jmap/BasicJMapTest.java	2015-11-23 13:36:08.000000000 +0800
@@ -42,9 +42,9 @@
  * @modules java.management
  * @build jdk.testlibrary.*
  * @build jdk.test.lib.hprof.*
- * @build jdk.test.lib.hprof.module.*
+ * @build jdk.test.lib.hprof.model.*
  * @build jdk.test.lib.hprof.parser.*
- * @build jdk.test.lib.hprof.utils.*
+ * @build jdk.test.lib.hprof.util.*
  * @run main/timeout=240 BasicJMapTest
  */
 public class BasicJMapTest {