--- old/test/hotspot/jtreg/serviceability/dcmd/vm/ClassLoaderHierarchyTest.java	2018-06-14 15:12:01.061991661 -0400
+++ new/test/hotspot/jtreg/serviceability/dcmd/vm/ClassLoaderHierarchyTest.java	2018-06-14 15:11:59.560082622 -0400
@@ -48,19 +48,19 @@
 
 public class ClassLoaderHierarchyTest {
 
-//+-- <bootstrap>
+//+-- 'bootstrap'
 //      |
-//      +-- "platform", jdk.internal.loader.ClassLoaders$PlatformClassLoader
+//      +-- 'platform', jdk.internal.loader.ClassLoaders$PlatformClassLoader
 //      |     |
-//      |     +-- "app", jdk.internal.loader.ClassLoaders$AppClassLoader
+//      |     +-- 'app', jdk.internal.loader.ClassLoaders$AppClassLoader
 //      |
-//      +-- jdk.internal.reflect.DelegatingClassLoader
+//      +-- jdk.internal.reflect.DelegatingClassLoader @<id>
 //      |
-//      +-- "Kevin", ClassLoaderHierarchyTest$TestClassLoader
+//      +-- 'Kevin' @<id>, ClassLoaderHierarchyTest$TestClassLoader
 //      |
-//      +-- ClassLoaderHierarchyTest$TestClassLoader
+//      +-- ClassLoaderHierarchyTest$TestClassLoader @<id>
 //            |
-//            +-- "Bill", ClassLoaderHierarchyTest$TestClassLoader
+//            +-- 'Bill' @<id>, ClassLoaderHierarchyTest$TestClassLoader
 
     public void run(CommandExecutor executor) throws ClassNotFoundException {
 
@@ -84,18 +84,18 @@
 
         // First test: simple output, no classes displayed
         OutputAnalyzer output = executor.execute("VM.classloaders");
-        output.shouldContain("<bootstrap>");
+        output.shouldContain("'bootstrap'");
         output.shouldMatch(".*TestClassLoader");
-        output.shouldMatch("Kevin.*TestClassLoader");
-        output.shouldMatch("Bill.*TestClassLoader");
+        output.shouldMatch("'Kevin'.*TestClassLoader");
+        output.shouldMatch("'Bill'.*TestClassLoader");
 
         // Second test: print with classes.
         output = executor.execute("VM.classloaders show-classes");
-        output.shouldContain("<bootstrap>");
+        output.shouldContain("'bootstrap'");
         output.shouldContain("java.lang.Object");
         output.shouldMatch(".*TestClassLoader");
-        output.shouldMatch("Kevin.*TestClassLoader");
-        output.shouldMatch("Bill.*TestClassLoader");
+        output.shouldMatch("'Kevin'.*TestClassLoader");
+        output.shouldMatch("'Bill'.*TestClassLoader");
         output.shouldContain("TestClass2");
     }