--- a/hotspot/src/share/vm/oops/arrayKlass.cpp	Thu Dec 08 15:49:29 2016 +0100
+++ b/hotspot/src/share/vm/oops/arrayKlass.cpp	Thu Dec 08 17:03:45 2016 +0100
@@ -90,7 +90,7 @@
     set_super(Universe::is_bootstrapping() ? (Klass*)NULL : SystemDictionary::Object_klass());
     set_layout_helper(Klass::_lh_neutral_value);
     set_is_cloneable(); // All arrays are considered to be cloneable (See JLS 20.1.5)
-    TRACE_INIT_KLASS_ID(this);
+    TRACE_INIT_ID(this);
 }
 
 
@@ -105,7 +105,7 @@
   // These classes will be put on a fixup list and their module fields will be patched once
   // java.base is defined.
   assert((module_entry != NULL) || ((module_entry == NULL) && !ModuleEntryTable::javabase_defined()),
-         "module entry not available post java.base definition");
+         "module entry not available post " JAVA_BASE_NAME " definition");
   oop module = (module_entry != NULL) ? JNIHandles::resolve(module_entry->module()) : (oop)NULL;
   java_lang_Class::create_mirror(k, Handle(THREAD, k->class_loader()), Handle(THREAD, module), Handle(NULL), CHECK);
 }