--- old/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/X-VectorBits.java.template	2019-04-11 15:42:37.484947000 -0700
+++ new/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/X-VectorBits.java.template	2019-04-11 15:42:36.819313000 -0700
@@ -1307,7 +1307,7 @@
         for (int i = 0; i < a.length; i++) {
             sa[i] = (int) a[i];
         }
-        return $abstractvectortype$.shuffleFromArray(SPECIES, sa, 0);
+        return Shuffle.fromArray(SPECIES, sa, 0);
     }
 
     // Memory operations
@@ -1852,7 +1852,7 @@
         @ForceInline
         public boolean allTrue() {
             return VectorIntrinsics.test(BT_overflow, $masktype$.class, $bitstype$.class, LENGTH,
-                                         this, $abstractvectortype$.maskAllTrue(species()),
+                                         this, Mask.maskAllTrue(species()),
                                          (m, __) -> allTrueHelper((($masktype$)m).getBits()));
         }
     }
@@ -1916,7 +1916,7 @@
         }
 
         @Override
-        public $shuffletype$ rearrange(Vector.Shuffle<$Boxtype$> o) {
+        public $shuffletype$ rearrange(Shuffle<$Boxtype$> o) {
             $shuffletype$ s = ($shuffletype$) o;
             byte[] r = new byte[reorder.length];
             for (int i = 0; i < reorder.length; i++) {