--- old/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/IntMaxVector.java	2019-04-23 10:51:18.450828700 -0700
+++ new/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/IntMaxVector.java	2019-04-23 10:51:18.029052300 -0700
@@ -163,7 +163,7 @@
         return VectorIntrinsics.cast(
             IntMaxVector.class,
             int.class, LENGTH,
-            s.boxType(),
+            s.vectorType(),
             s.elementType(), LENGTH,
             this, s,
             (species, vector) -> vector.castDefault(species)
@@ -301,7 +301,7 @@
     @ForceInline
     public IntVector reshape(VectorSpecies<Integer> s) {
         Objects.requireNonNull(s);
-        if (s.bitSize() == 64 && (s.boxType() == Int64Vector.class)) {
+        if (s.bitSize() == 64 && (s.vectorType() == Int64Vector.class)) {
             return VectorIntrinsics.reinterpret(
                 IntMaxVector.class,
                 int.class, LENGTH,
@@ -310,7 +310,7 @@
                 this, s,
                 (species, vector) -> (IntVector) vector.defaultReinterpret(species)
             );
-        } else if (s.bitSize() == 128 && (s.boxType() == Int128Vector.class)) {
+        } else if (s.bitSize() == 128 && (s.vectorType() == Int128Vector.class)) {
             return VectorIntrinsics.reinterpret(
                 IntMaxVector.class,
                 int.class, LENGTH,
@@ -319,7 +319,7 @@
                 this, s,
                 (species, vector) -> (IntVector) vector.defaultReinterpret(species)
             );
-        } else if (s.bitSize() == 256 && (s.boxType() == Int256Vector.class)) {
+        } else if (s.bitSize() == 256 && (s.vectorType() == Int256Vector.class)) {
             return VectorIntrinsics.reinterpret(
                 IntMaxVector.class,
                 int.class, LENGTH,
@@ -328,7 +328,7 @@
                 this, s,
                 (species, vector) -> (IntVector) vector.defaultReinterpret(species)
             );
-        } else if (s.bitSize() == 512 && (s.boxType() == Int512Vector.class)) {
+        } else if (s.bitSize() == 512 && (s.vectorType() == Int512Vector.class)) {
             return VectorIntrinsics.reinterpret(
                 IntMaxVector.class,
                 int.class, LENGTH,
@@ -338,7 +338,7 @@
                 (species, vector) -> (IntVector) vector.defaultReinterpret(species)
             );
         } else if ((s.bitSize() > 0) && (s.bitSize() <= 2048)
-                && (s.bitSize() % 128 == 0) && (s.boxType() == IntMaxVector.class)) {
+                && (s.bitSize() % 128 == 0) && (s.vectorType() == IntMaxVector.class)) {
             return VectorIntrinsics.reinterpret(
                 IntMaxVector.class,
                 int.class, LENGTH,
@@ -665,7 +665,7 @@
 
     @Override
     @ForceInline
-    public IntMaxVector shiftL(int s) {
+    public IntMaxVector shiftLeft(int s) {
         return VectorIntrinsics.broadcastInt(
             VECTOR_OP_LSHIFT, IntMaxVector.class, int.class, LENGTH,
             this, s,
@@ -674,13 +674,13 @@
 
     @Override
     @ForceInline
-    public IntMaxVector shiftL(int s, VectorMask<Integer> m) {
-        return blend(shiftL(s), m);
+    public IntMaxVector shiftLeft(int s, VectorMask<Integer> m) {
+        return blend(shiftLeft(s), m);
     }
 
     @Override
     @ForceInline
-    public IntMaxVector shiftR(int s) {
+    public IntMaxVector shiftRight(int s) {
         return VectorIntrinsics.broadcastInt(
             VECTOR_OP_URSHIFT, IntMaxVector.class, int.class, LENGTH,
             this, s,
@@ -689,13 +689,13 @@
 
     @Override
     @ForceInline
-    public IntMaxVector shiftR(int s, VectorMask<Integer> m) {
-        return blend(shiftR(s), m);
+    public IntMaxVector shiftRight(int s, VectorMask<Integer> m) {
+        return blend(shiftRight(s), m);
     }
 
     @Override
     @ForceInline
-    public IntMaxVector aShiftR(int s) {
+    public IntMaxVector shiftArithmeticRight(int s) {
         return VectorIntrinsics.broadcastInt(
             VECTOR_OP_RSHIFT, IntMaxVector.class, int.class, LENGTH,
             this, s,
@@ -704,13 +704,13 @@
 
     @Override
     @ForceInline
-    public IntMaxVector aShiftR(int s, VectorMask<Integer> m) {
-        return blend(aShiftR(s), m);
+    public IntMaxVector shiftArithmeticRight(int s, VectorMask<Integer> m) {
+        return blend(shiftArithmeticRight(s), m);
     }
 
     @Override
     @ForceInline
-    public IntMaxVector shiftL(Vector<Integer> s) {
+    public IntMaxVector shiftLeft(Vector<Integer> s) {
         IntMaxVector shiftv = (IntMaxVector)s;
         // As per shift specification for Java, mask the shift count.
         shiftv = shiftv.and(IntVector.broadcast(SPECIES, 0x1f));
@@ -722,7 +722,7 @@
 
     @Override
     @ForceInline
-    public IntMaxVector shiftR(Vector<Integer> s) {
+    public IntMaxVector shiftRight(Vector<Integer> s) {
         IntMaxVector shiftv = (IntMaxVector)s;
         // As per shift specification for Java, mask the shift count.
         shiftv = shiftv.and(IntVector.broadcast(SPECIES, 0x1f));
@@ -734,7 +734,7 @@
 
     @Override
     @ForceInline
-    public IntMaxVector aShiftR(Vector<Integer> s) {
+    public IntMaxVector shiftArithmeticRight(Vector<Integer> s) {
         IntMaxVector shiftv = (IntMaxVector)s;
         // As per shift specification for Java, mask the shift count.
         shiftv = shiftv.and(IntVector.broadcast(SPECIES, 0x1f));
@@ -1107,7 +1107,7 @@
     }
 
     @Override
-    public IntMaxVector rotateEL(int j) {
+    public IntMaxVector rotateLanesLeft(int j) {
         int[] vec = getElements();
         int[] res = new int[length()];
         for (int i = 0; i < length(); i++){
@@ -1117,7 +1117,7 @@
     }
 
     @Override
-    public IntMaxVector rotateER(int j) {
+    public IntMaxVector rotateLanesRight(int j) {
         int[] vec = getElements();
         int[] res = new int[length()];
         for (int i = 0; i < length(); i++){
@@ -1132,7 +1132,7 @@
     }
 
     @Override
-    public IntMaxVector shiftEL(int j) {
+    public IntMaxVector shiftLanesLeft(int j) {
         int[] vec = getElements();
         int[] res = new int[length()];
         for (int i = 0; i < length() - j; i++) {
@@ -1142,7 +1142,7 @@
     }
 
     @Override
-    public IntMaxVector shiftER(int j) {
+    public IntMaxVector shiftLanesRight(int j) {
         int[] vec = getElements();
         int[] res = new int[length()];
         for (int i = 0; i < length() - j; i++){