--- old/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Long128Vector.java	2019-04-15 14:43:02.673424000 -0700
+++ new/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Long128Vector.java	2019-04-15 14:43:02.247690400 -0700
@@ -38,7 +38,7 @@
 
 @SuppressWarnings("cast")
 final class Long128Vector extends LongVector {
-    private static final Species<Long> SPECIES = LongVector.SPECIES_128;
+    private static final VectorSpecies<Long> SPECIES = LongVector.SPECIES_128;
 
     static final Long128Vector ZERO = new Long128Vector();
 
@@ -49,7 +49,7 @@
 
     static {
         int bitSize = Vector.bitSizeForVectorLength(int.class, LENGTH);
-        INDEX_SPECIES = (IntVector.IntSpecies) IntVector.species(Shape.forBitSize(bitSize));
+        INDEX_SPECIES = (IntVector.IntSpecies) IntVector.species(VectorShape.forBitSize(bitSize));
     }
 
     private final long[] vec; // Don't access directly, use getElements() instead.
@@ -82,7 +82,7 @@
     }
 
     @Override
-    Long128Vector uOp(Mask<Long> o, FUnOp f) {
+    Long128Vector uOp(VectorMask<Long> o, FUnOp f) {
         long[] vec = getElements();
         long[] res = new long[length()];
         boolean[] mbits = ((Long128Mask)o).getBits();
@@ -106,7 +106,7 @@
     }
 
     @Override
-    Long128Vector bOp(Vector<Long> o1, Mask<Long> o2, FBinOp f) {
+    Long128Vector bOp(Vector<Long> o1, VectorMask<Long> o2, FBinOp f) {
         long[] res = new long[length()];
         long[] vec1 = this.getElements();
         long[] vec2 = ((Long128Vector)o1).getElements();
@@ -132,7 +132,7 @@
     }
 
     @Override
-    Long128Vector tOp(Vector<Long> o1, Vector<Long> o2, Mask<Long> o3, FTriOp f) {
+    Long128Vector tOp(Vector<Long> o1, Vector<Long> o2, VectorMask<Long> o3, FTriOp f) {
         long[] res = new long[length()];
         long[] vec1 = getElements();
         long[] vec2 = ((Long128Vector)o1).getElements();
@@ -155,7 +155,7 @@
 
     @Override
     @ForceInline
-    public <F> Vector<F> cast(Species<F> s) {
+    public <F> Vector<F> cast(VectorSpecies<F> s) {
         Objects.requireNonNull(s);
         if (s.length() != LENGTH)
             throw new IllegalArgumentException("Vector length this species length differ");
@@ -172,7 +172,7 @@
 
     @SuppressWarnings("unchecked")
     @ForceInline
-    private <F> Vector<F> castDefault(Species<F> s) {
+    private <F> Vector<F> castDefault(VectorSpecies<F> s) {
         int limit = s.length();
 
         Class<?> stype = s.elementType();
@@ -181,37 +181,37 @@
             for (int i = 0; i < limit; i++) {
                 a[i] = (byte) this.get(i);
             }
-            return (Vector) ByteVector.fromArray((Species<Byte>) s, a, 0);
+            return (Vector) ByteVector.fromArray((VectorSpecies<Byte>) s, a, 0);
         } else if (stype == short.class) {
             short[] a = new short[limit];
             for (int i = 0; i < limit; i++) {
                 a[i] = (short) this.get(i);
             }
-            return (Vector) ShortVector.fromArray((Species<Short>) s, a, 0);
+            return (Vector) ShortVector.fromArray((VectorSpecies<Short>) s, a, 0);
         } else if (stype == int.class) {
             int[] a = new int[limit];
             for (int i = 0; i < limit; i++) {
                 a[i] = (int) this.get(i);
             }
-            return (Vector) IntVector.fromArray((Species<Integer>) s, a, 0);
+            return (Vector) IntVector.fromArray((VectorSpecies<Integer>) s, a, 0);
         } else if (stype == long.class) {
             long[] a = new long[limit];
             for (int i = 0; i < limit; i++) {
                 a[i] = (long) this.get(i);
             }
-            return (Vector) LongVector.fromArray((Species<Long>) s, a, 0);
+            return (Vector) LongVector.fromArray((VectorSpecies<Long>) s, a, 0);
         } else if (stype == float.class) {
             float[] a = new float[limit];
             for (int i = 0; i < limit; i++) {
                 a[i] = (float) this.get(i);
             }
-            return (Vector) FloatVector.fromArray((Species<Float>) s, a, 0);
+            return (Vector) FloatVector.fromArray((VectorSpecies<Float>) s, a, 0);
         } else if (stype == double.class) {
             double[] a = new double[limit];
             for (int i = 0; i < limit; i++) {
                 a[i] = (double) this.get(i);
             }
-            return (Vector) DoubleVector.fromArray((Species<Double>) s, a, 0);
+            return (Vector) DoubleVector.fromArray((VectorSpecies<Double>) s, a, 0);
         } else {
             throw new UnsupportedOperationException("Bad lane type for casting.");
         }
@@ -220,11 +220,11 @@
     @Override
     @ForceInline
     @SuppressWarnings("unchecked")
-    public <F> Vector<F> reinterpret(Species<F> s) {
+    public <F> Vector<F> reinterpret(VectorSpecies<F> s) {
         Objects.requireNonNull(s);
 
         if(s.elementType().equals(long.class)) {
-            return (Vector<F>) reshape((Species<Long>)s);
+            return (Vector<F>) reshape((VectorSpecies<Long>)s);
         }
         if(s.bitSize() == bitSize()) {
             return reinterpretType(s);
@@ -234,7 +234,7 @@
     }
 
     @ForceInline
-    private <F> Vector<F> reinterpretType(Species<F> s) {
+    private <F> Vector<F> reinterpretType(VectorSpecies<F> s) {
         Objects.requireNonNull(s);
 
         Class<?> stype = s.elementType();
@@ -299,7 +299,7 @@
 
     @Override
     @ForceInline
-    public LongVector reshape(Species<Long> s) {
+    public LongVector reshape(VectorSpecies<Long> s) {
         Objects.requireNonNull(s);
         if (s.bitSize() == 64 && (s.boxType() == Long64Vector.class)) {
             return VectorIntrinsics.reinterpret(
@@ -362,7 +362,7 @@
 
     @Override
     @ForceInline
-    public LongVector add(long o, Mask<Long> m) {
+    public LongVector add(long o, VectorMask<Long> m) {
         return add((Long128Vector)LongVector.broadcast(SPECIES, o), m);
     }
 
@@ -374,7 +374,7 @@
 
     @Override
     @ForceInline
-    public LongVector sub(long o, Mask<Long> m) {
+    public LongVector sub(long o, VectorMask<Long> m) {
         return sub((Long128Vector)LongVector.broadcast(SPECIES, o), m);
     }
 
@@ -386,7 +386,7 @@
 
     @Override
     @ForceInline
-    public LongVector mul(long o, Mask<Long> m) {
+    public LongVector mul(long o, VectorMask<Long> m) {
         return mul((Long128Vector)LongVector.broadcast(SPECIES, o), m);
     }
 
@@ -404,43 +404,43 @@
 
     @Override
     @ForceInline
-    public Mask<Long> equal(long o) {
+    public VectorMask<Long> equal(long o) {
         return equal((Long128Vector)LongVector.broadcast(SPECIES, o));
     }
 
     @Override
     @ForceInline
-    public Mask<Long> notEqual(long o) {
+    public VectorMask<Long> notEqual(long o) {
         return notEqual((Long128Vector)LongVector.broadcast(SPECIES, o));
     }
 
     @Override
     @ForceInline
-    public Mask<Long> lessThan(long o) {
+    public VectorMask<Long> lessThan(long o) {
         return lessThan((Long128Vector)LongVector.broadcast(SPECIES, o));
     }
 
     @Override
     @ForceInline
-    public Mask<Long> lessThanEq(long o) {
+    public VectorMask<Long> lessThanEq(long o) {
         return lessThanEq((Long128Vector)LongVector.broadcast(SPECIES, o));
     }
 
     @Override
     @ForceInline
-    public Mask<Long> greaterThan(long o) {
+    public VectorMask<Long> greaterThan(long o) {
         return greaterThan((Long128Vector)LongVector.broadcast(SPECIES, o));
     }
 
     @Override
     @ForceInline
-    public Mask<Long> greaterThanEq(long o) {
+    public VectorMask<Long> greaterThanEq(long o) {
         return greaterThanEq((Long128Vector)LongVector.broadcast(SPECIES, o));
     }
 
     @Override
     @ForceInline
-    public LongVector blend(long o, Mask<Long> m) {
+    public LongVector blend(long o, VectorMask<Long> m) {
         return blend((Long128Vector)LongVector.broadcast(SPECIES, o), m);
     }
 
@@ -453,7 +453,7 @@
 
     @Override
     @ForceInline
-    public LongVector and(long o, Mask<Long> m) {
+    public LongVector and(long o, VectorMask<Long> m) {
         return and((Long128Vector)LongVector.broadcast(SPECIES, o), m);
     }
 
@@ -465,7 +465,7 @@
 
     @Override
     @ForceInline
-    public LongVector or(long o, Mask<Long> m) {
+    public LongVector or(long o, VectorMask<Long> m) {
         return or((Long128Vector)LongVector.broadcast(SPECIES, o), m);
     }
 
@@ -477,7 +477,7 @@
 
     @Override
     @ForceInline
-    public LongVector xor(long o, Mask<Long> m) {
+    public LongVector xor(long o, VectorMask<Long> m) {
         return xor((Long128Vector)LongVector.broadcast(SPECIES, o), m);
     }
 
@@ -491,7 +491,7 @@
 
     @ForceInline
     @Override
-    public Long128Vector neg(Mask<Long> m) {
+    public Long128Vector neg(VectorMask<Long> m) {
         return blend(neg(), m);
     }
 
@@ -506,7 +506,7 @@
 
     @ForceInline
     @Override
-    public Long128Vector abs(Mask<Long> m) {
+    public Long128Vector abs(VectorMask<Long> m) {
         return blend(abs(), m);
     }
 
@@ -522,7 +522,7 @@
 
     @ForceInline
     @Override
-    public Long128Vector not(Mask<Long> m) {
+    public Long128Vector not(VectorMask<Long> m) {
         return blend(not(), m);
     }
     // Binary operations
@@ -540,7 +540,7 @@
 
     @Override
     @ForceInline
-    public Long128Vector add(Vector<Long> v, Mask<Long> m) {
+    public Long128Vector add(Vector<Long> v, VectorMask<Long> m) {
         return blend(add(v), m);
     }
 
@@ -557,7 +557,7 @@
 
     @Override
     @ForceInline
-    public Long128Vector sub(Vector<Long> v, Mask<Long> m) {
+    public Long128Vector sub(Vector<Long> v, VectorMask<Long> m) {
         return blend(sub(v), m);
     }
 
@@ -574,7 +574,7 @@
 
     @Override
     @ForceInline
-    public Long128Vector mul(Vector<Long> v, Mask<Long> m) {
+    public Long128Vector mul(Vector<Long> v, VectorMask<Long> m) {
         return blend(mul(v), m);
     }
 
@@ -591,7 +591,7 @@
 
     @Override
     @ForceInline
-    public Long128Vector min(Vector<Long> v, Mask<Long> m) {
+    public Long128Vector min(Vector<Long> v, VectorMask<Long> m) {
         return blend(min(v), m);
     }
 
@@ -608,7 +608,7 @@
 
     @Override
     @ForceInline
-    public Long128Vector max(Vector<Long> v, Mask<Long> m) {
+    public Long128Vector max(Vector<Long> v, VectorMask<Long> m) {
         return blend(max(v), m);
     }
 
@@ -647,19 +647,19 @@
 
     @Override
     @ForceInline
-    public Long128Vector and(Vector<Long> v, Mask<Long> m) {
+    public Long128Vector and(Vector<Long> v, VectorMask<Long> m) {
         return blend(and(v), m);
     }
 
     @Override
     @ForceInline
-    public Long128Vector or(Vector<Long> v, Mask<Long> m) {
+    public Long128Vector or(Vector<Long> v, VectorMask<Long> m) {
         return blend(or(v), m);
     }
 
     @Override
     @ForceInline
-    public Long128Vector xor(Vector<Long> v, Mask<Long> m) {
+    public Long128Vector xor(Vector<Long> v, VectorMask<Long> m) {
         return blend(xor(v), m);
     }
 
@@ -674,7 +674,7 @@
 
     @Override
     @ForceInline
-    public Long128Vector shiftL(int s, Mask<Long> m) {
+    public Long128Vector shiftL(int s, VectorMask<Long> m) {
         return blend(shiftL(s), m);
     }
 
@@ -689,7 +689,7 @@
 
     @Override
     @ForceInline
-    public Long128Vector shiftR(int s, Mask<Long> m) {
+    public Long128Vector shiftR(int s, VectorMask<Long> m) {
         return blend(shiftR(s), m);
     }
 
@@ -704,7 +704,7 @@
 
     @Override
     @ForceInline
-    public Long128Vector aShiftR(int s, Mask<Long> m) {
+    public Long128Vector aShiftR(int s, VectorMask<Long> m) {
         return blend(aShiftR(s), m);
     }
 
@@ -768,7 +768,7 @@
 
     @Override
     @ForceInline
-    public long andAll(Mask<Long> m) {
+    public long andAll(VectorMask<Long> m) {
         return blend((Long128Vector)LongVector.broadcast(SPECIES, (long) -1), m).andAll();
     }
 
@@ -810,7 +810,7 @@
 
     @Override
     @ForceInline
-    public long orAll(Mask<Long> m) {
+    public long orAll(VectorMask<Long> m) {
         return blend((Long128Vector)LongVector.broadcast(SPECIES, (long) 0), m).orAll();
     }
 
@@ -825,45 +825,45 @@
 
     @Override
     @ForceInline
-    public long xorAll(Mask<Long> m) {
+    public long xorAll(VectorMask<Long> m) {
         return blend((Long128Vector)LongVector.broadcast(SPECIES, (long) 0), m).xorAll();
     }
 
 
     @Override
     @ForceInline
-    public long addAll(Mask<Long> m) {
+    public long addAll(VectorMask<Long> m) {
         return blend((Long128Vector)LongVector.broadcast(SPECIES, (long) 0), m).addAll();
     }
 
 
     @Override
     @ForceInline
-    public long mulAll(Mask<Long> m) {
+    public long mulAll(VectorMask<Long> m) {
         return blend((Long128Vector)LongVector.broadcast(SPECIES, (long) 1), m).mulAll();
     }
 
     @Override
     @ForceInline
-    public long minAll(Mask<Long> m) {
+    public long minAll(VectorMask<Long> m) {
         return blend((Long128Vector)LongVector.broadcast(SPECIES, Long.MAX_VALUE), m).minAll();
     }
 
     @Override
     @ForceInline
-    public long maxAll(Mask<Long> m) {
+    public long maxAll(VectorMask<Long> m) {
         return blend((Long128Vector)LongVector.broadcast(SPECIES, Long.MIN_VALUE), m).maxAll();
     }
 
     @Override
     @ForceInline
-    public Shuffle<Long> toShuffle() {
+    public VectorShuffle<Long> toShuffle() {
         long[] a = toArray();
         int[] sa = new int[a.length];
         for (int i = 0; i < a.length; i++) {
             sa[i] = (int) a[i];
         }
-        return LongVector.shuffleFromArray(SPECIES, sa, 0);
+        return VectorShuffle.fromArray(SPECIES, sa, 0);
     }
 
     // Memory operations
@@ -885,7 +885,7 @@
 
     @Override
     @ForceInline
-    public final void intoArray(long[] a, int ax, Mask<Long> m) {
+    public final void intoArray(long[] a, int ax, VectorMask<Long> m) {
         LongVector oldVal = LongVector.fromArray(SPECIES, a, ax);
         LongVector newVal = oldVal.blend(this, m);
         newVal.intoArray(a, ax);
@@ -910,7 +910,7 @@
 
      @Override
      @ForceInline
-     public final void intoArray(long[] a, int ax, Mask<Long> m, int[] b, int iy) {
+     public final void intoArray(long[] a, int ax, VectorMask<Long> m, int[] b, int iy) {
          // @@@ This can result in out of bounds errors for unset mask lanes
          LongVector oldVal = LongVector.fromArray(SPECIES, a, ax, b, iy);
          LongVector newVal = oldVal.blend(this, m);
@@ -935,7 +935,7 @@
 
     @Override
     @ForceInline
-    public final void intoByteArray(byte[] a, int ix, Mask<Long> m) {
+    public final void intoByteArray(byte[] a, int ix, VectorMask<Long> m) {
         Long128Vector oldVal = (Long128Vector) LongVector.fromByteArray(SPECIES, a, ix);
         Long128Vector newVal = oldVal.blend(this, m);
         newVal.intoByteArray(a, ix);
@@ -964,7 +964,7 @@
 
     @Override
     @ForceInline
-    public void intoByteBuffer(ByteBuffer bb, int ix, Mask<Long> m) {
+    public void intoByteBuffer(ByteBuffer bb, int ix, VectorMask<Long> m) {
         Long128Vector oldVal = (Long128Vector) LongVector.fromByteBuffer(SPECIES, bb, ix);
         Long128Vector newVal = oldVal.blend(this, m);
         newVal.intoByteBuffer(bb, ix);
@@ -1089,7 +1089,7 @@
     }
 
     @Override
-    void forEach(Mask<Long> o, FUnCon f) {
+    void forEach(VectorMask<Long> o, FUnCon f) {
         boolean[] mbits = ((Long128Mask)o).getBits();
         forEach((i, a) -> {
             if (mbits[i]) { f.apply(i, a); }
@@ -1154,13 +1154,13 @@
     @Override
     @ForceInline
     public Long128Vector rearrange(Vector<Long> v,
-                                  Shuffle<Long> s, Mask<Long> m) {
+                                  VectorShuffle<Long> s, VectorMask<Long> m) {
         return this.rearrange(s).blend(v.rearrange(s), m);
     }
 
     @Override
     @ForceInline
-    public Long128Vector rearrange(Shuffle<Long> o1) {
+    public Long128Vector rearrange(VectorShuffle<Long> o1) {
         Objects.requireNonNull(o1);
         Long128Shuffle s =  (Long128Shuffle)o1;
 
@@ -1175,7 +1175,7 @@
 
     @Override
     @ForceInline
-    public Long128Vector blend(Vector<Long> o1, Mask<Long> o2) {
+    public Long128Vector blend(Vector<Long> o1, VectorMask<Long> o2) {
         Objects.requireNonNull(o1);
         Objects.requireNonNull(o2);
         Long128Vector v = (Long128Vector)o1;
@@ -1259,7 +1259,7 @@
         }
 
         @Override
-        Long128Mask bOp(Mask<Long> o, MBinOp f) {
+        Long128Mask bOp(VectorMask<Long> o, MBinOp f) {
             boolean[] res = new boolean[species().length()];
             boolean[] bits = getBits();
             boolean[] mbits = ((Long128Mask)o).getBits();
@@ -1270,7 +1270,7 @@
         }
 
         @Override
-        public Species<Long> species() {
+        public VectorSpecies<Long> species() {
             return SPECIES;
         }
 
@@ -1289,23 +1289,23 @@
         @Override
         @ForceInline
         @SuppressWarnings("unchecked")
-        public <E> Mask<E> cast(Species<E> species) {
+        public <E> VectorMask<E> cast(VectorSpecies<E> species) {
             if (length() != species.length())
-                throw new IllegalArgumentException("Mask length and species length differ");
+                throw new IllegalArgumentException("VectorMask length and species length differ");
             Class<?> stype = species.elementType();
             boolean [] maskArray = toArray();
             if (stype == byte.class) {
-                return (Mask <E>) new Byte128Vector.Byte128Mask(maskArray);
+                return (VectorMask <E>) new Byte128Vector.Byte128Mask(maskArray);
             } else if (stype == short.class) {
-                return (Mask <E>) new Short128Vector.Short128Mask(maskArray);
+                return (VectorMask <E>) new Short128Vector.Short128Mask(maskArray);
             } else if (stype == int.class) {
-                return (Mask <E>) new Int128Vector.Int128Mask(maskArray);
+                return (VectorMask <E>) new Int128Vector.Int128Mask(maskArray);
             } else if (stype == long.class) {
-                return (Mask <E>) new Long128Vector.Long128Mask(maskArray);
+                return (VectorMask <E>) new Long128Vector.Long128Mask(maskArray);
             } else if (stype == float.class) {
-                return (Mask <E>) new Float128Vector.Float128Mask(maskArray);
+                return (VectorMask <E>) new Float128Vector.Float128Mask(maskArray);
             } else if (stype == double.class) {
-                return (Mask <E>) new Double128Vector.Double128Mask(maskArray);
+                return (VectorMask <E>) new Double128Vector.Double128Mask(maskArray);
             } else {
                 throw new UnsupportedOperationException("Bad lane type for casting.");
             }
@@ -1326,7 +1326,7 @@
 
         @Override
         @ForceInline
-        public Long128Mask and(Mask<Long> o) {
+        public Long128Mask and(VectorMask<Long> o) {
             Objects.requireNonNull(o);
             Long128Mask m = (Long128Mask)o;
             return VectorIntrinsics.binaryOp(VECTOR_OP_AND, Long128Mask.class, long.class, LENGTH,
@@ -1336,7 +1336,7 @@
 
         @Override
         @ForceInline
-        public Long128Mask or(Mask<Long> o) {
+        public Long128Mask or(VectorMask<Long> o) {
             Objects.requireNonNull(o);
             Long128Mask m = (Long128Mask)o;
             return VectorIntrinsics.binaryOp(VECTOR_OP_OR, Long128Mask.class, long.class, LENGTH,
@@ -1358,7 +1358,7 @@
         @ForceInline
         public boolean allTrue() {
             return VectorIntrinsics.test(BT_overflow, Long128Mask.class, long.class, LENGTH,
-                                         this, LongVector.maskAllTrue(species()),
+                                         this, VectorMask.maskAllTrue(species()),
                                          (m, __) -> allTrueHelper(((Long128Mask)m).getBits()));
         }
     }
@@ -1383,7 +1383,7 @@
         }
 
         @Override
-        public Species<Long> species() {
+        public VectorSpecies<Long> species() {
             return SPECIES;
         }
 
@@ -1399,30 +1399,30 @@
         @Override
         @ForceInline
         @SuppressWarnings("unchecked")
-        public <F> Shuffle<F> cast(Species<F> species) {
+        public <F> VectorShuffle<F> cast(VectorSpecies<F> species) {
             if (length() != species.length())
                 throw new IllegalArgumentException("Shuffle length and species length differ");
             Class<?> stype = species.elementType();
             int [] shuffleArray = toArray();
             if (stype == byte.class) {
-                return (Shuffle<F>) new Byte128Vector.Byte128Shuffle(shuffleArray);
+                return (VectorShuffle<F>) new Byte128Vector.Byte128Shuffle(shuffleArray);
             } else if (stype == short.class) {
-                return (Shuffle<F>) new Short128Vector.Short128Shuffle(shuffleArray);
+                return (VectorShuffle<F>) new Short128Vector.Short128Shuffle(shuffleArray);
             } else if (stype == int.class) {
-                return (Shuffle<F>) new Int128Vector.Int128Shuffle(shuffleArray);
+                return (VectorShuffle<F>) new Int128Vector.Int128Shuffle(shuffleArray);
             } else if (stype == long.class) {
-                return (Shuffle<F>) new Long128Vector.Long128Shuffle(shuffleArray);
+                return (VectorShuffle<F>) new Long128Vector.Long128Shuffle(shuffleArray);
             } else if (stype == float.class) {
-                return (Shuffle<F>) new Float128Vector.Float128Shuffle(shuffleArray);
+                return (VectorShuffle<F>) new Float128Vector.Float128Shuffle(shuffleArray);
             } else if (stype == double.class) {
-                return (Shuffle<F>) new Double128Vector.Double128Shuffle(shuffleArray);
+                return (VectorShuffle<F>) new Double128Vector.Double128Shuffle(shuffleArray);
             } else {
                 throw new UnsupportedOperationException("Bad lane type for casting.");
             }
         }
 
         @Override
-        public Long128Shuffle rearrange(Vector.Shuffle<Long> o) {
+        public Long128Shuffle rearrange(VectorShuffle<Long> o) {
             Long128Shuffle s = (Long128Shuffle) o;
             byte[] r = new byte[reorder.length];
             for (int i = 0; i < reorder.length; i++) {
@@ -1432,10 +1432,10 @@
         }
     }
 
-    // Species
+    // VectorSpecies
 
     @Override
-    public Species<Long> species() {
+    public VectorSpecies<Long> species() {
         return SPECIES;
     }
 }