--- a/hotspot/src/share/vm/classfile/classFileParser.cpp	Fri Apr 29 18:55:41 2016 +0000
+++ b/hotspot/src/share/vm/classfile/classFileParser.cpp	Fri Apr 29 22:40:51 2016 -0400
@@ -5349,7 +5349,7 @@
   ClassLoadingService::notify_class_loaded(ik, false /* not shared class */);
 
   if (!is_internal()) {
-    if (log_is_enabled(Info, classload)) {
+    if (log_is_enabled(Info, class, load)) {
       ResourceMark rm;
       const char* module_name = NULL;
       static const size_t modules_image_name_len = strlen(MODULES_IMAGE_NAME);
@@ -5361,21 +5361,21 @@
         module_name = module_entry->name()->as_C_string();
       }
 
-      if (log_is_enabled(Info, classload)) {
+      if (log_is_enabled(Info, class, load)) {
         ik->print_loading_log(LogLevel::Info, _loader_data, module_name, _stream);
       }
       // No 'else' here as logging levels are not mutually exclusive
-      if (log_is_enabled(Debug, classload)) {
+      if (log_is_enabled(Debug, class, load)) {
         ik->print_loading_log(LogLevel::Debug, _loader_data, module_name, _stream);
       }
     }
 
-    if (log_is_enabled(Debug, classresolve))  {
+    if (log_is_enabled(Debug, class, resolve))  {
       ResourceMark rm;
       // print out the superclass.
       const char * from = ik->external_name();
       if (ik->java_super() != NULL) {
-        log_debug(classresolve)("%s %s (super)",
+        log_debug(class, resolve)("%s %s (super)",
                    from,
                    ik->java_super()->external_name());
       }
@@ -5386,7 +5386,7 @@
         for (int i = 0; i < length; i++) {
           const Klass* const k = local_interfaces->at(i);
           const char * to = k->external_name();
-          log_debug(classresolve)("%s %s (interface)", from, to);
+          log_debug(class, resolve)("%s %s (interface)", from, to);
         }
       }
     }
@@ -5696,9 +5696,9 @@
   }
 
   if (!is_internal()) {
-    if (log_is_enabled(Debug, classload, preorder)){
+    if (log_is_enabled(Debug, class, preorder)){
       ResourceMark rm(THREAD);
-      outputStream* log = Log(classload, preorder)::debug_stream();
+      outputStream* log = Log(class, preorder)::debug_stream();
       log->print("%s", _class_name->as_klass_external_name());
       if (stream->source() != NULL) {
         log->print(" source: %s", stream->source());