--- old/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/FloatMaxVector.java	2019-04-11 15:40:50.405075400 -0700
+++ new/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/FloatMaxVector.java	2019-04-11 15:40:49.779456800 -0700
@@ -923,7 +923,7 @@
         for (int i = 0; i < a.length; i++) {
             sa[i] = (int) a[i];
         }
-        return FloatVector.shuffleFromArray(SPECIES, sa, 0);
+        return Shuffle.fromArray(SPECIES, sa, 0);
     }
 
     // Memory operations
@@ -1419,7 +1419,7 @@
         @ForceInline
         public boolean allTrue() {
             return VectorIntrinsics.test(BT_overflow, FloatMaxMask.class, int.class, LENGTH,
-                                         this, FloatVector.maskAllTrue(species()),
+                                         this, Mask.maskAllTrue(species()),
                                          (m, __) -> allTrueHelper(((FloatMaxMask)m).getBits()));
         }
     }
@@ -1483,7 +1483,7 @@
         }
 
         @Override
-        public FloatMaxShuffle rearrange(Vector.Shuffle<Float> o) {
+        public FloatMaxShuffle rearrange(Shuffle<Float> o) {
             FloatMaxShuffle s = (FloatMaxShuffle) o;
             byte[] r = new byte[reorder.length];
             for (int i = 0; i < reorder.length; i++) {