--- old/test/jdk/jdk/incubator/vector/benchmark/src/main/java/benchmark/jdk/incubator/vector/Double64Vector.java	2019-04-15 14:49:30.442061700 -0700
+++ new/test/jdk/jdk/incubator/vector/benchmark/src/main/java/benchmark/jdk/incubator/vector/Double64Vector.java	2019-04-15 14:49:29.952553000 -0700
@@ -24,8 +24,9 @@
 package benchmark.jdk.incubator.vector;
 
 import jdk.incubator.vector.Vector;
-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.VectorShuffle;
 import jdk.incubator.vector.DoubleVector;
 
 import java.util.concurrent.TimeUnit;
@@ -42,7 +43,7 @@
 @Measurement(iterations = 5, time = 1)
 @Fork(value = 1, jvmArgsPrepend = {"--add-modules=jdk.incubator.vector"})
 public class Double64Vector extends AbstractVectorBenchmark {
-    static final Species<Double> SPECIES = DoubleVector.SPECIES_64;
+    static final VectorSpecies<Double> SPECIES = DoubleVector.SPECIES_64;
 
     static final int INVOC_COUNT = 1; // get rid of outer loop
 
@@ -108,7 +109,7 @@
         double[] b = fb.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.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()) {
@@ -144,7 +145,7 @@
         double[] b = fb.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.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()) {
@@ -183,7 +184,7 @@
         double[] b = fb.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.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()) {
@@ -220,7 +221,7 @@
         double[] b = fb.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.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()) {
@@ -382,13 +383,13 @@
         double[] a = fa.apply(size);
         double[] b = fb.apply(size);
         boolean[] ms = fm.apply(size);
-        Vector.Mask<Double> m = DoubleVector.maskFromArray(SPECIES, ms, 0);
+        VectorMask<Double> m = VectorMask.maskFromArray(SPECIES, ms, 0);
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 DoubleVector av = DoubleVector.fromArray(SPECIES, a, i);
                 DoubleVector bv = DoubleVector.fromArray(SPECIES, b, i);
-                Vector.Mask<Double> mv = av.lessThan(bv);
+                VectorMask<Double> mv = av.lessThan(bv);
 
                 m = m.and(mv); // accumulate results, so JIT can't eliminate relevant computations
             }
@@ -402,13 +403,13 @@
         double[] a = fa.apply(size);
         double[] b = fb.apply(size);
         boolean[] ms = fm.apply(size);
-        Vector.Mask<Double> m = DoubleVector.maskFromArray(SPECIES, ms, 0);
+        VectorMask<Double> m = VectorMask.maskFromArray(SPECIES, ms, 0);
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 DoubleVector av = DoubleVector.fromArray(SPECIES, a, i);
                 DoubleVector bv = DoubleVector.fromArray(SPECIES, b, i);
-                Vector.Mask<Double> mv = av.greaterThan(bv);
+                VectorMask<Double> mv = av.greaterThan(bv);
 
                 m = m.and(mv); // accumulate results, so JIT can't eliminate relevant computations
             }
@@ -422,13 +423,13 @@
         double[] a = fa.apply(size);
         double[] b = fb.apply(size);
         boolean[] ms = fm.apply(size);
-        Vector.Mask<Double> m = DoubleVector.maskFromArray(SPECIES, ms, 0);
+        VectorMask<Double> m = VectorMask.maskFromArray(SPECIES, ms, 0);
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 DoubleVector av = DoubleVector.fromArray(SPECIES, a, i);
                 DoubleVector bv = DoubleVector.fromArray(SPECIES, b, i);
-                Vector.Mask<Double> mv = av.equal(bv);
+                VectorMask<Double> mv = av.equal(bv);
 
                 m = m.and(mv); // accumulate results, so JIT can't eliminate relevant computations
             }
@@ -442,13 +443,13 @@
         double[] a = fa.apply(size);
         double[] b = fb.apply(size);
         boolean[] ms = fm.apply(size);
-        Vector.Mask<Double> m = DoubleVector.maskFromArray(SPECIES, ms, 0);
+        VectorMask<Double> m = VectorMask.maskFromArray(SPECIES, ms, 0);
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 DoubleVector av = DoubleVector.fromArray(SPECIES, a, i);
                 DoubleVector bv = DoubleVector.fromArray(SPECIES, b, i);
-                Vector.Mask<Double> mv = av.notEqual(bv);
+                VectorMask<Double> mv = av.notEqual(bv);
 
                 m = m.and(mv); // accumulate results, so JIT can't eliminate relevant computations
             }
@@ -462,13 +463,13 @@
         double[] a = fa.apply(size);
         double[] b = fb.apply(size);
         boolean[] ms = fm.apply(size);
-        Vector.Mask<Double> m = DoubleVector.maskFromArray(SPECIES, ms, 0);
+        VectorMask<Double> m = VectorMask.maskFromArray(SPECIES, ms, 0);
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 DoubleVector av = DoubleVector.fromArray(SPECIES, a, i);
                 DoubleVector bv = DoubleVector.fromArray(SPECIES, b, i);
-                Vector.Mask<Double> mv = av.lessThanEq(bv);
+                VectorMask<Double> mv = av.lessThanEq(bv);
 
                 m = m.and(mv); // accumulate results, so JIT can't eliminate relevant computations
             }
@@ -482,13 +483,13 @@
         double[] a = fa.apply(size);
         double[] b = fb.apply(size);
         boolean[] ms = fm.apply(size);
-        Vector.Mask<Double> m = DoubleVector.maskFromArray(SPECIES, ms, 0);
+        VectorMask<Double> m = VectorMask.maskFromArray(SPECIES, ms, 0);
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 DoubleVector av = DoubleVector.fromArray(SPECIES, a, i);
                 DoubleVector bv = DoubleVector.fromArray(SPECIES, b, i);
-                Vector.Mask<Double> mv = av.greaterThanEq(bv);
+                VectorMask<Double> mv = av.greaterThanEq(bv);
 
                 m = m.and(mv); // accumulate results, so JIT can't eliminate relevant computations
             }
@@ -503,7 +504,7 @@
         double[] b = fb.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.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()) {
@@ -525,7 +526,7 @@
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 DoubleVector av = DoubleVector.fromArray(SPECIES, a, i);
-                av.rearrange(DoubleVector.shuffleFromArray(SPECIES, order, i)).intoArray(r, i);
+                av.rearrange(VectorShuffle.fromArray(SPECIES, order, i)).intoArray(r, i);
             }
         }
 
@@ -1029,7 +1030,7 @@
         double[] c = fc.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.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()) {
@@ -1064,7 +1065,7 @@
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.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()) {
@@ -1096,7 +1097,7 @@
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.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()) {
@@ -1133,7 +1134,7 @@
         double[] a = fa.apply(SPECIES.length());
         double[] r = fr.apply(SPECIES.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()) {