--- old/src/hotspot/share/classfile/javaClasses.hpp	2019-05-15 13:57:17.335604611 -0400
+++ new/src/hotspot/share/classfile/javaClasses.hpp	2019-05-15 13:57:16.967602786 -0400
@@ -251,8 +251,8 @@
   static int _component_mirror_offset;
   static int _name_offset;
   static int _source_file_offset;
-  static int _box_mirror_offset;
-  static int _value_mirror_offset;
+  static int _inline_mirror_offset;
+  static int _nullable_mirror_offset;
 
   static bool offsets_computed;
   static int classRedefinedCount_offset;
@@ -275,7 +275,7 @@
                             Handle protection_domain, TRAPS);
   static void fixup_mirror(Klass* k, TRAPS);
   static oop  create_basic_type_mirror(const char* basic_type_name, BasicType type, TRAPS);
-  static oop  create_value_mirror(Klass* k, Handle mirror, TRAPS);
+  static oop  create_nullable_inline_type_mirror(Klass* k, Handle mirror, TRAPS);
 
   // Archiving
   static void serialize_offsets(SerializeClosure* f) NOT_CDS_RETURN;
@@ -309,7 +309,7 @@
   // compiler support for class operations
   static int klass_offset_in_bytes()                { return _klass_offset; }
   static int array_klass_offset_in_bytes()          { return _array_klass_offset; }
-  static int value_mirror_offset_in_bytes()         { return _value_mirror_offset; }
+  static int inline_mirror_offset_in_bytes()        { return _inline_mirror_offset; }
   static int component_mirror_offset_in_bytes()     { return _component_mirror_offset; }
   // Support for classRedefinedCount field
   static int classRedefinedCount(oop the_class_mirror);
@@ -326,14 +326,14 @@
   static void set_module(oop java_class, oop module);
   static oop module(oop java_class);
 
-  static void set_box_mirror(oop java_class, oop mirror);
-  static oop box_mirror(oop java_class);
-  static bool is_box_type(oop java_class) { // Must match "Class.isBoxType()"
-    return box_mirror(java_class) == NULL || oopDesc::equals(box_mirror(java_class), java_class);
+  static void set_nullable_type_mirror(oop java_class, oop mirror);
+  static oop nullable_type_mirror(oop java_class);
+  static bool is_nullable_type(oop java_class) { // Must match "Class.isNullableType()"
+    return nullable_type_mirror(java_class) == NULL || oopDesc::equals(nullable_type_mirror(java_class), java_class);
   }
 
-  static void set_value_mirror(oop java_class, oop mirror);
-  static oop value_mirror(oop java_class);
+  static void set_inline_type_mirror(oop java_class, oop mirror);
+  static oop inline_type_mirror(oop java_class);
 
   static oop name(Handle java_class, TRAPS);