--- old/test/jdk/jdk/incubator/vector/Double512VectorLoadStoreTests.java	2019-04-15 14:45:19.572770800 -0700
+++ new/test/jdk/jdk/incubator/vector/Double512VectorLoadStoreTests.java	2019-04-15 14:45:19.098209500 -0700
@@ -28,8 +28,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.DoubleVector;
@@ -46,7 +47,7 @@
 
 @Test
 public class Double512VectorLoadStoreTests extends AbstractVectorTest {
-    static final Species<Double> SPECIES =
+    static final VectorSpecies<Double> SPECIES =
                 DoubleVector.SPECIES_512;
 
     static final int INVOC_COUNT = Integer.getInteger("jdk.incubator.vector.test.loop-iterations", 10);
@@ -199,7 +200,7 @@
         double[] a = fa.apply(SPECIES.length());
         double[] r = new double[a.length];
         boolean[] mask = fm.apply(SPECIES.length());
-        Vector.Mask<Double> vmask = DoubleVector.maskFromValues(SPECIES, mask);
+        VectorMask<Double> vmask = VectorMask.fromValues(SPECIES, mask);
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
             for (int i = 0; i < a.length; i += SPECIES.length()) {
@@ -273,7 +274,7 @@
         ByteBuffer a = toBuffer(fa.apply(SPECIES.length()), fb);
         ByteBuffer r = fb.apply(a.limit());
         boolean[] mask = fm.apply(SPECIES.length());
-        Vector.Mask<Double> vmask = DoubleVector.maskFromValues(SPECIES, mask);
+        VectorMask<Double> vmask = VectorMask.fromValues(SPECIES, mask);
 
         int l = a.limit();
         int s = SPECIES.length() * SPECIES.elementSize() / 8;
@@ -313,7 +314,7 @@
         a = a.asReadOnlyBuffer().order(a.order());
         ByteBuffer r = fb.apply(a.limit());
         boolean[] mask = fm.apply(SPECIES.length());
-        Vector.Mask<Double> vmask = DoubleVector.maskFromValues(SPECIES, mask);
+        VectorMask<Double> vmask = VectorMask.fromValues(SPECIES, mask);
 
         int l = a.limit();
         int s = SPECIES.length() * SPECIES.elementSize() / 8;