--- old/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Int512Vector.java	2019-04-11 15:41:09.021343400 -0700
+++ new/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Int512Vector.java	2019-04-11 15:41:07.412891500 -0700
@@ -863,7 +863,7 @@
         for (int i = 0; i < a.length; i++) {
             sa[i] = (int) a[i];
         }
-        return IntVector.shuffleFromArray(SPECIES, sa, 0);
+        return Shuffle.fromArray(SPECIES, sa, 0);
     }
 
     // Memory operations
@@ -1358,7 +1358,7 @@
         @ForceInline
         public boolean allTrue() {
             return VectorIntrinsics.test(BT_overflow, Int512Mask.class, int.class, LENGTH,
-                                         this, IntVector.maskAllTrue(species()),
+                                         this, Mask.maskAllTrue(species()),
                                          (m, __) -> allTrueHelper(((Int512Mask)m).getBits()));
         }
     }
@@ -1422,7 +1422,7 @@
         }
 
         @Override
-        public Int512Shuffle rearrange(Vector.Shuffle<Integer> o) {
+        public Int512Shuffle rearrange(Shuffle<Integer> o) {
             Int512Shuffle s = (Int512Shuffle) o;
             byte[] r = new byte[reorder.length];
             for (int i = 0; i < reorder.length; i++) {