--- old/test/jdk/jdk/incubator/vector/ShortMaxVectorLoadStoreTests.java	2019-04-15 14:48:31.000020600 -0700
+++ new/test/jdk/jdk/incubator/vector/ShortMaxVectorLoadStoreTests.java	2019-04-15 14:48:30.508095100 -0700
@@ -29,8 +29,9 @@
  *
  */
 
-import jdk.incubator.vector.Vector.Shape;
-import jdk.incubator.vector.Vector.Species;
+import jdk.incubator.vector.VectorShape;
+import jdk.incubator.vector.VectorSpecies;
+import jdk.incubator.vector.VectorMask;
 import jdk.incubator.vector.Vector;
 
 import jdk.incubator.vector.ShortVector;
@@ -49,13 +50,13 @@
 
 @Test
 public class ShortMaxVectorLoadStoreTests extends AbstractVectorTest {
-    static final Species<Short> SPECIES =
+    static final VectorSpecies<Short> SPECIES =
                 ShortVector.SPECIES_MAX;
 
     static final int INVOC_COUNT = Integer.getInteger("jdk.incubator.vector.test.loop-iterations", 10);
 
-    static Shape getMaxBit() {
-        return Shape.S_Max_BIT;
+    static VectorShape getMaxBit() {
+        return VectorShape.S_Max_BIT;
     }
 
     static void assertArraysEquals(short[] a, short[] r, boolean[] mask) {
@@ -206,7 +207,7 @@
         short[] a = fa.apply(SPECIES.length());
         short[] r = new short[a.length];
         boolean[] mask = fm.apply(SPECIES.length());
-        Vector.Mask<Short> vmask = ShortVector.maskFromValues(SPECIES, mask);
+        VectorMask<Short> vmask = VectorMask.fromValues(SPECIES, mask);
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
             for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -280,7 +281,7 @@
         ByteBuffer a = toBuffer(fa.apply(SPECIES.length()), fb);
         ByteBuffer r = fb.apply(a.limit());
         boolean[] mask = fm.apply(SPECIES.length());
-        Vector.Mask<Short> vmask = ShortVector.maskFromValues(SPECIES, mask);
+        VectorMask<Short> vmask = VectorMask.fromValues(SPECIES, mask);
 
         int l = a.limit();
         int s = SPECIES.length() * SPECIES.elementSize() / 8;
@@ -320,7 +321,7 @@
         a = a.asReadOnlyBuffer().order(a.order());
         ByteBuffer r = fb.apply(a.limit());
         boolean[] mask = fm.apply(SPECIES.length());
-        Vector.Mask<Short> vmask = ShortVector.maskFromValues(SPECIES, mask);
+        VectorMask<Short> vmask = VectorMask.fromValues(SPECIES, mask);
 
         int l = a.limit();
         int s = SPECIES.length() * SPECIES.elementSize() / 8;