--- old/test/hotspot/jtreg/serviceability/dcmd/vm/ClassLoaderHierarchyTest.java	2018-06-13 19:40:40.403551180 -0400
+++ new/test/hotspot/jtreg/serviceability/dcmd/vm/ClassLoaderHierarchyTest.java	2018-06-13 19:40:38.924565624 -0400
@@ -48,11 +48,11 @@
 
 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
 //      |
@@ -84,14 +84,14 @@
 
         // 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");
 
         // 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");