--- old/test/hotspot/jtreg/runtime/valhalla/valuetypes/ValueTypeArray.java	2019-05-15 13:58:11.919875279 -0400
+++ new/test/hotspot/jtreg/runtime/valhalla/valuetypes/ValueTypeArray.java	2019-05-15 13:58:11.551873455 -0400
@@ -69,7 +69,7 @@
             Class<?> arrayCls = Class.forName(arrayClsName);
             assertTrue(arrayCls.isArray(), "Expected an array class");
 
-            assertTrue(arrayCls.getComponentType() == Point.class.asBoxType(),
+            assertTrue(arrayCls.getComponentType() == Point.class.asNullableType(),
                        "Expected component type of Point.class got: " + arrayCls.getComponentType());
 
             arrayClsName = "[" + arrayClsName;
@@ -81,7 +81,7 @@
             arrayCls = Class.forName(qarrayClsName);
             assertTrue(arrayCls.isArray(), "Expected an array class");
 
-            assertTrue(arrayCls.getComponentType() == Point.class.asValueType(),
+            assertTrue(arrayCls.getComponentType() == Point.class.asPrimaryType(),
                        arrayCls +
                        " Expected component type of Point.class got: " + arrayCls.getComponentType());
 
@@ -200,7 +200,7 @@
         assertTrue(array3[0][0] == null, "Expected NULL");
 
         // Now create ObjArrays of ValueArray...
-        cls = (Class<?>) Point.class.asBoxType();
+        cls = (Class<?>) Point.class.asNullableType();
         Point?[][] barray = (Point?[][]) Array.newInstance(cls, 1, 2);
         assertEquals(barray.length, 1, "Incorrect length");
         assertEquals(barray[0].length, 2, "Incorrect length");
@@ -255,8 +255,8 @@
         assertTrue(myInts instanceof Comparable[]);
         assertTrue(myInts instanceof MyInt?[]);
 
-        Class<?> cls = MyInt.class.asValueType();
-        assertTrue(cls.isValue());
+        Class<?> cls = MyInt.class.asPrimaryType();
+        assertTrue(cls.isInlineClass());
         Object arrObj = Array.newInstance(cls, 1);
         assertTrue(arrObj instanceof Object[], "Not Object array");
         assertTrue(arrObj instanceof Comparable[], "Not Comparable array");