--- old/src/hotspot/share/classfile/classLoaderHierarchyDCmd.cpp	2018-06-14 15:07:04.361651119 -0400
+++ new/src/hotspot/share/classfile/classLoaderHierarchyDCmd.cpp	2018-06-14 15:07:03.015248554 -0400
@@ -156,18 +156,13 @@
 
     // Retrieve information.
     const Klass* const loader_klass = _cld->class_loader_klass();
-    const Symbol* const loader_name = _cld->class_loader_name();
 
     branchtracker.print(st);
 
     // e.g. "+--- jdk.internal.reflect.DelegatingClassLoader"
     st->print("+%.*s", BranchTracker::twig_len, "----------");
-    if (_cld->is_the_null_class_loader_data()) {
-      st->print(" <bootstrap>");
-    } else {
-      if (loader_name != NULL) {
-        st->print(" \"%s\",", loader_name->as_C_string());
-      }
+    st->print(" %s,", _cld->loader_name_and_id());
+    if (!_cld->is_the_null_class_loader_data()) {
       st->print(" %s", loader_klass != NULL ? loader_klass->external_name() : "??");
       st->print(" {" PTR_FORMAT "}", p2i(_loader_oop));
     }