--- old/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Short256Vector.java	2019-04-11 15:42:00.765083800 -0700
+++ new/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Short256Vector.java	2019-04-11 15:42:00.120922800 -0700
@@ -819,7 +819,7 @@
         for (int i = 0; i < a.length; i++) {
             sa[i] = (int) a[i];
         }
-        return ShortVector.shuffleFromArray(SPECIES, sa, 0);
+        return Shuffle.fromArray(SPECIES, sa, 0);
     }
 
     // Memory operations
@@ -1280,7 +1280,7 @@
         @ForceInline
         public boolean allTrue() {
             return VectorIntrinsics.test(BT_overflow, Short256Mask.class, short.class, LENGTH,
-                                         this, ShortVector.maskAllTrue(species()),
+                                         this, Mask.maskAllTrue(species()),
                                          (m, __) -> allTrueHelper(((Short256Mask)m).getBits()));
         }
     }
@@ -1344,7 +1344,7 @@
         }
 
         @Override
-        public Short256Shuffle rearrange(Vector.Shuffle<Short> o) {
+        public Short256Shuffle rearrange(Shuffle<Short> o) {
             Short256Shuffle s = (Short256Shuffle) o;
             byte[] r = new byte[reorder.length];
             for (int i = 0; i < reorder.length; i++) {