changeset 58923:82514a6254e6 vectorIntrinsics

8222752: [vector] Javadoc changes for Vector api Summary: Javadoc changes for Vector api Reviewed-by: jrose, briangoetz, vlivanov, sviswanathan
author kkharbas
date Fri, 19 Apr 2019 11:35:36 -0700
parents c7ae168bfe55
children 5a87e918e324 03cdb342f182
files src/jdk.incubator.vector/share/classes/jdk/incubator/vector/AbstractMask.java src/jdk.incubator.vector/share/classes/jdk/incubator/vector/AbstractShuffle.java src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Byte128Vector.java src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Byte256Vector.java src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Byte512Vector.java src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Byte64Vector.java src/jdk.incubator.vector/share/classes/jdk/incubator/vector/ByteMaxVector.java src/jdk.incubator.vector/share/classes/jdk/incubator/vector/ByteVector.java src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Double128Vector.java src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Double256Vector.java src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Double512Vector.java src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Double64Vector.java src/jdk.incubator.vector/share/classes/jdk/incubator/vector/DoubleMaxVector.java src/jdk.incubator.vector/share/classes/jdk/incubator/vector/DoubleVector.java src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Float128Vector.java src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Float256Vector.java src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Float512Vector.java src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Float64Vector.java src/jdk.incubator.vector/share/classes/jdk/incubator/vector/FloatMaxVector.java src/jdk.incubator.vector/share/classes/jdk/incubator/vector/FloatVector.java src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Int128Vector.java src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Int256Vector.java src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Int512Vector.java src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Int64Vector.java src/jdk.incubator.vector/share/classes/jdk/incubator/vector/IntMaxVector.java src/jdk.incubator.vector/share/classes/jdk/incubator/vector/IntVector.java src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Long128Vector.java src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Long256Vector.java src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Long512Vector.java src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Long64Vector.java src/jdk.incubator.vector/share/classes/jdk/incubator/vector/LongMaxVector.java src/jdk.incubator.vector/share/classes/jdk/incubator/vector/LongVector.java src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Short128Vector.java src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Short256Vector.java src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Short512Vector.java src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Short64Vector.java src/jdk.incubator.vector/share/classes/jdk/incubator/vector/ShortMaxVector.java src/jdk.incubator.vector/share/classes/jdk/incubator/vector/ShortVector.java src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Vector.java src/jdk.incubator.vector/share/classes/jdk/incubator/vector/VectorMask.java src/jdk.incubator.vector/share/classes/jdk/incubator/vector/VectorShape.java src/jdk.incubator.vector/share/classes/jdk/incubator/vector/VectorShuffle.java src/jdk.incubator.vector/share/classes/jdk/incubator/vector/X-Vector.java.template src/jdk.incubator.vector/share/classes/jdk/incubator/vector/X-VectorBits.java.template src/jdk.incubator.vector/share/classes/jdk/incubator/vector/package-info.java
diffstat 45 files changed, 2906 insertions(+), 2183 deletions(-) [+]
line wrap: on
line diff
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/AbstractMask.java	Thu Apr 18 23:47:37 2019 -0700
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/AbstractMask.java	Fri Apr 19 11:35:36 2019 -0700
@@ -53,7 +53,7 @@
     }
 
     @Override
-    public boolean getElement(int i) {
+    public boolean lane(int i) {
         return getBits()[i];
     }
 
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/AbstractShuffle.java	Thu Apr 18 23:47:37 2019 -0700
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/AbstractShuffle.java	Fri Apr 19 11:35:36 2019 -0700
@@ -72,7 +72,7 @@
     }
 
     @Override
-    public int getElement(int i) {
+    public int lane(int i) {
         return reorder[i];
     }
 
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Byte128Vector.java	Thu Apr 18 23:47:37 2019 -0700
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Byte128Vector.java	Fri Apr 19 11:35:36 2019 -0700
@@ -170,37 +170,37 @@
         if (stype == byte.class) {
             byte[] a = new byte[limit];
             for (int i = 0; i < limit; i++) {
-                a[i] = (byte) this.get(i);
+                a[i] = (byte) this.lane(i);
             }
             return (Vector) ByteVector.fromArray((VectorSpecies<Byte>) s, a, 0);
         } else if (stype == short.class) {
             short[] a = new short[limit];
             for (int i = 0; i < limit; i++) {
-                a[i] = (short) this.get(i);
+                a[i] = (short) this.lane(i);
             }
             return (Vector) ShortVector.fromArray((VectorSpecies<Short>) s, a, 0);
         } else if (stype == int.class) {
             int[] a = new int[limit];
             for (int i = 0; i < limit; i++) {
-                a[i] = (int) this.get(i);
+                a[i] = (int) this.lane(i);
             }
             return (Vector) IntVector.fromArray((VectorSpecies<Integer>) s, a, 0);
         } else if (stype == long.class) {
             long[] a = new long[limit];
             for (int i = 0; i < limit; i++) {
-                a[i] = (long) this.get(i);
+                a[i] = (long) this.lane(i);
             }
             return (Vector) LongVector.fromArray((VectorSpecies<Long>) s, a, 0);
         } else if (stype == float.class) {
             float[] a = new float[limit];
             for (int i = 0; i < limit; i++) {
-                a[i] = (float) this.get(i);
+                a[i] = (float) this.lane(i);
             }
             return (Vector) FloatVector.fromArray((VectorSpecies<Float>) s, a, 0);
         } else if (stype == double.class) {
             double[] a = new double[limit];
             for (int i = 0; i < limit; i++) {
-                a[i] = (double) this.get(i);
+                a[i] = (double) this.lane(i);
             }
             return (Vector) DoubleVector.fromArray((VectorSpecies<Double>) s, a, 0);
         } else {
@@ -1089,8 +1089,8 @@
             Byte128Vector.class, Byte128Shuffle.class, byte.class, LENGTH,
             this, s,
             (v1, s_) -> v1.uOp((i, a) -> {
-                int ei = s_.getElement(i);
-                return v1.get(ei);
+                int ei = s_.lane(i);
+                return v1.lane(ei);
             }));
     }
 
@@ -1105,13 +1105,13 @@
         return VectorIntrinsics.blend(
             Byte128Vector.class, Byte128Mask.class, byte.class, LENGTH,
             this, v, m,
-            (v1, v2, m_) -> v1.bOp(v2, (i, a, b) -> m_.getElement(i) ? b : a));
+            (v1, v2, m_) -> v1.bOp(v2, (i, a, b) -> m_.lane(i) ? b : a));
     }
 
     // Accessors
 
     @Override
-    public byte get(int i) {
+    public byte lane(int i) {
         if (i < 0 || i >= LENGTH) {
             throw new IllegalArgumentException("Index " + i + " must be zero or positive, and less than " + LENGTH);
         }
@@ -1312,7 +1312,7 @@
         public ByteVector toVector() {
             byte[] va = new byte[SPECIES.length()];
             for (int i = 0; i < va.length; i++) {
-              va[i] = (byte) getElement(i);
+              va[i] = (byte) lane(i);
             }
             return ByteVector.fromArray(SPECIES, va, 0);
         }
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Byte256Vector.java	Thu Apr 18 23:47:37 2019 -0700
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Byte256Vector.java	Fri Apr 19 11:35:36 2019 -0700
@@ -170,37 +170,37 @@
         if (stype == byte.class) {
             byte[] a = new byte[limit];
             for (int i = 0; i < limit; i++) {
-                a[i] = (byte) this.get(i);
+                a[i] = (byte) this.lane(i);
             }
             return (Vector) ByteVector.fromArray((VectorSpecies<Byte>) s, a, 0);
         } else if (stype == short.class) {
             short[] a = new short[limit];
             for (int i = 0; i < limit; i++) {
-                a[i] = (short) this.get(i);
+                a[i] = (short) this.lane(i);
             }
             return (Vector) ShortVector.fromArray((VectorSpecies<Short>) s, a, 0);
         } else if (stype == int.class) {
             int[] a = new int[limit];
             for (int i = 0; i < limit; i++) {
-                a[i] = (int) this.get(i);
+                a[i] = (int) this.lane(i);
             }
             return (Vector) IntVector.fromArray((VectorSpecies<Integer>) s, a, 0);
         } else if (stype == long.class) {
             long[] a = new long[limit];
             for (int i = 0; i < limit; i++) {
-                a[i] = (long) this.get(i);
+                a[i] = (long) this.lane(i);
             }
             return (Vector) LongVector.fromArray((VectorSpecies<Long>) s, a, 0);
         } else if (stype == float.class) {
             float[] a = new float[limit];
             for (int i = 0; i < limit; i++) {
-                a[i] = (float) this.get(i);
+                a[i] = (float) this.lane(i);
             }
             return (Vector) FloatVector.fromArray((VectorSpecies<Float>) s, a, 0);
         } else if (stype == double.class) {
             double[] a = new double[limit];
             for (int i = 0; i < limit; i++) {
-                a[i] = (double) this.get(i);
+                a[i] = (double) this.lane(i);
             }
             return (Vector) DoubleVector.fromArray((VectorSpecies<Double>) s, a, 0);
         } else {
@@ -1089,8 +1089,8 @@
             Byte256Vector.class, Byte256Shuffle.class, byte.class, LENGTH,
             this, s,
             (v1, s_) -> v1.uOp((i, a) -> {
-                int ei = s_.getElement(i);
-                return v1.get(ei);
+                int ei = s_.lane(i);
+                return v1.lane(ei);
             }));
     }
 
@@ -1105,13 +1105,13 @@
         return VectorIntrinsics.blend(
             Byte256Vector.class, Byte256Mask.class, byte.class, LENGTH,
             this, v, m,
-            (v1, v2, m_) -> v1.bOp(v2, (i, a, b) -> m_.getElement(i) ? b : a));
+            (v1, v2, m_) -> v1.bOp(v2, (i, a, b) -> m_.lane(i) ? b : a));
     }
 
     // Accessors
 
     @Override
-    public byte get(int i) {
+    public byte lane(int i) {
         if (i < 0 || i >= LENGTH) {
             throw new IllegalArgumentException("Index " + i + " must be zero or positive, and less than " + LENGTH);
         }
@@ -1312,7 +1312,7 @@
         public ByteVector toVector() {
             byte[] va = new byte[SPECIES.length()];
             for (int i = 0; i < va.length; i++) {
-              va[i] = (byte) getElement(i);
+              va[i] = (byte) lane(i);
             }
             return ByteVector.fromArray(SPECIES, va, 0);
         }
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Byte512Vector.java	Thu Apr 18 23:47:37 2019 -0700
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Byte512Vector.java	Fri Apr 19 11:35:36 2019 -0700
@@ -170,37 +170,37 @@
         if (stype == byte.class) {
             byte[] a = new byte[limit];
             for (int i = 0; i < limit; i++) {
-                a[i] = (byte) this.get(i);
+                a[i] = (byte) this.lane(i);
             }
             return (Vector) ByteVector.fromArray((VectorSpecies<Byte>) s, a, 0);
         } else if (stype == short.class) {
             short[] a = new short[limit];
             for (int i = 0; i < limit; i++) {
-                a[i] = (short) this.get(i);
+                a[i] = (short) this.lane(i);
             }
             return (Vector) ShortVector.fromArray((VectorSpecies<Short>) s, a, 0);
         } else if (stype == int.class) {
             int[] a = new int[limit];
             for (int i = 0; i < limit; i++) {
-                a[i] = (int) this.get(i);
+                a[i] = (int) this.lane(i);
             }
             return (Vector) IntVector.fromArray((VectorSpecies<Integer>) s, a, 0);
         } else if (stype == long.class) {
             long[] a = new long[limit];
             for (int i = 0; i < limit; i++) {
-                a[i] = (long) this.get(i);
+                a[i] = (long) this.lane(i);
             }
             return (Vector) LongVector.fromArray((VectorSpecies<Long>) s, a, 0);
         } else if (stype == float.class) {
             float[] a = new float[limit];
             for (int i = 0; i < limit; i++) {
-                a[i] = (float) this.get(i);
+                a[i] = (float) this.lane(i);
             }
             return (Vector) FloatVector.fromArray((VectorSpecies<Float>) s, a, 0);
         } else if (stype == double.class) {
             double[] a = new double[limit];
             for (int i = 0; i < limit; i++) {
-                a[i] = (double) this.get(i);
+                a[i] = (double) this.lane(i);
             }
             return (Vector) DoubleVector.fromArray((VectorSpecies<Double>) s, a, 0);
         } else {
@@ -1089,8 +1089,8 @@
             Byte512Vector.class, Byte512Shuffle.class, byte.class, LENGTH,
             this, s,
             (v1, s_) -> v1.uOp((i, a) -> {
-                int ei = s_.getElement(i);
-                return v1.get(ei);
+                int ei = s_.lane(i);
+                return v1.lane(ei);
             }));
     }
 
@@ -1105,13 +1105,13 @@
         return VectorIntrinsics.blend(
             Byte512Vector.class, Byte512Mask.class, byte.class, LENGTH,
             this, v, m,
-            (v1, v2, m_) -> v1.bOp(v2, (i, a, b) -> m_.getElement(i) ? b : a));
+            (v1, v2, m_) -> v1.bOp(v2, (i, a, b) -> m_.lane(i) ? b : a));
     }
 
     // Accessors
 
     @Override
-    public byte get(int i) {
+    public byte lane(int i) {
         if (i < 0 || i >= LENGTH) {
             throw new IllegalArgumentException("Index " + i + " must be zero or positive, and less than " + LENGTH);
         }
@@ -1312,7 +1312,7 @@
         public ByteVector toVector() {
             byte[] va = new byte[SPECIES.length()];
             for (int i = 0; i < va.length; i++) {
-              va[i] = (byte) getElement(i);
+              va[i] = (byte) lane(i);
             }
             return ByteVector.fromArray(SPECIES, va, 0);
         }
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Byte64Vector.java	Thu Apr 18 23:47:37 2019 -0700
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Byte64Vector.java	Fri Apr 19 11:35:36 2019 -0700
@@ -170,37 +170,37 @@
         if (stype == byte.class) {
             byte[] a = new byte[limit];
             for (int i = 0; i < limit; i++) {
-                a[i] = (byte) this.get(i);
+                a[i] = (byte) this.lane(i);
             }
             return (Vector) ByteVector.fromArray((VectorSpecies<Byte>) s, a, 0);
         } else if (stype == short.class) {
             short[] a = new short[limit];
             for (int i = 0; i < limit; i++) {
-                a[i] = (short) this.get(i);
+                a[i] = (short) this.lane(i);
             }
             return (Vector) ShortVector.fromArray((VectorSpecies<Short>) s, a, 0);
         } else if (stype == int.class) {
             int[] a = new int[limit];
             for (int i = 0; i < limit; i++) {
-                a[i] = (int) this.get(i);
+                a[i] = (int) this.lane(i);
             }
             return (Vector) IntVector.fromArray((VectorSpecies<Integer>) s, a, 0);
         } else if (stype == long.class) {
             long[] a = new long[limit];
             for (int i = 0; i < limit; i++) {
-                a[i] = (long) this.get(i);
+                a[i] = (long) this.lane(i);
             }
             return (Vector) LongVector.fromArray((VectorSpecies<Long>) s, a, 0);
         } else if (stype == float.class) {
             float[] a = new float[limit];
             for (int i = 0; i < limit; i++) {
-                a[i] = (float) this.get(i);
+                a[i] = (float) this.lane(i);
             }
             return (Vector) FloatVector.fromArray((VectorSpecies<Float>) s, a, 0);
         } else if (stype == double.class) {
             double[] a = new double[limit];
             for (int i = 0; i < limit; i++) {
-                a[i] = (double) this.get(i);
+                a[i] = (double) this.lane(i);
             }
             return (Vector) DoubleVector.fromArray((VectorSpecies<Double>) s, a, 0);
         } else {
@@ -1089,8 +1089,8 @@
             Byte64Vector.class, Byte64Shuffle.class, byte.class, LENGTH,
             this, s,
             (v1, s_) -> v1.uOp((i, a) -> {
-                int ei = s_.getElement(i);
-                return v1.get(ei);
+                int ei = s_.lane(i);
+                return v1.lane(ei);
             }));
     }
 
@@ -1105,13 +1105,13 @@
         return VectorIntrinsics.blend(
             Byte64Vector.class, Byte64Mask.class, byte.class, LENGTH,
             this, v, m,
-            (v1, v2, m_) -> v1.bOp(v2, (i, a, b) -> m_.getElement(i) ? b : a));
+            (v1, v2, m_) -> v1.bOp(v2, (i, a, b) -> m_.lane(i) ? b : a));
     }
 
     // Accessors
 
     @Override
-    public byte get(int i) {
+    public byte lane(int i) {
         if (i < 0 || i >= LENGTH) {
             throw new IllegalArgumentException("Index " + i + " must be zero or positive, and less than " + LENGTH);
         }
@@ -1312,7 +1312,7 @@
         public ByteVector toVector() {
             byte[] va = new byte[SPECIES.length()];
             for (int i = 0; i < va.length; i++) {
-              va[i] = (byte) getElement(i);
+              va[i] = (byte) lane(i);
             }
             return ByteVector.fromArray(SPECIES, va, 0);
         }
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/ByteMaxVector.java	Thu Apr 18 23:47:37 2019 -0700
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/ByteMaxVector.java	Fri Apr 19 11:35:36 2019 -0700
@@ -170,37 +170,37 @@
         if (stype == byte.class) {
             byte[] a = new byte[limit];
             for (int i = 0; i < limit; i++) {
-                a[i] = (byte) this.get(i);
+                a[i] = (byte) this.lane(i);
             }
             return (Vector) ByteVector.fromArray((VectorSpecies<Byte>) s, a, 0);
         } else if (stype == short.class) {
             short[] a = new short[limit];
             for (int i = 0; i < limit; i++) {
-                a[i] = (short) this.get(i);
+                a[i] = (short) this.lane(i);
             }
             return (Vector) ShortVector.fromArray((VectorSpecies<Short>) s, a, 0);
         } else if (stype == int.class) {
             int[] a = new int[limit];
             for (int i = 0; i < limit; i++) {
-                a[i] = (int) this.get(i);
+                a[i] = (int) this.lane(i);
             }
             return (Vector) IntVector.fromArray((VectorSpecies<Integer>) s, a, 0);
         } else if (stype == long.class) {
             long[] a = new long[limit];
             for (int i = 0; i < limit; i++) {
-                a[i] = (long) this.get(i);
+                a[i] = (long) this.lane(i);
             }
             return (Vector) LongVector.fromArray((VectorSpecies<Long>) s, a, 0);
         } else if (stype == float.class) {
             float[] a = new float[limit];
             for (int i = 0; i < limit; i++) {
-                a[i] = (float) this.get(i);
+                a[i] = (float) this.lane(i);
             }
             return (Vector) FloatVector.fromArray((VectorSpecies<Float>) s, a, 0);
         } else if (stype == double.class) {
             double[] a = new double[limit];
             for (int i = 0; i < limit; i++) {
-                a[i] = (double) this.get(i);
+                a[i] = (double) this.lane(i);
             }
             return (Vector) DoubleVector.fromArray((VectorSpecies<Double>) s, a, 0);
         } else {
@@ -1089,8 +1089,8 @@
             ByteMaxVector.class, ByteMaxShuffle.class, byte.class, LENGTH,
             this, s,
             (v1, s_) -> v1.uOp((i, a) -> {
-                int ei = s_.getElement(i);
-                return v1.get(ei);
+                int ei = s_.lane(i);
+                return v1.lane(ei);
             }));
     }
 
@@ -1105,13 +1105,13 @@
         return VectorIntrinsics.blend(
             ByteMaxVector.class, ByteMaxMask.class, byte.class, LENGTH,
             this, v, m,
-            (v1, v2, m_) -> v1.bOp(v2, (i, a, b) -> m_.getElement(i) ? b : a));
+            (v1, v2, m_) -> v1.bOp(v2, (i, a, b) -> m_.lane(i) ? b : a));
     }
 
     // Accessors
 
     @Override
-    public byte get(int i) {
+    public byte lane(int i) {
         if (i < 0 || i >= LENGTH) {
             throw new IllegalArgumentException("Index " + i + " must be zero or positive, and less than " + LENGTH);
         }
@@ -1312,7 +1312,7 @@
         public ByteVector toVector() {
             byte[] va = new byte[SPECIES.length()];
             for (int i = 0; i < va.length; i++) {
-              va[i] = (byte) getElement(i);
+              va[i] = (byte) lane(i);
             }
             return ByteVector.fromArray(SPECIES, va, 0);
         }
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/ByteVector.java	Thu Apr 18 23:47:37 2019 -0700
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/ByteVector.java	Fri Apr 19 11:35:36 2019 -0700
@@ -124,26 +124,26 @@
      * <p>
      * This method behaves as if it returns the result of calling the
      * byte buffer, offset, and mask accepting
-     * {@link #fromByteBuffer(VectorSpecies<Byte>, ByteBuffer, int, VectorMask) method} as follows:
+     * {@link #fromByteBuffer(VectorSpecies, ByteBuffer, int, VectorMask) method} as follows:
      * <pre>{@code
-     * return this.fromByteBuffer(ByteBuffer.wrap(a), i, this.maskAllTrue());
+     * return fromByteBuffer(species, ByteBuffer.wrap(a), offset, VectorMask.allTrue());
      * }</pre>
      *
      * @param species species of desired vector
      * @param a the byte array
-     * @param ix the offset into the array
+     * @param offset the offset into the array
      * @return a vector loaded from a byte array
      * @throws IndexOutOfBoundsException if {@code i < 0} or
-     * {@code i > a.length - (this.length() * this.elementSize() / Byte.SIZE)}
+     * {@code offset > a.length - (species.length() * species.elementSize() / Byte.SIZE)}
      */
     @ForceInline
     @SuppressWarnings("unchecked")
-    public static ByteVector fromByteArray(VectorSpecies<Byte> species, byte[] a, int ix) {
+    public static ByteVector fromByteArray(VectorSpecies<Byte> species, byte[] a, int offset) {
         Objects.requireNonNull(a);
-        ix = VectorIntrinsics.checkIndex(ix, a.length, species.bitSize() / Byte.SIZE);
+        offset = VectorIntrinsics.checkIndex(offset, a.length, species.bitSize() / Byte.SIZE);
         return VectorIntrinsics.load((Class<ByteVector>) species.boxType(), byte.class, species.length(),
-                                     a, ((long) ix) + Unsafe.ARRAY_BYTE_BASE_OFFSET,
-                                     a, ix, species,
+                                     a, ((long) offset) + Unsafe.ARRAY_BYTE_BASE_OFFSET,
+                                     a, offset, species,
                                      (c, idx, s) -> {
                                          ByteBuffer bbc = ByteBuffer.wrap(c, idx, a.length - idx).order(ByteOrder.nativeOrder());
                                          ByteBuffer tb = bbc;
@@ -160,51 +160,48 @@
      * <p>
      * This method behaves as if it returns the result of calling the
      * byte buffer, offset, and mask accepting
-     * {@link #fromByteBuffer(VectorSpecies<Byte>, ByteBuffer, int, VectorMask) method} as follows:
+     * {@link #fromByteBuffer(VectorSpecies, ByteBuffer, int, VectorMask) method} as follows:
      * <pre>{@code
-     * return this.fromByteBuffer(ByteBuffer.wrap(a), i, m);
+     * return fromByteBuffer(species, ByteBuffer.wrap(a), offset, m);
      * }</pre>
      *
      * @param species species of desired vector
      * @param a the byte array
-     * @param ix the offset into the array
+     * @param offset the offset into the array
      * @param m the mask
      * @return a vector loaded from a byte array
-     * @throws IndexOutOfBoundsException if {@code i < 0} or
-     * {@code i > a.length - (this.length() * this.elementSize() / Byte.SIZE)}
-     * @throws IndexOutOfBoundsException if the offset is {@code < 0},
-     * or {@code > a.length},
+     * @throws IndexOutOfBoundsException if {@code offset < 0} or
      * for any vector lane index {@code N} where the mask at lane {@code N}
      * is set
-     * {@code i >= a.length - (N * this.elementSize() / Byte.SIZE)}
+     * {@code offset >= a.length - (N * species.elementSize() / Byte.SIZE)}
      */
     @ForceInline
-    public static ByteVector fromByteArray(VectorSpecies<Byte> species, byte[] a, int ix, VectorMask<Byte> m) {
-        return zero(species).blend(fromByteArray(species, a, ix), m);
+    public static ByteVector fromByteArray(VectorSpecies<Byte> species, byte[] a, int offset, VectorMask<Byte> m) {
+        return zero(species).blend(fromByteArray(species, a, offset), m);
     }
 
     /**
      * Loads a vector from an array starting at offset.
      * <p>
      * For each vector lane, where {@code N} is the vector lane index, the
-     * array element at index {@code i + N} is placed into the
+     * array element at index {@code offset + N} is placed into the
      * resulting vector at lane index {@code N}.
      *
      * @param species species of desired vector
      * @param a the array
-     * @param i the offset into the array
+     * @param offset the offset into the array
      * @return the vector loaded from an array
-     * @throws IndexOutOfBoundsException if {@code i < 0}, or
-     * {@code i > a.length - this.length()}
+     * @throws IndexOutOfBoundsException if {@code offset < 0}, or
+     * {@code offset > a.length - species.length()}
      */
     @ForceInline
     @SuppressWarnings("unchecked")
-    public static ByteVector fromArray(VectorSpecies<Byte> species, byte[] a, int i){
+    public static ByteVector fromArray(VectorSpecies<Byte> species, byte[] a, int offset){
         Objects.requireNonNull(a);
-        i = VectorIntrinsics.checkIndex(i, a.length, species.length());
+        offset = VectorIntrinsics.checkIndex(offset, a.length, species.length());
         return VectorIntrinsics.load((Class<ByteVector>) species.boxType(), byte.class, species.length(),
-                                     a, (((long) i) << ARRAY_SHIFT) + Unsafe.ARRAY_BYTE_BASE_OFFSET,
-                                     a, i, species,
+                                     a, (((long) offset) << ARRAY_SHIFT) + Unsafe.ARRAY_BYTE_BASE_OFFSET,
+                                     a, offset, species,
                                      (c, idx, s) -> ((ByteSpecies)s).op(n -> c[idx + n]));
     }
 
@@ -214,22 +211,22 @@
      * <p>
      * For each vector lane, where {@code N} is the vector lane index,
      * if the mask lane at index {@code N} is set then the array element at
-     * index {@code i + N} is placed into the resulting vector at lane index
+     * index {@code offset + N} is placed into the resulting vector at lane index
      * {@code N}, otherwise the default element value is placed into the
      * resulting vector at lane index {@code N}.
      *
      * @param species species of desired vector
      * @param a the array
-     * @param i the offset into the array
+     * @param offset the offset into the array
      * @param m the mask
      * @return the vector loaded from an array
-     * @throws IndexOutOfBoundsException if {@code i < 0}, or
+     * @throws IndexOutOfBoundsException if {@code offset < 0}, or
      * for any vector lane index {@code N} where the mask at lane {@code N}
-     * is set {@code i > a.length - N}
+     * is set {@code offset > a.length - N}
      */
     @ForceInline
-    public static ByteVector fromArray(VectorSpecies<Byte> species, byte[] a, int i, VectorMask<Byte> m) {
-        return zero(species).blend(fromArray(species, a, i), m);
+    public static ByteVector fromArray(VectorSpecies<Byte> species, byte[] a, int offset, VectorMask<Byte> m) {
+        return zero(species).blend(fromArray(species, a, offset), m);
     }
 
     /**
@@ -237,24 +234,24 @@
      * map.
      * <p>
      * For each vector lane, where {@code N} is the vector lane index, the
-     * array element at index {@code i + indexMap[j + N]} is placed into the
+     * array element at index {@code a_offset + indexMap[i_offset + N]} is placed into the
      * resulting vector at lane index {@code N}.
      *
      * @param species species of desired vector
      * @param a the array
-     * @param i the offset into the array, may be negative if relative
+     * @param a_offset the offset into the array, may be negative if relative
      * indexes in the index map compensate to produce a value within the
      * array bounds
      * @param indexMap the index map
-     * @param j the offset into the index map
+     * @param i_offset the offset into the index map
      * @return the vector loaded from an array
-     * @throws IndexOutOfBoundsException if {@code j < 0}, or
-     * {@code j > indexMap.length - this.length()},
+     * @throws IndexOutOfBoundsException if {@code i_offset < 0}, or
+     * {@code i_offset > indexMap.length - species.length()},
      * or for any vector lane index {@code N} the result of
-     * {@code i + indexMap[j + N]} is {@code < 0} or {@code >= a.length}
+     * {@code a_offset + indexMap[i_offset + N]} is {@code < 0} or {@code >= a.length}
      */
-    public static ByteVector fromArray(VectorSpecies<Byte> species, byte[] a, int i, int[] indexMap, int j) {
-        return ((ByteSpecies)species).op(n -> a[i + indexMap[j + n]]);
+    public static ByteVector fromArray(VectorSpecies<Byte> species, byte[] a, int a_offset, int[] indexMap, int i_offset) {
+        return ((ByteSpecies)species).op(n -> a[a_offset + indexMap[i_offset + n]]);
     }
     /**
      * Loads a vector from an array using indexes obtained from an index
@@ -262,26 +259,26 @@
      * <p>
      * For each vector lane, where {@code N} is the vector lane index,
      * if the mask lane at index {@code N} is set then the array element at
-     * index {@code i + indexMap[j + N]} is placed into the resulting vector
+     * index {@code a_offset + indexMap[i_offset + N]} is placed into the resulting vector
      * at lane index {@code N}.
      *
      * @param species species of desired vector
      * @param a the array
-     * @param i the offset into the array, may be negative if relative
+     * @param a_offset the offset into the array, may be negative if relative
      * indexes in the index map compensate to produce a value within the
      * array bounds
      * @param m the mask
      * @param indexMap the index map
-     * @param j the offset into the index map
+     * @param i_offset the offset into the index map
      * @return the vector loaded from an array
-     * @throws IndexOutOfBoundsException if {@code j < 0}, or
-     * {@code j > indexMap.length - this.length()},
+     * @throws IndexOutOfBoundsException if {@code i_offset < 0}, or
+     * {@code i_offset > indexMap.length - species.length()},
      * or for any vector lane index {@code N} where the mask at lane
-     * {@code N} is set the result of {@code i + indexMap[j + N]} is
+     * {@code N} is set the result of {@code a_offset + indexMap[i_offset + N]} is
      * {@code < 0} or {@code >= a.length}
      */
-    public static ByteVector fromArray(VectorSpecies<Byte> species, byte[] a, int i, VectorMask<Byte> m, int[] indexMap, int j) {
-        return ((ByteSpecies)species).op(m, n -> a[i + indexMap[j + n]]);
+    public static ByteVector fromArray(VectorSpecies<Byte> species, byte[] a, int a_offset, VectorMask<Byte> m, int[] indexMap, int i_offset) {
+        return ((ByteSpecies)species).op(m, n -> a[a_offset + indexMap[i_offset + n]]);
     }
 
     /**
@@ -293,31 +290,31 @@
      * <p>
      * This method behaves as if it returns the result of calling the
      * byte buffer, offset, and mask accepting
-     * {@link #fromByteBuffer(VectorSpecies<Byte>, ByteBuffer, int, VectorMask)} method} as follows:
+     * {@link #fromByteBuffer(VectorSpecies, ByteBuffer, int, VectorMask)} method} as follows:
      * <pre>{@code
-     *   return this.fromByteBuffer(b, i, this.maskAllTrue())
+     *   return fromByteBuffer(b, offset, VectorMask.allTrue())
      * }</pre>
      *
      * @param species species of desired vector
      * @param bb the byte buffer
-     * @param ix the offset into the byte buffer
+     * @param offset the offset into the byte buffer
      * @return a vector loaded from a byte buffer
      * @throws IndexOutOfBoundsException if the offset is {@code < 0},
      * or {@code > b.limit()},
      * or if there are fewer than
-     * {@code this.length() * this.elementSize() / Byte.SIZE} bytes
+     * {@code species.length() * species.elementSize() / Byte.SIZE} bytes
      * remaining in the byte buffer from the given offset
      */
     @ForceInline
     @SuppressWarnings("unchecked")
-    public static ByteVector fromByteBuffer(VectorSpecies<Byte> species, ByteBuffer bb, int ix) {
+    public static ByteVector fromByteBuffer(VectorSpecies<Byte> species, ByteBuffer bb, int offset) {
         if (bb.order() != ByteOrder.nativeOrder()) {
             throw new IllegalArgumentException();
         }
-        ix = VectorIntrinsics.checkIndex(ix, bb.limit(), species.bitSize() / Byte.SIZE);
+        offset = VectorIntrinsics.checkIndex(offset, bb.limit(), species.bitSize() / Byte.SIZE);
         return VectorIntrinsics.load((Class<ByteVector>) species.boxType(), byte.class, species.length(),
-                                     U.getReference(bb, BYTE_BUFFER_HB), U.getLong(bb, BUFFER_ADDRESS) + ix,
-                                     bb, ix, species,
+                                     U.getReference(bb, BYTE_BUFFER_HB), U.getLong(bb, BUFFER_ADDRESS) + offset,
+                                     bb, offset, species,
                                      (c, idx, s) -> {
                                          ByteBuffer bbc = c.duplicate().position(idx).order(ByteOrder.nativeOrder());
                                          ByteBuffer tb = bbc;
@@ -335,77 +332,77 @@
      * the returned vector is loaded with a mask from a primitive array
      * obtained from the primitive buffer.
      * The following pseudocode expresses the behaviour, where
-     * {@coce EBuffer} is the primitive buffer type, {@code e} is the
-     * primitive element type, and {@code ESpecies<S>} is the primitive
+     * {@code EBuffer} is the primitive buffer type, {@code e} is the
+     * primitive element type, and {@code ESpecies} is the primitive
      * species for {@code e}:
      * <pre>{@code
      * EBuffer eb = b.duplicate().
-     *     order(ByteOrder.nativeOrder()).position(i).
+     *     order(ByteOrder.nativeOrder()).position(offset).
      *     asEBuffer();
-     * e[] es = new e[this.length()];
+     * e[] es = new e[species.length()];
      * for (int n = 0; n < t.length; n++) {
      *     if (m.isSet(n))
      *         es[n] = eb.get(n);
      * }
-     * Vector<E> r = ((ESpecies<S>)this).fromArray(es, 0, m);
+     * EVector r = EVector.fromArray(es, 0, m);
      * }</pre>
      *
      * @param species species of desired vector
      * @param bb the byte buffer
-     * @param ix the offset into the byte buffer
+     * @param offset the offset into the byte buffer
      * @param m the mask
      * @return a vector loaded from a byte buffer
      * @throws IndexOutOfBoundsException if the offset is {@code < 0},
      * or {@code > b.limit()},
      * for any vector lane index {@code N} where the mask at lane {@code N}
      * is set
-     * {@code i >= b.limit() - (N * this.elementSize() / Byte.SIZE)}
+     * {@code offset >= b.limit() - (N * species.elementSize() / Byte.SIZE)}
      */
     @ForceInline
-    public static ByteVector fromByteBuffer(VectorSpecies<Byte> species, ByteBuffer bb, int ix, VectorMask<Byte> m) {
-        return zero(species).blend(fromByteBuffer(species, bb, ix), m);
+    public static ByteVector fromByteBuffer(VectorSpecies<Byte> species, ByteBuffer bb, int offset, VectorMask<Byte> m) {
+        return zero(species).blend(fromByteBuffer(species, bb, offset), m);
     }
 
     /**
      * Returns a vector where all lane elements are set to the primitive
      * value {@code e}.
      *
-     * @param s species of the desired vector
+     * @param species species of the desired vector
      * @param e the value
      * @return a vector of vector where all lane elements are set to
      * the primitive value {@code e}
      */
     @ForceInline
     @SuppressWarnings("unchecked")
-    public static ByteVector broadcast(VectorSpecies<Byte> s, byte e) {
+    public static ByteVector broadcast(VectorSpecies<Byte> species, byte e) {
         return VectorIntrinsics.broadcastCoerced(
-            (Class<ByteVector>) s.boxType(), byte.class, s.length(),
-            e, s,
+            (Class<ByteVector>) species.boxType(), byte.class, species.length(),
+            e, species,
             ((bits, sp) -> ((ByteSpecies)sp).op(i -> (byte)bits)));
     }
 
     /**
-     * Returns a vector where each lane element is set to a given
-     * primitive value.
+     * Returns a vector where each lane element is set to given
+     * primitive values.
      * <p>
      * For each vector lane, where {@code N} is the vector lane index, the
      * the primitive value at index {@code N} is placed into the resulting
      * vector at lane index {@code N}.
      *
-     * @param s species of the desired vector
+     * @param species species of the desired vector
      * @param es the given primitive values
-     * @return a vector where each lane element is set to a given primitive
-     * value
-     * @throws IndexOutOfBoundsException if {@code es.length < this.length()}
+     * @return a vector where each lane element is set to given primitive
+     * values
+     * @throws IndexOutOfBoundsException if {@code es.length < species.length()}
      */
     @ForceInline
     @SuppressWarnings("unchecked")
-    public static ByteVector scalars(VectorSpecies<Byte> s, byte... es) {
+    public static ByteVector scalars(VectorSpecies<Byte> species, byte... es) {
         Objects.requireNonNull(es);
-        int ix = VectorIntrinsics.checkIndex(0, es.length, s.length());
-        return VectorIntrinsics.load((Class<ByteVector>) s.boxType(), byte.class, s.length(),
+        int ix = VectorIntrinsics.checkIndex(0, es.length, species.length());
+        return VectorIntrinsics.load((Class<ByteVector>) species.boxType(), byte.class, species.length(),
                                      es, Unsafe.ARRAY_BYTE_BASE_OFFSET,
-                                     es, ix, s,
+                                     es, ix, species,
                                      (c, idx, sp) -> ((ByteSpecies)sp).op(n -> c[idx + n]));
     }
 
@@ -414,14 +411,14 @@
      * value {@code e}, all other lane elements are set to the default
      * value.
      *
-     * @param s species of the desired vector
+     * @param species species of the desired vector
      * @param e the value
      * @return a vector where the first lane element is set to the primitive
      * value {@code e}
      */
     @ForceInline
-    public static final ByteVector single(VectorSpecies<Byte> s, byte e) {
-        return zero(s).with(0, e);
+    public static final ByteVector single(VectorSpecies<Byte> species, byte e) {
+        return zero(species).with(0, e);
     }
 
     /**
@@ -431,25 +428,28 @@
      * The semantics are equivalent to calling
      * (byte){@link ThreadLocalRandom#nextInt()}
      *
-     * @param s species of the desired vector
+     * @param species species of the desired vector
      * @return a vector where each lane elements is set to a randomly
      * generated primitive value
      */
-    public static ByteVector random(VectorSpecies<Byte> s) {
+    public static ByteVector random(VectorSpecies<Byte> species) {
         ThreadLocalRandom r = ThreadLocalRandom.current();
-        return ((ByteSpecies)s).op(i -> (byte) r.nextInt());
+        return ((ByteSpecies)species).op(i -> (byte) r.nextInt());
     }
 
     // Ops
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public abstract ByteVector add(Vector<Byte> v);
 
     /**
      * Adds this vector to the broadcast of an input scalar.
      * <p>
-     * This is a vector binary operation where the primitive addition operation
-     * ({@code +}) is applied to lane elements.
+     * This is a lane-wise binary operation which applies the primitive addition operation
+     * ({@code +}) to each lane.
      *
      * @param s the input scalar
      * @return the result of adding this vector to the broadcast of an input
@@ -457,6 +457,9 @@
      */
     public abstract ByteVector add(byte s);
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public abstract ByteVector add(Vector<Byte> v, VectorMask<Byte> m);
 
@@ -464,8 +467,8 @@
      * Adds this vector to broadcast of an input scalar,
      * selecting lane elements controlled by a mask.
      * <p>
-     * This is a vector binary operation where the primitive addition operation
-     * ({@code +}) is applied to lane elements.
+     * This is a lane-wise binary operation which applies the primitive addition operation
+     * ({@code +}) to each lane.
      *
      * @param s the input scalar
      * @param m the mask controlling lane selection
@@ -474,14 +477,17 @@
      */
     public abstract ByteVector add(byte s, VectorMask<Byte> m);
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public abstract ByteVector sub(Vector<Byte> v);
 
     /**
      * Subtracts the broadcast of an input scalar from this vector.
      * <p>
-     * This is a vector binary operation where the primitive subtraction
-     * operation ({@code -}) is applied to lane elements.
+     * This is a lane-wise binary operation which applies the primitive subtraction
+     * operation ({@code -}) to each lane.
      *
      * @param s the input scalar
      * @return the result of subtracting the broadcast of an input
@@ -489,6 +495,9 @@
      */
     public abstract ByteVector sub(byte s);
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public abstract ByteVector sub(Vector<Byte> v, VectorMask<Byte> m);
 
@@ -496,8 +505,8 @@
      * Subtracts the broadcast of an input scalar from this vector, selecting
      * lane elements controlled by a mask.
      * <p>
-     * This is a vector binary operation where the primitive subtraction
-     * operation ({@code -}) is applied to lane elements.
+     * This is a lane-wise binary operation which applies the primitive subtraction
+     * operation ({@code -}) to each lane.
      *
      * @param s the input scalar
      * @param m the mask controlling lane selection
@@ -506,14 +515,17 @@
      */
     public abstract ByteVector sub(byte s, VectorMask<Byte> m);
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public abstract ByteVector mul(Vector<Byte> v);
 
     /**
      * Multiplies this vector with the broadcast of an input scalar.
      * <p>
-     * This is a vector binary operation where the primitive multiplication
-     * operation ({@code *}) is applied to lane elements.
+     * This is a lane-wise binary operation which applies the primitive multiplication
+     * operation ({@code *}) to each lane.
      *
      * @param s the input scalar
      * @return the result of multiplying this vector with the broadcast of an
@@ -521,6 +533,9 @@
      */
     public abstract ByteVector mul(byte s);
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public abstract ByteVector mul(Vector<Byte> v, VectorMask<Byte> m);
 
@@ -528,8 +543,8 @@
      * Multiplies this vector with the broadcast of an input scalar, selecting
      * lane elements controlled by a mask.
      * <p>
-     * This is a vector binary operation where the primitive multiplication
-     * operation ({@code *}) is applied to lane elements.
+     * This is a lane-wise binary operation which applies the primitive multiplication
+     * operation ({@code *}) to each lane.
      *
      * @param s the input scalar
      * @param m the mask controlling lane selection
@@ -538,60 +553,87 @@
      */
     public abstract ByteVector mul(byte s, VectorMask<Byte> m);
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public abstract ByteVector neg();
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public abstract ByteVector neg(VectorMask<Byte> m);
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public abstract ByteVector abs();
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public abstract ByteVector abs(VectorMask<Byte> m);
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public abstract ByteVector min(Vector<Byte> v);
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public abstract ByteVector min(Vector<Byte> v, VectorMask<Byte> m);
 
     /**
      * Returns the minimum of this vector and the broadcast of an input scalar.
      * <p>
-     * This is a vector binary operation where the operation
-     * {@code (a, b) -> Math.min(a, b)} is applied to lane elements.
+     * This is a lane-wise binary operation which applies the operation
+     * {@code (a, b) -> Math.min(a, b)} to each lane.
      *
      * @param s the input scalar
      * @return the minimum of this vector and the broadcast of an input scalar
      */
     public abstract ByteVector min(byte s);
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public abstract ByteVector max(Vector<Byte> v);
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public abstract ByteVector max(Vector<Byte> v, VectorMask<Byte> m);
 
     /**
      * Returns the maximum of this vector and the broadcast of an input scalar.
      * <p>
-     * This is a vector binary operation where the operation
-     * {@code (a, b) -> Math.max(a, b)} is applied to lane elements.
+     * This is a lane-wise binary operation which applies the operation
+     * {@code (a, b) -> Math.max(a, b)} to each lane.
      *
      * @param s the input scalar
      * @return the maximum of this vector and the broadcast of an input scalar
      */
     public abstract ByteVector max(byte s);
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public abstract VectorMask<Byte> equal(Vector<Byte> v);
 
     /**
      * Tests if this vector is equal to the broadcast of an input scalar.
      * <p>
-     * This is a vector binary test operation where the primitive equals
-     * operation ({@code ==}) is applied to lane elements.
+     * This is a lane-wise binary test operation which applies the primitive equals
+     * operation ({@code ==}) each lane.
      *
      * @param s the input scalar
      * @return the result mask of testing if this vector is equal to the
@@ -599,14 +641,17 @@
      */
     public abstract VectorMask<Byte> equal(byte s);
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public abstract VectorMask<Byte> notEqual(Vector<Byte> v);
 
     /**
      * Tests if this vector is not equal to the broadcast of an input scalar.
      * <p>
-     * This is a vector binary test operation where the primitive not equals
-     * operation ({@code !=}) is applied to lane elements.
+     * This is a lane-wise binary test operation which applies the primitive not equals
+     * operation ({@code !=}) to each lane.
      *
      * @param s the input scalar
      * @return the result mask of testing if this vector is not equal to the
@@ -614,14 +659,17 @@
      */
     public abstract VectorMask<Byte> notEqual(byte s);
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public abstract VectorMask<Byte> lessThan(Vector<Byte> v);
 
     /**
      * Tests if this vector is less than the broadcast of an input scalar.
      * <p>
-     * This is a vector binary test operation where the primitive less than
-     * operation ({@code <}) is applied to lane elements.
+     * This is a lane-wise binary test operation which applies the primitive less than
+     * operation ({@code <}) to each lane.
      *
      * @param s the input scalar
      * @return the mask result of testing if this vector is less than the
@@ -629,14 +677,17 @@
      */
     public abstract VectorMask<Byte> lessThan(byte s);
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public abstract VectorMask<Byte> lessThanEq(Vector<Byte> v);
 
     /**
      * Tests if this vector is less or equal to the broadcast of an input scalar.
      * <p>
-     * This is a vector binary test operation where the primitive less than
-     * or equal to operation ({@code <=}) is applied to lane elements.
+     * This is a lane-wise binary test operation which applies the primitive less than
+     * or equal to operation ({@code <=}) to each lane.
      *
      * @param s the input scalar
      * @return the mask result of testing if this vector is less than or equal
@@ -644,14 +695,17 @@
      */
     public abstract VectorMask<Byte> lessThanEq(byte s);
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public abstract VectorMask<Byte> greaterThan(Vector<Byte> v);
 
     /**
      * Tests if this vector is greater than the broadcast of an input scalar.
      * <p>
-     * This is a vector binary test operation where the primitive greater than
-     * operation ({@code >}) is applied to lane elements.
+     * This is a lane-wise binary test operation which applies the primitive greater than
+     * operation ({@code >}) to each lane.
      *
      * @param s the input scalar
      * @return the mask result of testing if this vector is greater than the
@@ -659,6 +713,9 @@
      */
     public abstract VectorMask<Byte> greaterThan(byte s);
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public abstract VectorMask<Byte> greaterThanEq(Vector<Byte> v);
 
@@ -666,8 +723,8 @@
      * Tests if this vector is greater than or equal to the broadcast of an
      * input scalar.
      * <p>
-     * This is a vector binary test operation where the primitive greater than
-     * or equal to operation ({@code >=}) is applied to lane elements.
+     * This is a lane-wise binary test operation which applies the primitive greater than
+     * or equal to operation ({@code >=}) to each lane.
      *
      * @param s the input scalar
      * @return the mask result of testing if this vector is greater than or
@@ -675,6 +732,9 @@
      */
     public abstract VectorMask<Byte> greaterThanEq(byte s);
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public abstract ByteVector blend(Vector<Byte> v, VectorMask<Byte> m);
 
@@ -695,25 +755,46 @@
      */
     public abstract ByteVector blend(byte s, VectorMask<Byte> m);
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public abstract ByteVector rearrange(Vector<Byte> v,
                                                       VectorShuffle<Byte> s, VectorMask<Byte> m);
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public abstract ByteVector rearrange(VectorShuffle<Byte> m);
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public abstract ByteVector reshape(VectorSpecies<Byte> s);
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public abstract ByteVector rotateEL(int i);
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public abstract ByteVector rotateER(int i);
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public abstract ByteVector shiftEL(int i);
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public abstract ByteVector shiftER(int i);
 
@@ -722,8 +803,8 @@
     /**
      * Bitwise ANDs this vector with an input vector.
      * <p>
-     * This is a vector binary operation where the primitive bitwise AND
-     * operation ({@code &}) is applied to lane elements.
+     * This is a lane-wise binary operation which applies the primitive bitwise AND
+     * operation ({@code &}) to each lane.
      *
      * @param v the input vector
      * @return the bitwise AND of this vector with the input vector
@@ -733,8 +814,8 @@
     /**
      * Bitwise ANDs this vector with the broadcast of an input scalar.
      * <p>
-     * This is a vector binary operation where the primitive bitwise AND
-     * operation ({@code &}) is applied to lane elements.
+     * This is a lane-wise binary operation which applies the primitive bitwise AND
+     * operation ({@code &}) to each lane.
      *
      * @param s the input scalar
      * @return the bitwise AND of this vector with the broadcast of an input
@@ -746,8 +827,8 @@
      * Bitwise ANDs this vector with an input vector, selecting lane elements
      * controlled by a mask.
      * <p>
-     * This is a vector binary operation where the primitive bitwise AND
-     * operation ({@code &}) is applied to lane elements.
+     * This is a lane-wise binary operation which applies the primitive bitwise AND
+     * operation ({@code &}) to each lane.
      *
      * @param v the input vector
      * @param m the mask controlling lane selection
@@ -759,8 +840,8 @@
      * Bitwise ANDs this vector with the broadcast of an input scalar, selecting
      * lane elements controlled by a mask.
      * <p>
-     * This is a vector binary operation where the primitive bitwise AND
-     * operation ({@code &}) is applied to lane elements.
+     * This is a lane-wise binary operation which applies the primitive bitwise AND
+     * operation ({@code &}) to each lane.
      *
      * @param s the input scalar
      * @param m the mask controlling lane selection
@@ -772,8 +853,8 @@
     /**
      * Bitwise ORs this vector with an input vector.
      * <p>
-     * This is a vector binary operation where the primitive bitwise OR
-     * operation ({@code |}) is applied to lane elements.
+     * This is a lane-wise binary operation which applies the primitive bitwise OR
+     * operation ({@code |}) to each lane.
      *
      * @param v the input vector
      * @return the bitwise OR of this vector with the input vector
@@ -783,8 +864,8 @@
     /**
      * Bitwise ORs this vector with the broadcast of an input scalar.
      * <p>
-     * This is a vector binary operation where the primitive bitwise OR
-     * operation ({@code |}) is applied to lane elements.
+     * This is a lane-wise binary operation which applies the primitive bitwise OR
+     * operation ({@code |}) to each lane.
      *
      * @param s the input scalar
      * @return the bitwise OR of this vector with the broadcast of an input
@@ -796,8 +877,8 @@
      * Bitwise ORs this vector with an input vector, selecting lane elements
      * controlled by a mask.
      * <p>
-     * This is a vector binary operation where the primitive bitwise OR
-     * operation ({@code |}) is applied to lane elements.
+     * This is a lane-wise binary operation which applies the primitive bitwise OR
+     * operation ({@code |}) to each lane.
      *
      * @param v the input vector
      * @param m the mask controlling lane selection
@@ -809,8 +890,8 @@
      * Bitwise ORs this vector with the broadcast of an input scalar, selecting
      * lane elements controlled by a mask.
      * <p>
-     * This is a vector binary operation where the primitive bitwise OR
-     * operation ({@code |}) is applied to lane elements.
+     * This is a lane-wise binary operation which applies the primitive bitwise OR
+     * operation ({@code |}) to each lane.
      *
      * @param s the input scalar
      * @param m the mask controlling lane selection
@@ -822,8 +903,8 @@
     /**
      * Bitwise XORs this vector with an input vector.
      * <p>
-     * This is a vector binary operation where the primitive bitwise XOR
-     * operation ({@code ^}) is applied to lane elements.
+     * This is a lane-wise binary operation which applies the primitive bitwise XOR
+     * operation ({@code ^}) to each lane.
      *
      * @param v the input vector
      * @return the bitwise XOR of this vector with the input vector
@@ -833,8 +914,8 @@
     /**
      * Bitwise XORs this vector with the broadcast of an input scalar.
      * <p>
-     * This is a vector binary operation where the primitive bitwise XOR
-     * operation ({@code ^}) is applied to lane elements.
+     * This is a lane-wise binary operation which applies the primitive bitwise XOR
+     * operation ({@code ^}) to each lane.
      *
      * @param s the input scalar
      * @return the bitwise XOR of this vector with the broadcast of an input
@@ -846,8 +927,8 @@
      * Bitwise XORs this vector with an input vector, selecting lane elements
      * controlled by a mask.
      * <p>
-     * This is a vector binary operation where the primitive bitwise XOR
-     * operation ({@code ^}) is applied to lane elements.
+     * This is a lane-wise binary operation which applies the primitive bitwise XOR
+     * operation ({@code ^}) to each lane.
      *
      * @param v the input vector
      * @param m the mask controlling lane selection
@@ -859,8 +940,8 @@
      * Bitwise XORs this vector with the broadcast of an input scalar, selecting
      * lane elements controlled by a mask.
      * <p>
-     * This is a vector binary operation where the primitive bitwise XOR
-     * operation ({@code ^}) is applied to lane elements.
+     * This is a lane-wise binary operation which applies the primitive bitwise XOR
+     * operation ({@code ^}) to each lane.
      *
      * @param s the input scalar
      * @param m the mask controlling lane selection
@@ -872,8 +953,8 @@
     /**
      * Bitwise NOTs this vector.
      * <p>
-     * This is a vector unary operation where the primitive bitwise NOT
-     * operation ({@code ~}) is applied to lane elements.
+     * This is a lane-wise unary operation which applies the primitive bitwise NOT
+     * operation ({@code ~}) to each lane.
      *
      * @return the bitwise NOT of this vector
      */
@@ -882,8 +963,8 @@
     /**
      * Bitwise NOTs this vector, selecting lane elements controlled by a mask.
      * <p>
-     * This is a vector unary operation where the primitive bitwise NOT
-     * operation ({@code ~}) is applied to lane elements.
+     * This is a lane-wise unary operation which applies the primitive bitwise NOT
+     * operation ({@code ~}) to each lane.
      *
      * @param m the mask controlling lane selection
      * @return the bitwise NOT of this vector
@@ -893,8 +974,8 @@
     /**
      * Logically left shifts this vector by the broadcast of an input scalar.
      * <p>
-     * This is a vector binary operation where the primitive logical left shift
-     * operation ({@code <<}) is applied to lane elements to left shift the
+     * This is a lane-wise binary operation which applies the primitive logical left shift
+     * operation ({@code <<}) to each lane to left shift the
      * element by shift value as specified by the input scalar. Only the 3
      * lowest-order bits of shift value are used. It is as if the shift value
      * were subjected to a bitwise logical AND operator ({@code &}) with the mask value 0x7.
@@ -910,8 +991,8 @@
      * Logically left shifts this vector by the broadcast of an input scalar,
      * selecting lane elements controlled by a mask.
      * <p>
-     * This is a vector binary operation where the primitive logical left shift
-     * operation ({@code <<}) is applied to lane elements to left shift the
+     * This is a lane-wise binary operation which applies the primitive logical left shift
+     * operation ({@code <<}) to each lane to left shift the
      * element by shift value as specified by the input scalar. Only the 3
      * lowest-order bits of shift value are used. It is as if the shift value
      * were subjected to a bitwise logical AND operator ({@code &}) with the mask value 0x7.
@@ -931,8 +1012,8 @@
      * Logically right shifts (or unsigned right shifts) this vector by the
      * broadcast of an input scalar.
      * <p>
-     * This is a vector binary operation where the primitive logical right shift
-     * operation ({@code >>>}) is applied to lane elements to logically right shift the
+     * This is a lane-wise binary operation which applies the primitive logical right shift
+     * operation ({@code >>>}) to each lane to logically right shift the
      * element by shift value as specified by the input scalar. Only the 3
      * lowest-order bits of shift value are used. It is as if the shift value
      * were subjected to a bitwise logical AND operator ({@code &}) with the mask value 0x7.
@@ -949,8 +1030,8 @@
      * broadcast of an input scalar, selecting lane elements controlled by a
      * mask.
      * <p>
-     * This is a vector binary operation where the primitive logical right shift
-     * operation ({@code >>>}) is applied to lane elements to logically right shift the
+     * This is a lane-wise binary operation which applies the primitive logical right shift
+     * operation ({@code >>}) to each lane to logically right shift the
      * element by shift value as specified by the input scalar. Only the 3
      * lowest-order bits of shift value are used. It is as if the shift value
      * were subjected to a bitwise logical AND operator ({@code &}) with the mask value 0x7.
@@ -968,8 +1049,8 @@
      * Arithmetically right shifts (or signed right shifts) this vector by the
      * broadcast of an input scalar.
      * <p>
-     * This is a vector binary operation where the primitive arithmetic right
-     * shift operation ({@code >>}) is applied to lane elements  to arithmetically
+     * This is a lane-wise binary operation which applies the primitive arithmetic right
+     * shift operation ({@code >>}) to each lane to arithmetically
      * right shift the element by shift value as specified by the input scalar.
      * Only the 3 lowest-order bits of shift value are used. It is as if the shift
      * value were subjected to a bitwise logical AND operator ({@code &}) with the mask value 0x7.
@@ -986,8 +1067,8 @@
      * broadcast of an input scalar, selecting lane elements controlled by a
      * mask.
      * <p>
-     * This is a vector binary operation where the primitive arithmetic right
-     * shift operation ({@code >>}) is applied to lane elements  to arithmetically
+     * This is a lane-wise binary operation which applies the primitive arithmetic right
+     * shift operation ({@code >>}) to each lane to arithmetically
      * right shift the element by shift value as specified by the input scalar.
      * Only the 3 lowest-order bits of shift value are used. It is as if the shift
      * value were subjected to a bitwise logical AND operator ({@code &}) with the mask value 0x7.
@@ -1001,15 +1082,27 @@
     public abstract ByteVector aShiftR(int s, VectorMask<Byte> m);
 
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public abstract void intoByteArray(byte[] a, int ix);
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public abstract void intoByteArray(byte[] a, int ix, VectorMask<Byte> m);
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public abstract void intoByteBuffer(ByteBuffer bb, int ix);
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public abstract void intoByteBuffer(ByteBuffer bb, int ix, VectorMask<Byte> m);
 
@@ -1018,8 +1111,8 @@
     /**
      * Adds all lane elements of this vector.
      * <p>
-     * This is an associative vector reduction operation where the addition
-     * operation ({@code +}) is applied to lane elements,
+     * This is an associative cross-lane reduction operation which applies the addition
+     * operation ({@code +}) to lane elements,
      * and the identity value is {@code 0}.
      *
      * @return the addition of all the lane elements of this vector
@@ -1030,8 +1123,8 @@
      * Adds all lane elements of this vector, selecting lane elements
      * controlled by a mask.
      * <p>
-     * This is an associative vector reduction operation where the addition
-     * operation ({@code +}) is applied to lane elements,
+     * This is an associative cross-lane reduction operation which applies the addition
+     * operation ({@code +}) to lane elements,
      * and the identity value is {@code 0}.
      *
      * @param m the mask controlling lane selection
@@ -1042,8 +1135,8 @@
     /**
      * Multiplies all lane elements of this vector.
      * <p>
-     * This is an associative vector reduction operation where the
-     * multiplication operation ({@code *}) is applied to lane elements,
+     * This is an associative cross-lane reduction operation which applies the
+     * multiplication operation ({@code *}) to lane elements,
      * and the identity value is {@code 1}.
      *
      * @return the multiplication of all the lane elements of this vector
@@ -1054,8 +1147,8 @@
      * Multiplies all lane elements of this vector, selecting lane elements
      * controlled by a mask.
      * <p>
-     * This is an associative vector reduction operation where the
-     * multiplication operation ({@code *}) is applied to lane elements,
+     * This is an associative cross-lane reduction operation which applies the
+     * multiplication operation ({@code *}) to lane elements,
      * and the identity value is {@code 1}.
      *
      * @param m the mask controlling lane selection
@@ -1066,8 +1159,8 @@
     /**
      * Returns the minimum lane element of this vector.
      * <p>
-     * This is an associative vector reduction operation where the operation
-     * {@code (a, b) -> Math.min(a, b)} is applied to lane elements,
+     * This is an associative cross-lane reduction operation which applies the operation
+     * {@code (a, b) -> Math.min(a, b)} to lane elements,
      * and the identity value is
      * {@link Byte#MAX_VALUE}.
      *
@@ -1079,8 +1172,8 @@
      * Returns the minimum lane element of this vector, selecting lane elements
      * controlled by a mask.
      * <p>
-     * This is an associative vector reduction operation where the operation
-     * {@code (a, b) -> Math.min(a, b)} is applied to lane elements,
+     * This is an associative cross-lane reduction operation which applies the operation
+     * {@code (a, b) -> Math.min(a, b)} to lane elements,
      * and the identity value is
      * {@link Byte#MAX_VALUE}.
      *
@@ -1092,8 +1185,8 @@
     /**
      * Returns the maximum lane element of this vector.
      * <p>
-     * This is an associative vector reduction operation where the operation
-     * {@code (a, b) -> Math.max(a, b)} is applied to lane elements,
+     * This is an associative cross-lane reduction operation which applies the operation
+     * {@code (a, b) -> Math.max(a, b)} to lane elements,
      * and the identity value is
      * {@link Byte#MIN_VALUE}.
      *
@@ -1105,8 +1198,8 @@
      * Returns the maximum lane element of this vector, selecting lane elements
      * controlled by a mask.
      * <p>
-     * This is an associative vector reduction operation where the operation
-     * {@code (a, b) -> Math.max(a, b)} is applied to lane elements,
+     * This is an associative cross-lane reduction operation which applies the operation
+     * {@code (a, b) -> Math.max(a, b)} to lane elements,
      * and the identity value is
      * {@link Byte#MIN_VALUE}.
      *
@@ -1118,8 +1211,8 @@
     /**
      * Logically ORs all lane elements of this vector.
      * <p>
-     * This is an associative vector reduction operation where the logical OR
-     * operation ({@code |}) is applied to lane elements,
+     * This is an associative cross-lane reduction operation which applies the logical OR
+     * operation ({@code |}) to lane elements,
      * and the identity value is {@code 0}.
      *
      * @return the logical OR all the lane elements of this vector
@@ -1130,8 +1223,8 @@
      * Logically ORs all lane elements of this vector, selecting lane elements
      * controlled by a mask.
      * <p>
-     * This is an associative vector reduction operation where the logical OR
-     * operation ({@code |}) is applied to lane elements,
+     * This is an associative cross-lane reduction operation which applies the logical OR
+     * operation ({@code |}) to lane elements,
      * and the identity value is {@code 0}.
      *
      * @param m the mask controlling lane selection
@@ -1142,8 +1235,8 @@
     /**
      * Logically ANDs all lane elements of this vector.
      * <p>
-     * This is an associative vector reduction operation where the logical AND
-     * operation ({@code |}) is applied to lane elements,
+     * This is an associative cross-lane reduction operation which applies the logical AND
+     * operation ({@code |}) to lane elements,
      * and the identity value is {@code -1}.
      *
      * @return the logical AND all the lane elements of this vector
@@ -1154,8 +1247,8 @@
      * Logically ANDs all lane elements of this vector, selecting lane elements
      * controlled by a mask.
      * <p>
-     * This is an associative vector reduction operation where the logical AND
-     * operation ({@code |}) is applied to lane elements,
+     * This is an associative cross-lane reduction operation which applies the logical AND
+     * operation ({@code |}) to lane elements,
      * and the identity value is {@code -1}.
      *
      * @param m the mask controlling lane selection
@@ -1166,8 +1259,8 @@
     /**
      * Logically XORs all lane elements of this vector.
      * <p>
-     * This is an associative vector reduction operation where the logical XOR
-     * operation ({@code ^}) is applied to lane elements,
+     * This is an associative cross-lane reduction operation which applies the logical XOR
+     * operation ({@code ^}) to lane elements,
      * and the identity value is {@code 0}.
      *
      * @return the logical XOR all the lane elements of this vector
@@ -1178,8 +1271,8 @@
      * Logically XORs all lane elements of this vector, selecting lane elements
      * controlled by a mask.
      * <p>
-     * This is an associative vector reduction operation where the logical XOR
-     * operation ({@code ^}) is applied to lane elements,
+     * This is an associative cross-lane reduction operation which applies the logical XOR
+     * operation ({@code ^}) to lane elements,
      * and the identity value is {@code 0}.
      *
      * @param m the mask controlling lane selection
@@ -1197,7 +1290,7 @@
      * @throws IllegalArgumentException if the index is is out of range
      * ({@code < 0 || >= length()})
      */
-    public abstract byte get(int i);
+    public abstract byte lane(int i);
 
     /**
      * Replaces the lane element of this vector at lane index {@code i} with
@@ -1244,30 +1337,30 @@
      * <p>
      * For each vector lane, where {@code N} is the vector lane index,
      * the lane element at index {@code N} is stored into the array at index
-     * {@code i + N}.
+     * {@code offset + N}.
      *
      * @param a the array
-     * @param i the offset into the array
-     * @throws IndexOutOfBoundsException if {@code i < 0}, or
-     * {@code i > a.length - this.length()}
+     * @param offset the offset into the array
+     * @throws IndexOutOfBoundsException if {@code offset < 0}, or
+     * {@code offset > a.length - this.length()}
      */
-    public abstract void intoArray(byte[] a, int i);
+    public abstract void intoArray(byte[] a, int offset);
 
     /**
      * Stores this vector into an array starting at offset and using a mask.
      * <p>
      * For each vector lane, where {@code N} is the vector lane index,
      * if the mask lane at index {@code N} is set then the lane element at
-     * index {@code N} is stored into the array index {@code i + N}.
+     * index {@code N} is stored into the array index {@code offset + N}.
      *
      * @param a the array
-     * @param i the offset into the array
+     * @param offset the offset into the array
      * @param m the mask
-     * @throws IndexOutOfBoundsException if {@code i < 0}, or
+     * @throws IndexOutOfBoundsException if {@code offset < 0}, or
      * for any vector lane index {@code N} where the mask at lane {@code N}
-     * is set {@code i >= a.length - N}
+     * is set {@code offset >= a.length - N}
      */
-    public abstract void intoArray(byte[] a, int i, VectorMask<Byte> m);
+    public abstract void intoArray(byte[] a, int offset, VectorMask<Byte> m);
 
     /**
      * Stores this vector into an array using indexes obtained from an index
@@ -1275,21 +1368,21 @@
      * <p>
      * For each vector lane, where {@code N} is the vector lane index, the
      * lane element at index {@code N} is stored into the array at index
-     * {@code i + indexMap[j + N]}.
+     * {@code a_offset + indexMap[i_offset + N]}.
      *
      * @param a the array
-     * @param i the offset into the array, may be negative if relative
+     * @param a_offset the offset into the array, may be negative if relative
      * indexes in the index map compensate to produce a value within the
      * array bounds
      * @param indexMap the index map
-     * @param j the offset into the index map
-     * @throws IndexOutOfBoundsException if {@code j < 0}, or
-     * {@code j > indexMap.length - this.length()},
+     * @param i_offset the offset into the index map
+     * @throws IndexOutOfBoundsException if {@code i_offset < 0}, or
+     * {@code i_offset > indexMap.length - this.length()},
      * or for any vector lane index {@code N} the result of
-     * {@code i + indexMap[j + N]} is {@code < 0} or {@code >= a.length}
+     * {@code a_offset + indexMap[i_offset + N]} is {@code < 0} or {@code >= a.length}
      */
-    public void intoArray(byte[] a, int i, int[] indexMap, int j) {
-        forEach((n, e) -> a[i + indexMap[j + n]] = e);
+    public void intoArray(byte[] a, int a_offset, int[] indexMap, int i_offset) {
+        forEach((n, e) -> a[a_offset + indexMap[i_offset + n]] = e);
     }
 
     /**
@@ -1299,26 +1392,29 @@
      * For each vector lane, where {@code N} is the vector lane index,
      * if the mask lane at index {@code N} is set then the lane element at
      * index {@code N} is stored into the array at index
-     * {@code i + indexMap[j + N]}.
+     * {@code a_offset + indexMap[i_offset + N]}.
      *
      * @param a the array
-     * @param i the offset into the array, may be negative if relative
+     * @param a_offset the offset into the array, may be negative if relative
      * indexes in the index map compensate to produce a value within the
      * array bounds
      * @param m the mask
      * @param indexMap the index map
-     * @param j the offset into the index map
+     * @param i_offset the offset into the index map
      * @throws IndexOutOfBoundsException if {@code j < 0}, or
-     * {@code j > indexMap.length - this.length()},
+     * {@code i_offset > indexMap.length - this.length()},
      * or for any vector lane index {@code N} where the mask at lane
-     * {@code N} is set the result of {@code i + indexMap[j + N]} is
+     * {@code N} is set the result of {@code a_offset + indexMap[i_offset + N]} is
      * {@code < 0} or {@code >= a.length}
      */
-    public void intoArray(byte[] a, int i, VectorMask<Byte> m, int[] indexMap, int j) {
-        forEach(m, (n, e) -> a[i + indexMap[j + n]] = e);
+    public void intoArray(byte[] a, int a_offset, VectorMask<Byte> m, int[] indexMap, int i_offset) {
+        forEach(m, (n, e) -> a[a_offset + indexMap[i_offset + n]] = e);
     }
     // Species
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public abstract VectorSpecies<Byte> species();
 
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Double128Vector.java	Thu Apr 18 23:47:37 2019 -0700
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Double128Vector.java	Fri Apr 19 11:35:36 2019 -0700
@@ -179,37 +179,37 @@
         if (stype == byte.class) {
             byte[] a = new byte[limit];
             for (int i = 0; i < limit; i++) {
-                a[i] = (byte) this.get(i);
+                a[i] = (byte) this.lane(i);
             }
             return (Vector) ByteVector.fromArray((VectorSpecies<Byte>) s, a, 0);
         } else if (stype == short.class) {
             short[] a = new short[limit];
             for (int i = 0; i < limit; i++) {
-                a[i] = (short) this.get(i);
+                a[i] = (short) this.lane(i);
             }
             return (Vector) ShortVector.fromArray((VectorSpecies<Short>) s, a, 0);
         } else if (stype == int.class) {
             int[] a = new int[limit];
             for (int i = 0; i < limit; i++) {
-                a[i] = (int) this.get(i);
+                a[i] = (int) this.lane(i);
             }
             return (Vector) IntVector.fromArray((VectorSpecies<Integer>) s, a, 0);
         } else if (stype == long.class) {
             long[] a = new long[limit];
             for (int i = 0; i < limit; i++) {
-                a[i] = (long) this.get(i);
+                a[i] = (long) this.lane(i);
             }
             return (Vector) LongVector.fromArray((VectorSpecies<Long>) s, a, 0);
         } else if (stype == float.class) {
             float[] a = new float[limit];
             for (int i = 0; i < limit; i++) {
-                a[i] = (float) this.get(i);
+                a[i] = (float) this.lane(i);
             }
             return (Vector) FloatVector.fromArray((VectorSpecies<Float>) s, a, 0);
         } else if (stype == double.class) {
             double[] a = new double[limit];
             for (int i = 0; i < limit; i++) {
-                a[i] = (double) this.get(i);
+                a[i] = (double) this.lane(i);
             }
             return (Vector) DoubleVector.fromArray((VectorSpecies<Double>) s, a, 0);
         } else {
@@ -1228,8 +1228,8 @@
             Double128Vector.class, Double128Shuffle.class, double.class, LENGTH,
             this, s,
             (v1, s_) -> v1.uOp((i, a) -> {
-                int ei = s_.getElement(i);
-                return v1.get(ei);
+                int ei = s_.lane(i);
+                return v1.lane(ei);
             }));
     }
 
@@ -1244,13 +1244,13 @@
         return VectorIntrinsics.blend(
             Double128Vector.class, Double128Mask.class, double.class, LENGTH,
             this, v, m,
-            (v1, v2, m_) -> v1.bOp(v2, (i, a, b) -> m_.getElement(i) ? b : a));
+            (v1, v2, m_) -> v1.bOp(v2, (i, a, b) -> m_.lane(i) ? b : a));
     }
 
     // Accessors
 
     @Override
-    public double get(int i) {
+    public double lane(int i) {
         if (i < 0 || i >= LENGTH) {
             throw new IllegalArgumentException("Index " + i + " must be zero or positive, and less than " + LENGTH);
         }
@@ -1452,7 +1452,7 @@
         public DoubleVector toVector() {
             double[] va = new double[SPECIES.length()];
             for (int i = 0; i < va.length; i++) {
-              va[i] = (double) getElement(i);
+              va[i] = (double) lane(i);
             }
             return DoubleVector.fromArray(SPECIES, va, 0);
         }
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Double256Vector.java	Thu Apr 18 23:47:37 2019 -0700
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Double256Vector.java	Fri Apr 19 11:35:36 2019 -0700
@@ -179,37 +179,37 @@
         if (stype == byte.class) {
             byte[] a = new byte[limit];
             for (int i = 0; i < limit; i++) {
-                a[i] = (byte) this.get(i);
+                a[i] = (byte) this.lane(i);
             }
             return (Vector) ByteVector.fromArray((VectorSpecies<Byte>) s, a, 0);
         } else if (stype == short.class) {
             short[] a = new short[limit];
             for (int i = 0; i < limit; i++) {
-                a[i] = (short) this.get(i);
+                a[i] = (short) this.lane(i);
             }
             return (Vector) ShortVector.fromArray((VectorSpecies<Short>) s, a, 0);
         } else if (stype == int.class) {
             int[] a = new int[limit];
             for (int i = 0; i < limit; i++) {
-                a[i] = (int) this.get(i);
+                a[i] = (int) this.lane(i);
             }
             return (Vector) IntVector.fromArray((VectorSpecies<Integer>) s, a, 0);
         } else if (stype == long.class) {
             long[] a = new long[limit];
             for (int i = 0; i < limit; i++) {
-                a[i] = (long) this.get(i);
+                a[i] = (long) this.lane(i);
             }
             return (Vector) LongVector.fromArray((VectorSpecies<Long>) s, a, 0);
         } else if (stype == float.class) {
             float[] a = new float[limit];
             for (int i = 0; i < limit; i++) {
-                a[i] = (float) this.get(i);
+                a[i] = (float) this.lane(i);
             }
             return (Vector) FloatVector.fromArray((VectorSpecies<Float>) s, a, 0);
         } else if (stype == double.class) {
             double[] a = new double[limit];
             for (int i = 0; i < limit; i++) {
-                a[i] = (double) this.get(i);
+                a[i] = (double) this.lane(i);
             }
             return (Vector) DoubleVector.fromArray((VectorSpecies<Double>) s, a, 0);
         } else {
@@ -1228,8 +1228,8 @@
             Double256Vector.class, Double256Shuffle.class, double.class, LENGTH,
             this, s,
             (v1, s_) -> v1.uOp((i, a) -> {
-                int ei = s_.getElement(i);
-                return v1.get(ei);
+                int ei = s_.lane(i);
+                return v1.lane(ei);
             }));
     }
 
@@ -1244,13 +1244,13 @@
         return VectorIntrinsics.blend(
             Double256Vector.class, Double256Mask.class, double.class, LENGTH,
             this, v, m,
-            (v1, v2, m_) -> v1.bOp(v2, (i, a, b) -> m_.getElement(i) ? b : a));
+            (v1, v2, m_) -> v1.bOp(v2, (i, a, b) -> m_.lane(i) ? b : a));
     }
 
     // Accessors
 
     @Override
-    public double get(int i) {
+    public double lane(int i) {
         if (i < 0 || i >= LENGTH) {
             throw new IllegalArgumentException("Index " + i + " must be zero or positive, and less than " + LENGTH);
         }
@@ -1452,7 +1452,7 @@
         public DoubleVector toVector() {
             double[] va = new double[SPECIES.length()];
             for (int i = 0; i < va.length; i++) {
-              va[i] = (double) getElement(i);
+              va[i] = (double) lane(i);
             }
             return DoubleVector.fromArray(SPECIES, va, 0);
         }
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Double512Vector.java	Thu Apr 18 23:47:37 2019 -0700
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Double512Vector.java	Fri Apr 19 11:35:36 2019 -0700
@@ -179,37 +179,37 @@
         if (stype == byte.class) {
             byte[] a = new byte[limit];
             for (int i = 0; i < limit; i++) {
-                a[i] = (byte) this.get(i);
+                a[i] = (byte) this.lane(i);
             }
             return (Vector) ByteVector.fromArray((VectorSpecies<Byte>) s, a, 0);
         } else if (stype == short.class) {
             short[] a = new short[limit];
             for (int i = 0; i < limit; i++) {
-                a[i] = (short) this.get(i);
+                a[i] = (short) this.lane(i);
             }
             return (Vector) ShortVector.fromArray((VectorSpecies<Short>) s, a, 0);
         } else if (stype == int.class) {
             int[] a = new int[limit];
             for (int i = 0; i < limit; i++) {
-                a[i] = (int) this.get(i);
+                a[i] = (int) this.lane(i);
             }
             return (Vector) IntVector.fromArray((VectorSpecies<Integer>) s, a, 0);
         } else if (stype == long.class) {
             long[] a = new long[limit];
             for (int i = 0; i < limit; i++) {
-                a[i] = (long) this.get(i);
+                a[i] = (long) this.lane(i);
             }
             return (Vector) LongVector.fromArray((VectorSpecies<Long>) s, a, 0);
         } else if (stype == float.class) {
             float[] a = new float[limit];
             for (int i = 0; i < limit; i++) {
-                a[i] = (float) this.get(i);
+                a[i] = (float) this.lane(i);
             }
             return (Vector) FloatVector.fromArray((VectorSpecies<Float>) s, a, 0);
         } else if (stype == double.class) {
             double[] a = new double[limit];
             for (int i = 0; i < limit; i++) {
-                a[i] = (double) this.get(i);
+                a[i] = (double) this.lane(i);
             }
             return (Vector) DoubleVector.fromArray((VectorSpecies<Double>) s, a, 0);
         } else {
@@ -1228,8 +1228,8 @@
             Double512Vector.class, Double512Shuffle.class, double.class, LENGTH,
             this, s,
             (v1, s_) -> v1.uOp((i, a) -> {
-                int ei = s_.getElement(i);
-                return v1.get(ei);
+                int ei = s_.lane(i);
+                return v1.lane(ei);
             }));
     }
 
@@ -1244,13 +1244,13 @@
         return VectorIntrinsics.blend(
             Double512Vector.class, Double512Mask.class, double.class, LENGTH,
             this, v, m,
-            (v1, v2, m_) -> v1.bOp(v2, (i, a, b) -> m_.getElement(i) ? b : a));
+            (v1, v2, m_) -> v1.bOp(v2, (i, a, b) -> m_.lane(i) ? b : a));
     }
 
     // Accessors
 
     @Override
-    public double get(int i) {
+    public double lane(int i) {
         if (i < 0 || i >= LENGTH) {
             throw new IllegalArgumentException("Index " + i + " must be zero or positive, and less than " + LENGTH);
         }
@@ -1452,7 +1452,7 @@
         public DoubleVector toVector() {
             double[] va = new double[SPECIES.length()];
             for (int i = 0; i < va.length; i++) {
-              va[i] = (double) getElement(i);
+              va[i] = (double) lane(i);
             }
             return DoubleVector.fromArray(SPECIES, va, 0);
         }
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Double64Vector.java	Thu Apr 18 23:47:37 2019 -0700
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Double64Vector.java	Fri Apr 19 11:35:36 2019 -0700
@@ -178,37 +178,37 @@
         if (stype == byte.class) {
             byte[] a = new byte[limit];
             for (int i = 0; i < limit; i++) {
-                a[i] = (byte) this.get(i);
+                a[i] = (byte) this.lane(i);
             }
             return (Vector) ByteVector.fromArray((VectorSpecies<Byte>) s, a, 0);
         } else if (stype == short.class) {
             short[] a = new short[limit];
             for (int i = 0; i < limit; i++) {
-                a[i] = (short) this.get(i);
+                a[i] = (short) this.lane(i);
             }
             return (Vector) ShortVector.fromArray((VectorSpecies<Short>) s, a, 0);
         } else if (stype == int.class) {
             int[] a = new int[limit];
             for (int i = 0; i < limit; i++) {
-                a[i] = (int) this.get(i);
+                a[i] = (int) this.lane(i);
             }
             return (Vector) IntVector.fromArray((VectorSpecies<Integer>) s, a, 0);
         } else if (stype == long.class) {
             long[] a = new long[limit];
             for (int i = 0; i < limit; i++) {
-                a[i] = (long) this.get(i);
+                a[i] = (long) this.lane(i);
             }
             return (Vector) LongVector.fromArray((VectorSpecies<Long>) s, a, 0);
         } else if (stype == float.class) {
             float[] a = new float[limit];
             for (int i = 0; i < limit; i++) {
-                a[i] = (float) this.get(i);
+                a[i] = (float) this.lane(i);
             }
             return (Vector) FloatVector.fromArray((VectorSpecies<Float>) s, a, 0);
         } else if (stype == double.class) {
             double[] a = new double[limit];
             for (int i = 0; i < limit; i++) {
-                a[i] = (double) this.get(i);
+                a[i] = (double) this.lane(i);
             }
             return (Vector) DoubleVector.fromArray((VectorSpecies<Double>) s, a, 0);
         } else {
@@ -1215,8 +1215,8 @@
             Double64Vector.class, Double64Shuffle.class, double.class, LENGTH,
             this, s,
             (v1, s_) -> v1.uOp((i, a) -> {
-                int ei = s_.getElement(i);
-                return v1.get(ei);
+                int ei = s_.lane(i);
+                return v1.lane(ei);
             }));
     }
 
@@ -1231,13 +1231,13 @@
         return VectorIntrinsics.blend(
             Double64Vector.class, Double64Mask.class, double.class, LENGTH,
             this, v, m,
-            (v1, v2, m_) -> v1.bOp(v2, (i, a, b) -> m_.getElement(i) ? b : a));
+            (v1, v2, m_) -> v1.bOp(v2, (i, a, b) -> m_.lane(i) ? b : a));
     }
 
     // Accessors
 
     @Override
-    public double get(int i) {
+    public double lane(int i) {
         if (i < 0 || i >= LENGTH) {
             throw new IllegalArgumentException("Index " + i + " must be zero or positive, and less than " + LENGTH);
         }
@@ -1439,7 +1439,7 @@
         public DoubleVector toVector() {
             double[] va = new double[SPECIES.length()];
             for (int i = 0; i < va.length; i++) {
-              va[i] = (double) getElement(i);
+              va[i] = (double) lane(i);
             }
             return DoubleVector.fromArray(SPECIES, va, 0);
         }
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/DoubleMaxVector.java	Thu Apr 18 23:47:37 2019 -0700
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/DoubleMaxVector.java	Fri Apr 19 11:35:36 2019 -0700
@@ -179,37 +179,37 @@
         if (stype == byte.class) {
             byte[] a = new byte[limit];
             for (int i = 0; i < limit; i++) {
-                a[i] = (byte) this.get(i);
+                a[i] = (byte) this.lane(i);
             }
             return (Vector) ByteVector.fromArray((VectorSpecies<Byte>) s, a, 0);
         } else if (stype == short.class) {
             short[] a = new short[limit];
             for (int i = 0; i < limit; i++) {
-                a[i] = (short) this.get(i);
+                a[i] = (short) this.lane(i);
             }
             return (Vector) ShortVector.fromArray((VectorSpecies<Short>) s, a, 0);
         } else if (stype == int.class) {
             int[] a = new int[limit];
             for (int i = 0; i < limit; i++) {
-                a[i] = (int) this.get(i);
+                a[i] = (int) this.lane(i);
             }
             return (Vector) IntVector.fromArray((VectorSpecies<Integer>) s, a, 0);
         } else if (stype == long.class) {
             long[] a = new long[limit];
             for (int i = 0; i < limit; i++) {
-                a[i] = (long) this.get(i);
+                a[i] = (long) this.lane(i);
             }
             return (Vector) LongVector.fromArray((VectorSpecies<Long>) s, a, 0);
         } else if (stype == float.class) {
             float[] a = new float[limit];
             for (int i = 0; i < limit; i++) {
-                a[i] = (float) this.get(i);
+                a[i] = (float) this.lane(i);
             }
             return (Vector) FloatVector.fromArray((VectorSpecies<Float>) s, a, 0);
         } else if (stype == double.class) {
             double[] a = new double[limit];
             for (int i = 0; i < limit; i++) {
-                a[i] = (double) this.get(i);
+                a[i] = (double) this.lane(i);
             }
             return (Vector) DoubleVector.fromArray((VectorSpecies<Double>) s, a, 0);
         } else {
@@ -1228,8 +1228,8 @@
             DoubleMaxVector.class, DoubleMaxShuffle.class, double.class, LENGTH,
             this, s,
             (v1, s_) -> v1.uOp((i, a) -> {
-                int ei = s_.getElement(i);
-                return v1.get(ei);
+                int ei = s_.lane(i);
+                return v1.lane(ei);
             }));
     }
 
@@ -1244,13 +1244,13 @@
         return VectorIntrinsics.blend(
             DoubleMaxVector.class, DoubleMaxMask.class, double.class, LENGTH,
             this, v, m,
-            (v1, v2, m_) -> v1.bOp(v2, (i, a, b) -> m_.getElement(i) ? b : a));
+            (v1, v2, m_) -> v1.bOp(v2, (i, a, b) -> m_.lane(i) ? b : a));
     }
 
     // Accessors
 
     @Override
-    public double get(int i) {
+    public double lane(int i) {
         if (i < 0 || i >= LENGTH) {
             throw new IllegalArgumentException("Index " + i + " must be zero or positive, and less than " + LENGTH);
         }
@@ -1452,7 +1452,7 @@
         public DoubleVector toVector() {
             double[] va = new double[SPECIES.length()];
             for (int i = 0; i < va.length; i++) {
-              va[i] = (double) getElement(i);
+              va[i] = (double) lane(i);
             }
             return DoubleVector.fromArray(SPECIES, va, 0);
         }
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/DoubleVector.java	Thu Apr 18 23:47:37 2019 -0700
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/DoubleVector.java	Fri Apr 19 11:35:36 2019 -0700
@@ -125,26 +125,26 @@
      * <p>
      * This method behaves as if it returns the result of calling the
      * byte buffer, offset, and mask accepting
-     * {@link #fromByteBuffer(VectorSpecies<Double>, ByteBuffer, int, VectorMask) method} as follows:
+     * {@link #fromByteBuffer(VectorSpecies, ByteBuffer, int, VectorMask) method} as follows:
      * <pre>{@code
-     * return this.fromByteBuffer(ByteBuffer.wrap(a), i, this.maskAllTrue());
+     * return fromByteBuffer(species, ByteBuffer.wrap(a), offset, VectorMask.allTrue());
      * }</pre>
      *
      * @param species species of desired vector
      * @param a the byte array
-     * @param ix the offset into the array
+     * @param offset the offset into the array
      * @return a vector loaded from a byte array
      * @throws IndexOutOfBoundsException if {@code i < 0} or
-     * {@code i > a.length - (this.length() * this.elementSize() / Byte.SIZE)}
+     * {@code offset > a.length - (species.length() * species.elementSize() / Byte.SIZE)}
      */
     @ForceInline
     @SuppressWarnings("unchecked")
-    public static DoubleVector fromByteArray(VectorSpecies<Double> species, byte[] a, int ix) {
+    public static DoubleVector fromByteArray(VectorSpecies<Double> species, byte[] a, int offset) {
         Objects.requireNonNull(a);
-        ix = VectorIntrinsics.checkIndex(ix, a.length, species.bitSize() / Byte.SIZE);
+        offset = VectorIntrinsics.checkIndex(offset, a.length, species.bitSize() / Byte.SIZE);
         return VectorIntrinsics.load((Class<DoubleVector>) species.boxType(), double.class, species.length(),
-                                     a, ((long) ix) + Unsafe.ARRAY_BYTE_BASE_OFFSET,
-                                     a, ix, species,
+                                     a, ((long) offset) + Unsafe.ARRAY_BYTE_BASE_OFFSET,
+                                     a, offset, species,
                                      (c, idx, s) -> {
                                          ByteBuffer bbc = ByteBuffer.wrap(c, idx, a.length - idx).order(ByteOrder.nativeOrder());
                                          DoubleBuffer tb = bbc.asDoubleBuffer();
@@ -161,51 +161,48 @@
      * <p>
      * This method behaves as if it returns the result of calling the
      * byte buffer, offset, and mask accepting
-     * {@link #fromByteBuffer(VectorSpecies<Double>, ByteBuffer, int, VectorMask) method} as follows:
+     * {@link #fromByteBuffer(VectorSpecies, ByteBuffer, int, VectorMask) method} as follows:
      * <pre>{@code
-     * return this.fromByteBuffer(ByteBuffer.wrap(a), i, m);
+     * return fromByteBuffer(species, ByteBuffer.wrap(a), offset, m);
      * }</pre>
      *
      * @param species species of desired vector
      * @param a the byte array
-     * @param ix the offset into the array
+     * @param offset the offset into the array
      * @param m the mask
      * @return a vector loaded from a byte array
-     * @throws IndexOutOfBoundsException if {@code i < 0} or
-     * {@code i > a.length - (this.length() * this.elementSize() / Byte.SIZE)}
-     * @throws IndexOutOfBoundsException if the offset is {@code < 0},
-     * or {@code > a.length},
+     * @throws IndexOutOfBoundsException if {@code offset < 0} or
      * for any vector lane index {@code N} where the mask at lane {@code N}
      * is set
-     * {@code i >= a.length - (N * this.elementSize() / Byte.SIZE)}
+     * {@code offset >= a.length - (N * species.elementSize() / Byte.SIZE)}
      */
     @ForceInline
-    public static DoubleVector fromByteArray(VectorSpecies<Double> species, byte[] a, int ix, VectorMask<Double> m) {
-        return zero(species).blend(fromByteArray(species, a, ix), m);
+    public static DoubleVector fromByteArray(VectorSpecies<Double> species, byte[] a, int offset, VectorMask<Double> m) {
+        return zero(species).blend(fromByteArray(species, a, offset), m);
     }
 
     /**
      * Loads a vector from an array starting at offset.
      * <p>
      * For each vector lane, where {@code N} is the vector lane index, the
-     * array element at index {@code i + N} is placed into the
+     * array element at index {@code offset + N} is placed into the
      * resulting vector at lane index {@code N}.
      *
      * @param species species of desired vector
      * @param a the array
-     * @param i the offset into the array
+     * @param offset the offset into the array
      * @return the vector loaded from an array
-     * @throws IndexOutOfBoundsException if {@code i < 0}, or
-     * {@code i > a.length - this.length()}
+     * @throws IndexOutOfBoundsException if {@code offset < 0}, or
+     * {@code offset > a.length - species.length()}
      */
     @ForceInline
     @SuppressWarnings("unchecked")
-    public static DoubleVector fromArray(VectorSpecies<Double> species, double[] a, int i){
+    public static DoubleVector fromArray(VectorSpecies<Double> species, double[] a, int offset){
         Objects.requireNonNull(a);
-        i = VectorIntrinsics.checkIndex(i, a.length, species.length());
+        offset = VectorIntrinsics.checkIndex(offset, a.length, species.length());
         return VectorIntrinsics.load((Class<DoubleVector>) species.boxType(), double.class, species.length(),
-                                     a, (((long) i) << ARRAY_SHIFT) + Unsafe.ARRAY_DOUBLE_BASE_OFFSET,
-                                     a, i, species,
+                                     a, (((long) offset) << ARRAY_SHIFT) + Unsafe.ARRAY_DOUBLE_BASE_OFFSET,
+                                     a, offset, species,
                                      (c, idx, s) -> ((DoubleSpecies)s).op(n -> c[idx + n]));
     }
 
@@ -215,22 +212,22 @@
      * <p>
      * For each vector lane, where {@code N} is the vector lane index,
      * if the mask lane at index {@code N} is set then the array element at
-     * index {@code i + N} is placed into the resulting vector at lane index
+     * index {@code offset + N} is placed into the resulting vector at lane index
      * {@code N}, otherwise the default element value is placed into the
      * resulting vector at lane index {@code N}.
      *
      * @param species species of desired vector
      * @param a the array
-     * @param i the offset into the array
+     * @param offset the offset into the array
      * @param m the mask
      * @return the vector loaded from an array
-     * @throws IndexOutOfBoundsException if {@code i < 0}, or
+     * @throws IndexOutOfBoundsException if {@code offset < 0}, or
      * for any vector lane index {@code N} where the mask at lane {@code N}
-     * is set {@code i > a.length - N}
+     * is set {@code offset > a.length - N}
      */
     @ForceInline
-    public static DoubleVector fromArray(VectorSpecies<Double> species, double[] a, int i, VectorMask<Double> m) {
-        return zero(species).blend(fromArray(species, a, i), m);
+    public static DoubleVector fromArray(VectorSpecies<Double> species, double[] a, int offset, VectorMask<Double> m) {
+        return zero(species).blend(fromArray(species, a, offset), m);
     }
 
     /**
@@ -238,40 +235,40 @@
      * map.
      * <p>
      * For each vector lane, where {@code N} is the vector lane index, the
-     * array element at index {@code i + indexMap[j + N]} is placed into the
+     * array element at index {@code a_offset + indexMap[i_offset + N]} is placed into the
      * resulting vector at lane index {@code N}.
      *
      * @param species species of desired vector
      * @param a the array
-     * @param i the offset into the array, may be negative if relative
+     * @param a_offset the offset into the array, may be negative if relative
      * indexes in the index map compensate to produce a value within the
      * array bounds
      * @param indexMap the index map
-     * @param j the offset into the index map
+     * @param i_offset the offset into the index map
      * @return the vector loaded from an array
-     * @throws IndexOutOfBoundsException if {@code j < 0}, or
-     * {@code j > indexMap.length - this.length()},
+     * @throws IndexOutOfBoundsException if {@code i_offset < 0}, or
+     * {@code i_offset > indexMap.length - species.length()},
      * or for any vector lane index {@code N} the result of
-     * {@code i + indexMap[j + N]} is {@code < 0} or {@code >= a.length}
+     * {@code a_offset + indexMap[i_offset + N]} is {@code < 0} or {@code >= a.length}
      */
     @ForceInline
     @SuppressWarnings("unchecked")
-    public static DoubleVector fromArray(VectorSpecies<Double> species, double[] a, int i, int[] indexMap, int j) {
+    public static DoubleVector fromArray(VectorSpecies<Double> species, double[] a, int a_offset, int[] indexMap, int i_offset) {
         Objects.requireNonNull(a);
         Objects.requireNonNull(indexMap);
 
         if (species.length() == 1) {
-          return DoubleVector.fromArray(species, a, i + indexMap[j]);
+          return DoubleVector.fromArray(species, a, a_offset + indexMap[i_offset]);
         }
 
-        // Index vector: vix[0:n] = k -> i + indexMap[j + k]
-        IntVector vix = IntVector.fromArray(IntVector.species(species.indexShape()), indexMap, j).add(i);
+        // Index vector: vix[0:n] = k -> a_offset + indexMap[i_offset + k]
+        IntVector vix = IntVector.fromArray(IntVector.species(species.indexShape()), indexMap, i_offset).add(a_offset);
 
         vix = VectorIntrinsics.checkIndex(vix, a.length);
 
         return VectorIntrinsics.loadWithMap((Class<DoubleVector>) species.boxType(), double.class, species.length(),
                                             IntVector.species(species.indexShape()).boxType(), a, Unsafe.ARRAY_DOUBLE_BASE_OFFSET, vix,
-                                            a, i, indexMap, j, species,
+                                            a, a_offset, indexMap, i_offset, species,
                                             (double[] c, int idx, int[] iMap, int idy, VectorSpecies<Double> s) ->
                                                 ((DoubleSpecies)s).op(n -> c[idx + iMap[idy+n]]));
         }
@@ -282,29 +279,29 @@
      * <p>
      * For each vector lane, where {@code N} is the vector lane index,
      * if the mask lane at index {@code N} is set then the array element at
-     * index {@code i + indexMap[j + N]} is placed into the resulting vector
+     * index {@code a_offset + indexMap[i_offset + N]} is placed into the resulting vector
      * at lane index {@code N}.
      *
      * @param species species of desired vector
      * @param a the array
-     * @param i the offset into the array, may be negative if relative
+     * @param a_offset the offset into the array, may be negative if relative
      * indexes in the index map compensate to produce a value within the
      * array bounds
      * @param m the mask
      * @param indexMap the index map
-     * @param j the offset into the index map
+     * @param i_offset the offset into the index map
      * @return the vector loaded from an array
-     * @throws IndexOutOfBoundsException if {@code j < 0}, or
-     * {@code j > indexMap.length - this.length()},
+     * @throws IndexOutOfBoundsException if {@code i_offset < 0}, or
+     * {@code i_offset > indexMap.length - species.length()},
      * or for any vector lane index {@code N} where the mask at lane
-     * {@code N} is set the result of {@code i + indexMap[j + N]} is
+     * {@code N} is set the result of {@code a_offset + indexMap[i_offset + N]} is
      * {@code < 0} or {@code >= a.length}
      */
     @ForceInline
     @SuppressWarnings("unchecked")
-    public static DoubleVector fromArray(VectorSpecies<Double> species, double[] a, int i, VectorMask<Double> m, int[] indexMap, int j) {
+    public static DoubleVector fromArray(VectorSpecies<Double> species, double[] a, int a_offset, VectorMask<Double> m, int[] indexMap, int i_offset) {
         // @@@ This can result in out of bounds errors for unset mask lanes
-        return zero(species).blend(fromArray(species, a, i, indexMap, j), m);
+        return zero(species).blend(fromArray(species, a, a_offset, indexMap, i_offset), m);
     }
 
 
@@ -317,31 +314,31 @@
      * <p>
      * This method behaves as if it returns the result of calling the
      * byte buffer, offset, and mask accepting
-     * {@link #fromByteBuffer(VectorSpecies<Double>, ByteBuffer, int, VectorMask)} method} as follows:
+     * {@link #fromByteBuffer(VectorSpecies, ByteBuffer, int, VectorMask)} method} as follows:
      * <pre>{@code
-     *   return this.fromByteBuffer(b, i, this.maskAllTrue())
+     *   return fromByteBuffer(b, offset, VectorMask.allTrue())
      * }</pre>
      *
      * @param species species of desired vector
      * @param bb the byte buffer
-     * @param ix the offset into the byte buffer
+     * @param offset the offset into the byte buffer
      * @return a vector loaded from a byte buffer
      * @throws IndexOutOfBoundsException if the offset is {@code < 0},
      * or {@code > b.limit()},
      * or if there are fewer than
-     * {@code this.length() * this.elementSize() / Byte.SIZE} bytes
+     * {@code species.length() * species.elementSize() / Byte.SIZE} bytes
      * remaining in the byte buffer from the given offset
      */
     @ForceInline
     @SuppressWarnings("unchecked")
-    public static DoubleVector fromByteBuffer(VectorSpecies<Double> species, ByteBuffer bb, int ix) {
+    public static DoubleVector fromByteBuffer(VectorSpecies<Double> species, ByteBuffer bb, int offset) {
         if (bb.order() != ByteOrder.nativeOrder()) {
             throw new IllegalArgumentException();
         }
-        ix = VectorIntrinsics.checkIndex(ix, bb.limit(), species.bitSize() / Byte.SIZE);
+        offset = VectorIntrinsics.checkIndex(offset, bb.limit(), species.bitSize() / Byte.SIZE);
         return VectorIntrinsics.load((Class<DoubleVector>) species.boxType(), double.class, species.length(),
-                                     U.getReference(bb, BYTE_BUFFER_HB), U.getLong(bb, BUFFER_ADDRESS) + ix,
-                                     bb, ix, species,
+                                     U.getReference(bb, BYTE_BUFFER_HB), U.getLong(bb, BUFFER_ADDRESS) + offset,
+                                     bb, offset, species,
                                      (c, idx, s) -> {
                                          ByteBuffer bbc = c.duplicate().position(idx).order(ByteOrder.nativeOrder());
                                          DoubleBuffer tb = bbc.asDoubleBuffer();
@@ -359,77 +356,77 @@
      * the returned vector is loaded with a mask from a primitive array
      * obtained from the primitive buffer.
      * The following pseudocode expresses the behaviour, where
-     * {@coce EBuffer} is the primitive buffer type, {@code e} is the
-     * primitive element type, and {@code ESpecies<S>} is the primitive
+     * {@code EBuffer} is the primitive buffer type, {@code e} is the
+     * primitive element type, and {@code ESpecies} is the primitive
      * species for {@code e}:
      * <pre>{@code
      * EBuffer eb = b.duplicate().
-     *     order(ByteOrder.nativeOrder()).position(i).
+     *     order(ByteOrder.nativeOrder()).position(offset).
      *     asEBuffer();
-     * e[] es = new e[this.length()];
+     * e[] es = new e[species.length()];
      * for (int n = 0; n < t.length; n++) {
      *     if (m.isSet(n))
      *         es[n] = eb.get(n);
      * }
-     * Vector<E> r = ((ESpecies<S>)this).fromArray(es, 0, m);
+     * EVector r = EVector.fromArray(es, 0, m);
      * }</pre>
      *
      * @param species species of desired vector
      * @param bb the byte buffer
-     * @param ix the offset into the byte buffer
+     * @param offset the offset into the byte buffer
      * @param m the mask
      * @return a vector loaded from a byte buffer
      * @throws IndexOutOfBoundsException if the offset is {@code < 0},
      * or {@code > b.limit()},
      * for any vector lane index {@code N} where the mask at lane {@code N}
      * is set
-     * {@code i >= b.limit() - (N * this.elementSize() / Byte.SIZE)}
+     * {@code offset >= b.limit() - (N * species.elementSize() / Byte.SIZE)}
      */
     @ForceInline
-    public static DoubleVector fromByteBuffer(VectorSpecies<Double> species, ByteBuffer bb, int ix, VectorMask<Double> m) {
-        return zero(species).blend(fromByteBuffer(species, bb, ix), m);
+    public static DoubleVector fromByteBuffer(VectorSpecies<Double> species, ByteBuffer bb, int offset, VectorMask<Double> m) {
+        return zero(species).blend(fromByteBuffer(species, bb, offset), m);
     }
 
     /**
      * Returns a vector where all lane elements are set to the primitive
      * value {@code e}.
      *
-     * @param s species of the desired vector
+     * @param species species of the desired vector
      * @param e the value
      * @return a vector of vector where all lane elements are set to
      * the primitive value {@code e}
      */
     @ForceInline
     @SuppressWarnings("unchecked")
-    public static DoubleVector broadcast(VectorSpecies<Double> s, double e) {
+    public static DoubleVector broadcast(VectorSpecies<Double> species, double e) {
         return VectorIntrinsics.broadcastCoerced(
-            (Class<DoubleVector>) s.boxType(), double.class, s.length(),
-            Double.doubleToLongBits(e), s,
+            (Class<DoubleVector>) species.boxType(), double.class, species.length(),
+            Double.doubleToLongBits(e), species,
             ((bits, sp) -> ((DoubleSpecies)sp).op(i -> Double.longBitsToDouble((long)bits))));
     }
 
     /**
-     * Returns a vector where each lane element is set to a given
-     * primitive value.
+     * Returns a vector where each lane element is set to given
+     * primitive values.
      * <p>
      * For each vector lane, where {@code N} is the vector lane index, the
      * the primitive value at index {@code N} is placed into the resulting
      * vector at lane index {@code N}.
      *
-     * @param s species of the desired vector
+     * @param species species of the desired vector
      * @param es the given primitive values
-     * @return a vector where each lane element is set to a given primitive
-     * value
-     * @throws IndexOutOfBoundsException if {@code es.length < this.length()}
+     * @return a vector where each lane element is set to given primitive
+     * values
+     * @throws IndexOutOfBoundsException if {@code es.length < species.length()}
      */
     @ForceInline
     @SuppressWarnings("unchecked")
-    public static DoubleVector scalars(VectorSpecies<Double> s, double... es) {
+    public static DoubleVector scalars(VectorSpecies<Double> species, double... es) {
         Objects.requireNonNull(es);
-        int ix = VectorIntrinsics.checkIndex(0, es.length, s.length());
-        return VectorIntrinsics.load((Class<DoubleVector>) s.boxType(), double.class, s.length(),
+        int ix = VectorIntrinsics.checkIndex(0, es.length, species.length());
+        return VectorIntrinsics.load((Class<DoubleVector>) species.boxType(), double.class, species.length(),
                                      es, Unsafe.ARRAY_DOUBLE_BASE_OFFSET,
-                                     es, ix, s,
+                                     es, ix, species,
                                      (c, idx, sp) -> ((DoubleSpecies)sp).op(n -> c[idx + n]));
     }
 
@@ -438,14 +435,14 @@
      * value {@code e}, all other lane elements are set to the default
      * value.
      *
-     * @param s species of the desired vector
+     * @param species species of the desired vector
      * @param e the value
      * @return a vector where the first lane element is set to the primitive
      * value {@code e}
      */
     @ForceInline
-    public static final DoubleVector single(VectorSpecies<Double> s, double e) {
-        return zero(s).with(0, e);
+    public static final DoubleVector single(VectorSpecies<Double> species, double e) {
+        return zero(species).with(0, e);
     }
 
     /**
@@ -455,25 +452,28 @@
      * The semantics are equivalent to calling
      * {@link ThreadLocalRandom#nextDouble()}
      *
-     * @param s species of the desired vector
+     * @param species species of the desired vector
      * @return a vector where each lane elements is set to a randomly
      * generated primitive value
      */
-    public static DoubleVector random(VectorSpecies<Double> s) {
+    public static DoubleVector random(VectorSpecies<Double> species) {
         ThreadLocalRandom r = ThreadLocalRandom.current();
-        return ((DoubleSpecies)s).op(i -> r.nextDouble());
+        return ((DoubleSpecies)species).op(i -> r.nextDouble());
     }
 
     // Ops
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public abstract DoubleVector add(Vector<Double> v);
 
     /**
      * Adds this vector to the broadcast of an input scalar.
      * <p>
-     * This is a vector binary operation where the primitive addition operation
-     * ({@code +}) is applied to lane elements.
+     * This is a lane-wise binary operation which applies the primitive addition operation
+     * ({@code +}) to each lane.
      *
      * @param s the input scalar
      * @return the result of adding this vector to the broadcast of an input
@@ -481,6 +481,9 @@
      */
     public abstract DoubleVector add(double s);
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public abstract DoubleVector add(Vector<Double> v, VectorMask<Double> m);
 
@@ -488,8 +491,8 @@
      * Adds this vector to broadcast of an input scalar,
      * selecting lane elements controlled by a mask.
      * <p>
-     * This is a vector binary operation where the primitive addition operation
-     * ({@code +}) is applied to lane elements.
+     * This is a lane-wise binary operation which applies the primitive addition operation
+     * ({@code +}) to each lane.
      *
      * @param s the input scalar
      * @param m the mask controlling lane selection
@@ -498,14 +501,17 @@
      */
     public abstract DoubleVector add(double s, VectorMask<Double> m);
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public abstract DoubleVector sub(Vector<Double> v);
 
     /**
      * Subtracts the broadcast of an input scalar from this vector.
      * <p>
-     * This is a vector binary operation where the primitive subtraction
-     * operation ({@code -}) is applied to lane elements.
+     * This is a lane-wise binary operation which applies the primitive subtraction
+     * operation ({@code -}) to each lane.
      *
      * @param s the input scalar
      * @return the result of subtracting the broadcast of an input
@@ -513,6 +519,9 @@
      */
     public abstract DoubleVector sub(double s);
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public abstract DoubleVector sub(Vector<Double> v, VectorMask<Double> m);
 
@@ -520,8 +529,8 @@
      * Subtracts the broadcast of an input scalar from this vector, selecting
      * lane elements controlled by a mask.
      * <p>
-     * This is a vector binary operation where the primitive subtraction
-     * operation ({@code -}) is applied to lane elements.
+     * This is a lane-wise binary operation which applies the primitive subtraction
+     * operation ({@code -}) to each lane.
      *
      * @param s the input scalar
      * @param m the mask controlling lane selection
@@ -530,14 +539,17 @@
      */
     public abstract DoubleVector sub(double s, VectorMask<Double> m);
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public abstract DoubleVector mul(Vector<Double> v);
 
     /**
      * Multiplies this vector with the broadcast of an input scalar.
      * <p>
-     * This is a vector binary operation where the primitive multiplication
-     * operation ({@code *}) is applied to lane elements.
+     * This is a lane-wise binary operation which applies the primitive multiplication
+     * operation ({@code *}) to each lane.
      *
      * @param s the input scalar
      * @return the result of multiplying this vector with the broadcast of an
@@ -545,6 +557,9 @@
      */
     public abstract DoubleVector mul(double s);
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public abstract DoubleVector mul(Vector<Double> v, VectorMask<Double> m);
 
@@ -552,8 +567,8 @@
      * Multiplies this vector with the broadcast of an input scalar, selecting
      * lane elements controlled by a mask.
      * <p>
-     * This is a vector binary operation where the primitive multiplication
-     * operation ({@code *}) is applied to lane elements.
+     * This is a lane-wise binary operation which applies the primitive multiplication
+     * operation ({@code *}) to each lane.
      *
      * @param s the input scalar
      * @param m the mask controlling lane selection
@@ -562,60 +577,87 @@
      */
     public abstract DoubleVector mul(double s, VectorMask<Double> m);
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public abstract DoubleVector neg();
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public abstract DoubleVector neg(VectorMask<Double> m);
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public abstract DoubleVector abs();
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public abstract DoubleVector abs(VectorMask<Double> m);
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public abstract DoubleVector min(Vector<Double> v);
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public abstract DoubleVector min(Vector<Double> v, VectorMask<Double> m);
 
     /**
      * Returns the minimum of this vector and the broadcast of an input scalar.
      * <p>
-     * This is a vector binary operation where the operation
-     * {@code (a, b) -> Math.min(a, b)} is applied to lane elements.
+     * This is a lane-wise binary operation which applies the operation
+     * {@code (a, b) -> Math.min(a, b)} to each lane.
      *
      * @param s the input scalar
      * @return the minimum of this vector and the broadcast of an input scalar
      */
     public abstract DoubleVector min(double s);
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public abstract DoubleVector max(Vector<Double> v);
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public abstract DoubleVector max(Vector<Double> v, VectorMask<Double> m);
 
     /**
      * Returns the maximum of this vector and the broadcast of an input scalar.
      * <p>
-     * This is a vector binary operation where the operation
-     * {@code (a, b) -> Math.max(a, b)} is applied to lane elements.
+     * This is a lane-wise binary operation which applies the operation
+     * {@code (a, b) -> Math.max(a, b)} to each lane.
      *
      * @param s the input scalar
      * @return the maximum of this vector and the broadcast of an input scalar
      */
     public abstract DoubleVector max(double s);
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public abstract VectorMask<Double> equal(Vector<Double> v);
 
     /**
      * Tests if this vector is equal to the broadcast of an input scalar.
      * <p>
-     * This is a vector binary test operation where the primitive equals
-     * operation ({@code ==}) is applied to lane elements.
+     * This is a lane-wise binary test operation which applies the primitive equals
+     * operation ({@code ==}) each lane.
      *
      * @param s the input scalar
      * @return the result mask of testing if this vector is equal to the
@@ -623,14 +665,17 @@
      */
     public abstract VectorMask<Double> equal(double s);
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public abstract VectorMask<Double> notEqual(Vector<Double> v);
 
     /**
      * Tests if this vector is not equal to the broadcast of an input scalar.
      * <p>
-     * This is a vector binary test operation where the primitive not equals
-     * operation ({@code !=}) is applied to lane elements.
+     * This is a lane-wise binary test operation which applies the primitive not equals
+     * operation ({@code !=}) to each lane.
      *
      * @param s the input scalar
      * @return the result mask of testing if this vector is not equal to the
@@ -638,14 +683,17 @@
      */
     public abstract VectorMask<Double> notEqual(double s);
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public abstract VectorMask<Double> lessThan(Vector<Double> v);
 
     /**
      * Tests if this vector is less than the broadcast of an input scalar.
      * <p>
-     * This is a vector binary test operation where the primitive less than
-     * operation ({@code <}) is applied to lane elements.
+     * This is a lane-wise binary test operation which applies the primitive less than
+     * operation ({@code <}) to each lane.
      *
      * @param s the input scalar
      * @return the mask result of testing if this vector is less than the
@@ -653,14 +701,17 @@
      */
     public abstract VectorMask<Double> lessThan(double s);
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public abstract VectorMask<Double> lessThanEq(Vector<Double> v);
 
     /**
      * Tests if this vector is less or equal to the broadcast of an input scalar.
      * <p>
-     * This is a vector binary test operation where the primitive less than
-     * or equal to operation ({@code <=}) is applied to lane elements.
+     * This is a lane-wise binary test operation which applies the primitive less than
+     * or equal to operation ({@code <=}) to each lane.
      *
      * @param s the input scalar
      * @return the mask result of testing if this vector is less than or equal
@@ -668,14 +719,17 @@
      */
     public abstract VectorMask<Double> lessThanEq(double s);
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public abstract VectorMask<Double> greaterThan(Vector<Double> v);
 
     /**
      * Tests if this vector is greater than the broadcast of an input scalar.
      * <p>
-     * This is a vector binary test operation where the primitive greater than
-     * operation ({@code >}) is applied to lane elements.
+     * This is a lane-wise binary test operation which applies the primitive greater than
+     * operation ({@code >}) to each lane.
      *
      * @param s the input scalar
      * @return the mask result of testing if this vector is greater than the
@@ -683,6 +737,9 @@
      */
     public abstract VectorMask<Double> greaterThan(double s);
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public abstract VectorMask<Double> greaterThanEq(Vector<Double> v);
 
@@ -690,8 +747,8 @@
      * Tests if this vector is greater than or equal to the broadcast of an
      * input scalar.
      * <p>
-     * This is a vector binary test operation where the primitive greater than
-     * or equal to operation ({@code >=}) is applied to lane elements.
+     * This is a lane-wise binary test operation which applies the primitive greater than
+     * or equal to operation ({@code >=}) to each lane.
      *
      * @param s the input scalar
      * @return the mask result of testing if this vector is greater than or
@@ -699,6 +756,9 @@
      */
     public abstract VectorMask<Double> greaterThanEq(double s);
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public abstract DoubleVector blend(Vector<Double> v, VectorMask<Double> m);
 
@@ -719,33 +779,54 @@
      */
     public abstract DoubleVector blend(double s, VectorMask<Double> m);
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public abstract DoubleVector rearrange(Vector<Double> v,
                                                       VectorShuffle<Double> s, VectorMask<Double> m);
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public abstract DoubleVector rearrange(VectorShuffle<Double> m);
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public abstract DoubleVector reshape(VectorSpecies<Double> s);
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public abstract DoubleVector rotateEL(int i);
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public abstract DoubleVector rotateER(int i);
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public abstract DoubleVector shiftEL(int i);
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public abstract DoubleVector shiftER(int i);
 
     /**
      * Divides this vector by an input vector.
      * <p>
-     * This is a vector binary operation where the primitive division
-     * operation ({@code /}) is applied to lane elements.
+     * This is a lane-wise binary operation which applies the primitive division
+     * operation ({@code /}) to each lane.
      *
      * @param v the input vector
      * @return the result of dividing this vector by the input vector
@@ -755,8 +836,8 @@
     /**
      * Divides this vector by the broadcast of an input scalar.
      * <p>
-     * This is a vector binary operation where the primitive division
-     * operation ({@code /}) is applied to lane elements.
+     * This is a lane-wise binary operation which applies the primitive division
+     * operation ({@code /}) to each lane.
      *
      * @param s the input scalar
      * @return the result of dividing this vector by the broadcast of an input
@@ -768,8 +849,8 @@
      * Divides this vector by an input vector, selecting lane elements
      * controlled by a mask.
      * <p>
-     * This is a vector binary operation where the primitive division
-     * operation ({@code /}) is applied to lane elements.
+     * This is a lane-wise binary operation which applies the primitive division
+     * operation ({@code /}) to each lane.
      *
      * @param v the input vector
      * @param m the mask controlling lane selection
@@ -781,8 +862,8 @@
      * Divides this vector by the broadcast of an input scalar, selecting lane
      * elements controlled by a mask.
      * <p>
-     * This is a vector binary operation where the primitive division
-     * operation ({@code /}) is applied to lane elements.
+     * This is a lane-wise binary operation which applies the primitive division
+     * operation ({@code /}) to each lane.
      *
      * @param s the input scalar
      * @param m the mask controlling lane selection
@@ -794,8 +875,8 @@
     /**
      * Calculates the square root of this vector.
      * <p>
-     * This is a vector unary operation where the {@link Math#sqrt} operation
-     * is applied to lane elements.
+     * This is a lane-wise unary operation which applies the {@link Math#sqrt} operation
+     * to each lane.
      *
      * @return the square root of this vector
      */
@@ -805,8 +886,8 @@
      * Calculates the square root of this vector, selecting lane elements
      * controlled by a mask.
      * <p>
-     * This is a vector unary operation where the {@link Math#sqrt} operation
-     * is applied to lane elements.
+     * This is a lane-wise unary operation which applies the {@link Math#sqrt} operation
+     * to each lane.
      *
      * @param m the mask controlling lane selection
      * @return the square root of this vector
@@ -818,8 +899,8 @@
     /**
      * Calculates the trigonometric tangent of this vector.
      * <p>
-     * This is a vector unary operation with same semantic definition as
-     * {@link Math#tan} operation applied to lane elements.
+     * This is a lane-wise unary operation with same semantic definition as
+     * {@link Math#tan} operation applied to each lane.
      * The implementation is not required to return same
      * results as {@link Math#tan}, but adheres to rounding, monotonicity,
      * and special case semantics as defined in the {@link Math#tan}
@@ -849,8 +930,8 @@
     /**
      * Calculates the hyperbolic tangent of this vector.
      * <p>
-     * This is a vector unary operation with same semantic definition as
-     * {@link Math#tanh} operation applied to lane elements.
+     * This is a lane-wise unary operation with same semantic definition as
+     * {@link Math#tanh} operation applied to each lane.
      * The implementation is not required to return same
      * results as {@link Math#tanh}, but adheres to rounding, monotonicity,
      * and special case semantics as defined in the {@link Math#tanh}
@@ -880,8 +961,8 @@
     /**
      * Calculates the trigonometric sine of this vector.
      * <p>
-     * This is a vector unary operation with same semantic definition as
-     * {@link Math#sin} operation applied to lane elements.
+     * This is a lane-wise unary operation with same semantic definition as
+     * {@link Math#sin} operation applied to each lane.
      * The implementation is not required to return same
      * results as {@link Math#sin}, but adheres to rounding, monotonicity,
      * and special case semantics as defined in the {@link Math#sin}
@@ -911,8 +992,8 @@
     /**
      * Calculates the hyperbolic sine of this vector.
      * <p>
-     * This is a vector unary operation with same semantic definition as
-     * {@link Math#sinh} operation applied to lane elements.
+     * This is a lane-wise unary operation with same semantic definition as
+     * {@link Math#sinh} operation applied to each lane.
      * The implementation is not required to return same
      * results as  {@link Math#sinh}, but adheres to rounding, monotonicity,
      * and special case semantics as defined in the {@link Math#sinh}
@@ -942,8 +1023,8 @@
     /**
      * Calculates the trigonometric cosine of this vector.
      * <p>
-     * This is a vector unary operation with same semantic definition as
-     * {@link Math#cos} operation applied to lane elements.
+     * This is a lane-wise unary operation with same semantic definition as
+     * {@link Math#cos} operation applied to each lane.
      * The implementation is not required to return same
      * results as {@link Math#cos}, but adheres to rounding, monotonicity,
      * and special case semantics as defined in the {@link Math#cos}
@@ -973,8 +1054,8 @@
     /**
      * Calculates the hyperbolic cosine of this vector.
      * <p>
-     * This is a vector unary operation with same semantic definition as
-     * {@link Math#cosh} operation applied to lane elements.
+     * This is a lane-wise unary operation with same semantic definition as
+     * {@link Math#cosh} operation applied to each lane.
      * The implementation is not required to return same
      * results as {@link Math#cosh}, but adheres to rounding, monotonicity,
      * and special case semantics as defined in the {@link Math#cosh}
@@ -1004,8 +1085,8 @@
     /**
      * Calculates the arc sine of this vector.
      * <p>
-     * This is a vector unary operation with same semantic definition as
-     * {@link Math#asin} operation applied to lane elements.
+     * This is a lane-wise unary operation with same semantic definition as
+     * {@link Math#asin} operation applied to each lane.
      * The implementation is not required to return same
      * results as {@link Math#asin}, but adheres to rounding, monotonicity,
      * and special case semantics as defined in the {@link Math#asin}
@@ -1035,8 +1116,8 @@
     /**
      * Calculates the arc cosine of this vector.
      * <p>
-     * This is a vector unary operation with same semantic definition as
-     * {@link Math#acos} operation applied to lane elements.
+     * This is a lane-wise unary operation with same semantic definition as
+     * {@link Math#acos} operation applied to each lane.
      * The implementation is not required to return same
      * results as {@link Math#acos}, but adheres to rounding, monotonicity,
      * and special case semantics as defined in the {@link Math#acos}
@@ -1066,8 +1147,8 @@
     /**
      * Calculates the arc tangent of this vector.
      * <p>
-     * This is a vector unary operation with same semantic definition as
-     * {@link Math#atan} operation applied to lane elements.
+     * This is a lane-wise unary operation with same semantic definition as
+     * {@link Math#atan} operation applied to each lane.
      * The implementation is not required to return same
      * results as {@link Math#atan}, but adheres to rounding, monotonicity,
      * and special case semantics as defined in the {@link Math#atan}
@@ -1097,8 +1178,8 @@
     /**
      * Calculates the arc tangent of this vector divided by an input vector.
      * <p>
-     * This is a vector binary operation with same semantic definition as
-     * {@link Math#atan2} operation applied to lane elements.
+     * This is a lane-wise binary operation with same semantic definition as
+     * {@link Math#atan2} operation applied to each lane.
      * The implementation is not required to return same
      * results as {@link Math#atan2}, but adheres to rounding, monotonicity,
      * and special case semantics as defined in the {@link Math#atan2}
@@ -1116,8 +1197,8 @@
      * Calculates the arc tangent of this vector divided by the broadcast of an
      * an input scalar.
      * <p>
-     * This is a vector binary operation with same semantic definition as
-     * {@link Math#atan2} operation applied to lane elements.
+     * This is a lane-wise binary operation with same semantic definition as
+     * {@link Math#atan2} operation applied to each lane.
      * The implementation is not required to return same
      * results as {@link Math#atan2}, but adheres to rounding, monotonicity,
      * and special case semantics as defined in the {@link Math#atan2}
@@ -1160,8 +1241,8 @@
     /**
      * Calculates the cube root of this vector.
      * <p>
-     * This is a vector unary operation with same semantic definition as
-     * {@link Math#cbrt} operation applied to lane elements.
+     * This is a lane-wise unary operation with same semantic definition as
+     * {@link Math#cbrt} operation applied to each lane.
      * The implementation is not required to return same
      * results as {@link Math#cbrt}, but adheres to rounding, monotonicity,
      * and special case semantics as defined in the {@link Math#cbrt}
@@ -1191,8 +1272,8 @@
     /**
      * Calculates the natural logarithm of this vector.
      * <p>
-     * This is a vector unary operation with same semantic definition as
-     * {@link Math#log} operation applied to lane elements.
+     * This is a lane-wise unary operation with same semantic definition as
+     * {@link Math#log} operation applied to each lane.
      * The implementation is not required to return same
      * results as {@link Math#log}, but adheres to rounding, monotonicity,
      * and special case semantics as defined in the {@link Math#log}
@@ -1222,8 +1303,8 @@
     /**
      * Calculates the base 10 logarithm of this vector.
      * <p>
-     * This is a vector unary operation with same semantic definition as
-     * {@link Math#log10} operation applied to lane elements.
+     * This is a lane-wise unary operation with same semantic definition as
+     * {@link Math#log10} operation applied to each lane.
      * The implementation is not required to return same
      * results as {@link Math#log10}, but adheres to rounding, monotonicity,
      * and special case semantics as defined in the {@link Math#log10}
@@ -1254,8 +1335,8 @@
      * Calculates the natural logarithm of the sum of this vector and the
      * broadcast of {@code 1}.
      * <p>
-     * This is a vector unary operation with same semantic definition as
-     * {@link Math#log1p} operation applied to lane elements.
+     * This is a lane-wise unary operation with same semantic definition as
+     * {@link Math#log1p} operation applied to each lane.
      * The implementation is not required to return same
      * results as  {@link Math#log1p}, but adheres to rounding, monotonicity,
      * and special case semantics as defined in the {@link Math#log1p}
@@ -1287,8 +1368,8 @@
     /**
      * Calculates this vector raised to the power of an input vector.
      * <p>
-     * This is a vector binary operation with same semantic definition as
-     * {@link Math#pow} operation applied to lane elements.
+     * This is a lane-wise binary operation with same semantic definition as
+     * {@link Math#pow} operation applied to each lane.
      * The implementation is not required to return same
      * results as {@link Math#pow}, but adheres to rounding, monotonicity,
      * and special case semantics as defined in the {@link Math#pow}
@@ -1306,8 +1387,8 @@
      * Calculates this vector raised to the power of the broadcast of an input
      * scalar.
      * <p>
-     * This is a vector binary operation with same semantic definition as
-     * {@link Math#pow} operation applied to lane elements.
+     * This is a lane-wise binary operation with same semantic definition as
+     * {@link Math#pow} operation applied to each lane.
      * The implementation is not required to return same
      * results as {@link Math#pow}, but adheres to rounding, monotonicity,
      * and special case semantics as defined in the {@link Math#pow}
@@ -1353,8 +1434,8 @@
      * Calculates the broadcast of Euler's number {@code e} raised to the power
      * of this vector.
      * <p>
-     * This is a vector unary operation with same semantic definition as
-     * {@link Math#exp} operation applied to lane elements.
+     * This is a lane-wise unary operation with same semantic definition as
+     * {@link Math#exp} operation applied to each lane.
      * The implementation is not required to return same
      * results as {@link Math#exp}, but adheres to rounding, monotonicity,
      * and special case semantics as defined in the {@link Math#exp}
@@ -1389,11 +1470,11 @@
      * More specifically as if the following (ignoring any differences in
      * numerical accuracy):
      * <pre>{@code
-     *   this.exp().sub(this.species().broadcast(1))
+     *   this.exp().sub(EVector.broadcast(this.species(), 1))
      * }</pre>
      * <p>
-     * This is a vector unary operation with same semantic definition as
-     * {@link Math#expm1} operation applied to lane elements.
+     * This is a lane-wise unary operation with same semantic definition as
+     * {@link Math#expm1} operation applied to each lane.
      * The implementation is not required to return same
      * results as {@link Math#expm1}, but adheres to rounding, monotonicity,
      * and special case semantics as defined in the {@link Math#expm1}
@@ -1414,7 +1495,7 @@
      * More specifically as if the following (ignoring any differences in
      * numerical accuracy):
      * <pre>{@code
-     *   this.exp(m).sub(this.species().broadcast(1), m)
+     *   this.exp(m).sub(EVector.broadcast(this.species(), 1), m)
      * }</pre>
      * <p>
      * Semantics for rounding, monotonicity, and special cases are
@@ -1437,8 +1518,8 @@
      *   this.mul(v1).add(v2)
      * }</pre>
      * <p>
-     * This is a vector ternary operation where the {@link Math#fma} operation
-     * is applied to lane elements.
+     * This is a lane-wise ternary operation which applies the {@link Math#fma} operation
+     * to each lane.
      *
      * @param v1 the first input vector
      * @param v2 the second input vector
@@ -1452,11 +1533,11 @@
      * scalar summed with the broadcast of a second input scalar.
      * More specifically as if the following:
      * <pre>{@code
-     *   this.fma(this.species().broadcast(s1), this.species().broadcast(s2))
+     *   this.fma(EVector.broadcast(this.species(), s1), EVector.broadcast(this.species(), s2))
      * }</pre>
      * <p>
-     * This is a vector ternary operation where the {@link Math#fma} operation
-     * is applied to lane elements.
+     * This is a lane-wise ternary operation which applies the {@link Math#fma} operation
+     * to each lane.
      *
      * @param s1 the first input scalar
      * @param s2 the second input scalar
@@ -1474,8 +1555,8 @@
      *   this.mul(v1, m).add(v2, m)
      * }</pre>
      * <p>
-     * This is a vector ternary operation where the {@link Math#fma} operation
-     * is applied to lane elements.
+     * This is a lane-wise ternary operation which applies the {@link Math#fma} operation
+     * to each lane.
      *
      * @param v1 the first input vector
      * @param v2 the second input vector
@@ -1493,11 +1574,11 @@
      * elements controlled by a mask
      * More specifically as if the following:
      * <pre>{@code
-     *   this.fma(this.species().broadcast(s1), this.species().broadcast(s2), m)
+     *   this.fma(EVector.broadcast(this.species(), s1), EVector.broadcast(this.species(), s2), m)
      * }</pre>
      * <p>
-     * This is a vector ternary operation where the {@link Math#fma} operation
-     * is applied to lane elements.
+     * This is a lane-wise ternary operation which applies the {@link Math#fma} operation
+     * to each lane.
      *
      * @param s1 the first input scalar
      * @param s2 the second input scalar
@@ -1516,8 +1597,8 @@
      *   this.mul(this).add(v.mul(v)).sqrt()
      * }</pre>
      * <p>
-     * This is a vector binary operation with same semantic definition as
-     * {@link Math#hypot} operation applied to lane elements.
+     * This is a lane-wise binary operation with same semantic definition as
+     * {@link Math#hypot} operation applied to each lane.
      * The implementation is not required to return same
      * results as {@link Math#hypot}, but adheres to rounding, monotonicity,
      * and special case semantics as defined in the {@link Math#hypot}
@@ -1538,11 +1619,11 @@
      * More specifically as if the following (ignoring any differences in
      * numerical accuracy):
      * <pre>{@code
-     *   this.mul(this).add(this.species().broadcast(v * v)).sqrt()
+     *   this.mul(this).add(EVector.broadcast(this.species(), s * s)).sqrt()
      * }</pre>
      * <p>
-     * This is a vector binary operation with same semantic definition as
-     * {@link Math#hypot} operation applied to lane elements.
+     * This is a lane-wise binary operation with same semantic definition as
+     * {@link Math#hypot} operation applied to each.
      * The implementation is not required to return same
      * results as {@link Math#hypot}, but adheres to rounding, monotonicity,
      * and special case semantics as defined in the {@link Math#hypot}
@@ -1583,7 +1664,7 @@
      * More specifically as if the following (ignoring any differences in
      * numerical accuracy):
      * <pre>{@code
-     *   this.mul(this, m).add(this.species().broadcast(v * v), m).sqrt(m)
+     *   this.mul(this, m).add(EVector.broadcast(this.species(), s * s), m).sqrt(m)
      * }</pre>
      * <p>
      * Semantics for rounding, monotonicity, and special cases are
@@ -1597,15 +1678,27 @@
     public abstract DoubleVector hypot(double s, VectorMask<Double> m);
 
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public abstract void intoByteArray(byte[] a, int ix);
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public abstract void intoByteArray(byte[] a, int ix, VectorMask<Double> m);
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public abstract void intoByteBuffer(ByteBuffer bb, int ix);
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public abstract void intoByteBuffer(ByteBuffer bb, int ix, VectorMask<Double> m);
 
@@ -1614,8 +1707,8 @@
     /**
      * Adds all lane elements of this vector.
      * <p>
-     * This is a vector reduction operation where the addition
-     * operation ({@code +}) is applied to lane elements,
+     * This is a cross-lane reduction operation which applies the addition
+     * operation ({@code +}) to lane elements,
      * and the identity value is {@code 0.0}.
      *
      * <p>The value of a floating-point sum is a function both of the input values as well
@@ -1635,8 +1728,8 @@
      * Adds all lane elements of this vector, selecting lane elements
      * controlled by a mask.
      * <p>
-     * This is a vector reduction operation where the addition
-     * operation ({@code +}) is applied to lane elements,
+     * This is a cross-lane reduction operation which applies the addition
+     * operation ({@code +}) to lane elements,
      * and the identity value is {@code 0.0}.
      *
      * <p>The value of a floating-point sum is a function both of the input values as well
@@ -1656,8 +1749,8 @@
     /**
      * Multiplies all lane elements of this vector.
      * <p>
-     * This is a vector reduction operation where the
-     * multiplication operation ({@code *}) is applied to lane elements,
+     * This is a cross-lane reduction operation which applies the
+     * multiplication operation ({@code *}) to lane elements,
      * and the identity value is {@code 1.0}.
      *
      * <p>The order of multiplication operations of this method
@@ -1676,8 +1769,8 @@
      * Multiplies all lane elements of this vector, selecting lane elements
      * controlled by a mask.
      * <p>
-     * This is a vector reduction operation where the
-     * multiplication operation ({@code *}) is applied to lane elements,
+     * This is a cross-lane reduction operation which applies the
+     * multiplication operation ({@code *}) to lane elements,
      * and the identity value is {@code 1.0}.
      *
      * <p>The order of multiplication operations of this method
@@ -1696,8 +1789,8 @@
     /**
      * Returns the minimum lane element of this vector.
      * <p>
-     * This is an associative vector reduction operation where the operation
-     * {@code (a, b) -> Math.min(a, b)} is applied to lane elements,
+     * This is an associative cross-lane reduction operation which applies the operation
+     * {@code (a, b) -> Math.min(a, b)} to lane elements,
      * and the identity value is
      * {@link Double#POSITIVE_INFINITY}.
      *
@@ -1709,8 +1802,8 @@
      * Returns the minimum lane element of this vector, selecting lane elements
      * controlled by a mask.
      * <p>
-     * This is an associative vector reduction operation where the operation
-     * {@code (a, b) -> Math.min(a, b)} is applied to lane elements,
+     * This is an associative cross-lane reduction operation which applies the operation
+     * {@code (a, b) -> Math.min(a, b)} to lane elements,
      * and the identity value is
      * {@link Double#POSITIVE_INFINITY}.
      *
@@ -1722,8 +1815,8 @@
     /**
      * Returns the maximum lane element of this vector.
      * <p>
-     * This is an associative vector reduction operation where the operation
-     * {@code (a, b) -> Math.max(a, b)} is applied to lane elements,
+     * This is an associative cross-lane reduction operation which applies the operation
+     * {@code (a, b) -> Math.max(a, b)} to lane elements,
      * and the identity value is
      * {@link Double#NEGATIVE_INFINITY}.
      *
@@ -1735,8 +1828,8 @@
      * Returns the maximum lane element of this vector, selecting lane elements
      * controlled by a mask.
      * <p>
-     * This is an associative vector reduction operation where the operation
-     * {@code (a, b) -> Math.max(a, b)} is applied to lane elements,
+     * This is an associative cross-lane reduction operation which applies the operation
+     * {@code (a, b) -> Math.max(a, b)} to lane elements,
      * and the identity value is
      * {@link Double#NEGATIVE_INFINITY}.
      *
@@ -1756,7 +1849,7 @@
      * @throws IllegalArgumentException if the index is is out of range
      * ({@code < 0 || >= length()})
      */
-    public abstract double get(int i);
+    public abstract double lane(int i);
 
     /**
      * Replaces the lane element of this vector at lane index {@code i} with
@@ -1803,30 +1896,30 @@
      * <p>
      * For each vector lane, where {@code N} is the vector lane index,
      * the lane element at index {@code N} is stored into the array at index
-     * {@code i + N}.
+     * {@code offset + N}.
      *
      * @param a the array
-     * @param i the offset into the array
-     * @throws IndexOutOfBoundsException if {@code i < 0}, or
-     * {@code i > a.length - this.length()}
+     * @param offset the offset into the array
+     * @throws IndexOutOfBoundsException if {@code offset < 0}, or
+     * {@code offset > a.length - this.length()}
      */
-    public abstract void intoArray(double[] a, int i);
+    public abstract void intoArray(double[] a, int offset);
 
     /**
      * Stores this vector into an array starting at offset and using a mask.
      * <p>
      * For each vector lane, where {@code N} is the vector lane index,
      * if the mask lane at index {@code N} is set then the lane element at
-     * index {@code N} is stored into the array index {@code i + N}.
+     * index {@code N} is stored into the array index {@code offset + N}.
      *
      * @param a the array
-     * @param i the offset into the array
+     * @param offset the offset into the array
      * @param m the mask
-     * @throws IndexOutOfBoundsException if {@code i < 0}, or
+     * @throws IndexOutOfBoundsException if {@code offset < 0}, or
      * for any vector lane index {@code N} where the mask at lane {@code N}
-     * is set {@code i >= a.length - N}
+     * is set {@code offset >= a.length - N}
      */
-    public abstract void intoArray(double[] a, int i, VectorMask<Double> m);
+    public abstract void intoArray(double[] a, int offset, VectorMask<Double> m);
 
     /**
      * Stores this vector into an array using indexes obtained from an index
@@ -1834,20 +1927,20 @@
      * <p>
      * For each vector lane, where {@code N} is the vector lane index, the
      * lane element at index {@code N} is stored into the array at index
-     * {@code i + indexMap[j + N]}.
+     * {@code a_offset + indexMap[i_offset + N]}.
      *
      * @param a the array
-     * @param i the offset into the array, may be negative if relative
+     * @param a_offset the offset into the array, may be negative if relative
      * indexes in the index map compensate to produce a value within the
      * array bounds
      * @param indexMap the index map
-     * @param j the offset into the index map
-     * @throws IndexOutOfBoundsException if {@code j < 0}, or
-     * {@code j > indexMap.length - this.length()},
+     * @param i_offset the offset into the index map
+     * @throws IndexOutOfBoundsException if {@code i_offset < 0}, or
+     * {@code i_offset > indexMap.length - this.length()},
      * or for any vector lane index {@code N} the result of
-     * {@code i + indexMap[j + N]} is {@code < 0} or {@code >= a.length}
+     * {@code a_offset + indexMap[i_offset + N]} is {@code < 0} or {@code >= a.length}
      */
-    public abstract void intoArray(double[] a, int i, int[] indexMap, int j);
+    public abstract void intoArray(double[] a, int a_offset, int[] indexMap, int i_offset);
 
     /**
      * Stores this vector into an array using indexes obtained from an index
@@ -1856,24 +1949,27 @@
      * For each vector lane, where {@code N} is the vector lane index,
      * if the mask lane at index {@code N} is set then the lane element at
      * index {@code N} is stored into the array at index
-     * {@code i + indexMap[j + N]}.
+     * {@code a_offset + indexMap[i_offset + N]}.
      *
      * @param a the array
-     * @param i the offset into the array, may be negative if relative
+     * @param a_offset the offset into the array, may be negative if relative
      * indexes in the index map compensate to produce a value within the
      * array bounds
      * @param m the mask
      * @param indexMap the index map
-     * @param j the offset into the index map
+     * @param i_offset the offset into the index map
      * @throws IndexOutOfBoundsException if {@code j < 0}, or
-     * {@code j > indexMap.length - this.length()},
+     * {@code i_offset > indexMap.length - this.length()},
      * or for any vector lane index {@code N} where the mask at lane
-     * {@code N} is set the result of {@code i + indexMap[j + N]} is
+     * {@code N} is set the result of {@code a_offset + indexMap[i_offset + N]} is
      * {@code < 0} or {@code >= a.length}
      */
-    public abstract void intoArray(double[] a, int i, VectorMask<Double> m, int[] indexMap, int j);
+    public abstract void intoArray(double[] a, int a_offset, VectorMask<Double> m, int[] indexMap, int i_offset);
     // Species
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public abstract VectorSpecies<Double> species();
 
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Float128Vector.java	Thu Apr 18 23:47:37 2019 -0700
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Float128Vector.java	Fri Apr 19 11:35:36 2019 -0700
@@ -179,37 +179,37 @@
         if (stype == byte.class) {
             byte[] a = new byte[limit];
             for (int i = 0; i < limit; i++) {
-                a[i] = (byte) this.get(i);
+                a[i] = (byte) this.lane(i);
             }
             return (Vector) ByteVector.fromArray((VectorSpecies<Byte>) s, a, 0);
         } else if (stype == short.class) {
             short[] a = new short[limit];
             for (int i = 0; i < limit; i++) {
-                a[i] = (short) this.get(i);
+                a[i] = (short) this.lane(i);
             }
             return (Vector) ShortVector.fromArray((VectorSpecies<Short>) s, a, 0);
         } else if (stype == int.class) {
             int[] a = new int[limit];
             for (int i = 0; i < limit; i++) {
-                a[i] = (int) this.get(i);
+                a[i] = (int) this.lane(i);
             }
             return (Vector) IntVector.fromArray((VectorSpecies<Integer>) s, a, 0);
         } else if (stype == long.class) {
             long[] a = new long[limit];
             for (int i = 0; i < limit; i++) {
-                a[i] = (long) this.get(i);
+                a[i] = (long) this.lane(i);
             }
             return (Vector) LongVector.fromArray((VectorSpecies<Long>) s, a, 0);
         } else if (stype == float.class) {
             float[] a = new float[limit];
             for (int i = 0; i < limit; i++) {
-                a[i] = (float) this.get(i);
+                a[i] = (float) this.lane(i);
             }
             return (Vector) FloatVector.fromArray((VectorSpecies<Float>) s, a, 0);
         } else if (stype == double.class) {
             double[] a = new double[limit];
             for (int i = 0; i < limit; i++) {
-                a[i] = (double) this.get(i);
+                a[i] = (double) this.lane(i);
             }
             return (Vector) DoubleVector.fromArray((VectorSpecies<Double>) s, a, 0);
         } else {
@@ -1228,8 +1228,8 @@
             Float128Vector.class, Float128Shuffle.class, float.class, LENGTH,
             this, s,
             (v1, s_) -> v1.uOp((i, a) -> {
-                int ei = s_.getElement(i);
-                return v1.get(ei);
+                int ei = s_.lane(i);
+                return v1.lane(ei);
             }));
     }
 
@@ -1244,13 +1244,13 @@
         return VectorIntrinsics.blend(
             Float128Vector.class, Float128Mask.class, float.class, LENGTH,
             this, v, m,
-            (v1, v2, m_) -> v1.bOp(v2, (i, a, b) -> m_.getElement(i) ? b : a));
+            (v1, v2, m_) -> v1.bOp(v2, (i, a, b) -> m_.lane(i) ? b : a));
     }
 
     // Accessors
 
     @Override
-    public float get(int i) {
+    public float lane(int i) {
         if (i < 0 || i >= LENGTH) {
             throw new IllegalArgumentException("Index " + i + " must be zero or positive, and less than " + LENGTH);
         }
@@ -1452,7 +1452,7 @@
         public FloatVector toVector() {
             float[] va = new float[SPECIES.length()];
             for (int i = 0; i < va.length; i++) {
-              va[i] = (float) getElement(i);
+              va[i] = (float) lane(i);
             }
             return FloatVector.fromArray(SPECIES, va, 0);
         }
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Float256Vector.java	Thu Apr 18 23:47:37 2019 -0700
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Float256Vector.java	Fri Apr 19 11:35:36 2019 -0700
@@ -179,37 +179,37 @@
         if (stype == byte.class) {
             byte[] a = new byte[limit];
             for (int i = 0; i < limit; i++) {
-                a[i] = (byte) this.get(i);
+                a[i] = (byte) this.lane(i);
             }
             return (Vector) ByteVector.fromArray((VectorSpecies<Byte>) s, a, 0);
         } else if (stype == short.class) {
             short[] a = new short[limit];
             for (int i = 0; i < limit; i++) {
-                a[i] = (short) this.get(i);
+                a[i] = (short) this.lane(i);
             }
             return (Vector) ShortVector.fromArray((VectorSpecies<Short>) s, a, 0);
         } else if (stype == int.class) {
             int[] a = new int[limit];
             for (int i = 0; i < limit; i++) {
-                a[i] = (int) this.get(i);
+                a[i] = (int) this.lane(i);
             }
             return (Vector) IntVector.fromArray((VectorSpecies<Integer>) s, a, 0);
         } else if (stype == long.class) {
             long[] a = new long[limit];
             for (int i = 0; i < limit; i++) {
-                a[i] = (long) this.get(i);
+                a[i] = (long) this.lane(i);
             }
             return (Vector) LongVector.fromArray((VectorSpecies<Long>) s, a, 0);
         } else if (stype == float.class) {
             float[] a = new float[limit];
             for (int i = 0; i < limit; i++) {
-                a[i] = (float) this.get(i);
+                a[i] = (float) this.lane(i);
             }
             return (Vector) FloatVector.fromArray((VectorSpecies<Float>) s, a, 0);
         } else if (stype == double.class) {
             double[] a = new double[limit];
             for (int i = 0; i < limit; i++) {
-                a[i] = (double) this.get(i);
+                a[i] = (double) this.lane(i);
             }
             return (Vector) DoubleVector.fromArray((VectorSpecies<Double>) s, a, 0);
         } else {
@@ -1228,8 +1228,8 @@
             Float256Vector.class, Float256Shuffle.class, float.class, LENGTH,
             this, s,
             (v1, s_) -> v1.uOp((i, a) -> {
-                int ei = s_.getElement(i);
-                return v1.get(ei);
+                int ei = s_.lane(i);
+                return v1.lane(ei);
             }));
     }
 
@@ -1244,13 +1244,13 @@
         return VectorIntrinsics.blend(
             Float256Vector.class, Float256Mask.class, float.class, LENGTH,
             this, v, m,
-            (v1, v2, m_) -> v1.bOp(v2, (i, a, b) -> m_.getElement(i) ? b : a));
+            (v1, v2, m_) -> v1.bOp(v2, (i, a, b) -> m_.lane(i) ? b : a));
     }
 
     // Accessors
 
     @Override
-    public float get(int i) {
+    public float lane(int i) {
         if (i < 0 || i >= LENGTH) {
             throw new IllegalArgumentException("Index " + i + " must be zero or positive, and less than " + LENGTH);
         }
@@ -1452,7 +1452,7 @@
         public FloatVector toVector() {
             float[] va = new float[SPECIES.length()];
             for (int i = 0; i < va.length; i++) {
-              va[i] = (float) getElement(i);
+              va[i] = (float) lane(i);
             }
             return FloatVector.fromArray(SPECIES, va, 0);
         }
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Float512Vector.java	Thu Apr 18 23:47:37 2019 -0700
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Float512Vector.java	Fri Apr 19 11:35:36 2019 -0700
@@ -179,37 +179,37 @@
         if (stype == byte.class) {
             byte[] a = new byte[limit];
             for (int i = 0; i < limit; i++) {
-                a[i] = (byte) this.get(i);
+                a[i] = (byte) this.lane(i);
             }
             return (Vector) ByteVector.fromArray((VectorSpecies<Byte>) s, a, 0);
         } else if (stype == short.class) {
             short[] a = new short[limit];
             for (int i = 0; i < limit; i++) {
-                a[i] = (short) this.get(i);
+                a[i] = (short) this.lane(i);
             }
             return (Vector) ShortVector.fromArray((VectorSpecies<Short>) s, a, 0);
         } else if (stype == int.class) {
             int[] a = new int[limit];
             for (int i = 0; i < limit; i++) {
-                a[i] = (int) this.get(i);
+                a[i] = (int) this.lane(i);
             }
             return (Vector) IntVector.fromArray((VectorSpecies<Integer>) s, a, 0);
         } else if (stype == long.class) {
             long[] a = new long[limit];
             for (int i = 0; i < limit; i++) {
-                a[i] = (long) this.get(i);
+                a[i] = (long) this.lane(i);
             }
             return (Vector) LongVector.fromArray((VectorSpecies<Long>) s, a, 0);
         } else if (stype == float.class) {
             float[] a = new float[limit];
             for (int i = 0; i < limit; i++) {
-                a[i] = (float) this.get(i);
+                a[i] = (float) this.lane(i);
             }
             return (Vector) FloatVector.fromArray((VectorSpecies<Float>) s, a, 0);
         } else if (stype == double.class) {
             double[] a = new double[limit];
             for (int i = 0; i < limit; i++) {
-                a[i] = (double) this.get(i);
+                a[i] = (double) this.lane(i);
             }
             return (Vector) DoubleVector.fromArray((VectorSpecies<Double>) s, a, 0);
         } else {
@@ -1228,8 +1228,8 @@
             Float512Vector.class, Float512Shuffle.class, float.class, LENGTH,
             this, s,
             (v1, s_) -> v1.uOp((i, a) -> {
-                int ei = s_.getElement(i);
-                return v1.get(ei);
+                int ei = s_.lane(i);
+                return v1.lane(ei);
             }));
     }
 
@@ -1244,13 +1244,13 @@
         return VectorIntrinsics.blend(
             Float512Vector.class, Float512Mask.class, float.class, LENGTH,
             this, v, m,
-            (v1, v2, m_) -> v1.bOp(v2, (i, a, b) -> m_.getElement(i) ? b : a));
+            (v1, v2, m_) -> v1.bOp(v2, (i, a, b) -> m_.lane(i) ? b : a));
     }
 
     // Accessors
 
     @Override
-    public float get(int i) {
+    public float lane(int i) {
         if (i < 0 || i >= LENGTH) {
             throw new IllegalArgumentException("Index " + i + " must be zero or positive, and less than " + LENGTH);
         }
@@ -1452,7 +1452,7 @@
         public FloatVector toVector() {
             float[] va = new float[SPECIES.length()];
             for (int i = 0; i < va.length; i++) {
-              va[i] = (float) getElement(i);
+              va[i] = (float) lane(i);
             }
             return FloatVector.fromArray(SPECIES, va, 0);
         }
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Float64Vector.java	Thu Apr 18 23:47:37 2019 -0700
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Float64Vector.java	Fri Apr 19 11:35:36 2019 -0700
@@ -179,37 +179,37 @@
         if (stype == byte.class) {
             byte[] a = new byte[limit];
             for (int i = 0; i < limit; i++) {
-                a[i] = (byte) this.get(i);
+                a[i] = (byte) this.lane(i);
             }
             return (Vector) ByteVector.fromArray((VectorSpecies<Byte>) s, a, 0);
         } else if (stype == short.class) {
             short[] a = new short[limit];
             for (int i = 0; i < limit; i++) {
-                a[i] = (short) this.get(i);
+                a[i] = (short) this.lane(i);
             }
             return (Vector) ShortVector.fromArray((VectorSpecies<Short>) s, a, 0);
         } else if (stype == int.class) {
             int[] a = new int[limit];
             for (int i = 0; i < limit; i++) {
-                a[i] = (int) this.get(i);
+                a[i] = (int) this.lane(i);
             }
             return (Vector) IntVector.fromArray((VectorSpecies<Integer>) s, a, 0);
         } else if (stype == long.class) {
             long[] a = new long[limit];
             for (int i = 0; i < limit; i++) {
-                a[i] = (long) this.get(i);
+                a[i] = (long) this.lane(i);
             }
             return (Vector) LongVector.fromArray((VectorSpecies<Long>) s, a, 0);
         } else if (stype == float.class) {
             float[] a = new float[limit];
             for (int i = 0; i < limit; i++) {
-                a[i] = (float) this.get(i);
+                a[i] = (float) this.lane(i);
             }
             return (Vector) FloatVector.fromArray((VectorSpecies<Float>) s, a, 0);
         } else if (stype == double.class) {
             double[] a = new double[limit];
             for (int i = 0; i < limit; i++) {
-                a[i] = (double) this.get(i);
+                a[i] = (double) this.lane(i);
             }
             return (Vector) DoubleVector.fromArray((VectorSpecies<Double>) s, a, 0);
         } else {
@@ -1228,8 +1228,8 @@
             Float64Vector.class, Float64Shuffle.class, float.class, LENGTH,
             this, s,
             (v1, s_) -> v1.uOp((i, a) -> {
-                int ei = s_.getElement(i);
-                return v1.get(ei);
+                int ei = s_.lane(i);
+                return v1.lane(ei);
             }));
     }
 
@@ -1244,13 +1244,13 @@
         return VectorIntrinsics.blend(
             Float64Vector.class, Float64Mask.class, float.class, LENGTH,
             this, v, m,
-            (v1, v2, m_) -> v1.bOp(v2, (i, a, b) -> m_.getElement(i) ? b : a));
+            (v1, v2, m_) -> v1.bOp(v2, (i, a, b) -> m_.lane(i) ? b : a));
     }
 
     // Accessors
 
     @Override
-    public float get(int i) {
+    public float lane(int i) {
         if (i < 0 || i >= LENGTH) {
             throw new IllegalArgumentException("Index " + i + " must be zero or positive, and less than " + LENGTH);
         }
@@ -1452,7 +1452,7 @@
         public FloatVector toVector() {
             float[] va = new float[SPECIES.length()];
             for (int i = 0; i < va.length; i++) {
-              va[i] = (float) getElement(i);
+              va[i] = (float) lane(i);
             }
             return FloatVector.fromArray(SPECIES, va, 0);
         }
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/FloatMaxVector.java	Thu Apr 18 23:47:37 2019 -0700
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/FloatMaxVector.java	Fri Apr 19 11:35:36 2019 -0700
@@ -179,37 +179,37 @@
         if (stype == byte.class) {
             byte[] a = new byte[limit];
             for (int i = 0; i < limit; i++) {
-                a[i] = (byte) this.get(i);
+                a[i] = (byte) this.lane(i);
             }
             return (Vector) ByteVector.fromArray((VectorSpecies<Byte>) s, a, 0);
         } else if (stype == short.class) {
             short[] a = new short[limit];
             for (int i = 0; i < limit; i++) {
-                a[i] = (short) this.get(i);
+                a[i] = (short) this.lane(i);
             }
             return (Vector) ShortVector.fromArray((VectorSpecies<Short>) s, a, 0);
         } else if (stype == int.class) {
             int[] a = new int[limit];
             for (int i = 0; i < limit; i++) {
-                a[i] = (int) this.get(i);
+                a[i] = (int) this.lane(i);
             }
             return (Vector) IntVector.fromArray((VectorSpecies<Integer>) s, a, 0);
         } else if (stype == long.class) {
             long[] a = new long[limit];
             for (int i = 0; i < limit; i++) {
-                a[i] = (long) this.get(i);
+                a[i] = (long) this.lane(i);
             }
             return (Vector) LongVector.fromArray((VectorSpecies<Long>) s, a, 0);
         } else if (stype == float.class) {
             float[] a = new float[limit];
             for (int i = 0; i < limit; i++) {
-                a[i] = (float) this.get(i);
+                a[i] = (float) this.lane(i);
             }
             return (Vector) FloatVector.fromArray((VectorSpecies<Float>) s, a, 0);
         } else if (stype == double.class) {
             double[] a = new double[limit];
             for (int i = 0; i < limit; i++) {
-                a[i] = (double) this.get(i);
+                a[i] = (double) this.lane(i);
             }
             return (Vector) DoubleVector.fromArray((VectorSpecies<Double>) s, a, 0);
         } else {
@@ -1228,8 +1228,8 @@
             FloatMaxVector.class, FloatMaxShuffle.class, float.class, LENGTH,
             this, s,
             (v1, s_) -> v1.uOp((i, a) -> {
-                int ei = s_.getElement(i);
-                return v1.get(ei);
+                int ei = s_.lane(i);
+                return v1.lane(ei);
             }));
     }
 
@@ -1244,13 +1244,13 @@
         return VectorIntrinsics.blend(
             FloatMaxVector.class, FloatMaxMask.class, float.class, LENGTH,
             this, v, m,
-            (v1, v2, m_) -> v1.bOp(v2, (i, a, b) -> m_.getElement(i) ? b : a));
+            (v1, v2, m_) -> v1.bOp(v2, (i, a, b) -> m_.lane(i) ? b : a));
     }
 
     // Accessors
 
     @Override
-    public float get(int i) {
+    public float lane(int i) {
         if (i < 0 || i >= LENGTH) {
             throw new IllegalArgumentException("Index " + i + " must be zero or positive, and less than " + LENGTH);
         }
@@ -1452,7 +1452,7 @@
         public FloatVector toVector() {
             float[] va = new float[SPECIES.length()];
             for (int i = 0; i < va.length; i++) {
-              va[i] = (float) getElement(i);
+              va[i] = (float) lane(i);
             }
             return FloatVector.fromArray(SPECIES, va, 0);
         }
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/FloatVector.java	Thu Apr 18 23:47:37 2019 -0700
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/FloatVector.java	Fri Apr 19 11:35:36 2019 -0700
@@ -125,26 +125,26 @@
      * <p>
      * This method behaves as if it returns the result of calling the
      * byte buffer, offset, and mask accepting
-     * {@link #fromByteBuffer(VectorSpecies<Float>, ByteBuffer, int, VectorMask) method} as follows:
+     * {@link #fromByteBuffer(VectorSpecies, ByteBuffer, int, VectorMask) method} as follows:
      * <pre>{@code
-     * return this.fromByteBuffer(ByteBuffer.wrap(a), i, this.maskAllTrue());
+     * return fromByteBuffer(species, ByteBuffer.wrap(a), offset, VectorMask.allTrue());
      * }</pre>
      *
      * @param species species of desired vector
      * @param a the byte array
-     * @param ix the offset into the array
+     * @param offset the offset into the array
      * @return a vector loaded from a byte array
      * @throws IndexOutOfBoundsException if {@code i < 0} or
-     * {@code i > a.length - (this.length() * this.elementSize() / Byte.SIZE)}
+     * {@code offset > a.length - (species.length() * species.elementSize() / Byte.SIZE)}
      */
     @ForceInline
     @SuppressWarnings("unchecked")
-    public static FloatVector fromByteArray(VectorSpecies<Float> species, byte[] a, int ix) {
+    public static FloatVector fromByteArray(VectorSpecies<Float> species, byte[] a, int offset) {
         Objects.requireNonNull(a);
-        ix = VectorIntrinsics.checkIndex(ix, a.length, species.bitSize() / Byte.SIZE);
+        offset = VectorIntrinsics.checkIndex(offset, a.length, species.bitSize() / Byte.SIZE);
         return VectorIntrinsics.load((Class<FloatVector>) species.boxType(), float.class, species.length(),
-                                     a, ((long) ix) + Unsafe.ARRAY_BYTE_BASE_OFFSET,
-                                     a, ix, species,
+                                     a, ((long) offset) + Unsafe.ARRAY_BYTE_BASE_OFFSET,
+                                     a, offset, species,
                                      (c, idx, s) -> {
                                          ByteBuffer bbc = ByteBuffer.wrap(c, idx, a.length - idx).order(ByteOrder.nativeOrder());
                                          FloatBuffer tb = bbc.asFloatBuffer();
@@ -161,51 +161,48 @@
      * <p>
      * This method behaves as if it returns the result of calling the
      * byte buffer, offset, and mask accepting
-     * {@link #fromByteBuffer(VectorSpecies<Float>, ByteBuffer, int, VectorMask) method} as follows:
+     * {@link #fromByteBuffer(VectorSpecies, ByteBuffer, int, VectorMask) method} as follows:
      * <pre>{@code
-     * return this.fromByteBuffer(ByteBuffer.wrap(a), i, m);
+     * return fromByteBuffer(species, ByteBuffer.wrap(a), offset, m);
      * }</pre>
      *
      * @param species species of desired vector
      * @param a the byte array
-     * @param ix the offset into the array
+     * @param offset the offset into the array
      * @param m the mask
      * @return a vector loaded from a byte array
-     * @throws IndexOutOfBoundsException if {@code i < 0} or
-     * {@code i > a.length - (this.length() * this.elementSize() / Byte.SIZE)}
-     * @throws IndexOutOfBoundsException if the offset is {@code < 0},
-     * or {@code > a.length},
+     * @throws IndexOutOfBoundsException if {@code offset < 0} or
      * for any vector lane index {@code N} where the mask at lane {@code N}
      * is set
-     * {@code i >= a.length - (N * this.elementSize() / Byte.SIZE)}
+     * {@code offset >= a.length - (N * species.elementSize() / Byte.SIZE)}
      */
     @ForceInline
-    public static FloatVector fromByteArray(VectorSpecies<Float> species, byte[] a, int ix, VectorMask<Float> m) {
-        return zero(species).blend(fromByteArray(species, a, ix), m);
+    public static FloatVector fromByteArray(VectorSpecies<Float> species, byte[] a, int offset, VectorMask<Float> m) {
+        return zero(species).blend(fromByteArray(species, a, offset), m);
     }
 
     /**
      * Loads a vector from an array starting at offset.
      * <p>
      * For each vector lane, where {@code N} is the vector lane index, the
-     * array element at index {@code i + N} is placed into the
+     * array element at index {@code offset + N} is placed into the
      * resulting vector at lane index {@code N}.
      *
      * @param species species of desired vector
      * @param a the array
-     * @param i the offset into the array
+     * @param offset the offset into the array
      * @return the vector loaded from an array
-     * @throws IndexOutOfBoundsException if {@code i < 0}, or
-     * {@code i > a.length - this.length()}
+     * @throws IndexOutOfBoundsException if {@code offset < 0}, or
+     * {@code offset > a.length - species.length()}
      */
     @ForceInline
     @SuppressWarnings("unchecked")
-    public static FloatVector fromArray(VectorSpecies<Float> species, float[] a, int i){
+    public static FloatVector fromArray(VectorSpecies<Float> species, float[] a, int offset){
         Objects.requireNonNull(a);
-        i = VectorIntrinsics.checkIndex(i, a.length, species.length());
+        offset = VectorIntrinsics.checkIndex(offset, a.length, species.length());
         return VectorIntrinsics.load((Class<FloatVector>) species.boxType(), float.class, species.length(),
-                                     a, (((long) i) << ARRAY_SHIFT) + Unsafe.ARRAY_FLOAT_BASE_OFFSET,
-                                     a, i, species,
+                                     a, (((long) offset) << ARRAY_SHIFT) + Unsafe.ARRAY_FLOAT_BASE_OFFSET,
+                                     a, offset, species,
                                      (c, idx, s) -> ((FloatSpecies)s).op(n -> c[idx + n]));
     }
 
@@ -215,22 +212,22 @@
      * <p>
      * For each vector lane, where {@code N} is the vector lane index,
      * if the mask lane at index {@code N} is set then the array element at
-     * index {@code i + N} is placed into the resulting vector at lane index
+     * index {@code offset + N} is placed into the resulting vector at lane index
      * {@code N}, otherwise the default element value is placed into the
      * resulting vector at lane index {@code N}.
      *
      * @param species species of desired vector
      * @param a the array
-     * @param i the offset into the array
+     * @param offset the offset into the array
      * @param m the mask
      * @return the vector loaded from an array
-     * @throws IndexOutOfBoundsException if {@code i < 0}, or
+     * @throws IndexOutOfBoundsException if {@code offset < 0}, or
      * for any vector lane index {@code N} where the mask at lane {@code N}
-     * is set {@code i > a.length - N}
+     * is set {@code offset > a.length - N}
      */
     @ForceInline
-    public static FloatVector fromArray(VectorSpecies<Float> species, float[] a, int i, VectorMask<Float> m) {
-        return zero(species).blend(fromArray(species, a, i), m);
+    public static FloatVector fromArray(VectorSpecies<Float> species, float[] a, int offset, VectorMask<Float> m) {
+        return zero(species).blend(fromArray(species, a, offset), m);
     }
 
     /**
@@ -238,37 +235,37 @@
      * map.
      * <p>
      * For each vector lane, where {@code N} is the vector lane index, the
-     * array element at index {@code i + indexMap[j + N]} is placed into the
+     * array element at index {@code a_offset + indexMap[i_offset + N]} is placed into the
      * resulting vector at lane index {@code N}.
      *
      * @param species species of desired vector
      * @param a the array
-     * @param i the offset into the array, may be negative if relative
+     * @param a_offset the offset into the array, may be negative if relative
      * indexes in the index map compensate to produce a value within the
      * array bounds
      * @param indexMap the index map
-     * @param j the offset into the index map
+     * @param i_offset the offset into the index map
      * @return the vector loaded from an array
-     * @throws IndexOutOfBoundsException if {@code j < 0}, or
-     * {@code j > indexMap.length - this.length()},
+     * @throws IndexOutOfBoundsException if {@code i_offset < 0}, or
+     * {@code i_offset > indexMap.length - species.length()},
      * or for any vector lane index {@code N} the result of
-     * {@code i + indexMap[j + N]} is {@code < 0} or {@code >= a.length}
+     * {@code a_offset + indexMap[i_offset + N]} is {@code < 0} or {@code >= a.length}
      */
     @ForceInline
     @SuppressWarnings("unchecked")
-    public static FloatVector fromArray(VectorSpecies<Float> species, float[] a, int i, int[] indexMap, int j) {
+    public static FloatVector fromArray(VectorSpecies<Float> species, float[] a, int a_offset, int[] indexMap, int i_offset) {
         Objects.requireNonNull(a);
         Objects.requireNonNull(indexMap);
 
 
-        // Index vector: vix[0:n] = k -> i + indexMap[j + k]
-        IntVector vix = IntVector.fromArray(IntVector.species(species.indexShape()), indexMap, j).add(i);
+        // Index vector: vix[0:n] = k -> a_offset + indexMap[i_offset + k]
+        IntVector vix = IntVector.fromArray(IntVector.species(species.indexShape()), indexMap, i_offset).add(a_offset);
 
         vix = VectorIntrinsics.checkIndex(vix, a.length);
 
         return VectorIntrinsics.loadWithMap((Class<FloatVector>) species.boxType(), float.class, species.length(),
                                             IntVector.species(species.indexShape()).boxType(), a, Unsafe.ARRAY_FLOAT_BASE_OFFSET, vix,
-                                            a, i, indexMap, j, species,
+                                            a, a_offset, indexMap, i_offset, species,
                                             (float[] c, int idx, int[] iMap, int idy, VectorSpecies<Float> s) ->
                                                 ((FloatSpecies)s).op(n -> c[idx + iMap[idy+n]]));
         }
@@ -279,29 +276,29 @@
      * <p>
      * For each vector lane, where {@code N} is the vector lane index,
      * if the mask lane at index {@code N} is set then the array element at
-     * index {@code i + indexMap[j + N]} is placed into the resulting vector
+     * index {@code a_offset + indexMap[i_offset + N]} is placed into the resulting vector
      * at lane index {@code N}.
      *
      * @param species species of desired vector
      * @param a the array
-     * @param i the offset into the array, may be negative if relative
+     * @param a_offset the offset into the array, may be negative if relative
      * indexes in the index map compensate to produce a value within the
      * array bounds
      * @param m the mask
      * @param indexMap the index map
-     * @param j the offset into the index map
+     * @param i_offset the offset into the index map
      * @return the vector loaded from an array
-     * @throws IndexOutOfBoundsException if {@code j < 0}, or
-     * {@code j > indexMap.length - this.length()},
+     * @throws IndexOutOfBoundsException if {@code i_offset < 0}, or
+     * {@code i_offset > indexMap.length - species.length()},
      * or for any vector lane index {@code N} where the mask at lane
-     * {@code N} is set the result of {@code i + indexMap[j + N]} is
+     * {@code N} is set the result of {@code a_offset + indexMap[i_offset + N]} is
      * {@code < 0} or {@code >= a.length}
      */
     @ForceInline
     @SuppressWarnings("unchecked")
-    public static FloatVector fromArray(VectorSpecies<Float> species, float[] a, int i, VectorMask<Float> m, int[] indexMap, int j) {
+    public static FloatVector fromArray(VectorSpecies<Float> species, float[] a, int a_offset, VectorMask<Float> m, int[] indexMap, int i_offset) {
         // @@@ This can result in out of bounds errors for unset mask lanes
-        return zero(species).blend(fromArray(species, a, i, indexMap, j), m);
+        return zero(species).blend(fromArray(species, a, a_offset, indexMap, i_offset), m);
     }
 
 
@@ -314,31 +311,31 @@
      * <p>
      * This method behaves as if it returns the result of calling the
      * byte buffer, offset, and mask accepting
-     * {@link #fromByteBuffer(VectorSpecies<Float>, ByteBuffer, int, VectorMask)} method} as follows:
+     * {@link #fromByteBuffer(VectorSpecies, ByteBuffer, int, VectorMask)} method} as follows:
      * <pre>{@code
-     *   return this.fromByteBuffer(b, i, this.maskAllTrue())
+     *   return fromByteBuffer(b, offset, VectorMask.allTrue())
      * }</pre>
      *
      * @param species species of desired vector
      * @param bb the byte buffer
-     * @param ix the offset into the byte buffer
+     * @param offset the offset into the byte buffer
      * @return a vector loaded from a byte buffer
      * @throws IndexOutOfBoundsException if the offset is {@code < 0},
      * or {@code > b.limit()},
      * or if there are fewer than
-     * {@code this.length() * this.elementSize() / Byte.SIZE} bytes
+     * {@code species.length() * species.elementSize() / Byte.SIZE} bytes
      * remaining in the byte buffer from the given offset
      */
     @ForceInline
     @SuppressWarnings("unchecked")
-    public static FloatVector fromByteBuffer(VectorSpecies<Float> species, ByteBuffer bb, int ix) {
+    public static FloatVector fromByteBuffer(VectorSpecies<Float> species, ByteBuffer bb, int offset) {
         if (bb.order() != ByteOrder.nativeOrder()) {
             throw new IllegalArgumentException();
         }
-        ix = VectorIntrinsics.checkIndex(ix, bb.limit(), species.bitSize() / Byte.SIZE);
+        offset = VectorIntrinsics.checkIndex(offset, bb.limit(), species.bitSize() / Byte.SIZE);
         return VectorIntrinsics.load((Class<FloatVector>) species.boxType(), float.class, species.length(),
-                                     U.getReference(bb, BYTE_BUFFER_HB), U.getLong(bb, BUFFER_ADDRESS) + ix,
-                                     bb, ix, species,
+                                     U.getReference(bb, BYTE_BUFFER_HB), U.getLong(bb, BUFFER_ADDRESS) + offset,
+                                     bb, offset, species,
                                      (c, idx, s) -> {
                                          ByteBuffer bbc = c.duplicate().position(idx).order(ByteOrder.nativeOrder());
                                          FloatBuffer tb = bbc.asFloatBuffer();
@@ -356,77 +353,77 @@
      * the returned vector is loaded with a mask from a primitive array
      * obtained from the primitive buffer.
      * The following pseudocode expresses the behaviour, where
-     * {@coce EBuffer} is the primitive buffer type, {@code e} is the
-     * primitive element type, and {@code ESpecies<S>} is the primitive
+     * {@code EBuffer} is the primitive buffer type, {@code e} is the
+     * primitive element type, and {@code ESpecies} is the primitive
      * species for {@code e}:
      * <pre>{@code
      * EBuffer eb = b.duplicate().
-     *     order(ByteOrder.nativeOrder()).position(i).
+     *     order(ByteOrder.nativeOrder()).position(offset).
      *     asEBuffer();
-     * e[] es = new e[this.length()];
+     * e[] es = new e[species.length()];
      * for (int n = 0; n < t.length; n++) {
      *     if (m.isSet(n))
      *         es[n] = eb.get(n);
      * }
-     * Vector<E> r = ((ESpecies<S>)this).fromArray(es, 0, m);
+     * EVector r = EVector.fromArray(es, 0, m);
      * }</pre>
      *
      * @param species species of desired vector
      * @param bb the byte buffer
-     * @param ix the offset into the byte buffer
+     * @param offset the offset into the byte buffer
      * @param m the mask
      * @return a vector loaded from a byte buffer
      * @throws IndexOutOfBoundsException if the offset is {@code < 0},
      * or {@code > b.limit()},
      * for any vector lane index {@code N} where the mask at lane {@code N}
      * is set
-     * {@code i >= b.limit() - (N * this.elementSize() / Byte.SIZE)}
+     * {@code offset >= b.limit() - (N * species.elementSize() / Byte.SIZE)}
      */
     @ForceInline
-    public static FloatVector fromByteBuffer(VectorSpecies<Float> species, ByteBuffer bb, int ix, VectorMask<Float> m) {
-        return zero(species).blend(fromByteBuffer(species, bb, ix), m);
+    public static FloatVector fromByteBuffer(VectorSpecies<Float> species, ByteBuffer bb, int offset, VectorMask<Float> m) {
+        return zero(species).blend(fromByteBuffer(species, bb, offset), m);
     }
 
     /**
      * Returns a vector where all lane elements are set to the primitive
      * value {@code e}.
      *
-     * @param s species of the desired vector
+     * @param species species of the desired vector
      * @param e the value
      * @return a vector of vector where all lane elements are set to
      * the primitive value {@code e}
      */
     @ForceInline
     @SuppressWarnings("unchecked")
-    public static FloatVector broadcast(VectorSpecies<Float> s, float e) {
+    public static FloatVector broadcast(VectorSpecies<Float> species, float e) {
         return VectorIntrinsics.broadcastCoerced(
-            (Class<FloatVector>) s.boxType(), float.class, s.length(),
-            Float.floatToIntBits(e), s,
+            (Class<FloatVector>) species.boxType(), float.class, species.length(),
+            Float.floatToIntBits(e), species,
             ((bits, sp) -> ((FloatSpecies)sp).op(i -> Float.intBitsToFloat((int)bits))));
     }
 
     /**
-     * Returns a vector where each lane element is set to a given
-     * primitive value.
+     * Returns a vector where each lane element is set to given
+     * primitive values.
      * <p>
      * For each vector lane, where {@code N} is the vector lane index, the
      * the primitive value at index {@code N} is placed into the resulting
      * vector at lane index {@code N}.
      *
-     * @param s species of the desired vector
+     * @param species species of the desired vector
      * @param es the given primitive values
-     * @return a vector where each lane element is set to a given primitive
-     * value
-     * @throws IndexOutOfBoundsException if {@code es.length < this.length()}
+     * @return a vector where each lane element is set to given primitive
+     * values
+     * @throws IndexOutOfBoundsException if {@code es.length < species.length()}
      */
     @ForceInline
     @SuppressWarnings("unchecked")
-    public static FloatVector scalars(VectorSpecies<Float> s, float... es) {
+    public static FloatVector scalars(VectorSpecies<Float> species, float... es) {
         Objects.requireNonNull(es);
-        int ix = VectorIntrinsics.checkIndex(0, es.length, s.length());
-        return VectorIntrinsics.load((Class<FloatVector>) s.boxType(), float.class, s.length(),
+        int ix = VectorIntrinsics.checkIndex(0, es.length, species.length());
+        return VectorIntrinsics.load((Class<FloatVector>) species.boxType(), float.class, species.length(),
                                      es, Unsafe.ARRAY_FLOAT_BASE_OFFSET,
-                                     es, ix, s,
+                                     es, ix, species,
                                      (c, idx, sp) -> ((FloatSpecies)sp).op(n -> c[idx + n]));
     }
 
@@ -435,14 +432,14 @@
      * value {@code e}, all other lane elements are set to the default
      * value.
      *
-     * @param s species of the desired vector
+     * @param species species of the desired vector
      * @param e the value
      * @return a vector where the first lane element is set to the primitive
      * value {@code e}
      */
     @ForceInline
-    public static final FloatVector single(VectorSpecies<Float> s, float e) {
-        return zero(s).with(0, e);
+    public static final FloatVector single(VectorSpecies<Float> species, float e) {
+        return zero(species).with(0, e);
     }
 
     /**
@@ -452,25 +449,28 @@
      * The semantics are equivalent to calling
      * {@link ThreadLocalRandom#nextFloat()}
      *
-     * @param s species of the desired vector
+     * @param species species of the desired vector
      * @return a vector where each lane elements is set to a randomly
      * generated primitive value
      */
-    public static FloatVector random(VectorSpecies<Float> s) {
+    public static FloatVector random(VectorSpecies<Float> species) {
         ThreadLocalRandom r = ThreadLocalRandom.current();
-        return ((FloatSpecies)s).op(i -> r.nextFloat());
+        return ((FloatSpecies)species).op(i -> r.nextFloat());
     }
 
     // Ops
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public abstract FloatVector add(Vector<Float> v);
 
     /**
      * Adds this vector to the broadcast of an input scalar.
      * <p>
-     * This is a vector binary operation where the primitive addition operation
-     * ({@code +}) is applied to lane elements.
+     * This is a lane-wise binary operation which applies the primitive addition operation
+     * ({@code +}) to each lane.
      *
      * @param s the input scalar
      * @return the result of adding this vector to the broadcast of an input
@@ -478,6 +478,9 @@
      */
     public abstract FloatVector add(float s);
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public abstract FloatVector add(Vector<Float> v, VectorMask<Float> m);
 
@@ -485,8 +488,8 @@
      * Adds this vector to broadcast of an input scalar,
      * selecting lane elements controlled by a mask.
      * <p>
-     * This is a vector binary operation where the primitive addition operation
-     * ({@code +}) is applied to lane elements.
+     * This is a lane-wise binary operation which applies the primitive addition operation
+     * ({@code +}) to each lane.
      *
      * @param s the input scalar
      * @param m the mask controlling lane selection
@@ -495,14 +498,17 @@
      */
     public abstract FloatVector add(float s, VectorMask<Float> m);
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public abstract FloatVector sub(Vector<Float> v);
 
     /**
      * Subtracts the broadcast of an input scalar from this vector.
      * <p>
-     * This is a vector binary operation where the primitive subtraction
-     * operation ({@code -}) is applied to lane elements.
+     * This is a lane-wise binary operation which applies the primitive subtraction
+     * operation ({@code -}) to each lane.
      *
      * @param s the input scalar
      * @return the result of subtracting the broadcast of an input
@@ -510,6 +516,9 @@
      */
     public abstract FloatVector sub(float s);
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public abstract FloatVector sub(Vector<Float> v, VectorMask<Float> m);
 
@@ -517,8 +526,8 @@
      * Subtracts the broadcast of an input scalar from this vector, selecting
      * lane elements controlled by a mask.
      * <p>
-     * This is a vector binary operation where the primitive subtraction
-     * operation ({@code -}) is applied to lane elements.
+     * This is a lane-wise binary operation which applies the primitive subtraction
+     * operation ({@code -}) to each lane.
      *
      * @param s the input scalar
      * @param m the mask controlling lane selection
@@ -527,14 +536,17 @@
      */
     public abstract FloatVector sub(float s, VectorMask<Float> m);
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public abstract FloatVector mul(Vector<Float> v);
 
     /**
      * Multiplies this vector with the broadcast of an input scalar.
      * <p>
-     * This is a vector binary operation where the primitive multiplication
-     * operation ({@code *}) is applied to lane elements.
+     * This is a lane-wise binary operation which applies the primitive multiplication
+     * operation ({@code *}) to each lane.
      *
      * @param s the input scalar
      * @return the result of multiplying this vector with the broadcast of an
@@ -542,6 +554,9 @@
      */
     public abstract FloatVector mul(float s);
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public abstract FloatVector mul(Vector<Float> v, VectorMask<Float> m);
 
@@ -549,8 +564,8 @@
      * Multiplies this vector with the broadcast of an input scalar, selecting
      * lane elements controlled by a mask.
      * <p>
-     * This is a vector binary operation where the primitive multiplication
-     * operation ({@code *}) is applied to lane elements.
+     * This is a lane-wise binary operation which applies the primitive multiplication
+     * operation ({@code *}) to each lane.
      *
      * @param s the input scalar
      * @param m the mask controlling lane selection
@@ -559,60 +574,87 @@
      */
     public abstract FloatVector mul(float s, VectorMask<Float> m);
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public abstract FloatVector neg();
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public abstract FloatVector neg(VectorMask<Float> m);
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public abstract FloatVector abs();
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public abstract FloatVector abs(VectorMask<Float> m);
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public abstract FloatVector min(Vector<Float> v);
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public abstract FloatVector min(Vector<Float> v, VectorMask<Float> m);
 
     /**
      * Returns the minimum of this vector and the broadcast of an input scalar.
      * <p>
-     * This is a vector binary operation where the operation
-     * {@code (a, b) -> Math.min(a, b)} is applied to lane elements.
+     * This is a lane-wise binary operation which applies the operation
+     * {@code (a, b) -> Math.min(a, b)} to each lane.
      *
      * @param s the input scalar
      * @return the minimum of this vector and the broadcast of an input scalar
      */
     public abstract FloatVector min(float s);
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public abstract FloatVector max(Vector<Float> v);
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public abstract FloatVector max(Vector<Float> v, VectorMask<Float> m);
 
     /**
      * Returns the maximum of this vector and the broadcast of an input scalar.
      * <p>
-     * This is a vector binary operation where the operation
-     * {@code (a, b) -> Math.max(a, b)} is applied to lane elements.
+     * This is a lane-wise binary operation which applies the operation
+     * {@code (a, b) -> Math.max(a, b)} to each lane.
      *
      * @param s the input scalar
      * @return the maximum of this vector and the broadcast of an input scalar
      */
     public abstract FloatVector max(float s);
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public abstract VectorMask<Float> equal(Vector<Float> v);
 
     /**
      * Tests if this vector is equal to the broadcast of an input scalar.
      * <p>
-     * This is a vector binary test operation where the primitive equals
-     * operation ({@code ==}) is applied to lane elements.
+     * This is a lane-wise binary test operation which applies the primitive equals
+     * operation ({@code ==}) each lane.
      *
      * @param s the input scalar
      * @return the result mask of testing if this vector is equal to the
@@ -620,14 +662,17 @@
      */
     public abstract VectorMask<Float> equal(float s);
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public abstract VectorMask<Float> notEqual(Vector<Float> v);
 
     /**
      * Tests if this vector is not equal to the broadcast of an input scalar.
      * <p>
-     * This is a vector binary test operation where the primitive not equals
-     * operation ({@code !=}) is applied to lane elements.
+     * This is a lane-wise binary test operation which applies the primitive not equals
+     * operation ({@code !=}) to each lane.
      *
      * @param s the input scalar
      * @return the result mask of testing if this vector is not equal to the
@@ -635,14 +680,17 @@
      */
     public abstract VectorMask<Float> notEqual(float s);
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public abstract VectorMask<Float> lessThan(Vector<Float> v);
 
     /**
      * Tests if this vector is less than the broadcast of an input scalar.
      * <p>
-     * This is a vector binary test operation where the primitive less than
-     * operation ({@code <}) is applied to lane elements.
+     * This is a lane-wise binary test operation which applies the primitive less than
+     * operation ({@code <}) to each lane.
      *
      * @param s the input scalar
      * @return the mask result of testing if this vector is less than the
@@ -650,14 +698,17 @@
      */
     public abstract VectorMask<Float> lessThan(float s);
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public abstract VectorMask<Float> lessThanEq(Vector<Float> v);
 
     /**
      * Tests if this vector is less or equal to the broadcast of an input scalar.
      * <p>
-     * This is a vector binary test operation where the primitive less than
-     * or equal to operation ({@code <=}) is applied to lane elements.
+     * This is a lane-wise binary test operation which applies the primitive less than
+     * or equal to operation ({@code <=}) to each lane.
      *
      * @param s the input scalar
      * @return the mask result of testing if this vector is less than or equal
@@ -665,14 +716,17 @@
      */
     public abstract VectorMask<Float> lessThanEq(float s);
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public abstract VectorMask<Float> greaterThan(Vector<Float> v);
 
     /**
      * Tests if this vector is greater than the broadcast of an input scalar.
      * <p>
-     * This is a vector binary test operation where the primitive greater than
-     * operation ({@code >}) is applied to lane elements.
+     * This is a lane-wise binary test operation which applies the primitive greater than
+     * operation ({@code >}) to each lane.
      *
      * @param s the input scalar
      * @return the mask result of testing if this vector is greater than the
@@ -680,6 +734,9 @@
      */
     public abstract VectorMask<Float> greaterThan(float s);
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public abstract VectorMask<Float> greaterThanEq(Vector<Float> v);
 
@@ -687,8 +744,8 @@
      * Tests if this vector is greater than or equal to the broadcast of an
      * input scalar.
      * <p>
-     * This is a vector binary test operation where the primitive greater than
-     * or equal to operation ({@code >=}) is applied to lane elements.
+     * This is a lane-wise binary test operation which applies the primitive greater than
+     * or equal to operation ({@code >=}) to each lane.
      *
      * @param s the input scalar
      * @return the mask result of testing if this vector is greater than or
@@ -696,6 +753,9 @@
      */
     public abstract VectorMask<Float> greaterThanEq(float s);
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public abstract FloatVector blend(Vector<Float> v, VectorMask<Float> m);
 
@@ -716,33 +776,54 @@
      */
     public abstract FloatVector blend(float s, VectorMask<Float> m);
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public abstract FloatVector rearrange(Vector<Float> v,
                                                       VectorShuffle<Float> s, VectorMask<Float> m);
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public abstract FloatVector rearrange(VectorShuffle<Float> m);
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public abstract FloatVector reshape(VectorSpecies<Float> s);
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public abstract FloatVector rotateEL(int i);
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public abstract FloatVector rotateER(int i);
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public abstract FloatVector shiftEL(int i);
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public abstract FloatVector shiftER(int i);
 
     /**
      * Divides this vector by an input vector.
      * <p>
-     * This is a vector binary operation where the primitive division
-     * operation ({@code /}) is applied to lane elements.
+     * This is a lane-wise binary operation which applies the primitive division
+     * operation ({@code /}) to each lane.
      *
      * @param v the input vector
      * @return the result of dividing this vector by the input vector
@@ -752,8 +833,8 @@
     /**
      * Divides this vector by the broadcast of an input scalar.
      * <p>
-     * This is a vector binary operation where the primitive division
-     * operation ({@code /}) is applied to lane elements.
+     * This is a lane-wise binary operation which applies the primitive division
+     * operation ({@code /}) to each lane.
      *
      * @param s the input scalar
      * @return the result of dividing this vector by the broadcast of an input
@@ -765,8 +846,8 @@
      * Divides this vector by an input vector, selecting lane elements
      * controlled by a mask.
      * <p>
-     * This is a vector binary operation where the primitive division
-     * operation ({@code /}) is applied to lane elements.
+     * This is a lane-wise binary operation which applies the primitive division
+     * operation ({@code /}) to each lane.
      *
      * @param v the input vector
      * @param m the mask controlling lane selection
@@ -778,8 +859,8 @@
      * Divides this vector by the broadcast of an input scalar, selecting lane
      * elements controlled by a mask.
      * <p>
-     * This is a vector binary operation where the primitive division
-     * operation ({@code /}) is applied to lane elements.
+     * This is a lane-wise binary operation which applies the primitive division
+     * operation ({@code /}) to each lane.
      *
      * @param s the input scalar
      * @param m the mask controlling lane selection
@@ -791,8 +872,8 @@
     /**
      * Calculates the square root of this vector.
      * <p>
-     * This is a vector unary operation where the {@link Math#sqrt} operation
-     * is applied to lane elements.
+     * This is a lane-wise unary operation which applies the {@link Math#sqrt} operation
+     * to each lane.
      *
      * @return the square root of this vector
      */
@@ -802,8 +883,8 @@
      * Calculates the square root of this vector, selecting lane elements
      * controlled by a mask.
      * <p>
-     * This is a vector unary operation where the {@link Math#sqrt} operation
-     * is applied to lane elements.
+     * This is a lane-wise unary operation which applies the {@link Math#sqrt} operation
+     * to each lane.
      *
      * @param m the mask controlling lane selection
      * @return the square root of this vector
@@ -815,8 +896,8 @@
     /**
      * Calculates the trigonometric tangent of this vector.
      * <p>
-     * This is a vector unary operation with same semantic definition as
-     * {@link Math#tan} operation applied to lane elements.
+     * This is a lane-wise unary operation with same semantic definition as
+     * {@link Math#tan} operation applied to each lane.
      * The implementation is not required to return same
      * results as {@link Math#tan}, but adheres to rounding, monotonicity,
      * and special case semantics as defined in the {@link Math#tan}
@@ -846,8 +927,8 @@
     /**
      * Calculates the hyperbolic tangent of this vector.
      * <p>
-     * This is a vector unary operation with same semantic definition as
-     * {@link Math#tanh} operation applied to lane elements.
+     * This is a lane-wise unary operation with same semantic definition as
+     * {@link Math#tanh} operation applied to each lane.
      * The implementation is not required to return same
      * results as {@link Math#tanh}, but adheres to rounding, monotonicity,
      * and special case semantics as defined in the {@link Math#tanh}
@@ -877,8 +958,8 @@
     /**
      * Calculates the trigonometric sine of this vector.
      * <p>
-     * This is a vector unary operation with same semantic definition as
-     * {@link Math#sin} operation applied to lane elements.
+     * This is a lane-wise unary operation with same semantic definition as
+     * {@link Math#sin} operation applied to each lane.
      * The implementation is not required to return same
      * results as {@link Math#sin}, but adheres to rounding, monotonicity,
      * and special case semantics as defined in the {@link Math#sin}
@@ -908,8 +989,8 @@
     /**
      * Calculates the hyperbolic sine of this vector.
      * <p>
-     * This is a vector unary operation with same semantic definition as
-     * {@link Math#sinh} operation applied to lane elements.
+     * This is a lane-wise unary operation with same semantic definition as
+     * {@link Math#sinh} operation applied to each lane.
      * The implementation is not required to return same
      * results as  {@link Math#sinh}, but adheres to rounding, monotonicity,
      * and special case semantics as defined in the {@link Math#sinh}
@@ -939,8 +1020,8 @@
     /**
      * Calculates the trigonometric cosine of this vector.
      * <p>
-     * This is a vector unary operation with same semantic definition as
-     * {@link Math#cos} operation applied to lane elements.
+     * This is a lane-wise unary operation with same semantic definition as
+     * {@link Math#cos} operation applied to each lane.
      * The implementation is not required to return same
      * results as {@link Math#cos}, but adheres to rounding, monotonicity,
      * and special case semantics as defined in the {@link Math#cos}
@@ -970,8 +1051,8 @@
     /**
      * Calculates the hyperbolic cosine of this vector.
      * <p>
-     * This is a vector unary operation with same semantic definition as
-     * {@link Math#cosh} operation applied to lane elements.
+     * This is a lane-wise unary operation with same semantic definition as
+     * {@link Math#cosh} operation applied to each lane.
      * The implementation is not required to return same
      * results as {@link Math#cosh}, but adheres to rounding, monotonicity,
      * and special case semantics as defined in the {@link Math#cosh}
@@ -1001,8 +1082,8 @@
     /**
      * Calculates the arc sine of this vector.
      * <p>
-     * This is a vector unary operation with same semantic definition as
-     * {@link Math#asin} operation applied to lane elements.
+     * This is a lane-wise unary operation with same semantic definition as
+     * {@link Math#asin} operation applied to each lane.
      * The implementation is not required to return same
      * results as {@link Math#asin}, but adheres to rounding, monotonicity,
      * and special case semantics as defined in the {@link Math#asin}
@@ -1032,8 +1113,8 @@
     /**
      * Calculates the arc cosine of this vector.
      * <p>
-     * This is a vector unary operation with same semantic definition as
-     * {@link Math#acos} operation applied to lane elements.
+     * This is a lane-wise unary operation with same semantic definition as
+     * {@link Math#acos} operation applied to each lane.
      * The implementation is not required to return same
      * results as {@link Math#acos}, but adheres to rounding, monotonicity,
      * and special case semantics as defined in the {@link Math#acos}
@@ -1063,8 +1144,8 @@
     /**
      * Calculates the arc tangent of this vector.
      * <p>
-     * This is a vector unary operation with same semantic definition as
-     * {@link Math#atan} operation applied to lane elements.
+     * This is a lane-wise unary operation with same semantic definition as
+     * {@link Math#atan} operation applied to each lane.
      * The implementation is not required to return same
      * results as {@link Math#atan}, but adheres to rounding, monotonicity,
      * and special case semantics as defined in the {@link Math#atan}
@@ -1094,8 +1175,8 @@
     /**
      * Calculates the arc tangent of this vector divided by an input vector.
      * <p>
-     * This is a vector binary operation with same semantic definition as
-     * {@link Math#atan2} operation applied to lane elements.
+     * This is a lane-wise binary operation with same semantic definition as
+     * {@link Math#atan2} operation applied to each lane.
      * The implementation is not required to return same
      * results as {@link Math#atan2}, but adheres to rounding, monotonicity,
      * and special case semantics as defined in the {@link Math#atan2}
@@ -1113,8 +1194,8 @@
      * Calculates the arc tangent of this vector divided by the broadcast of an
      * an input scalar.
      * <p>
-     * This is a vector binary operation with same semantic definition as
-     * {@link Math#atan2} operation applied to lane elements.
+     * This is a lane-wise binary operation with same semantic definition as
+     * {@link Math#atan2} operation applied to each lane.
      * The implementation is not required to return same
      * results as {@link Math#atan2}, but adheres to rounding, monotonicity,
      * and special case semantics as defined in the {@link Math#atan2}
@@ -1157,8 +1238,8 @@
     /**
      * Calculates the cube root of this vector.
      * <p>
-     * This is a vector unary operation with same semantic definition as
-     * {@link Math#cbrt} operation applied to lane elements.
+     * This is a lane-wise unary operation with same semantic definition as
+     * {@link Math#cbrt} operation applied to each lane.
      * The implementation is not required to return same
      * results as {@link Math#cbrt}, but adheres to rounding, monotonicity,
      * and special case semantics as defined in the {@link Math#cbrt}
@@ -1188,8 +1269,8 @@
     /**
      * Calculates the natural logarithm of this vector.
      * <p>
-     * This is a vector unary operation with same semantic definition as
-     * {@link Math#log} operation applied to lane elements.
+     * This is a lane-wise unary operation with same semantic definition as
+     * {@link Math#log} operation applied to each lane.
      * The implementation is not required to return same
      * results as {@link Math#log}, but adheres to rounding, monotonicity,
      * and special case semantics as defined in the {@link Math#log}
@@ -1219,8 +1300,8 @@
     /**
      * Calculates the base 10 logarithm of this vector.
      * <p>
-     * This is a vector unary operation with same semantic definition as
-     * {@link Math#log10} operation applied to lane elements.
+     * This is a lane-wise unary operation with same semantic definition as
+     * {@link Math#log10} operation applied to each lane.
      * The implementation is not required to return same
      * results as {@link Math#log10}, but adheres to rounding, monotonicity,
      * and special case semantics as defined in the {@link Math#log10}
@@ -1251,8 +1332,8 @@
      * Calculates the natural logarithm of the sum of this vector and the
      * broadcast of {@code 1}.
      * <p>
-     * This is a vector unary operation with same semantic definition as
-     * {@link Math#log1p} operation applied to lane elements.
+     * This is a lane-wise unary operation with same semantic definition as
+     * {@link Math#log1p} operation applied to each lane.
      * The implementation is not required to return same
      * results as  {@link Math#log1p}, but adheres to rounding, monotonicity,
      * and special case semantics as defined in the {@link Math#log1p}
@@ -1284,8 +1365,8 @@
     /**
      * Calculates this vector raised to the power of an input vector.
      * <p>
-     * This is a vector binary operation with same semantic definition as
-     * {@link Math#pow} operation applied to lane elements.
+     * This is a lane-wise binary operation with same semantic definition as
+     * {@link Math#pow} operation applied to each lane.
      * The implementation is not required to return same
      * results as {@link Math#pow}, but adheres to rounding, monotonicity,
      * and special case semantics as defined in the {@link Math#pow}
@@ -1303,8 +1384,8 @@
      * Calculates this vector raised to the power of the broadcast of an input
      * scalar.
      * <p>
-     * This is a vector binary operation with same semantic definition as
-     * {@link Math#pow} operation applied to lane elements.
+     * This is a lane-wise binary operation with same semantic definition as
+     * {@link Math#pow} operation applied to each lane.
      * The implementation is not required to return same
      * results as {@link Math#pow}, but adheres to rounding, monotonicity,
      * and special case semantics as defined in the {@link Math#pow}
@@ -1350,8 +1431,8 @@
      * Calculates the broadcast of Euler's number {@code e} raised to the power
      * of this vector.
      * <p>
-     * This is a vector unary operation with same semantic definition as
-     * {@link Math#exp} operation applied to lane elements.
+     * This is a lane-wise unary operation with same semantic definition as
+     * {@link Math#exp} operation applied to each lane.
      * The implementation is not required to return same
      * results as {@link Math#exp}, but adheres to rounding, monotonicity,
      * and special case semantics as defined in the {@link Math#exp}
@@ -1386,11 +1467,11 @@
      * More specifically as if the following (ignoring any differences in
      * numerical accuracy):
      * <pre>{@code
-     *   this.exp().sub(this.species().broadcast(1))
+     *   this.exp().sub(EVector.broadcast(this.species(), 1))
      * }</pre>
      * <p>
-     * This is a vector unary operation with same semantic definition as
-     * {@link Math#expm1} operation applied to lane elements.
+     * This is a lane-wise unary operation with same semantic definition as
+     * {@link Math#expm1} operation applied to each lane.
      * The implementation is not required to return same
      * results as {@link Math#expm1}, but adheres to rounding, monotonicity,
      * and special case semantics as defined in the {@link Math#expm1}
@@ -1411,7 +1492,7 @@
      * More specifically as if the following (ignoring any differences in
      * numerical accuracy):
      * <pre>{@code
-     *   this.exp(m).sub(this.species().broadcast(1), m)
+     *   this.exp(m).sub(EVector.broadcast(this.species(), 1), m)
      * }</pre>
      * <p>
      * Semantics for rounding, monotonicity, and special cases are
@@ -1434,8 +1515,8 @@
      *   this.mul(v1).add(v2)
      * }</pre>
      * <p>
-     * This is a vector ternary operation where the {@link Math#fma} operation
-     * is applied to lane elements.
+     * This is a lane-wise ternary operation which applies the {@link Math#fma} operation
+     * to each lane.
      *
      * @param v1 the first input vector
      * @param v2 the second input vector
@@ -1449,11 +1530,11 @@
      * scalar summed with the broadcast of a second input scalar.
      * More specifically as if the following:
      * <pre>{@code
-     *   this.fma(this.species().broadcast(s1), this.species().broadcast(s2))
+     *   this.fma(EVector.broadcast(this.species(), s1), EVector.broadcast(this.species(), s2))
      * }</pre>
      * <p>
-     * This is a vector ternary operation where the {@link Math#fma} operation
-     * is applied to lane elements.
+     * This is a lane-wise ternary operation which applies the {@link Math#fma} operation
+     * to each lane.
      *
      * @param s1 the first input scalar
      * @param s2 the second input scalar
@@ -1471,8 +1552,8 @@
      *   this.mul(v1, m).add(v2, m)
      * }</pre>
      * <p>
-     * This is a vector ternary operation where the {@link Math#fma} operation
-     * is applied to lane elements.
+     * This is a lane-wise ternary operation which applies the {@link Math#fma} operation
+     * to each lane.
      *
      * @param v1 the first input vector
      * @param v2 the second input vector
@@ -1490,11 +1571,11 @@
      * elements controlled by a mask
      * More specifically as if the following:
      * <pre>{@code
-     *   this.fma(this.species().broadcast(s1), this.species().broadcast(s2), m)
+     *   this.fma(EVector.broadcast(this.species(), s1), EVector.broadcast(this.species(), s2), m)
      * }</pre>
      * <p>
-     * This is a vector ternary operation where the {@link Math#fma} operation
-     * is applied to lane elements.
+     * This is a lane-wise ternary operation which applies the {@link Math#fma} operation
+     * to each lane.
      *
      * @param s1 the first input scalar
      * @param s2 the second input scalar
@@ -1513,8 +1594,8 @@
      *   this.mul(this).add(v.mul(v)).sqrt()
      * }</pre>
      * <p>
-     * This is a vector binary operation with same semantic definition as
-     * {@link Math#hypot} operation applied to lane elements.
+     * This is a lane-wise binary operation with same semantic definition as
+     * {@link Math#hypot} operation applied to each lane.
      * The implementation is not required to return same
      * results as {@link Math#hypot}, but adheres to rounding, monotonicity,
      * and special case semantics as defined in the {@link Math#hypot}
@@ -1535,11 +1616,11 @@
      * More specifically as if the following (ignoring any differences in
      * numerical accuracy):
      * <pre>{@code
-     *   this.mul(this).add(this.species().broadcast(v * v)).sqrt()
+     *   this.mul(this).add(EVector.broadcast(this.species(), s * s)).sqrt()
      * }</pre>
      * <p>
-     * This is a vector binary operation with same semantic definition as
-     * {@link Math#hypot} operation applied to lane elements.
+     * This is a lane-wise binary operation with same semantic definition as
+     * {@link Math#hypot} operation applied to each.
      * The implementation is not required to return same
      * results as {@link Math#hypot}, but adheres to rounding, monotonicity,
      * and special case semantics as defined in the {@link Math#hypot}
@@ -1580,7 +1661,7 @@
      * More specifically as if the following (ignoring any differences in
      * numerical accuracy):
      * <pre>{@code
-     *   this.mul(this, m).add(this.species().broadcast(v * v), m).sqrt(m)
+     *   this.mul(this, m).add(EVector.broadcast(this.species(), s * s), m).sqrt(m)
      * }</pre>
      * <p>
      * Semantics for rounding, monotonicity, and special cases are
@@ -1594,15 +1675,27 @@
     public abstract FloatVector hypot(float s, VectorMask<Float> m);
 
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public abstract void intoByteArray(byte[] a, int ix);
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public abstract void intoByteArray(byte[] a, int ix, VectorMask<Float> m);
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public abstract void intoByteBuffer(ByteBuffer bb, int ix);
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public abstract void intoByteBuffer(ByteBuffer bb, int ix, VectorMask<Float> m);
 
@@ -1611,8 +1704,8 @@
     /**
      * Adds all lane elements of this vector.
      * <p>
-     * This is a vector reduction operation where the addition
-     * operation ({@code +}) is applied to lane elements,
+     * This is a cross-lane reduction operation which applies the addition
+     * operation ({@code +}) to lane elements,
      * and the identity value is {@code 0.0}.
      *
      * <p>The value of a floating-point sum is a function both of the input values as well
@@ -1632,8 +1725,8 @@
      * Adds all lane elements of this vector, selecting lane elements
      * controlled by a mask.
      * <p>
-     * This is a vector reduction operation where the addition
-     * operation ({@code +}) is applied to lane elements,
+     * This is a cross-lane reduction operation which applies the addition
+     * operation ({@code +}) to lane elements,
      * and the identity value is {@code 0.0}.
      *
      * <p>The value of a floating-point sum is a function both of the input values as well
@@ -1653,8 +1746,8 @@
     /**
      * Multiplies all lane elements of this vector.
      * <p>
-     * This is a vector reduction operation where the
-     * multiplication operation ({@code *}) is applied to lane elements,
+     * This is a cross-lane reduction operation which applies the
+     * multiplication operation ({@code *}) to lane elements,
      * and the identity value is {@code 1.0}.
      *
      * <p>The order of multiplication operations of this method
@@ -1673,8 +1766,8 @@
      * Multiplies all lane elements of this vector, selecting lane elements
      * controlled by a mask.
      * <p>
-     * This is a vector reduction operation where the
-     * multiplication operation ({@code *}) is applied to lane elements,
+     * This is a cross-lane reduction operation which applies the
+     * multiplication operation ({@code *}) to lane elements,
      * and the identity value is {@code 1.0}.
      *
      * <p>The order of multiplication operations of this method
@@ -1693,8 +1786,8 @@
     /**
      * Returns the minimum lane element of this vector.
      * <p>
-     * This is an associative vector reduction operation where the operation
-     * {@code (a, b) -> Math.min(a, b)} is applied to lane elements,
+     * This is an associative cross-lane reduction operation which applies the operation
+     * {@code (a, b) -> Math.min(a, b)} to lane elements,
      * and the identity value is
      * {@link Float#POSITIVE_INFINITY}.
      *
@@ -1706,8 +1799,8 @@
      * Returns the minimum lane element of this vector, selecting lane elements
      * controlled by a mask.
      * <p>
-     * This is an associative vector reduction operation where the operation
-     * {@code (a, b) -> Math.min(a, b)} is applied to lane elements,
+     * This is an associative cross-lane reduction operation which applies the operation
+     * {@code (a, b) -> Math.min(a, b)} to lane elements,
      * and the identity value is
      * {@link Float#POSITIVE_INFINITY}.
      *
@@ -1719,8 +1812,8 @@
     /**
      * Returns the maximum lane element of this vector.
      * <p>
-     * This is an associative vector reduction operation where the operation
-     * {@code (a, b) -> Math.max(a, b)} is applied to lane elements,
+     * This is an associative cross-lane reduction operation which applies the operation
+     * {@code (a, b) -> Math.max(a, b)} to lane elements,
      * and the identity value is
      * {@link Float#NEGATIVE_INFINITY}.
      *
@@ -1732,8 +1825,8 @@
      * Returns the maximum lane element of this vector, selecting lane elements
      * controlled by a mask.
      * <p>
-     * This is an associative vector reduction operation where the operation
-     * {@code (a, b) -> Math.max(a, b)} is applied to lane elements,
+     * This is an associative cross-lane reduction operation which applies the operation
+     * {@code (a, b) -> Math.max(a, b)} to lane elements,
      * and the identity value is
      * {@link Float#NEGATIVE_INFINITY}.
      *
@@ -1753,7 +1846,7 @@
      * @throws IllegalArgumentException if the index is is out of range
      * ({@code < 0 || >= length()})
      */
-    public abstract float get(int i);
+    public abstract float lane(int i);
 
     /**
      * Replaces the lane element of this vector at lane index {@code i} with
@@ -1800,30 +1893,30 @@
      * <p>
      * For each vector lane, where {@code N} is the vector lane index,
      * the lane element at index {@code N} is stored into the array at index
-     * {@code i + N}.
+     * {@code offset + N}.
      *
      * @param a the array
-     * @param i the offset into the array
-     * @throws IndexOutOfBoundsException if {@code i < 0}, or
-     * {@code i > a.length - this.length()}
+     * @param offset the offset into the array
+     * @throws IndexOutOfBoundsException if {@code offset < 0}, or
+     * {@code offset > a.length - this.length()}
      */
-    public abstract void intoArray(float[] a, int i);
+    public abstract void intoArray(float[] a, int offset);
 
     /**
      * Stores this vector into an array starting at offset and using a mask.
      * <p>
      * For each vector lane, where {@code N} is the vector lane index,
      * if the mask lane at index {@code N} is set then the lane element at
-     * index {@code N} is stored into the array index {@code i + N}.
+     * index {@code N} is stored into the array index {@code offset + N}.
      *
      * @param a the array
-     * @param i the offset into the array
+     * @param offset the offset into the array
      * @param m the mask
-     * @throws IndexOutOfBoundsException if {@code i < 0}, or
+     * @throws IndexOutOfBoundsException if {@code offset < 0}, or
      * for any vector lane index {@code N} where the mask at lane {@code N}
-     * is set {@code i >= a.length - N}
+     * is set {@code offset >= a.length - N}
      */
-    public abstract void intoArray(float[] a, int i, VectorMask<Float> m);
+    public abstract void intoArray(float[] a, int offset, VectorMask<Float> m);
 
     /**
      * Stores this vector into an array using indexes obtained from an index
@@ -1831,20 +1924,20 @@
      * <p>
      * For each vector lane, where {@code N} is the vector lane index, the
      * lane element at index {@code N} is stored into the array at index
-     * {@code i + indexMap[j + N]}.
+     * {@code a_offset + indexMap[i_offset + N]}.
      *
      * @param a the array
-     * @param i the offset into the array, may be negative if relative
+     * @param a_offset the offset into the array, may be negative if relative
      * indexes in the index map compensate to produce a value within the
      * array bounds
      * @param indexMap the index map
-     * @param j the offset into the index map
-     * @throws IndexOutOfBoundsException if {@code j < 0}, or
-     * {@code j > indexMap.length - this.length()},
+     * @param i_offset the offset into the index map
+     * @throws IndexOutOfBoundsException if {@code i_offset < 0}, or
+     * {@code i_offset > indexMap.length - this.length()},
      * or for any vector lane index {@code N} the result of
-     * {@code i + indexMap[j + N]} is {@code < 0} or {@code >= a.length}
+     * {@code a_offset + indexMap[i_offset + N]} is {@code < 0} or {@code >= a.length}
      */
-    public abstract void intoArray(float[] a, int i, int[] indexMap, int j);
+    public abstract void intoArray(float[] a, int a_offset, int[] indexMap, int i_offset);
 
     /**
      * Stores this vector into an array using indexes obtained from an index
@@ -1853,24 +1946,27 @@
      * For each vector lane, where {@code N} is the vector lane index,
      * if the mask lane at index {@code N} is set then the lane element at
      * index {@code N} is stored into the array at index
-     * {@code i + indexMap[j + N]}.
+     * {@code a_offset + indexMap[i_offset + N]}.
      *
      * @param a the array
-     * @param i the offset into the array, may be negative if relative
+     * @param a_offset the offset into the array, may be negative if relative
      * indexes in the index map compensate to produce a value within the
      * array bounds
      * @param m the mask
      * @param indexMap the index map
-     * @param j the offset into the index map
+     * @param i_offset the offset into the index map
      * @throws IndexOutOfBoundsException if {@code j < 0}, or
-     * {@code j > indexMap.length - this.length()},
+     * {@code i_offset > indexMap.length - this.length()},
      * or for any vector lane index {@code N} where the mask at lane
-     * {@code N} is set the result of {@code i + indexMap[j + N]} is
+     * {@code N} is set the result of {@code a_offset + indexMap[i_offset + N]} is
      * {@code < 0} or {@code >= a.length}
      */
-    public abstract void intoArray(float[] a, int i, VectorMask<Float> m, int[] indexMap, int j);
+    public abstract void intoArray(float[] a, int a_offset, VectorMask<Float> m, int[] indexMap, int i_offset);
     // Species
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public abstract VectorSpecies<Float> species();
 
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Int128Vector.java	Thu Apr 18 23:47:37 2019 -0700
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Int128Vector.java	Fri Apr 19 11:35:36 2019 -0700
@@ -179,37 +179,37 @@
         if (stype == byte.class) {
             byte[] a = new byte[limit];
             for (int i = 0; i < limit; i++) {
-                a[i] = (byte) this.get(i);
+                a[i] = (byte) this.lane(i);
             }
             return (Vector) ByteVector.fromArray((VectorSpecies<Byte>) s, a, 0);
         } else if (stype == short.class) {
             short[] a = new short[limit];
             for (int i = 0; i < limit; i++) {
-                a[i] = (short) this.get(i);
+                a[i] = (short) this.lane(i);
             }
             return (Vector) ShortVector.fromArray((VectorSpecies<Short>) s, a, 0);
         } else if (stype == int.class) {
             int[] a = new int[limit];
             for (int i = 0; i < limit; i++) {
-                a[i] = (int) this.get(i);
+                a[i] = (int) this.lane(i);
             }
             return (Vector) IntVector.fromArray((VectorSpecies<Integer>) s, a, 0);
         } else if (stype == long.class) {
             long[] a = new long[limit];
             for (int i = 0; i < limit; i++) {
-                a[i] = (long) this.get(i);
+                a[i] = (long) this.lane(i);
             }
             return (Vector) LongVector.fromArray((VectorSpecies<Long>) s, a, 0);
         } else if (stype == float.class) {
             float[] a = new float[limit];
             for (int i = 0; i < limit; i++) {
-                a[i] = (float) this.get(i);
+                a[i] = (float) this.lane(i);
             }
             return (Vector) FloatVector.fromArray((VectorSpecies<Float>) s, a, 0);
         } else if (stype == double.class) {
             double[] a = new double[limit];
             for (int i = 0; i < limit; i++) {
-                a[i] = (double) this.get(i);
+                a[i] = (double) this.lane(i);
             }
             return (Vector) DoubleVector.fromArray((VectorSpecies<Double>) s, a, 0);
         } else {
@@ -1168,8 +1168,8 @@
             Int128Vector.class, Int128Shuffle.class, int.class, LENGTH,
             this, s,
             (v1, s_) -> v1.uOp((i, a) -> {
-                int ei = s_.getElement(i);
-                return v1.get(ei);
+                int ei = s_.lane(i);
+                return v1.lane(ei);
             }));
     }
 
@@ -1184,13 +1184,13 @@
         return VectorIntrinsics.blend(
             Int128Vector.class, Int128Mask.class, int.class, LENGTH,
             this, v, m,
-            (v1, v2, m_) -> v1.bOp(v2, (i, a, b) -> m_.getElement(i) ? b : a));
+            (v1, v2, m_) -> v1.bOp(v2, (i, a, b) -> m_.lane(i) ? b : a));
     }
 
     // Accessors
 
     @Override
-    public int get(int i) {
+    public int lane(int i) {
         if (i < 0 || i >= LENGTH) {
             throw new IllegalArgumentException("Index " + i + " must be zero or positive, and less than " + LENGTH);
         }
@@ -1391,7 +1391,7 @@
         public IntVector toVector() {
             int[] va = new int[SPECIES.length()];
             for (int i = 0; i < va.length; i++) {
-              va[i] = (int) getElement(i);
+              va[i] = (int) lane(i);
             }
             return IntVector.fromArray(SPECIES, va, 0);
         }
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Int256Vector.java	Thu Apr 18 23:47:37 2019 -0700
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Int256Vector.java	Fri Apr 19 11:35:36 2019 -0700
@@ -179,37 +179,37 @@
         if (stype == byte.class) {
             byte[] a = new byte[limit];
             for (int i = 0; i < limit; i++) {
-                a[i] = (byte) this.get(i);
+                a[i] = (byte) this.lane(i);
             }
             return (Vector) ByteVector.fromArray((VectorSpecies<Byte>) s, a, 0);
         } else if (stype == short.class) {
             short[] a = new short[limit];
             for (int i = 0; i < limit; i++) {
-                a[i] = (short) this.get(i);
+                a[i] = (short) this.lane(i);
             }
             return (Vector) ShortVector.fromArray((VectorSpecies<Short>) s, a, 0);
         } else if (stype == int.class) {
             int[] a = new int[limit];
             for (int i = 0; i < limit; i++) {
-                a[i] = (int) this.get(i);
+                a[i] = (int) this.lane(i);
             }
             return (Vector) IntVector.fromArray((VectorSpecies<Integer>) s, a, 0);
         } else if (stype == long.class) {
             long[] a = new long[limit];
             for (int i = 0; i < limit; i++) {
-                a[i] = (long) this.get(i);
+                a[i] = (long) this.lane(i);
             }
             return (Vector) LongVector.fromArray((VectorSpecies<Long>) s, a, 0);
         } else if (stype == float.class) {
             float[] a = new float[limit];
             for (int i = 0; i < limit; i++) {
-                a[i] = (float) this.get(i);
+                a[i] = (float) this.lane(i);
             }
             return (Vector) FloatVector.fromArray((VectorSpecies<Float>) s, a, 0);
         } else if (stype == double.class) {
             double[] a = new double[limit];
             for (int i = 0; i < limit; i++) {
-                a[i] = (double) this.get(i);
+                a[i] = (double) this.lane(i);
             }
             return (Vector) DoubleVector.fromArray((VectorSpecies<Double>) s, a, 0);
         } else {
@@ -1168,8 +1168,8 @@
             Int256Vector.class, Int256Shuffle.class, int.class, LENGTH,
             this, s,
             (v1, s_) -> v1.uOp((i, a) -> {
-                int ei = s_.getElement(i);
-                return v1.get(ei);
+                int ei = s_.lane(i);
+                return v1.lane(ei);
             }));
     }
 
@@ -1184,13 +1184,13 @@
         return VectorIntrinsics.blend(
             Int256Vector.class, Int256Mask.class, int.class, LENGTH,
             this, v, m,
-            (v1, v2, m_) -> v1.bOp(v2, (i, a, b) -> m_.getElement(i) ? b : a));
+            (v1, v2, m_) -> v1.bOp(v2, (i, a, b) -> m_.lane(i) ? b : a));
     }
 
     // Accessors
 
     @Override
-    public int get(int i) {
+    public int lane(int i) {
         if (i < 0 || i >= LENGTH) {
             throw new IllegalArgumentException("Index " + i + " must be zero or positive, and less than " + LENGTH);
         }
@@ -1391,7 +1391,7 @@
         public IntVector toVector() {
             int[] va = new int[SPECIES.length()];
             for (int i = 0; i < va.length; i++) {
-              va[i] = (int) getElement(i);
+              va[i] = (int) lane(i);
             }
             return IntVector.fromArray(SPECIES, va, 0);
         }
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Int512Vector.java	Thu Apr 18 23:47:37 2019 -0700
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Int512Vector.java	Fri Apr 19 11:35:36 2019 -0700
@@ -179,37 +179,37 @@
         if (stype == byte.class) {
             byte[] a = new byte[limit];
             for (int i = 0; i < limit; i++) {
-                a[i] = (byte) this.get(i);
+                a[i] = (byte) this.lane(i);
             }
             return (Vector) ByteVector.fromArray((VectorSpecies<Byte>) s, a, 0);
         } else if (stype == short.class) {
             short[] a = new short[limit];
             for (int i = 0; i < limit; i++) {
-                a[i] = (short) this.get(i);
+                a[i] = (short) this.lane(i);
             }
             return (Vector) ShortVector.fromArray((VectorSpecies<Short>) s, a, 0);
         } else if (stype == int.class) {
             int[] a = new int[limit];
             for (int i = 0; i < limit; i++) {
-                a[i] = (int) this.get(i);
+                a[i] = (int) this.lane(i);
             }
             return (Vector) IntVector.fromArray((VectorSpecies<Integer>) s, a, 0);
         } else if (stype == long.class) {
             long[] a = new long[limit];
             for (int i = 0; i < limit; i++) {
-                a[i] = (long) this.get(i);
+                a[i] = (long) this.lane(i);
             }
             return (Vector) LongVector.fromArray((VectorSpecies<Long>) s, a, 0);
         } else if (stype == float.class) {
             float[] a = new float[limit];
             for (int i = 0; i < limit; i++) {
-                a[i] = (float) this.get(i);
+                a[i] = (float) this.lane(i);
             }
             return (Vector) FloatVector.fromArray((VectorSpecies<Float>) s, a, 0);
         } else if (stype == double.class) {
             double[] a = new double[limit];
             for (int i = 0; i < limit; i++) {
-                a[i] = (double) this.get(i);
+                a[i] = (double) this.lane(i);
             }
             return (Vector) DoubleVector.fromArray((VectorSpecies<Double>) s, a, 0);
         } else {
@@ -1168,8 +1168,8 @@
             Int512Vector.class, Int512Shuffle.class, int.class, LENGTH,
             this, s,
             (v1, s_) -> v1.uOp((i, a) -> {
-                int ei = s_.getElement(i);
-                return v1.get(ei);
+                int ei = s_.lane(i);
+                return v1.lane(ei);
             }));
     }
 
@@ -1184,13 +1184,13 @@
         return VectorIntrinsics.blend(
             Int512Vector.class, Int512Mask.class, int.class, LENGTH,
             this, v, m,
-            (v1, v2, m_) -> v1.bOp(v2, (i, a, b) -> m_.getElement(i) ? b : a));
+            (v1, v2, m_) -> v1.bOp(v2, (i, a, b) -> m_.lane(i) ? b : a));
     }
 
     // Accessors
 
     @Override
-    public int get(int i) {
+    public int lane(int i) {
         if (i < 0 || i >= LENGTH) {
             throw new IllegalArgumentException("Index " + i + " must be zero or positive, and less than " + LENGTH);
         }
@@ -1391,7 +1391,7 @@
         public IntVector toVector() {
             int[] va = new int[SPECIES.length()];
             for (int i = 0; i < va.length; i++) {
-              va[i] = (int) getElement(i);
+              va[i] = (int) lane(i);
             }
             return IntVector.fromArray(SPECIES, va, 0);
         }
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Int64Vector.java	Thu Apr 18 23:47:37 2019 -0700
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Int64Vector.java	Fri Apr 19 11:35:36 2019 -0700
@@ -179,37 +179,37 @@
         if (stype == byte.class) {
             byte[] a = new byte[limit];
             for (int i = 0; i < limit; i++) {
-                a[i] = (byte) this.get(i);
+                a[i] = (byte) this.lane(i);
             }
             return (Vector) ByteVector.fromArray((VectorSpecies<Byte>) s, a, 0);
         } else if (stype == short.class) {
             short[] a = new short[limit];
             for (int i = 0; i < limit; i++) {
-                a[i] = (short) this.get(i);
+                a[i] = (short) this.lane(i);
             }
             return (Vector) ShortVector.fromArray((VectorSpecies<Short>) s, a, 0);
         } else if (stype == int.class) {
             int[] a = new int[limit];
             for (int i = 0; i < limit; i++) {
-                a[i] = (int) this.get(i);
+                a[i] = (int) this.lane(i);
             }
             return (Vector) IntVector.fromArray((VectorSpecies<Integer>) s, a, 0);
         } else if (stype == long.class) {
             long[] a = new long[limit];
             for (int i = 0; i < limit; i++) {
-                a[i] = (long) this.get(i);
+                a[i] = (long) this.lane(i);
             }
             return (Vector) LongVector.fromArray((VectorSpecies<Long>) s, a, 0);
         } else if (stype == float.class) {
             float[] a = new float[limit];
             for (int i = 0; i < limit; i++) {
-                a[i] = (float) this.get(i);
+                a[i] = (float) this.lane(i);
             }
             return (Vector) FloatVector.fromArray((VectorSpecies<Float>) s, a, 0);
         } else if (stype == double.class) {
             double[] a = new double[limit];
             for (int i = 0; i < limit; i++) {
-                a[i] = (double) this.get(i);
+                a[i] = (double) this.lane(i);
             }
             return (Vector) DoubleVector.fromArray((VectorSpecies<Double>) s, a, 0);
         } else {
@@ -1168,8 +1168,8 @@
             Int64Vector.class, Int64Shuffle.class, int.class, LENGTH,
             this, s,
             (v1, s_) -> v1.uOp((i, a) -> {
-                int ei = s_.getElement(i);
-                return v1.get(ei);
+                int ei = s_.lane(i);
+                return v1.lane(ei);
             }));
     }
 
@@ -1184,13 +1184,13 @@
         return VectorIntrinsics.blend(
             Int64Vector.class, Int64Mask.class, int.class, LENGTH,
             this, v, m,
-            (v1, v2, m_) -> v1.bOp(v2, (i, a, b) -> m_.getElement(i) ? b : a));
+            (v1, v2, m_) -> v1.bOp(v2, (i, a, b) -> m_.lane(i) ? b : a));
     }
 
     // Accessors
 
     @Override
-    public int get(int i) {
+    public int lane(int i) {
         if (i < 0 || i >= LENGTH) {
             throw new IllegalArgumentException("Index " + i + " must be zero or positive, and less than " + LENGTH);
         }
@@ -1391,7 +1391,7 @@
         public IntVector toVector() {
             int[] va = new int[SPECIES.length()];
             for (int i = 0; i < va.length; i++) {
-              va[i] = (int) getElement(i);
+              va[i] = (int) lane(i);
             }
             return IntVector.fromArray(SPECIES, va, 0);
         }
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/IntMaxVector.java	Thu Apr 18 23:47:37 2019 -0700
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/IntMaxVector.java	Fri Apr 19 11:35:36 2019 -0700
@@ -179,37 +179,37 @@
         if (stype == byte.class) {
             byte[] a = new byte[limit];
             for (int i = 0; i < limit; i++) {
-                a[i] = (byte) this.get(i);
+                a[i] = (byte) this.lane(i);
             }
             return (Vector) ByteVector.fromArray((VectorSpecies<Byte>) s, a, 0);
         } else if (stype == short.class) {
             short[] a = new short[limit];
             for (int i = 0; i < limit; i++) {
-                a[i] = (short) this.get(i);
+                a[i] = (short) this.lane(i);
             }
             return (Vector) ShortVector.fromArray((VectorSpecies<Short>) s, a, 0);
         } else if (stype == int.class) {
             int[] a = new int[limit];
             for (int i = 0; i < limit; i++) {
-                a[i] = (int) this.get(i);
+                a[i] = (int) this.lane(i);
             }
             return (Vector) IntVector.fromArray((VectorSpecies<Integer>) s, a, 0);
         } else if (stype == long.class) {
             long[] a = new long[limit];
             for (int i = 0; i < limit; i++) {
-                a[i] = (long) this.get(i);
+                a[i] = (long) this.lane(i);
             }
             return (Vector) LongVector.fromArray((VectorSpecies<Long>) s, a, 0);
         } else if (stype == float.class) {
             float[] a = new float[limit];
             for (int i = 0; i < limit; i++) {
-                a[i] = (float) this.get(i);
+                a[i] = (float) this.lane(i);
             }
             return (Vector) FloatVector.fromArray((VectorSpecies<Float>) s, a, 0);
         } else if (stype == double.class) {
             double[] a = new double[limit];
             for (int i = 0; i < limit; i++) {
-                a[i] = (double) this.get(i);
+                a[i] = (double) this.lane(i);
             }
             return (Vector) DoubleVector.fromArray((VectorSpecies<Double>) s, a, 0);
         } else {
@@ -1168,8 +1168,8 @@
             IntMaxVector.class, IntMaxShuffle.class, int.class, LENGTH,
             this, s,
             (v1, s_) -> v1.uOp((i, a) -> {
-                int ei = s_.getElement(i);
-                return v1.get(ei);
+                int ei = s_.lane(i);
+                return v1.lane(ei);
             }));
     }
 
@@ -1184,13 +1184,13 @@
         return VectorIntrinsics.blend(
             IntMaxVector.class, IntMaxMask.class, int.class, LENGTH,
             this, v, m,
-            (v1, v2, m_) -> v1.bOp(v2, (i, a, b) -> m_.getElement(i) ? b : a));
+            (v1, v2, m_) -> v1.bOp(v2, (i, a, b) -> m_.lane(i) ? b : a));
     }
 
     // Accessors
 
     @Override
-    public int get(int i) {
+    public int lane(int i) {
         if (i < 0 || i >= LENGTH) {
             throw new IllegalArgumentException("Index " + i + " must be zero or positive, and less than " + LENGTH);
         }
@@ -1391,7 +1391,7 @@
         public IntVector toVector() {
             int[] va = new int[SPECIES.length()];
             for (int i = 0; i < va.length; i++) {
-              va[i] = (int) getElement(i);
+              va[i] = (int) lane(i);
             }
             return IntVector.fromArray(SPECIES, va, 0);
         }
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/IntVector.java	Thu Apr 18 23:47:37 2019 -0700
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/IntVector.java	Fri Apr 19 11:35:36 2019 -0700
@@ -125,26 +125,26 @@
      * <p>
      * This method behaves as if it returns the result of calling the
      * byte buffer, offset, and mask accepting
-     * {@link #fromByteBuffer(VectorSpecies<Integer>, ByteBuffer, int, VectorMask) method} as follows:
+     * {@link #fromByteBuffer(VectorSpecies, ByteBuffer, int, VectorMask) method} as follows:
      * <pre>{@code
-     * return this.fromByteBuffer(ByteBuffer.wrap(a), i, this.maskAllTrue());
+     * return fromByteBuffer(species, ByteBuffer.wrap(a), offset, VectorMask.allTrue());
      * }</pre>
      *
      * @param species species of desired vector
      * @param a the byte array
-     * @param ix the offset into the array
+     * @param offset the offset into the array
      * @return a vector loaded from a byte array
      * @throws IndexOutOfBoundsException if {@code i < 0} or
-     * {@code i > a.length - (this.length() * this.elementSize() / Byte.SIZE)}
+     * {@code offset > a.length - (species.length() * species.elementSize() / Byte.SIZE)}
      */
     @ForceInline
     @SuppressWarnings("unchecked")
-    public static IntVector fromByteArray(VectorSpecies<Integer> species, byte[] a, int ix) {
+    public static IntVector fromByteArray(VectorSpecies<Integer> species, byte[] a, int offset) {
         Objects.requireNonNull(a);
-        ix = VectorIntrinsics.checkIndex(ix, a.length, species.bitSize() / Byte.SIZE);
+        offset = VectorIntrinsics.checkIndex(offset, a.length, species.bitSize() / Byte.SIZE);
         return VectorIntrinsics.load((Class<IntVector>) species.boxType(), int.class, species.length(),
-                                     a, ((long) ix) + Unsafe.ARRAY_BYTE_BASE_OFFSET,
-                                     a, ix, species,
+                                     a, ((long) offset) + Unsafe.ARRAY_BYTE_BASE_OFFSET,
+                                     a, offset, species,
                                      (c, idx, s) -> {
                                          ByteBuffer bbc = ByteBuffer.wrap(c, idx, a.length - idx).order(ByteOrder.nativeOrder());
                                          IntBuffer tb = bbc.asIntBuffer();
@@ -161,51 +161,48 @@
      * <p>
      * This method behaves as if it returns the result of calling the
      * byte buffer, offset, and mask accepting
-     * {@link #fromByteBuffer(VectorSpecies<Integer>, ByteBuffer, int, VectorMask) method} as follows:
+     * {@link #fromByteBuffer(VectorSpecies, ByteBuffer, int, VectorMask) method} as follows:
      * <pre>{@code
-     * return this.fromByteBuffer(ByteBuffer.wrap(a), i, m);
+     * return fromByteBuffer(species, ByteBuffer.wrap(a), offset, m);
      * }</pre>
      *
      * @param species species of desired vector
      * @param a the byte array
-     * @param ix the offset into the array
+     * @param offset the offset into the array
      * @param m the mask
      * @return a vector loaded from a byte array
-     * @throws IndexOutOfBoundsException if {@code i < 0} or
-     * {@code i > a.length - (this.length() * this.elementSize() / Byte.SIZE)}
-     * @throws IndexOutOfBoundsException if the offset is {@code < 0},
-     * or {@code > a.length},
+     * @throws IndexOutOfBoundsException if {@code offset < 0} or
      * for any vector lane index {@code N} where the mask at lane {@code N}
      * is set
-     * {@code i >= a.length - (N * this.elementSize() / Byte.SIZE)}
+     * {@code offset >= a.length - (N * species.elementSize() / Byte.SIZE)}
      */
     @ForceInline
-    public static IntVector fromByteArray(VectorSpecies<Integer> species, byte[] a, int ix, VectorMask<Integer> m) {
-        return zero(species).blend(fromByteArray(species, a, ix), m);
+    public static IntVector fromByteArray(VectorSpecies<Integer> species, byte[] a, int offset, VectorMask<Integer> m) {
+        return zero(species).blend(fromByteArray(species, a, offset), m);
     }
 
     /**
      * Loads a vector from an array starting at offset.
      * <p>
      * For each vector lane, where {@code N} is the vector lane index, the
-     * array element at index {@code i + N} is placed into the
+     * array element at index {@code offset + N} is placed into the
      * resulting vector at lane index {@code N}.
      *
      * @param species species of desired vector
      * @param a the array
-     * @param i the offset into the array
+     * @param offset the offset into the array
      * @return the vector loaded from an array
-     * @throws IndexOutOfBoundsException if {@code i < 0}, or
-     * {@code i > a.length - this.length()}
+     * @throws IndexOutOfBoundsException if {@code offset < 0}, or
+     * {@code offset > a.length - species.length()}
      */
     @ForceInline
     @SuppressWarnings("unchecked")
-    public static IntVector fromArray(VectorSpecies<Integer> species, int[] a, int i){
+    public static IntVector fromArray(VectorSpecies<Integer> species, int[] a, int offset){
         Objects.requireNonNull(a);
-        i = VectorIntrinsics.checkIndex(i, a.length, species.length());
+        offset = VectorIntrinsics.checkIndex(offset, a.length, species.length());
         return VectorIntrinsics.load((Class<IntVector>) species.boxType(), int.class, species.length(),
-                                     a, (((long) i) << ARRAY_SHIFT) + Unsafe.ARRAY_INT_BASE_OFFSET,
-                                     a, i, species,
+                                     a, (((long) offset) << ARRAY_SHIFT) + Unsafe.ARRAY_INT_BASE_OFFSET,
+                                     a, offset, species,
                                      (c, idx, s) -> ((IntSpecies)s).op(n -> c[idx + n]));
     }
 
@@ -215,22 +212,22 @@
      * <p>
      * For each vector lane, where {@code N} is the vector lane index,
      * if the mask lane at index {@code N} is set then the array element at
-     * index {@code i + N} is placed into the resulting vector at lane index
+     * index {@code offset + N} is placed into the resulting vector at lane index
      * {@code N}, otherwise the default element value is placed into the
      * resulting vector at lane index {@code N}.
      *
      * @param species species of desired vector
      * @param a the array
-     * @param i the offset into the array
+     * @param offset the offset into the array
      * @param m the mask
      * @return the vector loaded from an array
-     * @throws IndexOutOfBoundsException if {@code i < 0}, or
+     * @throws IndexOutOfBoundsException if {@code offset < 0}, or
      * for any vector lane index {@code N} where the mask at lane {@code N}
-     * is set {@code i > a.length - N}
+     * is set {@code offset > a.length - N}
      */
     @ForceInline
-    public static IntVector fromArray(VectorSpecies<Integer> species, int[] a, int i, VectorMask<Integer> m) {
-        return zero(species).blend(fromArray(species, a, i), m);
+    public static IntVector fromArray(VectorSpecies<Integer> species, int[] a, int offset, VectorMask<Integer> m) {
+        return zero(species).blend(fromArray(species, a, offset), m);
     }
 
     /**
@@ -238,37 +235,37 @@
      * map.
      * <p>
      * For each vector lane, where {@code N} is the vector lane index, the
-     * array element at index {@code i + indexMap[j + N]} is placed into the
+     * array element at index {@code a_offset + indexMap[i_offset + N]} is placed into the
      * resulting vector at lane index {@code N}.
      *
      * @param species species of desired vector
      * @param a the array
-     * @param i the offset into the array, may be negative if relative
+     * @param a_offset the offset into the array, may be negative if relative
      * indexes in the index map compensate to produce a value within the
      * array bounds
      * @param indexMap the index map
-     * @param j the offset into the index map
+     * @param i_offset the offset into the index map
      * @return the vector loaded from an array
-     * @throws IndexOutOfBoundsException if {@code j < 0}, or
-     * {@code j > indexMap.length - this.length()},
+     * @throws IndexOutOfBoundsException if {@code i_offset < 0}, or
+     * {@code i_offset > indexMap.length - species.length()},
      * or for any vector lane index {@code N} the result of
-     * {@code i + indexMap[j + N]} is {@code < 0} or {@code >= a.length}
+     * {@code a_offset + indexMap[i_offset + N]} is {@code < 0} or {@code >= a.length}
      */
     @ForceInline
     @SuppressWarnings("unchecked")
-    public static IntVector fromArray(VectorSpecies<Integer> species, int[] a, int i, int[] indexMap, int j) {
+    public static IntVector fromArray(VectorSpecies<Integer> species, int[] a, int a_offset, int[] indexMap, int i_offset) {
         Objects.requireNonNull(a);
         Objects.requireNonNull(indexMap);
 
 
-        // Index vector: vix[0:n] = k -> i + indexMap[j + k]
-        IntVector vix = IntVector.fromArray(IntVector.species(species.indexShape()), indexMap, j).add(i);
+        // Index vector: vix[0:n] = k -> a_offset + indexMap[i_offset + k]
+        IntVector vix = IntVector.fromArray(IntVector.species(species.indexShape()), indexMap, i_offset).add(a_offset);
 
         vix = VectorIntrinsics.checkIndex(vix, a.length);
 
         return VectorIntrinsics.loadWithMap((Class<IntVector>) species.boxType(), int.class, species.length(),
                                             IntVector.species(species.indexShape()).boxType(), a, Unsafe.ARRAY_INT_BASE_OFFSET, vix,
-                                            a, i, indexMap, j, species,
+                                            a, a_offset, indexMap, i_offset, species,
                                             (int[] c, int idx, int[] iMap, int idy, VectorSpecies<Integer> s) ->
                                                 ((IntSpecies)s).op(n -> c[idx + iMap[idy+n]]));
         }
@@ -279,29 +276,29 @@
      * <p>
      * For each vector lane, where {@code N} is the vector lane index,
      * if the mask lane at index {@code N} is set then the array element at
-     * index {@code i + indexMap[j + N]} is placed into the resulting vector
+     * index {@code a_offset + indexMap[i_offset + N]} is placed into the resulting vector
      * at lane index {@code N}.
      *
      * @param species species of desired vector
      * @param a the array
-     * @param i the offset into the array, may be negative if relative
+     * @param a_offset the offset into the array, may be negative if relative
      * indexes in the index map compensate to produce a value within the
      * array bounds
      * @param m the mask
      * @param indexMap the index map
-     * @param j the offset into the index map
+     * @param i_offset the offset into the index map
      * @return the vector loaded from an array
-     * @throws IndexOutOfBoundsException if {@code j < 0}, or
-     * {@code j > indexMap.length - this.length()},
+     * @throws IndexOutOfBoundsException if {@code i_offset < 0}, or
+     * {@code i_offset > indexMap.length - species.length()},
      * or for any vector lane index {@code N} where the mask at lane
-     * {@code N} is set the result of {@code i + indexMap[j + N]} is
+     * {@code N} is set the result of {@code a_offset + indexMap[i_offset + N]} is
      * {@code < 0} or {@code >= a.length}
      */
     @ForceInline
     @SuppressWarnings("unchecked")
-    public static IntVector fromArray(VectorSpecies<Integer> species, int[] a, int i, VectorMask<Integer> m, int[] indexMap, int j) {
+    public static IntVector fromArray(VectorSpecies<Integer> species, int[] a, int a_offset, VectorMask<Integer> m, int[] indexMap, int i_offset) {
         // @@@ This can result in out of bounds errors for unset mask lanes
-        return zero(species).blend(fromArray(species, a, i, indexMap, j), m);
+        return zero(species).blend(fromArray(species, a, a_offset, indexMap, i_offset), m);
     }
 
 
@@ -314,31 +311,31 @@
      * <p>
      * This method behaves as if it returns the result of calling the
      * byte buffer, offset, and mask accepting
-     * {@link #fromByteBuffer(VectorSpecies<Integer>, ByteBuffer, int, VectorMask)} method} as follows:
+     * {@link #fromByteBuffer(VectorSpecies, ByteBuffer, int, VectorMask)} method} as follows:
      * <pre>{@code
-     *   return this.fromByteBuffer(b, i, this.maskAllTrue())
+     *   return fromByteBuffer(b, offset, VectorMask.allTrue())
      * }</pre>
      *
      * @param species species of desired vector
      * @param bb the byte buffer
-     * @param ix the offset into the byte buffer
+     * @param offset the offset into the byte buffer
      * @return a vector loaded from a byte buffer
      * @throws IndexOutOfBoundsException if the offset is {@code < 0},
      * or {@code > b.limit()},
      * or if there are fewer than
-     * {@code this.length() * this.elementSize() / Byte.SIZE} bytes
+     * {@code species.length() * species.elementSize() / Byte.SIZE} bytes
      * remaining in the byte buffer from the given offset
      */
     @ForceInline
     @SuppressWarnings("unchecked")
-    public static IntVector fromByteBuffer(VectorSpecies<Integer> species, ByteBuffer bb, int ix) {
+    public static IntVector fromByteBuffer(VectorSpecies<Integer> species, ByteBuffer bb, int offset) {
         if (bb.order() != ByteOrder.nativeOrder()) {
             throw new IllegalArgumentException();
         }
-        ix = VectorIntrinsics.checkIndex(ix, bb.limit(), species.bitSize() / Byte.SIZE);
+        offset = VectorIntrinsics.checkIndex(offset, bb.limit(), species.bitSize() / Byte.SIZE);
         return VectorIntrinsics.load((Class<IntVector>) species.boxType(), int.class, species.length(),
-                                     U.getReference(bb, BYTE_BUFFER_HB), U.getLong(bb, BUFFER_ADDRESS) + ix,
-                                     bb, ix, species,
+                                     U.getReference(bb, BYTE_BUFFER_HB), U.getLong(bb, BUFFER_ADDRESS) + offset,
+                                     bb, offset, species,
                                      (c, idx, s) -> {
                                          ByteBuffer bbc = c.duplicate().position(idx).order(ByteOrder.nativeOrder());
                                          IntBuffer tb = bbc.asIntBuffer();
@@ -356,77 +353,77 @@
      * the returned vector is loaded with a mask from a primitive array
      * obtained from the primitive buffer.
      * The following pseudocode expresses the behaviour, where
-     * {@coce EBuffer} is the primitive buffer type, {@code e} is the
-     * primitive element type, and {@code ESpecies<S>} is the primitive
+     * {@code EBuffer} is the primitive buffer type, {@code e} is the
+     * primitive element type, and {@code ESpecies} is the primitive
      * species for {@code e}:
      * <pre>{@code
      * EBuffer eb = b.duplicate().
-     *     order(ByteOrder.nativeOrder()).position(i).
+     *     order(ByteOrder.nativeOrder()).position(offset).
      *     asEBuffer();
-     * e[] es = new e[this.length()];
+     * e[] es = new e[species.length()];
      * for (int n = 0; n < t.length; n++) {
      *     if (m.isSet(n))
      *         es[n] = eb.get(n);
      * }
-     * Vector<E> r = ((ESpecies<S>)this).fromArray(es, 0, m);
+     * EVector r = EVector.fromArray(es, 0, m);
      * }</pre>
      *
      * @param species species of desired vector
      * @param bb the byte buffer
-     * @param ix the offset into the byte buffer
+     * @param offset the offset into the byte buffer
      * @param m the mask
      * @return a vector loaded from a byte buffer
      * @throws IndexOutOfBoundsException if the offset is {@code < 0},
      * or {@code > b.limit()},
      * for any vector lane index {@code N} where the mask at lane {@code N}
      * is set
-     * {@code i >= b.limit() - (N * this.elementSize() / Byte.SIZE)}
+     * {@code offset >= b.limit() - (N * species.elementSize() / Byte.SIZE)}
      */
     @ForceInline
-    public static IntVector fromByteBuffer(VectorSpecies<Integer> species, ByteBuffer bb, int ix, VectorMask<Integer> m) {
-        return zero(species).blend(fromByteBuffer(species, bb, ix), m);
+    public static IntVector fromByteBuffer(VectorSpecies<Integer> species, ByteBuffer bb, int offset, VectorMask<Integer> m) {
+        return zero(species).blend(fromByteBuffer(species, bb, offset), m);
     }
 
     /**
      * Returns a vector where all lane elements are set to the primitive
      * value {@code e}.
      *
-     * @param s species of the desired vector
+     * @param species species of the desired vector
      * @param e the value
      * @return a vector of vector where all lane elements are set to
      * the primitive value {@code e}
      */
     @ForceInline
     @SuppressWarnings("unchecked")
-    public static IntVector broadcast(VectorSpecies<Integer> s, int e) {
+    public static IntVector broadcast(VectorSpecies<Integer> species, int e) {
         return VectorIntrinsics.broadcastCoerced(
-            (Class<IntVector>) s.boxType(), int.class, s.length(),
-            e, s,
+            (Class<IntVector>) species.boxType(), int.class, species.length(),
+            e, species,
             ((bits, sp) -> ((IntSpecies)sp).op(i -> (int)bits)));
     }
 
     /**
-     * Returns a vector where each lane element is set to a given
-     * primitive value.
+     * Returns a vector where each lane element is set to given
+     * primitive values.
      * <p>
      * For each vector lane, where {@code N} is the vector lane index, the
      * the primitive value at index {@code N} is placed into the resulting
      * vector at lane index {@code N}.
      *
-     * @param s species of the desired vector
+     * @param species species of the desired vector
      * @param es the given primitive values
-     * @return a vector where each lane element is set to a given primitive
-     * value
-     * @throws IndexOutOfBoundsException if {@code es.length < this.length()}
+     * @return a vector where each lane element is set to given primitive
+     * values
+     * @throws IndexOutOfBoundsException if {@code es.length < species.length()}
      */
     @ForceInline
     @SuppressWarnings("unchecked")
-    public static IntVector scalars(VectorSpecies<Integer> s, int... es) {
+    public static IntVector scalars(VectorSpecies<Integer> species, int... es) {
         Objects.requireNonNull(es);
-        int ix = VectorIntrinsics.checkIndex(0, es.length, s.length());
-        return VectorIntrinsics.load((Class<IntVector>) s.boxType(), int.class, s.length(),
+        int ix = VectorIntrinsics.checkIndex(0, es.length, species.length());
+        return VectorIntrinsics.load((Class<IntVector>) species.boxType(), int.class, species.length(),
                                      es, Unsafe.ARRAY_INT_BASE_OFFSET,
-                                     es, ix, s,
+                                     es, ix, species,
                                      (c, idx, sp) -> ((IntSpecies)sp).op(n -> c[idx + n]));
     }
 
@@ -435,14 +432,14 @@
      * value {@code e}, all other lane elements are set to the default
      * value.
      *
-     * @param s species of the desired vector
+     * @param species species of the desired vector
      * @param e the value
      * @return a vector where the first lane element is set to the primitive
      * value {@code e}
      */
     @ForceInline
-    public static final IntVector single(VectorSpecies<Integer> s, int e) {
-        return zero(s).with(0, e);
+    public static final IntVector single(VectorSpecies<Integer> species, int e) {
+        return zero(species).with(0, e);
     }
 
     /**
@@ -452,25 +449,28 @@
      * The semantics are equivalent to calling
      * {@link ThreadLocalRandom#nextInt()}
      *
-     * @param s species of the desired vector
+     * @param species species of the desired vector
      * @return a vector where each lane elements is set to a randomly
      * generated primitive value
      */
-    public static IntVector random(VectorSpecies<Integer> s) {
+    public static IntVector random(VectorSpecies<Integer> species) {
         ThreadLocalRandom r = ThreadLocalRandom.current();
-        return ((IntSpecies)s).op(i -> r.nextInt());
+        return ((IntSpecies)species).op(i -> r.nextInt());
     }
 
     // Ops
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public abstract IntVector add(Vector<Integer> v);
 
     /**
      * Adds this vector to the broadcast of an input scalar.
      * <p>
-     * This is a vector binary operation where the primitive addition operation
-     * ({@code +}) is applied to lane elements.
+     * This is a lane-wise binary operation which applies the primitive addition operation
+     * ({@code +}) to each lane.
      *
      * @param s the input scalar
      * @return the result of adding this vector to the broadcast of an input
@@ -478,6 +478,9 @@
      */
     public abstract IntVector add(int s);
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public abstract IntVector add(Vector<Integer> v, VectorMask<Integer> m);
 
@@ -485,8 +488,8 @@
      * Adds this vector to broadcast of an input scalar,
      * selecting lane elements controlled by a mask.
      * <p>
-     * This is a vector binary operation where the primitive addition operation
-     * ({@code +}) is applied to lane elements.
+     * This is a lane-wise binary operation which applies the primitive addition operation
+     * ({@code +}) to each lane.
      *
      * @param s the input scalar
      * @param m the mask controlling lane selection
@@ -495,14 +498,17 @@
      */
     public abstract IntVector add(int s, VectorMask<Integer> m);
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public abstract IntVector sub(Vector<Integer> v);
 
     /**
      * Subtracts the broadcast of an input scalar from this vector.
      * <p>
-     * This is a vector binary operation where the primitive subtraction
-     * operation ({@code -}) is applied to lane elements.
+     * This is a lane-wise binary operation which applies the primitive subtraction
+     * operation ({@code -}) to each lane.
      *
      * @param s the input scalar
      * @return the result of subtracting the broadcast of an input
@@ -510,6 +516,9 @@
      */
     public abstract IntVector sub(int s);
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public abstract IntVector sub(Vector<Integer> v, VectorMask<Integer> m);
 
@@ -517,8 +526,8 @@
      * Subtracts the broadcast of an input scalar from this vector, selecting
      * lane elements controlled by a mask.
      * <p>
-     * This is a vector binary operation where the primitive subtraction
-     * operation ({@code -}) is applied to lane elements.
+     * This is a lane-wise binary operation which applies the primitive subtraction
+     * operation ({@code -}) to each lane.
      *
      * @param s the input scalar
      * @param m the mask controlling lane selection
@@ -527,14 +536,17 @@
      */
     public abstract IntVector sub(int s, VectorMask<Integer> m);
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public abstract IntVector mul(Vector<Integer> v);
 
     /**
      * Multiplies this vector with the broadcast of an input scalar.
      * <p>
-     * This is a vector binary operation where the primitive multiplication
-     * operation ({@code *}) is applied to lane elements.
+     * This is a lane-wise binary operation which applies the primitive multiplication
+     * operation ({@code *}) to each lane.
      *
      * @param s the input scalar
      * @return the result of multiplying this vector with the broadcast of an
@@ -542,6 +554,9 @@
      */
     public abstract IntVector mul(int s);
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public abstract IntVector mul(Vector<Integer> v, VectorMask<Integer> m);
 
@@ -549,8 +564,8 @@
      * Multiplies this vector with the broadcast of an input scalar, selecting
      * lane elements controlled by a mask.
      * <p>
-     * This is a vector binary operation where the primitive multiplication
-     * operation ({@code *}) is applied to lane elements.
+     * This is a lane-wise binary operation which applies the primitive multiplication
+     * operation ({@code *}) to each lane.
      *
      * @param s the input scalar
      * @param m the mask controlling lane selection
@@ -559,60 +574,87 @@
      */
     public abstract IntVector mul(int s, VectorMask<Integer> m);
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public abstract IntVector neg();
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public abstract IntVector neg(VectorMask<Integer> m);
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public abstract IntVector abs();
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public abstract IntVector abs(VectorMask<Integer> m);
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public abstract IntVector min(Vector<Integer> v);
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public abstract IntVector min(Vector<Integer> v, VectorMask<Integer> m);
 
     /**
      * Returns the minimum of this vector and the broadcast of an input scalar.
      * <p>
-     * This is a vector binary operation where the operation
-     * {@code (a, b) -> Math.min(a, b)} is applied to lane elements.
+     * This is a lane-wise binary operation which applies the operation
+     * {@code (a, b) -> Math.min(a, b)} to each lane.
      *
      * @param s the input scalar
      * @return the minimum of this vector and the broadcast of an input scalar
      */
     public abstract IntVector min(int s);
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public abstract IntVector max(Vector<Integer> v);
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public abstract IntVector max(Vector<Integer> v, VectorMask<Integer> m);
 
     /**
      * Returns the maximum of this vector and the broadcast of an input scalar.
      * <p>
-     * This is a vector binary operation where the operation
-     * {@code (a, b) -> Math.max(a, b)} is applied to lane elements.
+     * This is a lane-wise binary operation which applies the operation
+     * {@code (a, b) -> Math.max(a, b)} to each lane.
      *
      * @param s the input scalar
      * @return the maximum of this vector and the broadcast of an input scalar
      */
     public abstract IntVector max(int s);
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public abstract VectorMask<Integer> equal(Vector<Integer> v);
 
     /**
      * Tests if this vector is equal to the broadcast of an input scalar.
      * <p>
-     * This is a vector binary test operation where the primitive equals
-     * operation ({@code ==}) is applied to lane elements.
+     * This is a lane-wise binary test operation which applies the primitive equals
+     * operation ({@code ==}) each lane.
      *
      * @param s the input scalar
      * @return the result mask of testing if this vector is equal to the
@@ -620,14 +662,17 @@
      */
     public abstract VectorMask<Integer> equal(int s);
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public abstract VectorMask<Integer> notEqual(Vector<Integer> v);
 
     /**
      * Tests if this vector is not equal to the broadcast of an input scalar.
      * <p>
-     * This is a vector binary test operation where the primitive not equals
-     * operation ({@code !=}) is applied to lane elements.
+     * This is a lane-wise binary test operation which applies the primitive not equals
+     * operation ({@code !=}) to each lane.
      *
      * @param s the input scalar
      * @return the result mask of testing if this vector is not equal to the
@@ -635,14 +680,17 @@
      */
     public abstract VectorMask<Integer> notEqual(int s);
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public abstract VectorMask<Integer> lessThan(Vector<Integer> v);
 
     /**
      * Tests if this vector is less than the broadcast of an input scalar.
      * <p>
-     * This is a vector binary test operation where the primitive less than
-     * operation ({@code <}) is applied to lane elements.
+     * This is a lane-wise binary test operation which applies the primitive less than
+     * operation ({@code <}) to each lane.
      *
      * @param s the input scalar
      * @return the mask result of testing if this vector is less than the
@@ -650,14 +698,17 @@
      */
     public abstract VectorMask<Integer> lessThan(int s);
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public abstract VectorMask<Integer> lessThanEq(Vector<Integer> v);
 
     /**
      * Tests if this vector is less or equal to the broadcast of an input scalar.
      * <p>
-     * This is a vector binary test operation where the primitive less than
-     * or equal to operation ({@code <=}) is applied to lane elements.
+     * This is a lane-wise binary test operation which applies the primitive less than
+     * or equal to operation ({@code <=}) to each lane.
      *
      * @param s the input scalar
      * @return the mask result of testing if this vector is less than or equal
@@ -665,14 +716,17 @@
      */
     public abstract VectorMask<Integer> lessThanEq(int s);
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public abstract VectorMask<Integer> greaterThan(Vector<Integer> v);
 
     /**
      * Tests if this vector is greater than the broadcast of an input scalar.
      * <p>
-     * This is a vector binary test operation where the primitive greater than
-     * operation ({@code >}) is applied to lane elements.
+     * This is a lane-wise binary test operation which applies the primitive greater than
+     * operation ({@code >}) to each lane.
      *
      * @param s the input scalar
      * @return the mask result of testing if this vector is greater than the
@@ -680,6 +734,9 @@
      */
     public abstract VectorMask<Integer> greaterThan(int s);
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public abstract VectorMask<Integer> greaterThanEq(Vector<Integer> v);
 
@@ -687,8 +744,8 @@
      * Tests if this vector is greater than or equal to the broadcast of an
      * input scalar.
      * <p>
-     * This is a vector binary test operation where the primitive greater than
-     * or equal to operation ({@code >=}) is applied to lane elements.
+     * This is a lane-wise binary test operation which applies the primitive greater than
+     * or equal to operation ({@code >=}) to each lane.
      *
      * @param s the input scalar
      * @return the mask result of testing if this vector is greater than or
@@ -696,6 +753,9 @@
      */
     public abstract VectorMask<Integer> greaterThanEq(int s);
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public abstract IntVector blend(Vector<Integer> v, VectorMask<Integer> m);
 
@@ -716,25 +776,46 @@
      */
     public abstract IntVector blend(int s, VectorMask<Integer> m);
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public abstract IntVector rearrange(Vector<Integer> v,
                                                       VectorShuffle<Integer> s, VectorMask<Integer> m);
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public abstract IntVector rearrange(VectorShuffle<Integer> m);
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public abstract IntVector reshape(VectorSpecies<Integer> s);
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public abstract IntVector rotateEL(int i);
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public abstract IntVector rotateER(int i);
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public abstract IntVector shiftEL(int i);
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public abstract IntVector shiftER(int i);
 
@@ -743,8 +824,8 @@
     /**
      * Bitwise ANDs this vector with an input vector.
      * <p>
-     * This is a vector binary operation where the primitive bitwise AND
-     * operation ({@code &}) is applied to lane elements.
+     * This is a lane-wise binary operation which applies the primitive bitwise AND
+     * operation ({@code &}) to each lane.
      *
      * @param v the input vector
      * @return the bitwise AND of this vector with the input vector
@@ -754,8 +835,8 @@
     /**
      * Bitwise ANDs this vector with the broadcast of an input scalar.
      * <p>
-     * This is a vector binary operation where the primitive bitwise AND
-     * operation ({@code &}) is applied to lane elements.
+     * This is a lane-wise binary operation which applies the primitive bitwise AND
+     * operation ({@code &}) to each lane.
      *
      * @param s the input scalar
      * @return the bitwise AND of this vector with the broadcast of an input
@@ -767,8 +848,8 @@
      * Bitwise ANDs this vector with an input vector, selecting lane elements
      * controlled by a mask.
      * <p>
-     * This is a vector binary operation where the primitive bitwise AND
-     * operation ({@code &}) is applied to lane elements.
+     * This is a lane-wise binary operation which applies the primitive bitwise AND
+     * operation ({@code &}) to each lane.
      *
      * @param v the input vector
      * @param m the mask controlling lane selection
@@ -780,8 +861,8 @@
      * Bitwise ANDs this vector with the broadcast of an input scalar, selecting
      * lane elements controlled by a mask.
      * <p>
-     * This is a vector binary operation where the primitive bitwise AND
-     * operation ({@code &}) is applied to lane elements.
+     * This is a lane-wise binary operation which applies the primitive bitwise AND
+     * operation ({@code &}) to each lane.
      *
      * @param s the input scalar
      * @param m the mask controlling lane selection
@@ -793,8 +874,8 @@
     /**
      * Bitwise ORs this vector with an input vector.
      * <p>
-     * This is a vector binary operation where the primitive bitwise OR
-     * operation ({@code |}) is applied to lane elements.
+     * This is a lane-wise binary operation which applies the primitive bitwise OR
+     * operation ({@code |}) to each lane.
      *
      * @param v the input vector
      * @return the bitwise OR of this vector with the input vector
@@ -804,8 +885,8 @@
     /**
      * Bitwise ORs this vector with the broadcast of an input scalar.
      * <p>
-     * This is a vector binary operation where the primitive bitwise OR
-     * operation ({@code |}) is applied to lane elements.
+     * This is a lane-wise binary operation which applies the primitive bitwise OR
+     * operation ({@code |}) to each lane.
      *
      * @param s the input scalar
      * @return the bitwise OR of this vector with the broadcast of an input
@@ -817,8 +898,8 @@
      * Bitwise ORs this vector with an input vector, selecting lane elements
      * controlled by a mask.
      * <p>
-     * This is a vector binary operation where the primitive bitwise OR
-     * operation ({@code |}) is applied to lane elements.
+     * This is a lane-wise binary operation which applies the primitive bitwise OR
+     * operation ({@code |}) to each lane.
      *
      * @param v the input vector
      * @param m the mask controlling lane selection
@@ -830,8 +911,8 @@
      * Bitwise ORs this vector with the broadcast of an input scalar, selecting
      * lane elements controlled by a mask.
      * <p>
-     * This is a vector binary operation where the primitive bitwise OR
-     * operation ({@code |}) is applied to lane elements.
+     * This is a lane-wise binary operation which applies the primitive bitwise OR
+     * operation ({@code |}) to each lane.
      *
      * @param s the input scalar
      * @param m the mask controlling lane selection
@@ -843,8 +924,8 @@
     /**
      * Bitwise XORs this vector with an input vector.
      * <p>
-     * This is a vector binary operation where the primitive bitwise XOR
-     * operation ({@code ^}) is applied to lane elements.
+     * This is a lane-wise binary operation which applies the primitive bitwise XOR
+     * operation ({@code ^}) to each lane.
      *
      * @param v the input vector
      * @return the bitwise XOR of this vector with the input vector
@@ -854,8 +935,8 @@
     /**
      * Bitwise XORs this vector with the broadcast of an input scalar.
      * <p>
-     * This is a vector binary operation where the primitive bitwise XOR
-     * operation ({@code ^}) is applied to lane elements.
+     * This is a lane-wise binary operation which applies the primitive bitwise XOR
+     * operation ({@code ^}) to each lane.
      *
      * @param s the input scalar
      * @return the bitwise XOR of this vector with the broadcast of an input
@@ -867,8 +948,8 @@
      * Bitwise XORs this vector with an input vector, selecting lane elements
      * controlled by a mask.
      * <p>
-     * This is a vector binary operation where the primitive bitwise XOR
-     * operation ({@code ^}) is applied to lane elements.
+     * This is a lane-wise binary operation which applies the primitive bitwise XOR
+     * operation ({@code ^}) to each lane.
      *
      * @param v the input vector
      * @param m the mask controlling lane selection
@@ -880,8 +961,8 @@
      * Bitwise XORs this vector with the broadcast of an input scalar, selecting
      * lane elements controlled by a mask.
      * <p>
-     * This is a vector binary operation where the primitive bitwise XOR
-     * operation ({@code ^}) is applied to lane elements.
+     * This is a lane-wise binary operation which applies the primitive bitwise XOR
+     * operation ({@code ^}) to each lane.
      *
      * @param s the input scalar
      * @param m the mask controlling lane selection
@@ -893,8 +974,8 @@
     /**
      * Bitwise NOTs this vector.
      * <p>
-     * This is a vector unary operation where the primitive bitwise NOT
-     * operation ({@code ~}) is applied to lane elements.
+     * This is a lane-wise unary operation which applies the primitive bitwise NOT
+     * operation ({@code ~}) to each lane.
      *
      * @return the bitwise NOT of this vector
      */
@@ -903,8 +984,8 @@
     /**
      * Bitwise NOTs this vector, selecting lane elements controlled by a mask.
      * <p>
-     * This is a vector unary operation where the primitive bitwise NOT
-     * operation ({@code ~}) is applied to lane elements.
+     * This is a lane-wise unary operation which applies the primitive bitwise NOT
+     * operation ({@code ~}) to each lane.
      *
      * @param m the mask controlling lane selection
      * @return the bitwise NOT of this vector
@@ -914,8 +995,8 @@
     /**
      * Logically left shifts this vector by the broadcast of an input scalar.
      * <p>
-     * This is a vector binary operation where the primitive logical left shift
-     * operation ({@code <<}) is applied to lane elements.
+     * This is a lane-wise binary operation which applies the primitive logical left shift
+     * operation ({@code <<}) to each lane.
      *
      * @param s the input scalar; the number of the bits to left shift
      * @return the result of logically left shifting left this vector by the
@@ -927,8 +1008,8 @@
      * Logically left shifts this vector by the broadcast of an input scalar,
      * selecting lane elements controlled by a mask.
      * <p>
-     * This is a vector binary operation where the primitive logical left shift
-     * operation ({@code <<}) is applied to lane elements.
+     * This is a lane-wise binary operation which applies the primitive logical left shift
+     * operation ({@code <<}) to each lane.
      *
      * @param s the input scalar; the number of the bits to left shift
      * @param m the mask controlling lane selection
@@ -940,8 +1021,8 @@
     /**
      * Logically left shifts this vector by an input vector.
      * <p>
-     * This is a vector binary operation where the primitive logical left shift
-     * operation ({@code <<}) is applied to lane elements.
+     * This is a lane-wise binary operation which applies the primitive logical left shift
+     * operation ({@code <<}) to each lane.
      *
      * @param v the input vector
      * @return the result of logically left shifting this vector by the input
@@ -953,8 +1034,8 @@
      * Logically left shifts this vector by an input vector, selecting lane
      * elements controlled by a mask.
      * <p>
-     * This is a vector binary operation where the primitive logical left shift
-     * operation ({@code <<}) is applied to lane elements.
+     * This is a lane-wise binary operation which applies the primitive logical left shift
+     * operation ({@code <<}) to each lane.
      *
      * @param v the input vector
      * @param m the mask controlling lane selection
@@ -971,8 +1052,8 @@
      * Logically right shifts (or unsigned right shifts) this vector by the
      * broadcast of an input scalar.
      * <p>
-     * This is a vector binary operation where the primitive logical right shift
-     * operation ({@code >>>}) is applied to lane elements.
+     * This is a lane-wise binary operation which applies the primitive logical right shift
+     * operation ({@code >>>}) to each lane.
      *
      * @param s the input scalar; the number of the bits to right shift
      * @return the result of logically right shifting this vector by the
@@ -985,8 +1066,8 @@
      * broadcast of an input scalar, selecting lane elements controlled by a
      * mask.
      * <p>
-     * This is a vector binary operation where the primitive logical right shift
-     * operation ({@code >>>}) is applied to lane elements.
+     * This is a lane-wise binary operation which applies the primitive logical right shift
+     * operation ({@code >>>}) to each lane.
      *
      * @param s the input scalar; the number of the bits to right shift
      * @param m the mask controlling lane selection
@@ -999,8 +1080,8 @@
      * Logically right shifts (or unsigned right shifts) this vector by an
      * input vector.
      * <p>
-     * This is a vector binary operation where the primitive logical right shift
-     * operation ({@code >>>}) is applied to lane elements.
+     * This is a lane-wise binary operation which applies the primitive logical right shift
+     * operation ({@code >>>}) to each lane.
      *
      * @param v the input vector
      * @return the result of logically right shifting this vector by the
@@ -1012,8 +1093,8 @@
      * Logically right shifts (or unsigned right shifts) this vector by an
      * input vector, selecting lane elements controlled by a mask.
      * <p>
-     * This is a vector binary operation where the primitive logical right shift
-     * operation ({@code >>>}) is applied to lane elements.
+     * This is a lane-wise binary operation which applies the primitive logical right shift
+     * operation ({@code >>>}) to each lane.
      *
      * @param v the input vector
      * @param m the mask controlling lane selection
@@ -1028,8 +1109,8 @@
      * Arithmetically right shifts (or signed right shifts) this vector by the
      * broadcast of an input scalar.
      * <p>
-     * This is a vector binary operation where the primitive arithmetic right
-     * shift operation ({@code >>}) is applied to lane elements.
+     * This is a lane-wise binary operation which applies the primitive arithmetic right
+     * shift operation ({@code >>}) to each lane.
      *
      * @param s the input scalar; the number of the bits to right shift
      * @return the result of arithmetically right shifting this vector by the
@@ -1042,8 +1123,8 @@
      * broadcast of an input scalar, selecting lane elements controlled by a
      * mask.
      * <p>
-     * This is a vector binary operation where the primitive arithmetic right
-     * shift operation ({@code >>}) is applied to lane elements.
+     * This is a lane-wise binary operation which applies the primitive arithmetic right
+     * shift operation ({@code >>}) to each lane.
      *
      * @param s the input scalar; the number of the bits to right shift
      * @param m the mask controlling lane selection
@@ -1056,8 +1137,8 @@
      * Arithmetically right shifts (or signed right shifts) this vector by an
      * input vector.
      * <p>
-     * This is a vector binary operation where the primitive arithmetic right
-     * shift operation ({@code >>}) is applied to lane elements.
+     * This is a lane-wise binary operation which applies the primitive arithmetic right
+     * shift operation ({@code >>}) to each lane.
      *
      * @param v the input vector
      * @return the result of arithmetically right shifting this vector by the
@@ -1069,8 +1150,8 @@
      * Arithmetically right shifts (or signed right shifts) this vector by an
      * input vector, selecting lane elements controlled by a mask.
      * <p>
-     * This is a vector binary operation where the primitive arithmetic right
-     * shift operation ({@code >>}) is applied to lane elements.
+     * This is a lane-wise binary operation which applies the primitive arithmetic right
+     * shift operation ({@code >>}) to each lane.
      *
      * @param v the input vector
      * @param m the mask controlling lane selection
@@ -1084,8 +1165,8 @@
     /**
      * Rotates left this vector by the broadcast of an input scalar.
      * <p>
-     * This is a vector binary operation where the operation
-     * {@link Integer#rotateLeft} is applied to lane elements and where
+     * This is a lane-wise binary operation which applies the operation
+     * {@link Integer#rotateLeft} to each lane and where
      * lane elements of this vector apply to the first argument, and lane
      * elements of the broadcast vector apply to the second argument (the
      * rotation distance).
@@ -1103,8 +1184,8 @@
      * Rotates left this vector by the broadcast of an input scalar, selecting
      * lane elements controlled by a mask.
      * <p>
-     * This is a vector binary operation where the operation
-     * {@link Integer#rotateLeft} is applied to lane elements and where
+     * This is a lane-wise binary operation which applies the operation
+     * {@link Integer#rotateLeft} to each lane and where
      * lane elements of this vector apply to the first argument, and lane
      * elements of the broadcast vector apply to the second argument (the
      * rotation distance).
@@ -1122,8 +1203,8 @@
     /**
      * Rotates right this vector by the broadcast of an input scalar.
      * <p>
-     * This is a vector binary operation where the operation
-     * {@link Integer#rotateRight} is applied to lane elements and where
+     * This is a lane-wise binary operation which applies the operation
+     * {@link Integer#rotateRight} to each lane and where
      * lane elements of this vector apply to the first argument, and lane
      * elements of the broadcast vector apply to the second argument (the
      * rotation distance).
@@ -1141,8 +1222,8 @@
      * Rotates right this vector by the broadcast of an input scalar, selecting
      * lane elements controlled by a mask.
      * <p>
-     * This is a vector binary operation where the operation
-     * {@link Integer#rotateRight} is applied to lane elements and where
+     * This is a lane-wise binary operation which applies the operation
+     * {@link Integer#rotateRight} to each lane and where
      * lane elements of this vector apply to the first argument, and lane
      * elements of the broadcast vector apply to the second argument (the
      * rotation distance).
@@ -1157,15 +1238,27 @@
         return shiftR(s, m).or(shiftL(-s, m), m);
     }
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public abstract void intoByteArray(byte[] a, int ix);
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public abstract void intoByteArray(byte[] a, int ix, VectorMask<Integer> m);
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public abstract void intoByteBuffer(ByteBuffer bb, int ix);
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public abstract void intoByteBuffer(ByteBuffer bb, int ix, VectorMask<Integer> m);
 
@@ -1174,8 +1267,8 @@
     /**
      * Adds all lane elements of this vector.
      * <p>
-     * This is an associative vector reduction operation where the addition
-     * operation ({@code +}) is applied to lane elements,
+     * This is an associative cross-lane reduction operation which applies the addition
+     * operation ({@code +}) to lane elements,
      * and the identity value is {@code 0}.
      *
      * @return the addition of all the lane elements of this vector
@@ -1186,8 +1279,8 @@
      * Adds all lane elements of this vector, selecting lane elements
      * controlled by a mask.
      * <p>
-     * This is an associative vector reduction operation where the addition
-     * operation ({@code +}) is applied to lane elements,
+     * This is an associative cross-lane reduction operation which applies the addition
+     * operation ({@code +}) to lane elements,
      * and the identity value is {@code 0}.
      *
      * @param m the mask controlling lane selection
@@ -1198,8 +1291,8 @@
     /**
      * Multiplies all lane elements of this vector.
      * <p>
-     * This is an associative vector reduction operation where the
-     * multiplication operation ({@code *}) is applied to lane elements,
+     * This is an associative cross-lane reduction operation which applies the
+     * multiplication operation ({@code *}) to lane elements,
      * and the identity value is {@code 1}.
      *
      * @return the multiplication of all the lane elements of this vector
@@ -1210,8 +1303,8 @@
      * Multiplies all lane elements of this vector, selecting lane elements
      * controlled by a mask.
      * <p>
-     * This is an associative vector reduction operation where the
-     * multiplication operation ({@code *}) is applied to lane elements,
+     * This is an associative cross-lane reduction operation which applies the
+     * multiplication operation ({@code *}) to lane elements,
      * and the identity value is {@code 1}.
      *
      * @param m the mask controlling lane selection
@@ -1222,8 +1315,8 @@
     /**
      * Returns the minimum lane element of this vector.
      * <p>
-     * This is an associative vector reduction operation where the operation
-     * {@code (a, b) -> Math.min(a, b)} is applied to lane elements,
+     * This is an associative cross-lane reduction operation which applies the operation
+     * {@code (a, b) -> Math.min(a, b)} to lane elements,
      * and the identity value is
      * {@link Integer#MAX_VALUE}.
      *
@@ -1235,8 +1328,8 @@
      * Returns the minimum lane element of this vector, selecting lane elements
      * controlled by a mask.
      * <p>
-     * This is an associative vector reduction operation where the operation
-     * {@code (a, b) -> Math.min(a, b)} is applied to lane elements,
+     * This is an associative cross-lane reduction operation which applies the operation
+     * {@code (a, b) -> Math.min(a, b)} to lane elements,
      * and the identity value is
      * {@link Integer#MAX_VALUE}.
      *
@@ -1248,8 +1341,8 @@
     /**
      * Returns the maximum lane element of this vector.
      * <p>
-     * This is an associative vector reduction operation where the operation
-     * {@code (a, b) -> Math.max(a, b)} is applied to lane elements,
+     * This is an associative cross-lane reduction operation which applies the operation
+     * {@code (a, b) -> Math.max(a, b)} to lane elements,
      * and the identity value is
      * {@link Integer#MIN_VALUE}.
      *
@@ -1261,8 +1354,8 @@
      * Returns the maximum lane element of this vector, selecting lane elements
      * controlled by a mask.
      * <p>
-     * This is an associative vector reduction operation where the operation
-     * {@code (a, b) -> Math.max(a, b)} is applied to lane elements,
+     * This is an associative cross-lane reduction operation which applies the operation
+     * {@code (a, b) -> Math.max(a, b)} to lane elements,
      * and the identity value is
      * {@link Integer#MIN_VALUE}.
      *
@@ -1274,8 +1367,8 @@
     /**
      * Logically ORs all lane elements of this vector.
      * <p>
-     * This is an associative vector reduction operation where the logical OR
-     * operation ({@code |}) is applied to lane elements,
+     * This is an associative cross-lane reduction operation which applies the logical OR
+     * operation ({@code |}) to lane elements,
      * and the identity value is {@code 0}.
      *
      * @return the logical OR all the lane elements of this vector
@@ -1286,8 +1379,8 @@
      * Logically ORs all lane elements of this vector, selecting lane elements
      * controlled by a mask.
      * <p>
-     * This is an associative vector reduction operation where the logical OR
-     * operation ({@code |}) is applied to lane elements,
+     * This is an associative cross-lane reduction operation which applies the logical OR
+     * operation ({@code |}) to lane elements,
      * and the identity value is {@code 0}.
      *
      * @param m the mask controlling lane selection
@@ -1298,8 +1391,8 @@
     /**
      * Logically ANDs all lane elements of this vector.
      * <p>
-     * This is an associative vector reduction operation where the logical AND
-     * operation ({@code |}) is applied to lane elements,
+     * This is an associative cross-lane reduction operation which applies the logical AND
+     * operation ({@code |}) to lane elements,
      * and the identity value is {@code -1}.
      *
      * @return the logical AND all the lane elements of this vector
@@ -1310,8 +1403,8 @@
      * Logically ANDs all lane elements of this vector, selecting lane elements
      * controlled by a mask.
      * <p>
-     * This is an associative vector reduction operation where the logical AND
-     * operation ({@code |}) is applied to lane elements,
+     * This is an associative cross-lane reduction operation which applies the logical AND
+     * operation ({@code |}) to lane elements,
      * and the identity value is {@code -1}.
      *
      * @param m the mask controlling lane selection
@@ -1322,8 +1415,8 @@
     /**
      * Logically XORs all lane elements of this vector.
      * <p>
-     * This is an associative vector reduction operation where the logical XOR
-     * operation ({@code ^}) is applied to lane elements,
+     * This is an associative cross-lane reduction operation which applies the logical XOR
+     * operation ({@code ^}) to lane elements,
      * and the identity value is {@code 0}.
      *
      * @return the logical XOR all the lane elements of this vector
@@ -1334,8 +1427,8 @@
      * Logically XORs all lane elements of this vector, selecting lane elements
      * controlled by a mask.
      * <p>
-     * This is an associative vector reduction operation where the logical XOR
-     * operation ({@code ^}) is applied to lane elements,
+     * This is an associative cross-lane reduction operation which applies the logical XOR
+     * operation ({@code ^}) to lane elements,
      * and the identity value is {@code 0}.
      *
      * @param m the mask controlling lane selection
@@ -1353,7 +1446,7 @@
      * @throws IllegalArgumentException if the index is is out of range
      * ({@code < 0 || >= length()})
      */
-    public abstract int get(int i);
+    public abstract int lane(int i);
 
     /**
      * Replaces the lane element of this vector at lane index {@code i} with
@@ -1400,30 +1493,30 @@
      * <p>
      * For each vector lane, where {@code N} is the vector lane index,
      * the lane element at index {@code N} is stored into the array at index
-     * {@code i + N}.
+     * {@code offset + N}.
      *
      * @param a the array
-     * @param i the offset into the array
-     * @throws IndexOutOfBoundsException if {@code i < 0}, or
-     * {@code i > a.length - this.length()}
+     * @param offset the offset into the array
+     * @throws IndexOutOfBoundsException if {@code offset < 0}, or
+     * {@code offset > a.length - this.length()}
      */
-    public abstract void intoArray(int[] a, int i);
+    public abstract void intoArray(int[] a, int offset);
 
     /**
      * Stores this vector into an array starting at offset and using a mask.
      * <p>
      * For each vector lane, where {@code N} is the vector lane index,
      * if the mask lane at index {@code N} is set then the lane element at
-     * index {@code N} is stored into the array index {@code i + N}.
+     * index {@code N} is stored into the array index {@code offset + N}.
      *
      * @param a the array
-     * @param i the offset into the array
+     * @param offset the offset into the array
      * @param m the mask
-     * @throws IndexOutOfBoundsException if {@code i < 0}, or
+     * @throws IndexOutOfBoundsException if {@code offset < 0}, or
      * for any vector lane index {@code N} where the mask at lane {@code N}
-     * is set {@code i >= a.length - N}
+     * is set {@code offset >= a.length - N}
      */
-    public abstract void intoArray(int[] a, int i, VectorMask<Integer> m);
+    public abstract void intoArray(int[] a, int offset, VectorMask<Integer> m);
 
     /**
      * Stores this vector into an array using indexes obtained from an index
@@ -1431,20 +1524,20 @@
      * <p>
      * For each vector lane, where {@code N} is the vector lane index, the
      * lane element at index {@code N} is stored into the array at index
-     * {@code i + indexMap[j + N]}.
+     * {@code a_offset + indexMap[i_offset + N]}.
      *
      * @param a the array
-     * @param i the offset into the array, may be negative if relative
+     * @param a_offset the offset into the array, may be negative if relative
      * indexes in the index map compensate to produce a value within the
      * array bounds
      * @param indexMap the index map
-     * @param j the offset into the index map
-     * @throws IndexOutOfBoundsException if {@code j < 0}, or
-     * {@code j > indexMap.length - this.length()},
+     * @param i_offset the offset into the index map
+     * @throws IndexOutOfBoundsException if {@code i_offset < 0}, or
+     * {@code i_offset > indexMap.length - this.length()},
      * or for any vector lane index {@code N} the result of
-     * {@code i + indexMap[j + N]} is {@code < 0} or {@code >= a.length}
+     * {@code a_offset + indexMap[i_offset + N]} is {@code < 0} or {@code >= a.length}
      */
-    public abstract void intoArray(int[] a, int i, int[] indexMap, int j);
+    public abstract void intoArray(int[] a, int a_offset, int[] indexMap, int i_offset);
 
     /**
      * Stores this vector into an array using indexes obtained from an index
@@ -1453,24 +1546,27 @@
      * For each vector lane, where {@code N} is the vector lane index,
      * if the mask lane at index {@code N} is set then the lane element at
      * index {@code N} is stored into the array at index
-     * {@code i + indexMap[j + N]}.
+     * {@code a_offset + indexMap[i_offset + N]}.
      *
      * @param a the array
-     * @param i the offset into the array, may be negative if relative
+     * @param a_offset the offset into the array, may be negative if relative
      * indexes in the index map compensate to produce a value within the
      * array bounds
      * @param m the mask
      * @param indexMap the index map
-     * @param j the offset into the index map
+     * @param i_offset the offset into the index map
      * @throws IndexOutOfBoundsException if {@code j < 0}, or
-     * {@code j > indexMap.length - this.length()},
+     * {@code i_offset > indexMap.length - this.length()},
      * or for any vector lane index {@code N} where the mask at lane
-     * {@code N} is set the result of {@code i + indexMap[j + N]} is
+     * {@code N} is set the result of {@code a_offset + indexMap[i_offset + N]} is
      * {@code < 0} or {@code >= a.length}
      */
-    public abstract void intoArray(int[] a, int i, VectorMask<Integer> m, int[] indexMap, int j);
+    public abstract void intoArray(int[] a, int a_offset, VectorMask<Integer> m, int[] indexMap, int i_offset);
     // Species
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public abstract VectorSpecies<Integer> species();
 
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Long128Vector.java	Thu Apr 18 23:47:37 2019 -0700
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Long128Vector.java	Fri Apr 19 11:35:36 2019 -0700
@@ -179,37 +179,37 @@
         if (stype == byte.class) {
             byte[] a = new byte[limit];
             for (int i = 0; i < limit; i++) {
-                a[i] = (byte) this.get(i);
+                a[i] = (byte) this.lane(i);
             }
             return (Vector) ByteVector.fromArray((VectorSpecies<Byte>) s, a, 0);
         } else if (stype == short.class) {
             short[] a = new short[limit];
             for (int i = 0; i < limit; i++) {
-                a[i] = (short) this.get(i);
+                a[i] = (short) this.lane(i);
             }
             return (Vector) ShortVector.fromArray((VectorSpecies<Short>) s, a, 0);
         } else if (stype == int.class) {
             int[] a = new int[limit];
             for (int i = 0; i < limit; i++) {
-                a[i] = (int) this.get(i);
+                a[i] = (int) this.lane(i);
             }
             return (Vector) IntVector.fromArray((VectorSpecies<Integer>) s, a, 0);
         } else if (stype == long.class) {
             long[] a = new long[limit];
             for (int i = 0; i < limit; i++) {
-                a[i] = (long) this.get(i);
+                a[i] = (long) this.lane(i);
             }
             return (Vector) LongVector.fromArray((VectorSpecies<Long>) s, a, 0);
         } else if (stype == float.class) {
             float[] a = new float[limit];
             for (int i = 0; i < limit; i++) {
-                a[i] = (float) this.get(i);
+                a[i] = (float) this.lane(i);
             }
             return (Vector) FloatVector.fromArray((VectorSpecies<Float>) s, a, 0);
         } else if (stype == double.class) {
             double[] a = new double[limit];
             for (int i = 0; i < limit; i++) {
-                a[i] = (double) this.get(i);
+                a[i] = (double) this.lane(i);
             }
             return (Vector) DoubleVector.fromArray((VectorSpecies<Double>) s, a, 0);
         } else {
@@ -1168,8 +1168,8 @@
             Long128Vector.class, Long128Shuffle.class, long.class, LENGTH,
             this, s,
             (v1, s_) -> v1.uOp((i, a) -> {
-                int ei = s_.getElement(i);
-                return v1.get(ei);
+                int ei = s_.lane(i);
+                return v1.lane(ei);
             }));
     }
 
@@ -1184,13 +1184,13 @@
         return VectorIntrinsics.blend(
             Long128Vector.class, Long128Mask.class, long.class, LENGTH,
             this, v, m,
-            (v1, v2, m_) -> v1.bOp(v2, (i, a, b) -> m_.getElement(i) ? b : a));
+            (v1, v2, m_) -> v1.bOp(v2, (i, a, b) -> m_.lane(i) ? b : a));
     }
 
     // Accessors
 
     @Override
-    public long get(int i) {
+    public long lane(int i) {
         if (i < 0 || i >= LENGTH) {
             throw new IllegalArgumentException("Index " + i + " must be zero or positive, and less than " + LENGTH);
         }
@@ -1391,7 +1391,7 @@
         public LongVector toVector() {
             long[] va = new long[SPECIES.length()];
             for (int i = 0; i < va.length; i++) {
-              va[i] = (long) getElement(i);
+              va[i] = (long) lane(i);
             }
             return LongVector.fromArray(SPECIES, va, 0);
         }
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Long256Vector.java	Thu Apr 18 23:47:37 2019 -0700
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Long256Vector.java	Fri Apr 19 11:35:36 2019 -0700
@@ -179,37 +179,37 @@
         if (stype == byte.class) {
             byte[] a = new byte[limit];
             for (int i = 0; i < limit; i++) {
-                a[i] = (byte) this.get(i);
+                a[i] = (byte) this.lane(i);
             }
             return (Vector) ByteVector.fromArray((VectorSpecies<Byte>) s, a, 0);
         } else if (stype == short.class) {
             short[] a = new short[limit];
             for (int i = 0; i < limit; i++) {
-                a[i] = (short) this.get(i);
+                a[i] = (short) this.lane(i);
             }
             return (Vector) ShortVector.fromArray((VectorSpecies<Short>) s, a, 0);
         } else if (stype == int.class) {
             int[] a = new int[limit];
             for (int i = 0; i < limit; i++) {
-                a[i] = (int) this.get(i);
+                a[i] = (int) this.lane(i);
             }
             return (Vector) IntVector.fromArray((VectorSpecies<Integer>) s, a, 0);
         } else if (stype == long.class) {
             long[] a = new long[limit];
             for (int i = 0; i < limit; i++) {
-                a[i] = (long) this.get(i);
+                a[i] = (long) this.lane(i);
             }
             return (Vector) LongVector.fromArray((VectorSpecies<Long>) s, a, 0);
         } else if (stype == float.class) {
             float[] a = new float[limit];
             for (int i = 0; i < limit; i++) {
-                a[i] = (float) this.get(i);
+                a[i] = (float) this.lane(i);
             }
             return (Vector) FloatVector.fromArray((VectorSpecies<Float>) s, a, 0);
         } else if (stype == double.class) {
             double[] a = new double[limit];
             for (int i = 0; i < limit; i++) {
-                a[i] = (double) this.get(i);
+                a[i] = (double) this.lane(i);
             }
             return (Vector) DoubleVector.fromArray((VectorSpecies<Double>) s, a, 0);
         } else {
@@ -1168,8 +1168,8 @@
             Long256Vector.class, Long256Shuffle.class, long.class, LENGTH,
             this, s,
             (v1, s_) -> v1.uOp((i, a) -> {
-                int ei = s_.getElement(i);
-                return v1.get(ei);
+                int ei = s_.lane(i);
+                return v1.lane(ei);
             }));
     }
 
@@ -1184,13 +1184,13 @@
         return VectorIntrinsics.blend(
             Long256Vector.class, Long256Mask.class, long.class, LENGTH,
             this, v, m,
-            (v1, v2, m_) -> v1.bOp(v2, (i, a, b) -> m_.getElement(i) ? b : a));
+            (v1, v2, m_) -> v1.bOp(v2, (i, a, b) -> m_.lane(i) ? b : a));
     }
 
     // Accessors
 
     @Override
-    public long get(int i) {
+    public long lane(int i) {
         if (i < 0 || i >= LENGTH) {
             throw new IllegalArgumentException("Index " + i + " must be zero or positive, and less than " + LENGTH);
         }
@@ -1391,7 +1391,7 @@
         public LongVector toVector() {
             long[] va = new long[SPECIES.length()];
             for (int i = 0; i < va.length; i++) {
-              va[i] = (long) getElement(i);
+              va[i] = (long) lane(i);
             }
             return LongVector.fromArray(SPECIES, va, 0);
         }
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Long512Vector.java	Thu Apr 18 23:47:37 2019 -0700
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Long512Vector.java	Fri Apr 19 11:35:36 2019 -0700
@@ -179,37 +179,37 @@
         if (stype == byte.class) {
             byte[] a = new byte[limit];
             for (int i = 0; i < limit; i++) {
-                a[i] = (byte) this.get(i);
+                a[i] = (byte) this.lane(i);
             }
             return (Vector) ByteVector.fromArray((VectorSpecies<Byte>) s, a, 0);
         } else if (stype == short.class) {
             short[] a = new short[limit];
             for (int i = 0; i < limit; i++) {
-                a[i] = (short) this.get(i);
+                a[i] = (short) this.lane(i);
             }
             return (Vector) ShortVector.fromArray((VectorSpecies<Short>) s, a, 0);
         } else if (stype == int.class) {
             int[] a = new int[limit];
             for (int i = 0; i < limit; i++) {
-                a[i] = (int) this.get(i);
+                a[i] = (int) this.lane(i);
             }
             return (Vector) IntVector.fromArray((VectorSpecies<Integer>) s, a, 0);
         } else if (stype == long.class) {
             long[] a = new long[limit];
             for (int i = 0; i < limit; i++) {
-                a[i] = (long) this.get(i);
+                a[i] = (long) this.lane(i);
             }
             return (Vector) LongVector.fromArray((VectorSpecies<Long>) s, a, 0);
         } else if (stype == float.class) {
             float[] a = new float[limit];
             for (int i = 0; i < limit; i++) {
-                a[i] = (float) this.get(i);
+                a[i] = (float) this.lane(i);
             }
             return (Vector) FloatVector.fromArray((VectorSpecies<Float>) s, a, 0);
         } else if (stype == double.class) {
             double[] a = new double[limit];
             for (int i = 0; i < limit; i++) {
-                a[i] = (double) this.get(i);
+                a[i] = (double) this.lane(i);
             }
             return (Vector) DoubleVector.fromArray((VectorSpecies<Double>) s, a, 0);
         } else {
@@ -1168,8 +1168,8 @@
             Long512Vector.class, Long512Shuffle.class, long.class, LENGTH,
             this, s,
             (v1, s_) -> v1.uOp((i, a) -> {
-                int ei = s_.getElement(i);
-                return v1.get(ei);
+                int ei = s_.lane(i);
+                return v1.lane(ei);
             }));
     }
 
@@ -1184,13 +1184,13 @@
         return VectorIntrinsics.blend(
             Long512Vector.class, Long512Mask.class, long.class, LENGTH,
             this, v, m,
-            (v1, v2, m_) -> v1.bOp(v2, (i, a, b) -> m_.getElement(i) ? b : a));
+            (v1, v2, m_) -> v1.bOp(v2, (i, a, b) -> m_.lane(i) ? b : a));
     }
 
     // Accessors
 
     @Override
-    public long get(int i) {
+    public long lane(int i) {
         if (i < 0 || i >= LENGTH) {
             throw new IllegalArgumentException("Index " + i + " must be zero or positive, and less than " + LENGTH);
         }
@@ -1391,7 +1391,7 @@
         public LongVector toVector() {
             long[] va = new long[SPECIES.length()];
             for (int i = 0; i < va.length; i++) {
-              va[i] = (long) getElement(i);
+              va[i] = (long) lane(i);
             }
             return LongVector.fromArray(SPECIES, va, 0);
         }
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Long64Vector.java	Thu Apr 18 23:47:37 2019 -0700
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Long64Vector.java	Fri Apr 19 11:35:36 2019 -0700
@@ -178,37 +178,37 @@
         if (stype == byte.class) {
             byte[] a = new byte[limit];
             for (int i = 0; i < limit; i++) {
-                a[i] = (byte) this.get(i);
+                a[i] = (byte) this.lane(i);
             }
             return (Vector) ByteVector.fromArray((VectorSpecies<Byte>) s, a, 0);
         } else if (stype == short.class) {
             short[] a = new short[limit];
             for (int i = 0; i < limit; i++) {
-                a[i] = (short) this.get(i);
+                a[i] = (short) this.lane(i);
             }
             return (Vector) ShortVector.fromArray((VectorSpecies<Short>) s, a, 0);
         } else if (stype == int.class) {
             int[] a = new int[limit];
             for (int i = 0; i < limit; i++) {
-                a[i] = (int) this.get(i);
+                a[i] = (int) this.lane(i);
             }
             return (Vector) IntVector.fromArray((VectorSpecies<Integer>) s, a, 0);
         } else if (stype == long.class) {
             long[] a = new long[limit];
             for (int i = 0; i < limit; i++) {
-                a[i] = (long) this.get(i);
+                a[i] = (long) this.lane(i);
             }
             return (Vector) LongVector.fromArray((VectorSpecies<Long>) s, a, 0);
         } else if (stype == float.class) {
             float[] a = new float[limit];
             for (int i = 0; i < limit; i++) {
-                a[i] = (float) this.get(i);
+                a[i] = (float) this.lane(i);
             }
             return (Vector) FloatVector.fromArray((VectorSpecies<Float>) s, a, 0);
         } else if (stype == double.class) {
             double[] a = new double[limit];
             for (int i = 0; i < limit; i++) {
-                a[i] = (double) this.get(i);
+                a[i] = (double) this.lane(i);
             }
             return (Vector) DoubleVector.fromArray((VectorSpecies<Double>) s, a, 0);
         } else {
@@ -1155,8 +1155,8 @@
             Long64Vector.class, Long64Shuffle.class, long.class, LENGTH,
             this, s,
             (v1, s_) -> v1.uOp((i, a) -> {
-                int ei = s_.getElement(i);
-                return v1.get(ei);
+                int ei = s_.lane(i);
+                return v1.lane(ei);
             }));
     }
 
@@ -1171,13 +1171,13 @@
         return VectorIntrinsics.blend(
             Long64Vector.class, Long64Mask.class, long.class, LENGTH,
             this, v, m,
-            (v1, v2, m_) -> v1.bOp(v2, (i, a, b) -> m_.getElement(i) ? b : a));
+            (v1, v2, m_) -> v1.bOp(v2, (i, a, b) -> m_.lane(i) ? b : a));
     }
 
     // Accessors
 
     @Override
-    public long get(int i) {
+    public long lane(int i) {
         if (i < 0 || i >= LENGTH) {
             throw new IllegalArgumentException("Index " + i + " must be zero or positive, and less than " + LENGTH);
         }
@@ -1378,7 +1378,7 @@
         public LongVector toVector() {
             long[] va = new long[SPECIES.length()];
             for (int i = 0; i < va.length; i++) {
-              va[i] = (long) getElement(i);
+              va[i] = (long) lane(i);
             }
             return LongVector.fromArray(SPECIES, va, 0);
         }
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/LongMaxVector.java	Thu Apr 18 23:47:37 2019 -0700
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/LongMaxVector.java	Fri Apr 19 11:35:36 2019 -0700
@@ -179,37 +179,37 @@
         if (stype == byte.class) {
             byte[] a = new byte[limit];
             for (int i = 0; i < limit; i++) {
-                a[i] = (byte) this.get(i);
+                a[i] = (byte) this.lane(i);
             }
             return (Vector) ByteVector.fromArray((VectorSpecies<Byte>) s, a, 0);
         } else if (stype == short.class) {
             short[] a = new short[limit];
             for (int i = 0; i < limit; i++) {
-                a[i] = (short) this.get(i);
+                a[i] = (short) this.lane(i);
             }
             return (Vector) ShortVector.fromArray((VectorSpecies<Short>) s, a, 0);
         } else if (stype == int.class) {
             int[] a = new int[limit];
             for (int i = 0; i < limit; i++) {
-                a[i] = (int) this.get(i);
+                a[i] = (int) this.lane(i);
             }
             return (Vector) IntVector.fromArray((VectorSpecies<Integer>) s, a, 0);
         } else if (stype == long.class) {
             long[] a = new long[limit];
             for (int i = 0; i < limit; i++) {
-                a[i] = (long) this.get(i);
+                a[i] = (long) this.lane(i);
             }
             return (Vector) LongVector.fromArray((VectorSpecies<Long>) s, a, 0);
         } else if (stype == float.class) {
             float[] a = new float[limit];
             for (int i = 0; i < limit; i++) {
-                a[i] = (float) this.get(i);
+                a[i] = (float) this.lane(i);
             }
             return (Vector) FloatVector.fromArray((VectorSpecies<Float>) s, a, 0);
         } else if (stype == double.class) {
             double[] a = new double[limit];
             for (int i = 0; i < limit; i++) {
-                a[i] = (double) this.get(i);
+                a[i] = (double) this.lane(i);
             }
             return (Vector) DoubleVector.fromArray((VectorSpecies<Double>) s, a, 0);
         } else {
@@ -1168,8 +1168,8 @@
             LongMaxVector.class, LongMaxShuffle.class, long.class, LENGTH,
             this, s,
             (v1, s_) -> v1.uOp((i, a) -> {
-                int ei = s_.getElement(i);
-                return v1.get(ei);
+                int ei = s_.lane(i);
+                return v1.lane(ei);
             }));
     }
 
@@ -1184,13 +1184,13 @@
         return VectorIntrinsics.blend(
             LongMaxVector.class, LongMaxMask.class, long.class, LENGTH,
             this, v, m,
-            (v1, v2, m_) -> v1.bOp(v2, (i, a, b) -> m_.getElement(i) ? b : a));
+            (v1, v2, m_) -> v1.bOp(v2, (i, a, b) -> m_.lane(i) ? b : a));
     }
 
     // Accessors
 
     @Override
-    public long get(int i) {
+    public long lane(int i) {
         if (i < 0 || i >= LENGTH) {
             throw new IllegalArgumentException("Index " + i + " must be zero or positive, and less than " + LENGTH);
         }
@@ -1391,7 +1391,7 @@
         public LongVector toVector() {
             long[] va = new long[SPECIES.length()];
             for (int i = 0; i < va.length; i++) {
-              va[i] = (long) getElement(i);
+              va[i] = (long) lane(i);
             }
             return LongVector.fromArray(SPECIES, va, 0);
         }
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/LongVector.java	Thu Apr 18 23:47:37 2019 -0700
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/LongVector.java	Fri Apr 19 11:35:36 2019 -0700
@@ -125,26 +125,26 @@
      * <p>
      * This method behaves as if it returns the result of calling the
      * byte buffer, offset, and mask accepting
-     * {@link #fromByteBuffer(VectorSpecies<Long>, ByteBuffer, int, VectorMask) method} as follows:
+     * {@link #fromByteBuffer(VectorSpecies, ByteBuffer, int, VectorMask) method} as follows:
      * <pre>{@code
-     * return this.fromByteBuffer(ByteBuffer.wrap(a), i, this.maskAllTrue());
+     * return fromByteBuffer(species, ByteBuffer.wrap(a), offset, VectorMask.allTrue());
      * }</pre>
      *
      * @param species species of desired vector
      * @param a the byte array
-     * @param ix the offset into the array
+     * @param offset the offset into the array
      * @return a vector loaded from a byte array
      * @throws IndexOutOfBoundsException if {@code i < 0} or
-     * {@code i > a.length - (this.length() * this.elementSize() / Byte.SIZE)}
+     * {@code offset > a.length - (species.length() * species.elementSize() / Byte.SIZE)}
      */
     @ForceInline
     @SuppressWarnings("unchecked")
-    public static LongVector fromByteArray(VectorSpecies<Long> species, byte[] a, int ix) {
+    public static LongVector fromByteArray(VectorSpecies<Long> species, byte[] a, int offset) {
         Objects.requireNonNull(a);
-        ix = VectorIntrinsics.checkIndex(ix, a.length, species.bitSize() / Byte.SIZE);
+        offset = VectorIntrinsics.checkIndex(offset, a.length, species.bitSize() / Byte.SIZE);
         return VectorIntrinsics.load((Class<LongVector>) species.boxType(), long.class, species.length(),
-                                     a, ((long) ix) + Unsafe.ARRAY_BYTE_BASE_OFFSET,
-                                     a, ix, species,
+                                     a, ((long) offset) + Unsafe.ARRAY_BYTE_BASE_OFFSET,
+                                     a, offset, species,
                                      (c, idx, s) -> {
                                          ByteBuffer bbc = ByteBuffer.wrap(c, idx, a.length - idx).order(ByteOrder.nativeOrder());
                                          LongBuffer tb = bbc.asLongBuffer();
@@ -161,51 +161,48 @@
      * <p>
      * This method behaves as if it returns the result of calling the
      * byte buffer, offset, and mask accepting
-     * {@link #fromByteBuffer(VectorSpecies<Long>, ByteBuffer, int, VectorMask) method} as follows:
+     * {@link #fromByteBuffer(VectorSpecies, ByteBuffer, int, VectorMask) method} as follows:
      * <pre>{@code
-     * return this.fromByteBuffer(ByteBuffer.wrap(a), i, m);
+     * return fromByteBuffer(species, ByteBuffer.wrap(a), offset, m);
      * }</pre>
      *
      * @param species species of desired vector
      * @param a the byte array
-     * @param ix the offset into the array
+     * @param offset the offset into the array
      * @param m the mask
      * @return a vector loaded from a byte array
-     * @throws IndexOutOfBoundsException if {@code i < 0} or
-     * {@code i > a.length - (this.length() * this.elementSize() / Byte.SIZE)}
-     * @throws IndexOutOfBoundsException if the offset is {@code < 0},
-     * or {@code > a.length},
+     * @throws IndexOutOfBoundsException if {@code offset < 0} or
      * for any vector lane index {@code N} where the mask at lane {@code N}
      * is set
-     * {@code i >= a.length - (N * this.elementSize() / Byte.SIZE)}
+     * {@code offset >= a.length - (N * species.elementSize() / Byte.SIZE)}
      */
     @ForceInline
-    public static LongVector fromByteArray(VectorSpecies<Long> species, byte[] a, int ix, VectorMask<Long> m) {
-        return zero(species).blend(fromByteArray(species, a, ix), m);
+    public static LongVector fromByteArray(VectorSpecies<Long> species, byte[] a, int offset, VectorMask<Long> m) {
+        return zero(species).blend(fromByteArray(species, a, offset), m);
     }
 
     /**
      * Loads a vector from an array starting at offset.
      * <p>
      * For each vector lane, where {@code N} is the vector lane index, the
-     * array element at index {@code i + N} is placed into the
+     * array element at index {@code offset + N} is placed into the
      * resulting vector at lane index {@code N}.
      *
      * @param species species of desired vector
      * @param a the array
-     * @param i the offset into the array
+     * @param offset the offset into the array
      * @return the vector loaded from an array
-     * @throws IndexOutOfBoundsException if {@code i < 0}, or
-     * {@code i > a.length - this.length()}
+     * @throws IndexOutOfBoundsException if {@code offset < 0}, or
+     * {@code offset > a.length - species.length()}
      */
     @ForceInline
     @SuppressWarnings("unchecked")
-    public static LongVector fromArray(VectorSpecies<Long> species, long[] a, int i){
+    public static LongVector fromArray(VectorSpecies<Long> species, long[] a, int offset){
         Objects.requireNonNull(a);
-        i = VectorIntrinsics.checkIndex(i, a.length, species.length());
+        offset = VectorIntrinsics.checkIndex(offset, a.length, species.length());
         return VectorIntrinsics.load((Class<LongVector>) species.boxType(), long.class, species.length(),
-                                     a, (((long) i) << ARRAY_SHIFT) + Unsafe.ARRAY_LONG_BASE_OFFSET,
-                                     a, i, species,
+                                     a, (((long) offset) << ARRAY_SHIFT) + Unsafe.ARRAY_LONG_BASE_OFFSET,
+                                     a, offset, species,
                                      (c, idx, s) -> ((LongSpecies)s).op(n -> c[idx + n]));
     }
 
@@ -215,22 +212,22 @@
      * <p>
      * For each vector lane, where {@code N} is the vector lane index,
      * if the mask lane at index {@code N} is set then the array element at
-     * index {@code i + N} is placed into the resulting vector at lane index
+     * index {@code offset + N} is placed into the resulting vector at lane index
      * {@code N}, otherwise the default element value is placed into the
      * resulting vector at lane index {@code N}.
      *
      * @param species species of desired vector
      * @param a the array
-     * @param i the offset into the array
+     * @param offset the offset into the array
      * @param m the mask
      * @return the vector loaded from an array
-     * @throws IndexOutOfBoundsException if {@code i < 0}, or
+     * @throws IndexOutOfBoundsException if {@code offset < 0}, or
      * for any vector lane index {@code N} where the mask at lane {@code N}
-     * is set {@code i > a.length - N}
+     * is set {@code offset > a.length - N}
      */
     @ForceInline
-    public static LongVector fromArray(VectorSpecies<Long> species, long[] a, int i, VectorMask<Long> m) {
-        return zero(species).blend(fromArray(species, a, i), m);
+    public static LongVector fromArray(VectorSpecies<Long> species, long[] a, int offset, VectorMask<Long> m) {
+        return zero(species).blend(fromArray(species, a, offset), m);
     }
 
     /**
@@ -238,40 +235,40 @@
      * map.
      * <p>
      * For each vector lane, where {@code N} is the vector lane index, the
-     * array element at index {@code i + indexMap[j + N]} is placed into the
+     * array element at index {@code a_offset + indexMap[i_offset + N]} is placed into the
      * resulting vector at lane index {@code N}.
      *
      * @param species species of desired vector
      * @param a the array
-     * @param i the offset into the array, may be negative if relative
+     * @param a_offset the offset into the array, may be negative if relative
      * indexes in the index map compensate to produce a value within the
      * array bounds
      * @param indexMap the index map
-     * @param j the offset into the index map
+     * @param i_offset the offset into the index map
      * @return the vector loaded from an array
-     * @throws IndexOutOfBoundsException if {@code j < 0}, or
-     * {@code j > indexMap.length - this.length()},
+     * @throws IndexOutOfBoundsException if {@code i_offset < 0}, or
+     * {@code i_offset > indexMap.length - species.length()},
      * or for any vector lane index {@code N} the result of
-     * {@code i + indexMap[j + N]} is {@code < 0} or {@code >= a.length}
+     * {@code a_offset + indexMap[i_offset + N]} is {@code < 0} or {@code >= a.length}
      */
     @ForceInline
     @SuppressWarnings("unchecked")
-    public static LongVector fromArray(VectorSpecies<Long> species, long[] a, int i, int[] indexMap, int j) {
+    public static LongVector fromArray(VectorSpecies<Long> species, long[] a, int a_offset, int[] indexMap, int i_offset) {
         Objects.requireNonNull(a);
         Objects.requireNonNull(indexMap);
 
         if (species.length() == 1) {
-          return LongVector.fromArray(species, a, i + indexMap[j]);
+          return LongVector.fromArray(species, a, a_offset + indexMap[i_offset]);
         }
 
-        // Index vector: vix[0:n] = k -> i + indexMap[j + k]
-        IntVector vix = IntVector.fromArray(IntVector.species(species.indexShape()), indexMap, j).add(i);
+        // Index vector: vix[0:n] = k -> a_offset + indexMap[i_offset + k]
+        IntVector vix = IntVector.fromArray(IntVector.species(species.indexShape()), indexMap, i_offset).add(a_offset);
 
         vix = VectorIntrinsics.checkIndex(vix, a.length);
 
         return VectorIntrinsics.loadWithMap((Class<LongVector>) species.boxType(), long.class, species.length(),
                                             IntVector.species(species.indexShape()).boxType(), a, Unsafe.ARRAY_LONG_BASE_OFFSET, vix,
-                                            a, i, indexMap, j, species,
+                                            a, a_offset, indexMap, i_offset, species,
                                             (long[] c, int idx, int[] iMap, int idy, VectorSpecies<Long> s) ->
                                                 ((LongSpecies)s).op(n -> c[idx + iMap[idy+n]]));
         }
@@ -282,29 +279,29 @@
      * <p>
      * For each vector lane, where {@code N} is the vector lane index,
      * if the mask lane at index {@code N} is set then the array element at
-     * index {@code i + indexMap[j + N]} is placed into the resulting vector
+     * index {@code a_offset + indexMap[i_offset + N]} is placed into the resulting vector
      * at lane index {@code N}.
      *
      * @param species species of desired vector
      * @param a the array
-     * @param i the offset into the array, may be negative if relative
+     * @param a_offset the offset into the array, may be negative if relative
      * indexes in the index map compensate to produce a value within the
      * array bounds
      * @param m the mask
      * @param indexMap the index map
-     * @param j the offset into the index map
+     * @param i_offset the offset into the index map
      * @return the vector loaded from an array
-     * @throws IndexOutOfBoundsException if {@code j < 0}, or
-     * {@code j > indexMap.length - this.length()},
+     * @throws IndexOutOfBoundsException if {@code i_offset < 0}, or
+     * {@code i_offset > indexMap.length - species.length()},
      * or for any vector lane index {@code N} where the mask at lane
-     * {@code N} is set the result of {@code i + indexMap[j + N]} is
+     * {@code N} is set the result of {@code a_offset + indexMap[i_offset + N]} is
      * {@code < 0} or {@code >= a.length}
      */
     @ForceInline
     @SuppressWarnings("unchecked")
-    public static LongVector fromArray(VectorSpecies<Long> species, long[] a, int i, VectorMask<Long> m, int[] indexMap, int j) {
+    public static LongVector fromArray(VectorSpecies<Long> species, long[] a, int a_offset, VectorMask<Long> m, int[] indexMap, int i_offset) {
         // @@@ This can result in out of bounds errors for unset mask lanes
-        return zero(species).blend(fromArray(species, a, i, indexMap, j), m);
+        return zero(species).blend(fromArray(species, a, a_offset, indexMap, i_offset), m);
     }
 
 
@@ -317,31 +314,31 @@
      * <p>
      * This method behaves as if it returns the result of calling the
      * byte buffer, offset, and mask accepting
-     * {@link #fromByteBuffer(VectorSpecies<Long>, ByteBuffer, int, VectorMask)} method} as follows:
+     * {@link #fromByteBuffer(VectorSpecies, ByteBuffer, int, VectorMask)} method} as follows:
      * <pre>{@code
-     *   return this.fromByteBuffer(b, i, this.maskAllTrue())
+     *   return fromByteBuffer(b, offset, VectorMask.allTrue())
      * }</pre>
      *
      * @param species species of desired vector
      * @param bb the byte buffer
-     * @param ix the offset into the byte buffer
+     * @param offset the offset into the byte buffer
      * @return a vector loaded from a byte buffer
      * @throws IndexOutOfBoundsException if the offset is {@code < 0},
      * or {@code > b.limit()},
      * or if there are fewer than
-     * {@code this.length() * this.elementSize() / Byte.SIZE} bytes
+     * {@code species.length() * species.elementSize() / Byte.SIZE} bytes
      * remaining in the byte buffer from the given offset
      */
     @ForceInline
     @SuppressWarnings("unchecked")
-    public static LongVector fromByteBuffer(VectorSpecies<Long> species, ByteBuffer bb, int ix) {
+    public static LongVector fromByteBuffer(VectorSpecies<Long> species, ByteBuffer bb, int offset) {
         if (bb.order() != ByteOrder.nativeOrder()) {
             throw new IllegalArgumentException();
         }
-        ix = VectorIntrinsics.checkIndex(ix, bb.limit(), species.bitSize() / Byte.SIZE);
+        offset = VectorIntrinsics.checkIndex(offset, bb.limit(), species.bitSize() / Byte.SIZE);
         return VectorIntrinsics.load((Class<LongVector>) species.boxType(), long.class, species.length(),
-                                     U.getReference(bb, BYTE_BUFFER_HB), U.getLong(bb, BUFFER_ADDRESS) + ix,
-                                     bb, ix, species,
+                                     U.getReference(bb, BYTE_BUFFER_HB), U.getLong(bb, BUFFER_ADDRESS) + offset,
+                                     bb, offset, species,
                                      (c, idx, s) -> {
                                          ByteBuffer bbc = c.duplicate().position(idx).order(ByteOrder.nativeOrder());
                                          LongBuffer tb = bbc.asLongBuffer();
@@ -359,77 +356,77 @@
      * the returned vector is loaded with a mask from a primitive array
      * obtained from the primitive buffer.
      * The following pseudocode expresses the behaviour, where
-     * {@coce EBuffer} is the primitive buffer type, {@code e} is the
-     * primitive element type, and {@code ESpecies<S>} is the primitive
+     * {@code EBuffer} is the primitive buffer type, {@code e} is the
+     * primitive element type, and {@code ESpecies} is the primitive
      * species for {@code e}:
      * <pre>{@code
      * EBuffer eb = b.duplicate().
-     *     order(ByteOrder.nativeOrder()).position(i).
+     *     order(ByteOrder.nativeOrder()).position(offset).
      *     asEBuffer();
-     * e[] es = new e[this.length()];
+     * e[] es = new e[species.length()];
      * for (int n = 0; n < t.length; n++) {
      *     if (m.isSet(n))
      *         es[n] = eb.get(n);
      * }
-     * Vector<E> r = ((ESpecies<S>)this).fromArray(es, 0, m);
+     * EVector r = EVector.fromArray(es, 0, m);
      * }</pre>
      *
      * @param species species of desired vector
      * @param bb the byte buffer
-     * @param ix the offset into the byte buffer
+     * @param offset the offset into the byte buffer
      * @param m the mask
      * @return a vector loaded from a byte buffer
      * @throws IndexOutOfBoundsException if the offset is {@code < 0},
      * or {@code > b.limit()},
      * for any vector lane index {@code N} where the mask at lane {@code N}
      * is set
-     * {@code i >= b.limit() - (N * this.elementSize() / Byte.SIZE)}
+     * {@code offset >= b.limit() - (N * species.elementSize() / Byte.SIZE)}
      */
     @ForceInline
-    public static LongVector fromByteBuffer(VectorSpecies<Long> species, ByteBuffer bb, int ix, VectorMask<Long> m) {
-        return zero(species).blend(fromByteBuffer(species, bb, ix), m);
+    public static LongVector fromByteBuffer(VectorSpecies<Long> species, ByteBuffer bb, int offset, VectorMask<Long> m) {
+        return zero(species).blend(fromByteBuffer(species, bb, offset), m);
     }
 
     /**
      * Returns a vector where all lane elements are set to the primitive
      * value {@code e}.
      *
-     * @param s species of the desired vector
+     * @param species species of the desired vector
      * @param e the value
      * @return a vector of vector where all lane elements are set to
      * the primitive value {@code e}
      */
     @ForceInline
     @SuppressWarnings("unchecked")
-    public static LongVector broadcast(VectorSpecies<Long> s, long e) {
+    public static LongVector broadcast(VectorSpecies<Long> species, long e) {
         return VectorIntrinsics.broadcastCoerced(
-            (Class<LongVector>) s.boxType(), long.class, s.length(),
-            e, s,
+            (Class<LongVector>) species.boxType(), long.class, species.length(),
+            e, species,
             ((bits, sp) -> ((LongSpecies)sp).op(i -> (long)bits)));
     }
 
     /**
-     * Returns a vector where each lane element is set to a given
-     * primitive value.
+     * Returns a vector where each lane element is set to given
+     * primitive values.
      * <p>
      * For each vector lane, where {@code N} is the vector lane index, the
      * the primitive value at index {@code N} is placed into the resulting
      * vector at lane index {@code N}.
      *
-     * @param s species of the desired vector
+     * @param species species of the desired vector
      * @param es the given primitive values
-     * @return a vector where each lane element is set to a given primitive
-     * value
-     * @throws IndexOutOfBoundsException if {@code es.length < this.length()}
+     * @return a vector where each lane element is set to given primitive
+     * values
+     * @throws IndexOutOfBoundsException if {@code es.length < species.length()}
      */
     @ForceInline
     @SuppressWarnings("unchecked")
-    public static LongVector scalars(VectorSpecies<Long> s, long... es) {
+    public static LongVector scalars(VectorSpecies<Long> species, long... es) {
         Objects.requireNonNull(es);
-        int ix = VectorIntrinsics.checkIndex(0, es.length, s.length());
-        return VectorIntrinsics.load((Class<LongVector>) s.boxType(), long.class, s.length(),
+        int ix = VectorIntrinsics.checkIndex(0, es.length, species.length());
+        return VectorIntrinsics.load((Class<LongVector>) species.boxType(), long.class, species.length(),
                                      es, Unsafe.ARRAY_LONG_BASE_OFFSET,
-                                     es, ix, s,
+                                     es, ix, species,
                                      (c, idx, sp) -> ((LongSpecies)sp).op(n -> c[idx + n]));
     }
 
@@ -438,14 +435,14 @@
      * value {@code e}, all other lane elements are set to the default
      * value.
      *
-     * @param s species of the desired vector
+     * @param species species of the desired vector
      * @param e the value
      * @return a vector where the first lane element is set to the primitive
      * value {@code e}
      */
     @ForceInline
-    public static final LongVector single(VectorSpecies<Long> s, long e) {
-        return zero(s).with(0, e);
+    public static final LongVector single(VectorSpecies<Long> species, long e) {
+        return zero(species).with(0, e);
     }
 
     /**
@@ -455,25 +452,28 @@
      * The semantics are equivalent to calling
      * {@link ThreadLocalRandom#nextLong()}
      *
-     * @param s species of the desired vector
+     * @param species species of the desired vector
      * @return a vector where each lane elements is set to a randomly
      * generated primitive value
      */
-    public static LongVector random(VectorSpecies<Long> s) {
+    public static LongVector random(VectorSpecies<Long> species) {
         ThreadLocalRandom r = ThreadLocalRandom.current();
-        return ((LongSpecies)s).op(i -> r.nextLong());
+        return ((LongSpecies)species).op(i -> r.nextLong());
     }
 
     // Ops
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public abstract LongVector add(Vector<Long> v);
 
     /**
      * Adds this vector to the broadcast of an input scalar.
      * <p>
-     * This is a vector binary operation where the primitive addition operation
-     * ({@code +}) is applied to lane elements.
+     * This is a lane-wise binary operation which applies the primitive addition operation
+     * ({@code +}) to each lane.
      *
      * @param s the input scalar
      * @return the result of adding this vector to the broadcast of an input
@@ -481,6 +481,9 @@
      */
     public abstract LongVector add(long s);
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public abstract LongVector add(Vector<Long> v, VectorMask<Long> m);
 
@@ -488,8 +491,8 @@
      * Adds this vector to broadcast of an input scalar,
      * selecting lane elements controlled by a mask.
      * <p>
-     * This is a vector binary operation where the primitive addition operation
-     * ({@code +}) is applied to lane elements.
+     * This is a lane-wise binary operation which applies the primitive addition operation
+     * ({@code +}) to each lane.
      *
      * @param s the input scalar
      * @param m the mask controlling lane selection
@@ -498,14 +501,17 @@
      */
     public abstract LongVector add(long s, VectorMask<Long> m);
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public abstract LongVector sub(Vector<Long> v);
 
     /**
      * Subtracts the broadcast of an input scalar from this vector.
      * <p>
-     * This is a vector binary operation where the primitive subtraction
-     * operation ({@code -}) is applied to lane elements.
+     * This is a lane-wise binary operation which applies the primitive subtraction
+     * operation ({@code -}) to each lane.
      *
      * @param s the input scalar
      * @return the result of subtracting the broadcast of an input
@@ -513,6 +519,9 @@
      */
     public abstract LongVector sub(long s);
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public abstract LongVector sub(Vector<Long> v, VectorMask<Long> m);
 
@@ -520,8 +529,8 @@
      * Subtracts the broadcast of an input scalar from this vector, selecting
      * lane elements controlled by a mask.
      * <p>
-     * This is a vector binary operation where the primitive subtraction
-     * operation ({@code -}) is applied to lane elements.
+     * This is a lane-wise binary operation which applies the primitive subtraction
+     * operation ({@code -}) to each lane.
      *
      * @param s the input scalar
      * @param m the mask controlling lane selection
@@ -530,14 +539,17 @@
      */
     public abstract LongVector sub(long s, VectorMask<Long> m);
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public abstract LongVector mul(Vector<Long> v);
 
     /**
      * Multiplies this vector with the broadcast of an input scalar.
      * <p>
-     * This is a vector binary operation where the primitive multiplication
-     * operation ({@code *}) is applied to lane elements.
+     * This is a lane-wise binary operation which applies the primitive multiplication
+     * operation ({@code *}) to each lane.
      *
      * @param s the input scalar
      * @return the result of multiplying this vector with the broadcast of an
@@ -545,6 +557,9 @@
      */
     public abstract LongVector mul(long s);
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public abstract LongVector mul(Vector<Long> v, VectorMask<Long> m);
 
@@ -552,8 +567,8 @@
      * Multiplies this vector with the broadcast of an input scalar, selecting
      * lane elements controlled by a mask.
      * <p>
-     * This is a vector binary operation where the primitive multiplication
-     * operation ({@code *}) is applied to lane elements.
+     * This is a lane-wise binary operation which applies the primitive multiplication
+     * operation ({@code *}) to each lane.
      *
      * @param s the input scalar
      * @param m the mask controlling lane selection
@@ -562,60 +577,87 @@
      */
     public abstract LongVector mul(long s, VectorMask<Long> m);
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public abstract LongVector neg();
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public abstract LongVector neg(VectorMask<Long> m);
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public abstract LongVector abs();
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public abstract LongVector abs(VectorMask<Long> m);
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public abstract LongVector min(Vector<Long> v);
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public abstract LongVector min(Vector<Long> v, VectorMask<Long> m);
 
     /**
      * Returns the minimum of this vector and the broadcast of an input scalar.
      * <p>
-     * This is a vector binary operation where the operation
-     * {@code (a, b) -> Math.min(a, b)} is applied to lane elements.
+     * This is a lane-wise binary operation which applies the operation
+     * {@code (a, b) -> Math.min(a, b)} to each lane.
      *
      * @param s the input scalar
      * @return the minimum of this vector and the broadcast of an input scalar
      */
     public abstract LongVector min(long s);
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public abstract LongVector max(Vector<Long> v);
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public abstract LongVector max(Vector<Long> v, VectorMask<Long> m);
 
     /**
      * Returns the maximum of this vector and the broadcast of an input scalar.
      * <p>
-     * This is a vector binary operation where the operation
-     * {@code (a, b) -> Math.max(a, b)} is applied to lane elements.
+     * This is a lane-wise binary operation which applies the operation
+     * {@code (a, b) -> Math.max(a, b)} to each lane.
      *
      * @param s the input scalar
      * @return the maximum of this vector and the broadcast of an input scalar
      */
     public abstract LongVector max(long s);
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public abstract VectorMask<Long> equal(Vector<Long> v);
 
     /**
      * Tests if this vector is equal to the broadcast of an input scalar.
      * <p>
-     * This is a vector binary test operation where the primitive equals
-     * operation ({@code ==}) is applied to lane elements.
+     * This is a lane-wise binary test operation which applies the primitive equals
+     * operation ({@code ==}) each lane.
      *
      * @param s the input scalar
      * @return the result mask of testing if this vector is equal to the
@@ -623,14 +665,17 @@
      */
     public abstract VectorMask<Long> equal(long s);
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public abstract VectorMask<Long> notEqual(Vector<Long> v);
 
     /**
      * Tests if this vector is not equal to the broadcast of an input scalar.
      * <p>
-     * This is a vector binary test operation where the primitive not equals
-     * operation ({@code !=}) is applied to lane elements.
+     * This is a lane-wise binary test operation which applies the primitive not equals
+     * operation ({@code !=}) to each lane.
      *
      * @param s the input scalar
      * @return the result mask of testing if this vector is not equal to the
@@ -638,14 +683,17 @@
      */
     public abstract VectorMask<Long> notEqual(long s);
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public abstract VectorMask<Long> lessThan(Vector<Long> v);
 
     /**
      * Tests if this vector is less than the broadcast of an input scalar.
      * <p>
-     * This is a vector binary test operation where the primitive less than
-     * operation ({@code <}) is applied to lane elements.
+     * This is a lane-wise binary test operation which applies the primitive less than
+     * operation ({@code <}) to each lane.
      *
      * @param s the input scalar
      * @return the mask result of testing if this vector is less than the
@@ -653,14 +701,17 @@
      */
     public abstract VectorMask<Long> lessThan(long s);
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public abstract VectorMask<Long> lessThanEq(Vector<Long> v);
 
     /**
      * Tests if this vector is less or equal to the broadcast of an input scalar.
      * <p>
-     * This is a vector binary test operation where the primitive less than
-     * or equal to operation ({@code <=}) is applied to lane elements.
+     * This is a lane-wise binary test operation which applies the primitive less than
+     * or equal to operation ({@code <=}) to each lane.
      *
      * @param s the input scalar
      * @return the mask result of testing if this vector is less than or equal
@@ -668,14 +719,17 @@
      */
     public abstract VectorMask<Long> lessThanEq(long s);
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public abstract VectorMask<Long> greaterThan(Vector<Long> v);
 
     /**
      * Tests if this vector is greater than the broadcast of an input scalar.
      * <p>
-     * This is a vector binary test operation where the primitive greater than
-     * operation ({@code >}) is applied to lane elements.
+     * This is a lane-wise binary test operation which applies the primitive greater than
+     * operation ({@code >}) to each lane.
      *
      * @param s the input scalar
      * @return the mask result of testing if this vector is greater than the
@@ -683,6 +737,9 @@
      */
     public abstract VectorMask<Long> greaterThan(long s);
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public abstract VectorMask<Long> greaterThanEq(Vector<Long> v);
 
@@ -690,8 +747,8 @@
      * Tests if this vector is greater than or equal to the broadcast of an
      * input scalar.
      * <p>
-     * This is a vector binary test operation where the primitive greater than
-     * or equal to operation ({@code >=}) is applied to lane elements.
+     * This is a lane-wise binary test operation which applies the primitive greater than
+     * or equal to operation ({@code >=}) to each lane.
      *
      * @param s the input scalar
      * @return the mask result of testing if this vector is greater than or
@@ -699,6 +756,9 @@
      */
     public abstract VectorMask<Long> greaterThanEq(long s);
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public abstract LongVector blend(Vector<Long> v, VectorMask<Long> m);
 
@@ -719,25 +779,46 @@
      */
     public abstract LongVector blend(long s, VectorMask<Long> m);
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public abstract LongVector rearrange(Vector<Long> v,
                                                       VectorShuffle<Long> s, VectorMask<Long> m);
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public abstract LongVector rearrange(VectorShuffle<Long> m);
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public abstract LongVector reshape(VectorSpecies<Long> s);
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public abstract LongVector rotateEL(int i);
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public abstract LongVector rotateER(int i);
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public abstract LongVector shiftEL(int i);
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public abstract LongVector shiftER(int i);
 
@@ -746,8 +827,8 @@
     /**
      * Bitwise ANDs this vector with an input vector.
      * <p>
-     * This is a vector binary operation where the primitive bitwise AND
-     * operation ({@code &}) is applied to lane elements.
+     * This is a lane-wise binary operation which applies the primitive bitwise AND
+     * operation ({@code &}) to each lane.
      *
      * @param v the input vector
      * @return the bitwise AND of this vector with the input vector
@@ -757,8 +838,8 @@
     /**
      * Bitwise ANDs this vector with the broadcast of an input scalar.
      * <p>
-     * This is a vector binary operation where the primitive bitwise AND
-     * operation ({@code &}) is applied to lane elements.
+     * This is a lane-wise binary operation which applies the primitive bitwise AND
+     * operation ({@code &}) to each lane.
      *
      * @param s the input scalar
      * @return the bitwise AND of this vector with the broadcast of an input
@@ -770,8 +851,8 @@
      * Bitwise ANDs this vector with an input vector, selecting lane elements
      * controlled by a mask.
      * <p>
-     * This is a vector binary operation where the primitive bitwise AND
-     * operation ({@code &}) is applied to lane elements.
+     * This is a lane-wise binary operation which applies the primitive bitwise AND
+     * operation ({@code &}) to each lane.
      *
      * @param v the input vector
      * @param m the mask controlling lane selection
@@ -783,8 +864,8 @@
      * Bitwise ANDs this vector with the broadcast of an input scalar, selecting
      * lane elements controlled by a mask.
      * <p>
-     * This is a vector binary operation where the primitive bitwise AND
-     * operation ({@code &}) is applied to lane elements.
+     * This is a lane-wise binary operation which applies the primitive bitwise AND
+     * operation ({@code &}) to each lane.
      *
      * @param s the input scalar
      * @param m the mask controlling lane selection
@@ -796,8 +877,8 @@
     /**
      * Bitwise ORs this vector with an input vector.
      * <p>
-     * This is a vector binary operation where the primitive bitwise OR
-     * operation ({@code |}) is applied to lane elements.
+     * This is a lane-wise binary operation which applies the primitive bitwise OR
+     * operation ({@code |}) to each lane.
      *
      * @param v the input vector
      * @return the bitwise OR of this vector with the input vector
@@ -807,8 +888,8 @@
     /**
      * Bitwise ORs this vector with the broadcast of an input scalar.
      * <p>
-     * This is a vector binary operation where the primitive bitwise OR
-     * operation ({@code |}) is applied to lane elements.
+     * This is a lane-wise binary operation which applies the primitive bitwise OR
+     * operation ({@code |}) to each lane.
      *
      * @param s the input scalar
      * @return the bitwise OR of this vector with the broadcast of an input
@@ -820,8 +901,8 @@
      * Bitwise ORs this vector with an input vector, selecting lane elements
      * controlled by a mask.
      * <p>
-     * This is a vector binary operation where the primitive bitwise OR
-     * operation ({@code |}) is applied to lane elements.
+     * This is a lane-wise binary operation which applies the primitive bitwise OR
+     * operation ({@code |}) to each lane.
      *
      * @param v the input vector
      * @param m the mask controlling lane selection
@@ -833,8 +914,8 @@
      * Bitwise ORs this vector with the broadcast of an input scalar, selecting
      * lane elements controlled by a mask.
      * <p>
-     * This is a vector binary operation where the primitive bitwise OR
-     * operation ({@code |}) is applied to lane elements.
+     * This is a lane-wise binary operation which applies the primitive bitwise OR
+     * operation ({@code |}) to each lane.
      *
      * @param s the input scalar
      * @param m the mask controlling lane selection
@@ -846,8 +927,8 @@
     /**
      * Bitwise XORs this vector with an input vector.
      * <p>
-     * This is a vector binary operation where the primitive bitwise XOR
-     * operation ({@code ^}) is applied to lane elements.
+     * This is a lane-wise binary operation which applies the primitive bitwise XOR
+     * operation ({@code ^}) to each lane.
      *
      * @param v the input vector
      * @return the bitwise XOR of this vector with the input vector
@@ -857,8 +938,8 @@
     /**
      * Bitwise XORs this vector with the broadcast of an input scalar.
      * <p>
-     * This is a vector binary operation where the primitive bitwise XOR
-     * operation ({@code ^}) is applied to lane elements.
+     * This is a lane-wise binary operation which applies the primitive bitwise XOR
+     * operation ({@code ^}) to each lane.
      *
      * @param s the input scalar
      * @return the bitwise XOR of this vector with the broadcast of an input
@@ -870,8 +951,8 @@
      * Bitwise XORs this vector with an input vector, selecting lane elements
      * controlled by a mask.
      * <p>
-     * This is a vector binary operation where the primitive bitwise XOR
-     * operation ({@code ^}) is applied to lane elements.
+     * This is a lane-wise binary operation which applies the primitive bitwise XOR
+     * operation ({@code ^}) to each lane.
      *
      * @param v the input vector
      * @param m the mask controlling lane selection
@@ -883,8 +964,8 @@
      * Bitwise XORs this vector with the broadcast of an input scalar, selecting
      * lane elements controlled by a mask.
      * <p>
-     * This is a vector binary operation where the primitive bitwise XOR
-     * operation ({@code ^}) is applied to lane elements.
+     * This is a lane-wise binary operation which applies the primitive bitwise XOR
+     * operation ({@code ^}) to each lane.
      *
      * @param s the input scalar
      * @param m the mask controlling lane selection
@@ -896,8 +977,8 @@
     /**
      * Bitwise NOTs this vector.
      * <p>
-     * This is a vector unary operation where the primitive bitwise NOT
-     * operation ({@code ~}) is applied to lane elements.
+     * This is a lane-wise unary operation which applies the primitive bitwise NOT
+     * operation ({@code ~}) to each lane.
      *
      * @return the bitwise NOT of this vector
      */
@@ -906,8 +987,8 @@
     /**
      * Bitwise NOTs this vector, selecting lane elements controlled by a mask.
      * <p>
-     * This is a vector unary operation where the primitive bitwise NOT
-     * operation ({@code ~}) is applied to lane elements.
+     * This is a lane-wise unary operation which applies the primitive bitwise NOT
+     * operation ({@code ~}) to each lane.
      *
      * @param m the mask controlling lane selection
      * @return the bitwise NOT of this vector
@@ -917,8 +998,8 @@
     /**
      * Logically left shifts this vector by the broadcast of an input scalar.
      * <p>
-     * This is a vector binary operation where the primitive logical left shift
-     * operation ({@code <<}) is applied to lane elements.
+     * This is a lane-wise binary operation which applies the primitive logical left shift
+     * operation ({@code <<}) to each lane.
      *
      * @param s the input scalar; the number of the bits to left shift
      * @return the result of logically left shifting left this vector by the
@@ -930,8 +1011,8 @@
      * Logically left shifts this vector by the broadcast of an input scalar,
      * selecting lane elements controlled by a mask.
      * <p>
-     * This is a vector binary operation where the primitive logical left shift
-     * operation ({@code <<}) is applied to lane elements.
+     * This is a lane-wise binary operation which applies the primitive logical left shift
+     * operation ({@code <<}) to each lane.
      *
      * @param s the input scalar; the number of the bits to left shift
      * @param m the mask controlling lane selection
@@ -943,8 +1024,8 @@
     /**
      * Logically left shifts this vector by an input vector.
      * <p>
-     * This is a vector binary operation where the primitive logical left shift
-     * operation ({@code <<}) is applied to lane elements.
+     * This is a lane-wise binary operation which applies the primitive logical left shift
+     * operation ({@code <<}) to each lane.
      *
      * @param v the input vector
      * @return the result of logically left shifting this vector by the input
@@ -956,8 +1037,8 @@
      * Logically left shifts this vector by an input vector, selecting lane
      * elements controlled by a mask.
      * <p>
-     * This is a vector binary operation where the primitive logical left shift
-     * operation ({@code <<}) is applied to lane elements.
+     * This is a lane-wise binary operation which applies the primitive logical left shift
+     * operation ({@code <<}) to each lane.
      *
      * @param v the input vector
      * @param m the mask controlling lane selection
@@ -974,8 +1055,8 @@
      * Logically right shifts (or unsigned right shifts) this vector by the
      * broadcast of an input scalar.
      * <p>
-     * This is a vector binary operation where the primitive logical right shift
-     * operation ({@code >>>}) is applied to lane elements.
+     * This is a lane-wise binary operation which applies the primitive logical right shift
+     * operation ({@code >>>}) to each lane.
      *
      * @param s the input scalar; the number of the bits to right shift
      * @return the result of logically right shifting this vector by the
@@ -988,8 +1069,8 @@
      * broadcast of an input scalar, selecting lane elements controlled by a
      * mask.
      * <p>
-     * This is a vector binary operation where the primitive logical right shift
-     * operation ({@code >>>}) is applied to lane elements.
+     * This is a lane-wise binary operation which applies the primitive logical right shift
+     * operation ({@code >>>}) to each lane.
      *
      * @param s the input scalar; the number of the bits to right shift
      * @param m the mask controlling lane selection
@@ -1002,8 +1083,8 @@
      * Logically right shifts (or unsigned right shifts) this vector by an
      * input vector.
      * <p>
-     * This is a vector binary operation where the primitive logical right shift
-     * operation ({@code >>>}) is applied to lane elements.
+     * This is a lane-wise binary operation which applies the primitive logical right shift
+     * operation ({@code >>>}) to each lane.
      *
      * @param v the input vector
      * @return the result of logically right shifting this vector by the
@@ -1015,8 +1096,8 @@
      * Logically right shifts (or unsigned right shifts) this vector by an
      * input vector, selecting lane elements controlled by a mask.
      * <p>
-     * This is a vector binary operation where the primitive logical right shift
-     * operation ({@code >>>}) is applied to lane elements.
+     * This is a lane-wise binary operation which applies the primitive logical right shift
+     * operation ({@code >>>}) to each lane.
      *
      * @param v the input vector
      * @param m the mask controlling lane selection
@@ -1031,8 +1112,8 @@
      * Arithmetically right shifts (or signed right shifts) this vector by the
      * broadcast of an input scalar.
      * <p>
-     * This is a vector binary operation where the primitive arithmetic right
-     * shift operation ({@code >>}) is applied to lane elements.
+     * This is a lane-wise binary operation which applies the primitive arithmetic right
+     * shift operation ({@code >>}) to each lane.
      *
      * @param s the input scalar; the number of the bits to right shift
      * @return the result of arithmetically right shifting this vector by the
@@ -1045,8 +1126,8 @@
      * broadcast of an input scalar, selecting lane elements controlled by a
      * mask.
      * <p>
-     * This is a vector binary operation where the primitive arithmetic right
-     * shift operation ({@code >>}) is applied to lane elements.
+     * This is a lane-wise binary operation which applies the primitive arithmetic right
+     * shift operation ({@code >>}) to each lane.
      *
      * @param s the input scalar; the number of the bits to right shift
      * @param m the mask controlling lane selection
@@ -1059,8 +1140,8 @@
      * Arithmetically right shifts (or signed right shifts) this vector by an
      * input vector.
      * <p>
-     * This is a vector binary operation where the primitive arithmetic right
-     * shift operation ({@code >>}) is applied to lane elements.
+     * This is a lane-wise binary operation which applies the primitive arithmetic right
+     * shift operation ({@code >>}) to each lane.
      *
      * @param v the input vector
      * @return the result of arithmetically right shifting this vector by the
@@ -1072,8 +1153,8 @@
      * Arithmetically right shifts (or signed right shifts) this vector by an
      * input vector, selecting lane elements controlled by a mask.
      * <p>
-     * This is a vector binary operation where the primitive arithmetic right
-     * shift operation ({@code >>}) is applied to lane elements.
+     * This is a lane-wise binary operation which applies the primitive arithmetic right
+     * shift operation ({@code >>}) to each lane.
      *
      * @param v the input vector
      * @param m the mask controlling lane selection
@@ -1087,8 +1168,8 @@
     /**
      * Rotates left this vector by the broadcast of an input scalar.
      * <p>
-     * This is a vector binary operation where the operation
-     * {@link Long#rotateLeft} is applied to lane elements and where
+     * This is a lane-wise binary operation which applies the operation
+     * {@link Long#rotateLeft} to each lane and where
      * lane elements of this vector apply to the first argument, and lane
      * elements of the broadcast vector apply to the second argument (the
      * rotation distance).
@@ -1106,8 +1187,8 @@
      * Rotates left this vector by the broadcast of an input scalar, selecting
      * lane elements controlled by a mask.
      * <p>
-     * This is a vector binary operation where the operation
-     * {@link Long#rotateLeft} is applied to lane elements and where
+     * This is a lane-wise binary operation which applies the operation
+     * {@link Long#rotateLeft} to each lane and where
      * lane elements of this vector apply to the first argument, and lane
      * elements of the broadcast vector apply to the second argument (the
      * rotation distance).
@@ -1125,8 +1206,8 @@
     /**
      * Rotates right this vector by the broadcast of an input scalar.
      * <p>
-     * This is a vector binary operation where the operation
-     * {@link Long#rotateRight} is applied to lane elements and where
+     * This is a lane-wise binary operation which applies the operation
+     * {@link Long#rotateRight} to each lane and where
      * lane elements of this vector apply to the first argument, and lane
      * elements of the broadcast vector apply to the second argument (the
      * rotation distance).
@@ -1144,8 +1225,8 @@
      * Rotates right this vector by the broadcast of an input scalar, selecting
      * lane elements controlled by a mask.
      * <p>
-     * This is a vector binary operation where the operation
-     * {@link Long#rotateRight} is applied to lane elements and where
+     * This is a lane-wise binary operation which applies the operation
+     * {@link Long#rotateRight} to each lane and where
      * lane elements of this vector apply to the first argument, and lane
      * elements of the broadcast vector apply to the second argument (the
      * rotation distance).
@@ -1160,15 +1241,27 @@
         return shiftR(s, m).or(shiftL(-s, m), m);
     }
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public abstract void intoByteArray(byte[] a, int ix);
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public abstract void intoByteArray(byte[] a, int ix, VectorMask<Long> m);
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public abstract void intoByteBuffer(ByteBuffer bb, int ix);
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public abstract void intoByteBuffer(ByteBuffer bb, int ix, VectorMask<Long> m);
 
@@ -1177,8 +1270,8 @@
     /**
      * Adds all lane elements of this vector.
      * <p>
-     * This is an associative vector reduction operation where the addition
-     * operation ({@code +}) is applied to lane elements,
+     * This is an associative cross-lane reduction operation which applies the addition
+     * operation ({@code +}) to lane elements,
      * and the identity value is {@code 0}.
      *
      * @return the addition of all the lane elements of this vector
@@ -1189,8 +1282,8 @@
      * Adds all lane elements of this vector, selecting lane elements
      * controlled by a mask.
      * <p>
-     * This is an associative vector reduction operation where the addition
-     * operation ({@code +}) is applied to lane elements,
+     * This is an associative cross-lane reduction operation which applies the addition
+     * operation ({@code +}) to lane elements,
      * and the identity value is {@code 0}.
      *
      * @param m the mask controlling lane selection
@@ -1201,8 +1294,8 @@
     /**
      * Multiplies all lane elements of this vector.
      * <p>
-     * This is an associative vector reduction operation where the
-     * multiplication operation ({@code *}) is applied to lane elements,
+     * This is an associative cross-lane reduction operation which applies the
+     * multiplication operation ({@code *}) to lane elements,
      * and the identity value is {@code 1}.
      *
      * @return the multiplication of all the lane elements of this vector
@@ -1213,8 +1306,8 @@
      * Multiplies all lane elements of this vector, selecting lane elements
      * controlled by a mask.
      * <p>
-     * This is an associative vector reduction operation where the
-     * multiplication operation ({@code *}) is applied to lane elements,
+     * This is an associative cross-lane reduction operation which applies the
+     * multiplication operation ({@code *}) to lane elements,
      * and the identity value is {@code 1}.
      *
      * @param m the mask controlling lane selection
@@ -1225,8 +1318,8 @@
     /**
      * Returns the minimum lane element of this vector.
      * <p>
-     * This is an associative vector reduction operation where the operation
-     * {@code (a, b) -> Math.min(a, b)} is applied to lane elements,
+     * This is an associative cross-lane reduction operation which applies the operation
+     * {@code (a, b) -> Math.min(a, b)} to lane elements,
      * and the identity value is
      * {@link Long#MAX_VALUE}.
      *
@@ -1238,8 +1331,8 @@
      * Returns the minimum lane element of this vector, selecting lane elements
      * controlled by a mask.
      * <p>
-     * This is an associative vector reduction operation where the operation
-     * {@code (a, b) -> Math.min(a, b)} is applied to lane elements,
+     * This is an associative cross-lane reduction operation which applies the operation
+     * {@code (a, b) -> Math.min(a, b)} to lane elements,
      * and the identity value is
      * {@link Long#MAX_VALUE}.
      *
@@ -1251,8 +1344,8 @@
     /**
      * Returns the maximum lane element of this vector.
      * <p>
-     * This is an associative vector reduction operation where the operation
-     * {@code (a, b) -> Math.max(a, b)} is applied to lane elements,
+     * This is an associative cross-lane reduction operation which applies the operation
+     * {@code (a, b) -> Math.max(a, b)} to lane elements,
      * and the identity value is
      * {@link Long#MIN_VALUE}.
      *
@@ -1264,8 +1357,8 @@
      * Returns the maximum lane element of this vector, selecting lane elements
      * controlled by a mask.
      * <p>
-     * This is an associative vector reduction operation where the operation
-     * {@code (a, b) -> Math.max(a, b)} is applied to lane elements,
+     * This is an associative cross-lane reduction operation which applies the operation
+     * {@code (a, b) -> Math.max(a, b)} to lane elements,
      * and the identity value is
      * {@link Long#MIN_VALUE}.
      *
@@ -1277,8 +1370,8 @@
     /**
      * Logically ORs all lane elements of this vector.
      * <p>
-     * This is an associative vector reduction operation where the logical OR
-     * operation ({@code |}) is applied to lane elements,
+     * This is an associative cross-lane reduction operation which applies the logical OR
+     * operation ({@code |}) to lane elements,
      * and the identity value is {@code 0}.
      *
      * @return the logical OR all the lane elements of this vector
@@ -1289,8 +1382,8 @@
      * Logically ORs all lane elements of this vector, selecting lane elements
      * controlled by a mask.
      * <p>
-     * This is an associative vector reduction operation where the logical OR
-     * operation ({@code |}) is applied to lane elements,
+     * This is an associative cross-lane reduction operation which applies the logical OR
+     * operation ({@code |}) to lane elements,
      * and the identity value is {@code 0}.
      *
      * @param m the mask controlling lane selection
@@ -1301,8 +1394,8 @@
     /**
      * Logically ANDs all lane elements of this vector.
      * <p>
-     * This is an associative vector reduction operation where the logical AND
-     * operation ({@code |}) is applied to lane elements,
+     * This is an associative cross-lane reduction operation which applies the logical AND
+     * operation ({@code |}) to lane elements,
      * and the identity value is {@code -1}.
      *
      * @return the logical AND all the lane elements of this vector
@@ -1313,8 +1406,8 @@
      * Logically ANDs all lane elements of this vector, selecting lane elements
      * controlled by a mask.
      * <p>
-     * This is an associative vector reduction operation where the logical AND
-     * operation ({@code |}) is applied to lane elements,
+     * This is an associative cross-lane reduction operation which applies the logical AND
+     * operation ({@code |}) to lane elements,
      * and the identity value is {@code -1}.
      *
      * @param m the mask controlling lane selection
@@ -1325,8 +1418,8 @@
     /**
      * Logically XORs all lane elements of this vector.
      * <p>
-     * This is an associative vector reduction operation where the logical XOR
-     * operation ({@code ^}) is applied to lane elements,
+     * This is an associative cross-lane reduction operation which applies the logical XOR
+     * operation ({@code ^}) to lane elements,
      * and the identity value is {@code 0}.
      *
      * @return the logical XOR all the lane elements of this vector
@@ -1337,8 +1430,8 @@
      * Logically XORs all lane elements of this vector, selecting lane elements
      * controlled by a mask.
      * <p>
-     * This is an associative vector reduction operation where the logical XOR
-     * operation ({@code ^}) is applied to lane elements,
+     * This is an associative cross-lane reduction operation which applies the logical XOR
+     * operation ({@code ^}) to lane elements,
      * and the identity value is {@code 0}.
      *
      * @param m the mask controlling lane selection
@@ -1356,7 +1449,7 @@
      * @throws IllegalArgumentException if the index is is out of range
      * ({@code < 0 || >= length()})
      */
-    public abstract long get(int i);
+    public abstract long lane(int i);
 
     /**
      * Replaces the lane element of this vector at lane index {@code i} with
@@ -1403,30 +1496,30 @@
      * <p>
      * For each vector lane, where {@code N} is the vector lane index,
      * the lane element at index {@code N} is stored into the array at index
-     * {@code i + N}.
+     * {@code offset + N}.
      *
      * @param a the array
-     * @param i the offset into the array
-     * @throws IndexOutOfBoundsException if {@code i < 0}, or
-     * {@code i > a.length - this.length()}
+     * @param offset the offset into the array
+     * @throws IndexOutOfBoundsException if {@code offset < 0}, or
+     * {@code offset > a.length - this.length()}
      */
-    public abstract void intoArray(long[] a, int i);
+    public abstract void intoArray(long[] a, int offset);
 
     /**
      * Stores this vector into an array starting at offset and using a mask.
      * <p>
      * For each vector lane, where {@code N} is the vector lane index,
      * if the mask lane at index {@code N} is set then the lane element at
-     * index {@code N} is stored into the array index {@code i + N}.
+     * index {@code N} is stored into the array index {@code offset + N}.
      *
      * @param a the array
-     * @param i the offset into the array
+     * @param offset the offset into the array
      * @param m the mask
-     * @throws IndexOutOfBoundsException if {@code i < 0}, or
+     * @throws IndexOutOfBoundsException if {@code offset < 0}, or
      * for any vector lane index {@code N} where the mask at lane {@code N}
-     * is set {@code i >= a.length - N}
+     * is set {@code offset >= a.length - N}
      */
-    public abstract void intoArray(long[] a, int i, VectorMask<Long> m);
+    public abstract void intoArray(long[] a, int offset, VectorMask<Long> m);
 
     /**
      * Stores this vector into an array using indexes obtained from an index
@@ -1434,20 +1527,20 @@
      * <p>
      * For each vector lane, where {@code N} is the vector lane index, the
      * lane element at index {@code N} is stored into the array at index
-     * {@code i + indexMap[j + N]}.
+     * {@code a_offset + indexMap[i_offset + N]}.
      *
      * @param a the array
-     * @param i the offset into the array, may be negative if relative
+     * @param a_offset the offset into the array, may be negative if relative
      * indexes in the index map compensate to produce a value within the
      * array bounds
      * @param indexMap the index map
-     * @param j the offset into the index map
-     * @throws IndexOutOfBoundsException if {@code j < 0}, or
-     * {@code j > indexMap.length - this.length()},
+     * @param i_offset the offset into the index map
+     * @throws IndexOutOfBoundsException if {@code i_offset < 0}, or
+     * {@code i_offset > indexMap.length - this.length()},
      * or for any vector lane index {@code N} the result of
-     * {@code i + indexMap[j + N]} is {@code < 0} or {@code >= a.length}
+     * {@code a_offset + indexMap[i_offset + N]} is {@code < 0} or {@code >= a.length}
      */
-    public abstract void intoArray(long[] a, int i, int[] indexMap, int j);
+    public abstract void intoArray(long[] a, int a_offset, int[] indexMap, int i_offset);
 
     /**
      * Stores this vector into an array using indexes obtained from an index
@@ -1456,24 +1549,27 @@
      * For each vector lane, where {@code N} is the vector lane index,
      * if the mask lane at index {@code N} is set then the lane element at
      * index {@code N} is stored into the array at index
-     * {@code i + indexMap[j + N]}.
+     * {@code a_offset + indexMap[i_offset + N]}.
      *
      * @param a the array
-     * @param i the offset into the array, may be negative if relative
+     * @param a_offset the offset into the array, may be negative if relative
      * indexes in the index map compensate to produce a value within the
      * array bounds
      * @param m the mask
      * @param indexMap the index map
-     * @param j the offset into the index map
+     * @param i_offset the offset into the index map
      * @throws IndexOutOfBoundsException if {@code j < 0}, or
-     * {@code j > indexMap.length - this.length()},
+     * {@code i_offset > indexMap.length - this.length()},
      * or for any vector lane index {@code N} where the mask at lane
-     * {@code N} is set the result of {@code i + indexMap[j + N]} is
+     * {@code N} is set the result of {@code a_offset + indexMap[i_offset + N]} is
      * {@code < 0} or {@code >= a.length}
      */
-    public abstract void intoArray(long[] a, int i, VectorMask<Long> m, int[] indexMap, int j);
+    public abstract void intoArray(long[] a, int a_offset, VectorMask<Long> m, int[] indexMap, int i_offset);
     // Species
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public abstract VectorSpecies<Long> species();
 
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Short128Vector.java	Thu Apr 18 23:47:37 2019 -0700
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Short128Vector.java	Fri Apr 19 11:35:36 2019 -0700
@@ -171,37 +171,37 @@
         if (stype == byte.class) {
             byte[] a = new byte[limit];
             for (int i = 0; i < limit; i++) {
-                a[i] = (byte) this.get(i);
+                a[i] = (byte) this.lane(i);
             }
             return (Vector) ByteVector.fromArray((VectorSpecies<Byte>) s, a, 0);
         } else if (stype == short.class) {
             short[] a = new short[limit];
             for (int i = 0; i < limit; i++) {
-                a[i] = (short) this.get(i);
+                a[i] = (short) this.lane(i);
             }
             return (Vector) ShortVector.fromArray((VectorSpecies<Short>) s, a, 0);
         } else if (stype == int.class) {
             int[] a = new int[limit];
             for (int i = 0; i < limit; i++) {
-                a[i] = (int) this.get(i);
+                a[i] = (int) this.lane(i);
             }
             return (Vector) IntVector.fromArray((VectorSpecies<Integer>) s, a, 0);
         } else if (stype == long.class) {
             long[] a = new long[limit];
             for (int i = 0; i < limit; i++) {
-                a[i] = (long) this.get(i);
+                a[i] = (long) this.lane(i);
             }
             return (Vector) LongVector.fromArray((VectorSpecies<Long>) s, a, 0);
         } else if (stype == float.class) {
             float[] a = new float[limit];
             for (int i = 0; i < limit; i++) {
-                a[i] = (float) this.get(i);
+                a[i] = (float) this.lane(i);
             }
             return (Vector) FloatVector.fromArray((VectorSpecies<Float>) s, a, 0);
         } else if (stype == double.class) {
             double[] a = new double[limit];
             for (int i = 0; i < limit; i++) {
-                a[i] = (double) this.get(i);
+                a[i] = (double) this.lane(i);
             }
             return (Vector) DoubleVector.fromArray((VectorSpecies<Double>) s, a, 0);
         } else {
@@ -1090,8 +1090,8 @@
             Short128Vector.class, Short128Shuffle.class, short.class, LENGTH,
             this, s,
             (v1, s_) -> v1.uOp((i, a) -> {
-                int ei = s_.getElement(i);
-                return v1.get(ei);
+                int ei = s_.lane(i);
+                return v1.lane(ei);
             }));
     }
 
@@ -1106,13 +1106,13 @@
         return VectorIntrinsics.blend(
             Short128Vector.class, Short128Mask.class, short.class, LENGTH,
             this, v, m,
-            (v1, v2, m_) -> v1.bOp(v2, (i, a, b) -> m_.getElement(i) ? b : a));
+            (v1, v2, m_) -> v1.bOp(v2, (i, a, b) -> m_.lane(i) ? b : a));
     }
 
     // Accessors
 
     @Override
-    public short get(int i) {
+    public short lane(int i) {
         if (i < 0 || i >= LENGTH) {
             throw new IllegalArgumentException("Index " + i + " must be zero or positive, and less than " + LENGTH);
         }
@@ -1313,7 +1313,7 @@
         public ShortVector toVector() {
             short[] va = new short[SPECIES.length()];
             for (int i = 0; i < va.length; i++) {
-              va[i] = (short) getElement(i);
+              va[i] = (short) lane(i);
             }
             return ShortVector.fromArray(SPECIES, va, 0);
         }
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Short256Vector.java	Thu Apr 18 23:47:37 2019 -0700
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Short256Vector.java	Fri Apr 19 11:35:36 2019 -0700
@@ -171,37 +171,37 @@
         if (stype == byte.class) {
             byte[] a = new byte[limit];
             for (int i = 0; i < limit; i++) {
-                a[i] = (byte) this.get(i);
+                a[i] = (byte) this.lane(i);
             }
             return (Vector) ByteVector.fromArray((VectorSpecies<Byte>) s, a, 0);
         } else if (stype == short.class) {
             short[] a = new short[limit];
             for (int i = 0; i < limit; i++) {
-                a[i] = (short) this.get(i);
+                a[i] = (short) this.lane(i);
             }
             return (Vector) ShortVector.fromArray((VectorSpecies<Short>) s, a, 0);
         } else if (stype == int.class) {
             int[] a = new int[limit];
             for (int i = 0; i < limit; i++) {
-                a[i] = (int) this.get(i);
+                a[i] = (int) this.lane(i);
             }
             return (Vector) IntVector.fromArray((VectorSpecies<Integer>) s, a, 0);
         } else if (stype == long.class) {
             long[] a = new long[limit];
             for (int i = 0; i < limit; i++) {
-                a[i] = (long) this.get(i);
+                a[i] = (long) this.lane(i);
             }
             return (Vector) LongVector.fromArray((VectorSpecies<Long>) s, a, 0);
         } else if (stype == float.class) {
             float[] a = new float[limit];
             for (int i = 0; i < limit; i++) {
-                a[i] = (float) this.get(i);
+                a[i] = (float) this.lane(i);
             }
             return (Vector) FloatVector.fromArray((VectorSpecies<Float>) s, a, 0);
         } else if (stype == double.class) {
             double[] a = new double[limit];
             for (int i = 0; i < limit; i++) {
-                a[i] = (double) this.get(i);
+                a[i] = (double) this.lane(i);
             }
             return (Vector) DoubleVector.fromArray((VectorSpecies<Double>) s, a, 0);
         } else {
@@ -1090,8 +1090,8 @@
             Short256Vector.class, Short256Shuffle.class, short.class, LENGTH,
             this, s,
             (v1, s_) -> v1.uOp((i, a) -> {
-                int ei = s_.getElement(i);
-                return v1.get(ei);
+                int ei = s_.lane(i);
+                return v1.lane(ei);
             }));
     }
 
@@ -1106,13 +1106,13 @@
         return VectorIntrinsics.blend(
             Short256Vector.class, Short256Mask.class, short.class, LENGTH,
             this, v, m,
-            (v1, v2, m_) -> v1.bOp(v2, (i, a, b) -> m_.getElement(i) ? b : a));
+            (v1, v2, m_) -> v1.bOp(v2, (i, a, b) -> m_.lane(i) ? b : a));
     }
 
     // Accessors
 
     @Override
-    public short get(int i) {
+    public short lane(int i) {
         if (i < 0 || i >= LENGTH) {
             throw new IllegalArgumentException("Index " + i + " must be zero or positive, and less than " + LENGTH);
         }
@@ -1313,7 +1313,7 @@
         public ShortVector toVector() {
             short[] va = new short[SPECIES.length()];
             for (int i = 0; i < va.length; i++) {
-              va[i] = (short) getElement(i);
+              va[i] = (short) lane(i);
             }
             return ShortVector.fromArray(SPECIES, va, 0);
         }
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Short512Vector.java	Thu Apr 18 23:47:37 2019 -0700
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Short512Vector.java	Fri Apr 19 11:35:36 2019 -0700
@@ -171,37 +171,37 @@
         if (stype == byte.class) {
             byte[] a = new byte[limit];
             for (int i = 0; i < limit; i++) {
-                a[i] = (byte) this.get(i);
+                a[i] = (byte) this.lane(i);
             }
             return (Vector) ByteVector.fromArray((VectorSpecies<Byte>) s, a, 0);
         } else if (stype == short.class) {
             short[] a = new short[limit];
             for (int i = 0; i < limit; i++) {
-                a[i] = (short) this.get(i);
+                a[i] = (short) this.lane(i);
             }
             return (Vector) ShortVector.fromArray((VectorSpecies<Short>) s, a, 0);
         } else if (stype == int.class) {
             int[] a = new int[limit];
             for (int i = 0; i < limit; i++) {
-                a[i] = (int) this.get(i);
+                a[i] = (int) this.lane(i);
             }
             return (Vector) IntVector.fromArray((VectorSpecies<Integer>) s, a, 0);
         } else if (stype == long.class) {
             long[] a = new long[limit];
             for (int i = 0; i < limit; i++) {
-                a[i] = (long) this.get(i);
+                a[i] = (long) this.lane(i);
             }
             return (Vector) LongVector.fromArray((VectorSpecies<Long>) s, a, 0);
         } else if (stype == float.class) {
             float[] a = new float[limit];
             for (int i = 0; i < limit; i++) {
-                a[i] = (float) this.get(i);
+                a[i] = (float) this.lane(i);
             }
             return (Vector) FloatVector.fromArray((VectorSpecies<Float>) s, a, 0);
         } else if (stype == double.class) {
             double[] a = new double[limit];
             for (int i = 0; i < limit; i++) {
-                a[i] = (double) this.get(i);
+                a[i] = (double) this.lane(i);
             }
             return (Vector) DoubleVector.fromArray((VectorSpecies<Double>) s, a, 0);
         } else {
@@ -1090,8 +1090,8 @@
             Short512Vector.class, Short512Shuffle.class, short.class, LENGTH,
             this, s,
             (v1, s_) -> v1.uOp((i, a) -> {
-                int ei = s_.getElement(i);
-                return v1.get(ei);
+                int ei = s_.lane(i);
+                return v1.lane(ei);
             }));
     }
 
@@ -1106,13 +1106,13 @@
         return VectorIntrinsics.blend(
             Short512Vector.class, Short512Mask.class, short.class, LENGTH,
             this, v, m,
-            (v1, v2, m_) -> v1.bOp(v2, (i, a, b) -> m_.getElement(i) ? b : a));
+            (v1, v2, m_) -> v1.bOp(v2, (i, a, b) -> m_.lane(i) ? b : a));
     }
 
     // Accessors
 
     @Override
-    public short get(int i) {
+    public short lane(int i) {
         if (i < 0 || i >= LENGTH) {
             throw new IllegalArgumentException("Index " + i + " must be zero or positive, and less than " + LENGTH);
         }
@@ -1313,7 +1313,7 @@
         public ShortVector toVector() {
             short[] va = new short[SPECIES.length()];
             for (int i = 0; i < va.length; i++) {
-              va[i] = (short) getElement(i);
+              va[i] = (short) lane(i);
             }
             return ShortVector.fromArray(SPECIES, va, 0);
         }
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Short64Vector.java	Thu Apr 18 23:47:37 2019 -0700
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Short64Vector.java	Fri Apr 19 11:35:36 2019 -0700
@@ -171,37 +171,37 @@
         if (stype == byte.class) {
             byte[] a = new byte[limit];
             for (int i = 0; i < limit; i++) {
-                a[i] = (byte) this.get(i);
+                a[i] = (byte) this.lane(i);
             }
             return (Vector) ByteVector.fromArray((VectorSpecies<Byte>) s, a, 0);
         } else if (stype == short.class) {
             short[] a = new short[limit];
             for (int i = 0; i < limit; i++) {
-                a[i] = (short) this.get(i);
+                a[i] = (short) this.lane(i);
             }
             return (Vector) ShortVector.fromArray((VectorSpecies<Short>) s, a, 0);
         } else if (stype == int.class) {
             int[] a = new int[limit];
             for (int i = 0; i < limit; i++) {
-                a[i] = (int) this.get(i);
+                a[i] = (int) this.lane(i);
             }
             return (Vector) IntVector.fromArray((VectorSpecies<Integer>) s, a, 0);
         } else if (stype == long.class) {
             long[] a = new long[limit];
             for (int i = 0; i < limit; i++) {
-                a[i] = (long) this.get(i);
+                a[i] = (long) this.lane(i);
             }
             return (Vector) LongVector.fromArray((VectorSpecies<Long>) s, a, 0);
         } else if (stype == float.class) {
             float[] a = new float[limit];
             for (int i = 0; i < limit; i++) {
-                a[i] = (float) this.get(i);
+                a[i] = (float) this.lane(i);
             }
             return (Vector) FloatVector.fromArray((VectorSpecies<Float>) s, a, 0);
         } else if (stype == double.class) {
             double[] a = new double[limit];
             for (int i = 0; i < limit; i++) {
-                a[i] = (double) this.get(i);
+                a[i] = (double) this.lane(i);
             }
             return (Vector) DoubleVector.fromArray((VectorSpecies<Double>) s, a, 0);
         } else {
@@ -1090,8 +1090,8 @@
             Short64Vector.class, Short64Shuffle.class, short.class, LENGTH,
             this, s,
             (v1, s_) -> v1.uOp((i, a) -> {
-                int ei = s_.getElement(i);
-                return v1.get(ei);
+                int ei = s_.lane(i);
+                return v1.lane(ei);
             }));
     }
 
@@ -1106,13 +1106,13 @@
         return VectorIntrinsics.blend(
             Short64Vector.class, Short64Mask.class, short.class, LENGTH,
             this, v, m,
-            (v1, v2, m_) -> v1.bOp(v2, (i, a, b) -> m_.getElement(i) ? b : a));
+            (v1, v2, m_) -> v1.bOp(v2, (i, a, b) -> m_.lane(i) ? b : a));
     }
 
     // Accessors
 
     @Override
-    public short get(int i) {
+    public short lane(int i) {
         if (i < 0 || i >= LENGTH) {
             throw new IllegalArgumentException("Index " + i + " must be zero or positive, and less than " + LENGTH);
         }
@@ -1313,7 +1313,7 @@
         public ShortVector toVector() {
             short[] va = new short[SPECIES.length()];
             for (int i = 0; i < va.length; i++) {
-              va[i] = (short) getElement(i);
+              va[i] = (short) lane(i);
             }
             return ShortVector.fromArray(SPECIES, va, 0);
         }
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/ShortMaxVector.java	Thu Apr 18 23:47:37 2019 -0700
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/ShortMaxVector.java	Fri Apr 19 11:35:36 2019 -0700
@@ -171,37 +171,37 @@
         if (stype == byte.class) {
             byte[] a = new byte[limit];
             for (int i = 0; i < limit; i++) {
-                a[i] = (byte) this.get(i);
+                a[i] = (byte) this.lane(i);
             }
             return (Vector) ByteVector.fromArray((VectorSpecies<Byte>) s, a, 0);
         } else if (stype == short.class) {
             short[] a = new short[limit];
             for (int i = 0; i < limit; i++) {
-                a[i] = (short) this.get(i);
+                a[i] = (short) this.lane(i);
             }
             return (Vector) ShortVector.fromArray((VectorSpecies<Short>) s, a, 0);
         } else if (stype == int.class) {
             int[] a = new int[limit];
             for (int i = 0; i < limit; i++) {
-                a[i] = (int) this.get(i);
+                a[i] = (int) this.lane(i);
             }
             return (Vector) IntVector.fromArray((VectorSpecies<Integer>) s, a, 0);
         } else if (stype == long.class) {
             long[] a = new long[limit];
             for (int i = 0; i < limit; i++) {
-                a[i] = (long) this.get(i);
+                a[i] = (long) this.lane(i);
             }
             return (Vector) LongVector.fromArray((VectorSpecies<Long>) s, a, 0);
         } else if (stype == float.class) {
             float[] a = new float[limit];
             for (int i = 0; i < limit; i++) {
-                a[i] = (float) this.get(i);
+                a[i] = (float) this.lane(i);
             }
             return (Vector) FloatVector.fromArray((VectorSpecies<Float>) s, a, 0);
         } else if (stype == double.class) {
             double[] a = new double[limit];
             for (int i = 0; i < limit; i++) {
-                a[i] = (double) this.get(i);
+                a[i] = (double) this.lane(i);
             }
             return (Vector) DoubleVector.fromArray((VectorSpecies<Double>) s, a, 0);
         } else {
@@ -1090,8 +1090,8 @@
             ShortMaxVector.class, ShortMaxShuffle.class, short.class, LENGTH,
             this, s,
             (v1, s_) -> v1.uOp((i, a) -> {
-                int ei = s_.getElement(i);
-                return v1.get(ei);
+                int ei = s_.lane(i);
+                return v1.lane(ei);
             }));
     }
 
@@ -1106,13 +1106,13 @@
         return VectorIntrinsics.blend(
             ShortMaxVector.class, ShortMaxMask.class, short.class, LENGTH,
             this, v, m,
-            (v1, v2, m_) -> v1.bOp(v2, (i, a, b) -> m_.getElement(i) ? b : a));
+            (v1, v2, m_) -> v1.bOp(v2, (i, a, b) -> m_.lane(i) ? b : a));
     }
 
     // Accessors
 
     @Override
-    public short get(int i) {
+    public short lane(int i) {
         if (i < 0 || i >= LENGTH) {
             throw new IllegalArgumentException("Index " + i + " must be zero or positive, and less than " + LENGTH);
         }
@@ -1313,7 +1313,7 @@
         public ShortVector toVector() {
             short[] va = new short[SPECIES.length()];
             for (int i = 0; i < va.length; i++) {
-              va[i] = (short) getElement(i);
+              va[i] = (short) lane(i);
             }
             return ShortVector.fromArray(SPECIES, va, 0);
         }
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/ShortVector.java	Thu Apr 18 23:47:37 2019 -0700
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/ShortVector.java	Fri Apr 19 11:35:36 2019 -0700
@@ -125,26 +125,26 @@
      * <p>
      * This method behaves as if it returns the result of calling the
      * byte buffer, offset, and mask accepting
-     * {@link #fromByteBuffer(VectorSpecies<Short>, ByteBuffer, int, VectorMask) method} as follows:
+     * {@link #fromByteBuffer(VectorSpecies, ByteBuffer, int, VectorMask) method} as follows:
      * <pre>{@code
-     * return this.fromByteBuffer(ByteBuffer.wrap(a), i, this.maskAllTrue());
+     * return fromByteBuffer(species, ByteBuffer.wrap(a), offset, VectorMask.allTrue());
      * }</pre>
      *
      * @param species species of desired vector
      * @param a the byte array
-     * @param ix the offset into the array
+     * @param offset the offset into the array
      * @return a vector loaded from a byte array
      * @throws IndexOutOfBoundsException if {@code i < 0} or
-     * {@code i > a.length - (this.length() * this.elementSize() / Byte.SIZE)}
+     * {@code offset > a.length - (species.length() * species.elementSize() / Byte.SIZE)}
      */
     @ForceInline
     @SuppressWarnings("unchecked")
-    public static ShortVector fromByteArray(VectorSpecies<Short> species, byte[] a, int ix) {
+    public static ShortVector fromByteArray(VectorSpecies<Short> species, byte[] a, int offset) {
         Objects.requireNonNull(a);
-        ix = VectorIntrinsics.checkIndex(ix, a.length, species.bitSize() / Byte.SIZE);
+        offset = VectorIntrinsics.checkIndex(offset, a.length, species.bitSize() / Byte.SIZE);
         return VectorIntrinsics.load((Class<ShortVector>) species.boxType(), short.class, species.length(),
-                                     a, ((long) ix) + Unsafe.ARRAY_BYTE_BASE_OFFSET,
-                                     a, ix, species,
+                                     a, ((long) offset) + Unsafe.ARRAY_BYTE_BASE_OFFSET,
+                                     a, offset, species,
                                      (c, idx, s) -> {
                                          ByteBuffer bbc = ByteBuffer.wrap(c, idx, a.length - idx).order(ByteOrder.nativeOrder());
                                          ShortBuffer tb = bbc.asShortBuffer();
@@ -161,51 +161,48 @@
      * <p>
      * This method behaves as if it returns the result of calling the
      * byte buffer, offset, and mask accepting
-     * {@link #fromByteBuffer(VectorSpecies<Short>, ByteBuffer, int, VectorMask) method} as follows:
+     * {@link #fromByteBuffer(VectorSpecies, ByteBuffer, int, VectorMask) method} as follows:
      * <pre>{@code
-     * return this.fromByteBuffer(ByteBuffer.wrap(a), i, m);
+     * return fromByteBuffer(species, ByteBuffer.wrap(a), offset, m);
      * }</pre>
      *
      * @param species species of desired vector
      * @param a the byte array
-     * @param ix the offset into the array
+     * @param offset the offset into the array
      * @param m the mask
      * @return a vector loaded from a byte array
-     * @throws IndexOutOfBoundsException if {@code i < 0} or
-     * {@code i > a.length - (this.length() * this.elementSize() / Byte.SIZE)}
-     * @throws IndexOutOfBoundsException if the offset is {@code < 0},
-     * or {@code > a.length},
+     * @throws IndexOutOfBoundsException if {@code offset < 0} or
      * for any vector lane index {@code N} where the mask at lane {@code N}
      * is set
-     * {@code i >= a.length - (N * this.elementSize() / Byte.SIZE)}
+     * {@code offset >= a.length - (N * species.elementSize() / Byte.SIZE)}
      */
     @ForceInline
-    public static ShortVector fromByteArray(VectorSpecies<Short> species, byte[] a, int ix, VectorMask<Short> m) {
-        return zero(species).blend(fromByteArray(species, a, ix), m);
+    public static ShortVector fromByteArray(VectorSpecies<Short> species, byte[] a, int offset, VectorMask<Short> m) {
+        return zero(species).blend(fromByteArray(species, a, offset), m);
     }
 
     /**
      * Loads a vector from an array starting at offset.
      * <p>
      * For each vector lane, where {@code N} is the vector lane index, the
-     * array element at index {@code i + N} is placed into the
+     * array element at index {@code offset + N} is placed into the
      * resulting vector at lane index {@code N}.
      *
      * @param species species of desired vector
      * @param a the array
-     * @param i the offset into the array
+     * @param offset the offset into the array
      * @return the vector loaded from an array
-     * @throws IndexOutOfBoundsException if {@code i < 0}, or
-     * {@code i > a.length - this.length()}
+     * @throws IndexOutOfBoundsException if {@code offset < 0}, or
+     * {@code offset > a.length - species.length()}
      */
     @ForceInline
     @SuppressWarnings("unchecked")
-    public static ShortVector fromArray(VectorSpecies<Short> species, short[] a, int i){
+    public static ShortVector fromArray(VectorSpecies<Short> species, short[] a, int offset){
         Objects.requireNonNull(a);
-        i = VectorIntrinsics.checkIndex(i, a.length, species.length());
+        offset = VectorIntrinsics.checkIndex(offset, a.length, species.length());
         return VectorIntrinsics.load((Class<ShortVector>) species.boxType(), short.class, species.length(),
-                                     a, (((long) i) << ARRAY_SHIFT) + Unsafe.ARRAY_SHORT_BASE_OFFSET,
-                                     a, i, species,
+                                     a, (((long) offset) << ARRAY_SHIFT) + Unsafe.ARRAY_SHORT_BASE_OFFSET,
+                                     a, offset, species,
                                      (c, idx, s) -> ((ShortSpecies)s).op(n -> c[idx + n]));
     }
 
@@ -215,22 +212,22 @@
      * <p>
      * For each vector lane, where {@code N} is the vector lane index,
      * if the mask lane at index {@code N} is set then the array element at
-     * index {@code i + N} is placed into the resulting vector at lane index
+     * index {@code offset + N} is placed into the resulting vector at lane index
      * {@code N}, otherwise the default element value is placed into the
      * resulting vector at lane index {@code N}.
      *
      * @param species species of desired vector
      * @param a the array
-     * @param i the offset into the array
+     * @param offset the offset into the array
      * @param m the mask
      * @return the vector loaded from an array
-     * @throws IndexOutOfBoundsException if {@code i < 0}, or
+     * @throws IndexOutOfBoundsException if {@code offset < 0}, or
      * for any vector lane index {@code N} where the mask at lane {@code N}
-     * is set {@code i > a.length - N}
+     * is set {@code offset > a.length - N}
      */
     @ForceInline
-    public static ShortVector fromArray(VectorSpecies<Short> species, short[] a, int i, VectorMask<Short> m) {
-        return zero(species).blend(fromArray(species, a, i), m);
+    public static ShortVector fromArray(VectorSpecies<Short> species, short[] a, int offset, VectorMask<Short> m) {
+        return zero(species).blend(fromArray(species, a, offset), m);
     }
 
     /**
@@ -238,24 +235,24 @@
      * map.
      * <p>
      * For each vector lane, where {@code N} is the vector lane index, the
-     * array element at index {@code i + indexMap[j + N]} is placed into the
+     * array element at index {@code a_offset + indexMap[i_offset + N]} is placed into the
      * resulting vector at lane index {@code N}.
      *
      * @param species species of desired vector
      * @param a the array
-     * @param i the offset into the array, may be negative if relative
+     * @param a_offset the offset into the array, may be negative if relative
      * indexes in the index map compensate to produce a value within the
      * array bounds
      * @param indexMap the index map
-     * @param j the offset into the index map
+     * @param i_offset the offset into the index map
      * @return the vector loaded from an array
-     * @throws IndexOutOfBoundsException if {@code j < 0}, or
-     * {@code j > indexMap.length - this.length()},
+     * @throws IndexOutOfBoundsException if {@code i_offset < 0}, or
+     * {@code i_offset > indexMap.length - species.length()},
      * or for any vector lane index {@code N} the result of
-     * {@code i + indexMap[j + N]} is {@code < 0} or {@code >= a.length}
+     * {@code a_offset + indexMap[i_offset + N]} is {@code < 0} or {@code >= a.length}
      */
-    public static ShortVector fromArray(VectorSpecies<Short> species, short[] a, int i, int[] indexMap, int j) {
-        return ((ShortSpecies)species).op(n -> a[i + indexMap[j + n]]);
+    public static ShortVector fromArray(VectorSpecies<Short> species, short[] a, int a_offset, int[] indexMap, int i_offset) {
+        return ((ShortSpecies)species).op(n -> a[a_offset + indexMap[i_offset + n]]);
     }
     /**
      * Loads a vector from an array using indexes obtained from an index
@@ -263,26 +260,26 @@
      * <p>
      * For each vector lane, where {@code N} is the vector lane index,
      * if the mask lane at index {@code N} is set then the array element at
-     * index {@code i + indexMap[j + N]} is placed into the resulting vector
+     * index {@code a_offset + indexMap[i_offset + N]} is placed into the resulting vector
      * at lane index {@code N}.
      *
      * @param species species of desired vector
      * @param a the array
-     * @param i the offset into the array, may be negative if relative
+     * @param a_offset the offset into the array, may be negative if relative
      * indexes in the index map compensate to produce a value within the
      * array bounds
      * @param m the mask
      * @param indexMap the index map
-     * @param j the offset into the index map
+     * @param i_offset the offset into the index map
      * @return the vector loaded from an array
-     * @throws IndexOutOfBoundsException if {@code j < 0}, or
-     * {@code j > indexMap.length - this.length()},
+     * @throws IndexOutOfBoundsException if {@code i_offset < 0}, or
+     * {@code i_offset > indexMap.length - species.length()},
      * or for any vector lane index {@code N} where the mask at lane
-     * {@code N} is set the result of {@code i + indexMap[j + N]} is
+     * {@code N} is set the result of {@code a_offset + indexMap[i_offset + N]} is
      * {@code < 0} or {@code >= a.length}
      */
-    public static ShortVector fromArray(VectorSpecies<Short> species, short[] a, int i, VectorMask<Short> m, int[] indexMap, int j) {
-        return ((ShortSpecies)species).op(m, n -> a[i + indexMap[j + n]]);
+    public static ShortVector fromArray(VectorSpecies<Short> species, short[] a, int a_offset, VectorMask<Short> m, int[] indexMap, int i_offset) {
+        return ((ShortSpecies)species).op(m, n -> a[a_offset + indexMap[i_offset + n]]);
     }
 
     /**
@@ -294,31 +291,31 @@
      * <p>
      * This method behaves as if it returns the result of calling the
      * byte buffer, offset, and mask accepting
-     * {@link #fromByteBuffer(VectorSpecies<Short>, ByteBuffer, int, VectorMask)} method} as follows:
+     * {@link #fromByteBuffer(VectorSpecies, ByteBuffer, int, VectorMask)} method} as follows:
      * <pre>{@code
-     *   return this.fromByteBuffer(b, i, this.maskAllTrue())
+     *   return fromByteBuffer(b, offset, VectorMask.allTrue())
      * }</pre>
      *
      * @param species species of desired vector
      * @param bb the byte buffer
-     * @param ix the offset into the byte buffer
+     * @param offset the offset into the byte buffer
      * @return a vector loaded from a byte buffer
      * @throws IndexOutOfBoundsException if the offset is {@code < 0},
      * or {@code > b.limit()},
      * or if there are fewer than
-     * {@code this.length() * this.elementSize() / Byte.SIZE} bytes
+     * {@code species.length() * species.elementSize() / Byte.SIZE} bytes
      * remaining in the byte buffer from the given offset
      */
     @ForceInline
     @SuppressWarnings("unchecked")
-    public static ShortVector fromByteBuffer(VectorSpecies<Short> species, ByteBuffer bb, int ix) {
+    public static ShortVector fromByteBuffer(VectorSpecies<Short> species, ByteBuffer bb, int offset) {
         if (bb.order() != ByteOrder.nativeOrder()) {
             throw new IllegalArgumentException();
         }
-        ix = VectorIntrinsics.checkIndex(ix, bb.limit(), species.bitSize() / Byte.SIZE);
+        offset = VectorIntrinsics.checkIndex(offset, bb.limit(), species.bitSize() / Byte.SIZE);
         return VectorIntrinsics.load((Class<ShortVector>) species.boxType(), short.class, species.length(),
-                                     U.getReference(bb, BYTE_BUFFER_HB), U.getLong(bb, BUFFER_ADDRESS) + ix,
-                                     bb, ix, species,
+                                     U.getReference(bb, BYTE_BUFFER_HB), U.getLong(bb, BUFFER_ADDRESS) + offset,
+                                     bb, offset, species,
                                      (c, idx, s) -> {
                                          ByteBuffer bbc = c.duplicate().position(idx).order(ByteOrder.nativeOrder());
                                          ShortBuffer tb = bbc.asShortBuffer();
@@ -336,77 +333,77 @@
      * the returned vector is loaded with a mask from a primitive array
      * obtained from the primitive buffer.
      * The following pseudocode expresses the behaviour, where
-     * {@coce EBuffer} is the primitive buffer type, {@code e} is the
-     * primitive element type, and {@code ESpecies<S>} is the primitive
+     * {@code EBuffer} is the primitive buffer type, {@code e} is the
+     * primitive element type, and {@code ESpecies} is the primitive
      * species for {@code e}:
      * <pre>{@code
      * EBuffer eb = b.duplicate().
-     *     order(ByteOrder.nativeOrder()).position(i).
+     *     order(ByteOrder.nativeOrder()).position(offset).
      *     asEBuffer();
-     * e[] es = new e[this.length()];
+     * e[] es = new e[species.length()];
      * for (int n = 0; n < t.length; n++) {
      *     if (m.isSet(n))
      *         es[n] = eb.get(n);
      * }
-     * Vector<E> r = ((ESpecies<S>)this).fromArray(es, 0, m);
+     * EVector r = EVector.fromArray(es, 0, m);
      * }</pre>
      *
      * @param species species of desired vector
      * @param bb the byte buffer
-     * @param ix the offset into the byte buffer
+     * @param offset the offset into the byte buffer
      * @param m the mask
      * @return a vector loaded from a byte buffer
      * @throws IndexOutOfBoundsException if the offset is {@code < 0},
      * or {@code > b.limit()},
      * for any vector lane index {@code N} where the mask at lane {@code N}
      * is set
-     * {@code i >= b.limit() - (N * this.elementSize() / Byte.SIZE)}
+     * {@code offset >= b.limit() - (N * species.elementSize() / Byte.SIZE)}
      */
     @ForceInline
-    public static ShortVector fromByteBuffer(VectorSpecies<Short> species, ByteBuffer bb, int ix, VectorMask<Short> m) {
-        return zero(species).blend(fromByteBuffer(species, bb, ix), m);
+    public static ShortVector fromByteBuffer(VectorSpecies<Short> species, ByteBuffer bb, int offset, VectorMask<Short> m) {
+        return zero(species).blend(fromByteBuffer(species, bb, offset), m);
     }
 
     /**
      * Returns a vector where all lane elements are set to the primitive
      * value {@code e}.
      *
-     * @param s species of the desired vector
+     * @param species species of the desired vector
      * @param e the value
      * @return a vector of vector where all lane elements are set to
      * the primitive value {@code e}
      */
     @ForceInline
     @SuppressWarnings("unchecked")
-    public static ShortVector broadcast(VectorSpecies<Short> s, short e) {
+    public static ShortVector broadcast(VectorSpecies<Short> species, short e) {
         return VectorIntrinsics.broadcastCoerced(
-            (Class<ShortVector>) s.boxType(), short.class, s.length(),
-            e, s,
+            (Class<ShortVector>) species.boxType(), short.class, species.length(),
+            e, species,
             ((bits, sp) -> ((ShortSpecies)sp).op(i -> (short)bits)));
     }
 
     /**
-     * Returns a vector where each lane element is set to a given
-     * primitive value.
+     * Returns a vector where each lane element is set to given
+     * primitive values.
      * <p>
      * For each vector lane, where {@code N} is the vector lane index, the
      * the primitive value at index {@code N} is placed into the resulting
      * vector at lane index {@code N}.
      *
-     * @param s species of the desired vector
+     * @param species species of the desired vector
      * @param es the given primitive values
-     * @return a vector where each lane element is set to a given primitive
-     * value
-     * @throws IndexOutOfBoundsException if {@code es.length < this.length()}
+     * @return a vector where each lane element is set to given primitive
+     * values
+     * @throws IndexOutOfBoundsException if {@code es.length < species.length()}
      */
     @ForceInline
     @SuppressWarnings("unchecked")
-    public static ShortVector scalars(VectorSpecies<Short> s, short... es) {
+    public static ShortVector scalars(VectorSpecies<Short> species, short... es) {
         Objects.requireNonNull(es);
-        int ix = VectorIntrinsics.checkIndex(0, es.length, s.length());
-        return VectorIntrinsics.load((Class<ShortVector>) s.boxType(), short.class, s.length(),
+        int ix = VectorIntrinsics.checkIndex(0, es.length, species.length());
+        return VectorIntrinsics.load((Class<ShortVector>) species.boxType(), short.class, species.length(),
                                      es, Unsafe.ARRAY_SHORT_BASE_OFFSET,
-                                     es, ix, s,
+                                     es, ix, species,
                                      (c, idx, sp) -> ((ShortSpecies)sp).op(n -> c[idx + n]));
     }
 
@@ -415,14 +412,14 @@
      * value {@code e}, all other lane elements are set to the default
      * value.
      *
-     * @param s species of the desired vector
+     * @param species species of the desired vector
      * @param e the value
      * @return a vector where the first lane element is set to the primitive
      * value {@code e}
      */
     @ForceInline
-    public static final ShortVector single(VectorSpecies<Short> s, short e) {
-        return zero(s).with(0, e);
+    public static final ShortVector single(VectorSpecies<Short> species, short e) {
+        return zero(species).with(0, e);
     }
 
     /**
@@ -432,25 +429,28 @@
      * The semantics are equivalent to calling
      * (short){@link ThreadLocalRandom#nextInt()}
      *
-     * @param s species of the desired vector
+     * @param species species of the desired vector
      * @return a vector where each lane elements is set to a randomly
      * generated primitive value
      */
-    public static ShortVector random(VectorSpecies<Short> s) {
+    public static ShortVector random(VectorSpecies<Short> species) {
         ThreadLocalRandom r = ThreadLocalRandom.current();
-        return ((ShortSpecies)s).op(i -> (short) r.nextInt());
+        return ((ShortSpecies)species).op(i -> (short) r.nextInt());
     }
 
     // Ops
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public abstract ShortVector add(Vector<Short> v);
 
     /**
      * Adds this vector to the broadcast of an input scalar.
      * <p>
-     * This is a vector binary operation where the primitive addition operation
-     * ({@code +}) is applied to lane elements.
+     * This is a lane-wise binary operation which applies the primitive addition operation
+     * ({@code +}) to each lane.
      *
      * @param s the input scalar
      * @return the result of adding this vector to the broadcast of an input
@@ -458,6 +458,9 @@
      */
     public abstract ShortVector add(short s);
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public abstract ShortVector add(Vector<Short> v, VectorMask<Short> m);
 
@@ -465,8 +468,8 @@
      * Adds this vector to broadcast of an input scalar,
      * selecting lane elements controlled by a mask.
      * <p>
-     * This is a vector binary operation where the primitive addition operation
-     * ({@code +}) is applied to lane elements.
+     * This is a lane-wise binary operation which applies the primitive addition operation
+     * ({@code +}) to each lane.
      *
      * @param s the input scalar
      * @param m the mask controlling lane selection
@@ -475,14 +478,17 @@
      */
     public abstract ShortVector add(short s, VectorMask<Short> m);
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public abstract ShortVector sub(Vector<Short> v);
 
     /**
      * Subtracts the broadcast of an input scalar from this vector.
      * <p>
-     * This is a vector binary operation where the primitive subtraction
-     * operation ({@code -}) is applied to lane elements.
+     * This is a lane-wise binary operation which applies the primitive subtraction
+     * operation ({@code -}) to each lane.
      *
      * @param s the input scalar
      * @return the result of subtracting the broadcast of an input
@@ -490,6 +496,9 @@
      */
     public abstract ShortVector sub(short s);
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public abstract ShortVector sub(Vector<Short> v, VectorMask<Short> m);
 
@@ -497,8 +506,8 @@
      * Subtracts the broadcast of an input scalar from this vector, selecting
      * lane elements controlled by a mask.
      * <p>
-     * This is a vector binary operation where the primitive subtraction
-     * operation ({@code -}) is applied to lane elements.
+     * This is a lane-wise binary operation which applies the primitive subtraction
+     * operation ({@code -}) to each lane.
      *
      * @param s the input scalar
      * @param m the mask controlling lane selection
@@ -507,14 +516,17 @@
      */
     public abstract ShortVector sub(short s, VectorMask<Short> m);
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public abstract ShortVector mul(Vector<Short> v);
 
     /**
      * Multiplies this vector with the broadcast of an input scalar.
      * <p>
-     * This is a vector binary operation where the primitive multiplication
-     * operation ({@code *}) is applied to lane elements.
+     * This is a lane-wise binary operation which applies the primitive multiplication
+     * operation ({@code *}) to each lane.
      *
      * @param s the input scalar
      * @return the result of multiplying this vector with the broadcast of an
@@ -522,6 +534,9 @@
      */
     public abstract ShortVector mul(short s);
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public abstract ShortVector mul(Vector<Short> v, VectorMask<Short> m);
 
@@ -529,8 +544,8 @@
      * Multiplies this vector with the broadcast of an input scalar, selecting
      * lane elements controlled by a mask.
      * <p>
-     * This is a vector binary operation where the primitive multiplication
-     * operation ({@code *}) is applied to lane elements.
+     * This is a lane-wise binary operation which applies the primitive multiplication
+     * operation ({@code *}) to each lane.
      *
      * @param s the input scalar
      * @param m the mask controlling lane selection
@@ -539,60 +554,87 @@
      */
     public abstract ShortVector mul(short s, VectorMask<Short> m);
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public abstract ShortVector neg();
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public abstract ShortVector neg(VectorMask<Short> m);
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public abstract ShortVector abs();
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public abstract ShortVector abs(VectorMask<Short> m);
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public abstract ShortVector min(Vector<Short> v);
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public abstract ShortVector min(Vector<Short> v, VectorMask<Short> m);
 
     /**
      * Returns the minimum of this vector and the broadcast of an input scalar.
      * <p>
-     * This is a vector binary operation where the operation
-     * {@code (a, b) -> Math.min(a, b)} is applied to lane elements.
+     * This is a lane-wise binary operation which applies the operation
+     * {@code (a, b) -> Math.min(a, b)} to each lane.
      *
      * @param s the input scalar
      * @return the minimum of this vector and the broadcast of an input scalar
      */
     public abstract ShortVector min(short s);
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public abstract ShortVector max(Vector<Short> v);
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public abstract ShortVector max(Vector<Short> v, VectorMask<Short> m);
 
     /**
      * Returns the maximum of this vector and the broadcast of an input scalar.
      * <p>
-     * This is a vector binary operation where the operation
-     * {@code (a, b) -> Math.max(a, b)} is applied to lane elements.
+     * This is a lane-wise binary operation which applies the operation
+     * {@code (a, b) -> Math.max(a, b)} to each lane.
      *
      * @param s the input scalar
      * @return the maximum of this vector and the broadcast of an input scalar
      */
     public abstract ShortVector max(short s);
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public abstract VectorMask<Short> equal(Vector<Short> v);
 
     /**
      * Tests if this vector is equal to the broadcast of an input scalar.
      * <p>
-     * This is a vector binary test operation where the primitive equals
-     * operation ({@code ==}) is applied to lane elements.
+     * This is a lane-wise binary test operation which applies the primitive equals
+     * operation ({@code ==}) each lane.
      *
      * @param s the input scalar
      * @return the result mask of testing if this vector is equal to the
@@ -600,14 +642,17 @@
      */
     public abstract VectorMask<Short> equal(short s);
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public abstract VectorMask<Short> notEqual(Vector<Short> v);
 
     /**
      * Tests if this vector is not equal to the broadcast of an input scalar.
      * <p>
-     * This is a vector binary test operation where the primitive not equals
-     * operation ({@code !=}) is applied to lane elements.
+     * This is a lane-wise binary test operation which applies the primitive not equals
+     * operation ({@code !=}) to each lane.
      *
      * @param s the input scalar
      * @return the result mask of testing if this vector is not equal to the
@@ -615,14 +660,17 @@
      */
     public abstract VectorMask<Short> notEqual(short s);
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public abstract VectorMask<Short> lessThan(Vector<Short> v);
 
     /**
      * Tests if this vector is less than the broadcast of an input scalar.
      * <p>
-     * This is a vector binary test operation where the primitive less than
-     * operation ({@code <}) is applied to lane elements.
+     * This is a lane-wise binary test operation which applies the primitive less than
+     * operation ({@code <}) to each lane.
      *
      * @param s the input scalar
      * @return the mask result of testing if this vector is less than the
@@ -630,14 +678,17 @@
      */
     public abstract VectorMask<Short> lessThan(short s);
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public abstract VectorMask<Short> lessThanEq(Vector<Short> v);
 
     /**
      * Tests if this vector is less or equal to the broadcast of an input scalar.
      * <p>
-     * This is a vector binary test operation where the primitive less than
-     * or equal to operation ({@code <=}) is applied to lane elements.
+     * This is a lane-wise binary test operation which applies the primitive less than
+     * or equal to operation ({@code <=}) to each lane.
      *
      * @param s the input scalar
      * @return the mask result of testing if this vector is less than or equal
@@ -645,14 +696,17 @@
      */
     public abstract VectorMask<Short> lessThanEq(short s);
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public abstract VectorMask<Short> greaterThan(Vector<Short> v);
 
     /**
      * Tests if this vector is greater than the broadcast of an input scalar.
      * <p>
-     * This is a vector binary test operation where the primitive greater than
-     * operation ({@code >}) is applied to lane elements.
+     * This is a lane-wise binary test operation which applies the primitive greater than
+     * operation ({@code >}) to each lane.
      *
      * @param s the input scalar
      * @return the mask result of testing if this vector is greater than the
@@ -660,6 +714,9 @@
      */
     public abstract VectorMask<Short> greaterThan(short s);
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public abstract VectorMask<Short> greaterThanEq(Vector<Short> v);
 
@@ -667,8 +724,8 @@
      * Tests if this vector is greater than or equal to the broadcast of an
      * input scalar.
      * <p>
-     * This is a vector binary test operation where the primitive greater than
-     * or equal to operation ({@code >=}) is applied to lane elements.
+     * This is a lane-wise binary test operation which applies the primitive greater than
+     * or equal to operation ({@code >=}) to each lane.
      *
      * @param s the input scalar
      * @return the mask result of testing if this vector is greater than or
@@ -676,6 +733,9 @@
      */
     public abstract VectorMask<Short> greaterThanEq(short s);
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public abstract ShortVector blend(Vector<Short> v, VectorMask<Short> m);
 
@@ -696,25 +756,46 @@
      */
     public abstract ShortVector blend(short s, VectorMask<Short> m);
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public abstract ShortVector rearrange(Vector<Short> v,
                                                       VectorShuffle<Short> s, VectorMask<Short> m);
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public abstract ShortVector rearrange(VectorShuffle<Short> m);
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public abstract ShortVector reshape(VectorSpecies<Short> s);
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public abstract ShortVector rotateEL(int i);
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public abstract ShortVector rotateER(int i);
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public abstract ShortVector shiftEL(int i);
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public abstract ShortVector shiftER(int i);
 
@@ -723,8 +804,8 @@
     /**
      * Bitwise ANDs this vector with an input vector.
      * <p>
-     * This is a vector binary operation where the primitive bitwise AND
-     * operation ({@code &}) is applied to lane elements.
+     * This is a lane-wise binary operation which applies the primitive bitwise AND
+     * operation ({@code &}) to each lane.
      *
      * @param v the input vector
      * @return the bitwise AND of this vector with the input vector
@@ -734,8 +815,8 @@
     /**
      * Bitwise ANDs this vector with the broadcast of an input scalar.
      * <p>
-     * This is a vector binary operation where the primitive bitwise AND
-     * operation ({@code &}) is applied to lane elements.
+     * This is a lane-wise binary operation which applies the primitive bitwise AND
+     * operation ({@code &}) to each lane.
      *
      * @param s the input scalar
      * @return the bitwise AND of this vector with the broadcast of an input
@@ -747,8 +828,8 @@
      * Bitwise ANDs this vector with an input vector, selecting lane elements
      * controlled by a mask.
      * <p>
-     * This is a vector binary operation where the primitive bitwise AND
-     * operation ({@code &}) is applied to lane elements.
+     * This is a lane-wise binary operation which applies the primitive bitwise AND
+     * operation ({@code &}) to each lane.
      *
      * @param v the input vector
      * @param m the mask controlling lane selection
@@ -760,8 +841,8 @@
      * Bitwise ANDs this vector with the broadcast of an input scalar, selecting
      * lane elements controlled by a mask.
      * <p>
-     * This is a vector binary operation where the primitive bitwise AND
-     * operation ({@code &}) is applied to lane elements.
+     * This is a lane-wise binary operation which applies the primitive bitwise AND
+     * operation ({@code &}) to each lane.
      *
      * @param s the input scalar
      * @param m the mask controlling lane selection
@@ -773,8 +854,8 @@
     /**
      * Bitwise ORs this vector with an input vector.
      * <p>
-     * This is a vector binary operation where the primitive bitwise OR
-     * operation ({@code |}) is applied to lane elements.
+     * This is a lane-wise binary operation which applies the primitive bitwise OR
+     * operation ({@code |}) to each lane.
      *
      * @param v the input vector
      * @return the bitwise OR of this vector with the input vector
@@ -784,8 +865,8 @@
     /**
      * Bitwise ORs this vector with the broadcast of an input scalar.
      * <p>
-     * This is a vector binary operation where the primitive bitwise OR
-     * operation ({@code |}) is applied to lane elements.
+     * This is a lane-wise binary operation which applies the primitive bitwise OR
+     * operation ({@code |}) to each lane.
      *
      * @param s the input scalar
      * @return the bitwise OR of this vector with the broadcast of an input
@@ -797,8 +878,8 @@
      * Bitwise ORs this vector with an input vector, selecting lane elements
      * controlled by a mask.
      * <p>
-     * This is a vector binary operation where the primitive bitwise OR
-     * operation ({@code |}) is applied to lane elements.
+     * This is a lane-wise binary operation which applies the primitive bitwise OR
+     * operation ({@code |}) to each lane.
      *
      * @param v the input vector
      * @param m the mask controlling lane selection
@@ -810,8 +891,8 @@
      * Bitwise ORs this vector with the broadcast of an input scalar, selecting
      * lane elements controlled by a mask.
      * <p>
-     * This is a vector binary operation where the primitive bitwise OR
-     * operation ({@code |}) is applied to lane elements.
+     * This is a lane-wise binary operation which applies the primitive bitwise OR
+     * operation ({@code |}) to each lane.
      *
      * @param s the input scalar
      * @param m the mask controlling lane selection
@@ -823,8 +904,8 @@
     /**
      * Bitwise XORs this vector with an input vector.
      * <p>
-     * This is a vector binary operation where the primitive bitwise XOR
-     * operation ({@code ^}) is applied to lane elements.
+     * This is a lane-wise binary operation which applies the primitive bitwise XOR
+     * operation ({@code ^}) to each lane.
      *
      * @param v the input vector
      * @return the bitwise XOR of this vector with the input vector
@@ -834,8 +915,8 @@
     /**
      * Bitwise XORs this vector with the broadcast of an input scalar.
      * <p>
-     * This is a vector binary operation where the primitive bitwise XOR
-     * operation ({@code ^}) is applied to lane elements.
+     * This is a lane-wise binary operation which applies the primitive bitwise XOR
+     * operation ({@code ^}) to each lane.
      *
      * @param s the input scalar
      * @return the bitwise XOR of this vector with the broadcast of an input
@@ -847,8 +928,8 @@
      * Bitwise XORs this vector with an input vector, selecting lane elements
      * controlled by a mask.
      * <p>
-     * This is a vector binary operation where the primitive bitwise XOR
-     * operation ({@code ^}) is applied to lane elements.
+     * This is a lane-wise binary operation which applies the primitive bitwise XOR
+     * operation ({@code ^}) to