# HG changeset patch
# User yzhang
# Date 1571711226 -28800
#      Tue Oct 22 10:27:06 2019 +0800
# Branch vectorIntrinsics
# Node ID d3401d2120b25846153013e679d279499d937511
# Parent  e2f1c1d585b98450f61ea2bef2dd16f91fdfdca0
Fix the issue that unslice modifies the argument vector
Summary: Change the name of getElements() to vec() and clone argument value to
avoid it being modified

diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Byte128Vector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Byte128Vector.java
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Byte128Vector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Byte128Vector.java
@@ -57,7 +57,7 @@
     static final Class<Byte> ETYPE = byte.class;
 
     // The JVM expects to find the state here.
-    private final byte[] vec; // Don't access directly, use getElements() instead.
+    private final byte[] vec; // Don't access directly, use vec() instead.
 
     Byte128Vector(byte[] v) {
         vec = v;
@@ -118,7 +118,7 @@
     /*package-private*/
     @ForceInline
     final @Override
-    byte[] getElements() {
+    byte[] vec() {
         return VectorIntrinsics.maybeRebox(this).vec;
     }
 
@@ -477,7 +477,7 @@
                                 VCLASS, ETYPE, VLENGTH,
                                 this, i,
                                 (vec, ix) -> {
-                                    byte[] vecarr = vec.getElements();
+                                    byte[] vecarr = vec.vec();
                                     return (long)vecarr[ix];
                                 });
     }
@@ -491,7 +491,7 @@
                                 VCLASS, ETYPE, VLENGTH,
                                 this, i, (long)e,
                                 (v, ix, bits) -> {
-                                    byte[] res = v.getElements().clone();
+                                    byte[] res = v.vec().clone();
                                     res[ix] = (byte)bits;
                                     return v.vectorFactory(res);
                                 });
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Byte256Vector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Byte256Vector.java
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Byte256Vector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Byte256Vector.java
@@ -57,7 +57,7 @@
     static final Class<Byte> ETYPE = byte.class;
 
     // The JVM expects to find the state here.
-    private final byte[] vec; // Don't access directly, use getElements() instead.
+    private final byte[] vec; // Don't access directly, use vec() instead.
 
     Byte256Vector(byte[] v) {
         vec = v;
@@ -118,7 +118,7 @@
     /*package-private*/
     @ForceInline
     final @Override
-    byte[] getElements() {
+    byte[] vec() {
         return VectorIntrinsics.maybeRebox(this).vec;
     }
 
@@ -477,7 +477,7 @@
                                 VCLASS, ETYPE, VLENGTH,
                                 this, i,
                                 (vec, ix) -> {
-                                    byte[] vecarr = vec.getElements();
+                                    byte[] vecarr = vec.vec();
                                     return (long)vecarr[ix];
                                 });
     }
@@ -491,7 +491,7 @@
                                 VCLASS, ETYPE, VLENGTH,
                                 this, i, (long)e,
                                 (v, ix, bits) -> {
-                                    byte[] res = v.getElements().clone();
+                                    byte[] res = v.vec().clone();
                                     res[ix] = (byte)bits;
                                     return v.vectorFactory(res);
                                 });
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Byte512Vector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Byte512Vector.java
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Byte512Vector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Byte512Vector.java
@@ -57,7 +57,7 @@
     static final Class<Byte> ETYPE = byte.class;
 
     // The JVM expects to find the state here.
-    private final byte[] vec; // Don't access directly, use getElements() instead.
+    private final byte[] vec; // Don't access directly, use vec() instead.
 
     Byte512Vector(byte[] v) {
         vec = v;
@@ -118,7 +118,7 @@
     /*package-private*/
     @ForceInline
     final @Override
-    byte[] getElements() {
+    byte[] vec() {
         return VectorIntrinsics.maybeRebox(this).vec;
     }
 
@@ -477,7 +477,7 @@
                                 VCLASS, ETYPE, VLENGTH,
                                 this, i,
                                 (vec, ix) -> {
-                                    byte[] vecarr = vec.getElements();
+                                    byte[] vecarr = vec.vec();
                                     return (long)vecarr[ix];
                                 });
     }
@@ -491,7 +491,7 @@
                                 VCLASS, ETYPE, VLENGTH,
                                 this, i, (long)e,
                                 (v, ix, bits) -> {
-                                    byte[] res = v.getElements().clone();
+                                    byte[] res = v.vec().clone();
                                     res[ix] = (byte)bits;
                                     return v.vectorFactory(res);
                                 });
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Byte64Vector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Byte64Vector.java
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Byte64Vector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Byte64Vector.java
@@ -57,7 +57,7 @@
     static final Class<Byte> ETYPE = byte.class;
 
     // The JVM expects to find the state here.
-    private final byte[] vec; // Don't access directly, use getElements() instead.
+    private final byte[] vec; // Don't access directly, use vec() instead.
 
     Byte64Vector(byte[] v) {
         vec = v;
@@ -118,7 +118,7 @@
     /*package-private*/
     @ForceInline
     final @Override
-    byte[] getElements() {
+    byte[] vec() {
         return VectorIntrinsics.maybeRebox(this).vec;
     }
 
@@ -477,7 +477,7 @@
                                 VCLASS, ETYPE, VLENGTH,
                                 this, i,
                                 (vec, ix) -> {
-                                    byte[] vecarr = vec.getElements();
+                                    byte[] vecarr = vec.vec();
                                     return (long)vecarr[ix];
                                 });
     }
@@ -491,7 +491,7 @@
                                 VCLASS, ETYPE, VLENGTH,
                                 this, i, (long)e,
                                 (v, ix, bits) -> {
-                                    byte[] res = v.getElements().clone();
+                                    byte[] res = v.vec().clone();
                                     res[ix] = (byte)bits;
                                     return v.vectorFactory(res);
                                 });
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/ByteMaxVector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/ByteMaxVector.java
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/ByteMaxVector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/ByteMaxVector.java
@@ -57,7 +57,7 @@
     static final Class<Byte> ETYPE = byte.class;
 
     // The JVM expects to find the state here.
-    private final byte[] vec; // Don't access directly, use getElements() instead.
+    private final byte[] vec; // Don't access directly, use vec() instead.
 
     ByteMaxVector(byte[] v) {
         vec = v;
@@ -118,7 +118,7 @@
     /*package-private*/
     @ForceInline
     final @Override
-    byte[] getElements() {
+    byte[] vec() {
         return VectorIntrinsics.maybeRebox(this).vec;
     }
 
@@ -477,7 +477,7 @@
                                 VCLASS, ETYPE, VLENGTH,
                                 this, i,
                                 (vec, ix) -> {
-                                    byte[] vecarr = vec.getElements();
+                                    byte[] vecarr = vec.vec();
                                     return (long)vecarr[ix];
                                 });
     }
@@ -491,7 +491,7 @@
                                 VCLASS, ETYPE, VLENGTH,
                                 this, i, (long)e,
                                 (v, ix, bits) -> {
-                                    byte[] res = v.getElements().clone();
+                                    byte[] res = v.vec().clone();
                                     res[ix] = (byte)bits;
                                     return v.vectorFactory(res);
                                 });
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/ByteVector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/ByteVector.java
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/ByteVector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/ByteVector.java
@@ -88,7 +88,7 @@
     // Virtualized getter
 
     /*package-private*/
-    abstract byte[] getElements();
+    abstract byte[] vec();
 
     // Virtualized constructors
 
@@ -152,7 +152,7 @@
     @ForceInline
     final
     ByteVector uOpTemplate(FUnOp f) {
-        byte[] vec = getElements();
+        byte[] vec = vec();
         byte[] res = new byte[length()];
         for (int i = 0; i < res.length; i++) {
             res[i] = f.apply(i, vec[i]);
@@ -168,7 +168,7 @@
     final
     ByteVector uOpTemplate(VectorMask<Byte> m,
                                      FUnOp f) {
-        byte[] vec = getElements();
+        byte[] vec = vec();
         byte[] res = new byte[length()];
         boolean[] mbits = ((AbstractMask<Byte>)m).getBits();
         for (int i = 0; i < res.length; i++) {
@@ -193,8 +193,8 @@
     ByteVector bOpTemplate(Vector<Byte> o,
                                      FBinOp f) {
         byte[] res = new byte[length()];
-        byte[] vec1 = this.getElements();
-        byte[] vec2 = ((ByteVector)o).getElements();
+        byte[] vec1 = this.vec();
+        byte[] vec2 = ((ByteVector)o).vec();
         for (int i = 0; i < res.length; i++) {
             res[i] = f.apply(i, vec1[i], vec2[i]);
         }
@@ -212,8 +212,8 @@
                                      VectorMask<Byte> m,
                                      FBinOp f) {
         byte[] res = new byte[length()];
-        byte[] vec1 = this.getElements();
-        byte[] vec2 = ((ByteVector)o).getElements();
+        byte[] vec1 = this.vec();
+        byte[] vec2 = ((ByteVector)o).vec();
         boolean[] mbits = ((AbstractMask<Byte>)m).getBits();
         for (int i = 0; i < res.length; i++) {
             res[i] = mbits[i] ? f.apply(i, vec1[i], vec2[i]) : vec1[i];
@@ -239,9 +239,9 @@
                                      Vector<Byte> o2,
                                      FTriOp f) {
         byte[] res = new byte[length()];
-        byte[] vec1 = this.getElements();
-        byte[] vec2 = ((ByteVector)o1).getElements();
-        byte[] vec3 = ((ByteVector)o2).getElements();
+        byte[] vec1 = this.vec();
+        byte[] vec2 = ((ByteVector)o1).vec();
+        byte[] vec3 = ((ByteVector)o2).vec();
         for (int i = 0; i < res.length; i++) {
             res[i] = f.apply(i, vec1[i], vec2[i], vec3[i]);
         }
@@ -261,9 +261,9 @@
                                      VectorMask<Byte> m,
                                      FTriOp f) {
         byte[] res = new byte[length()];
-        byte[] vec1 = this.getElements();
-        byte[] vec2 = ((ByteVector)o1).getElements();
-        byte[] vec3 = ((ByteVector)o2).getElements();
+        byte[] vec1 = this.vec();
+        byte[] vec2 = ((ByteVector)o1).vec();
+        byte[] vec3 = ((ByteVector)o2).vec();
         boolean[] mbits = ((AbstractMask<Byte>)m).getBits();
         for (int i = 0; i < res.length; i++) {
             res[i] = mbits[i] ? f.apply(i, vec1[i], vec2[i], vec3[i]) : vec1[i];
@@ -279,7 +279,7 @@
     @ForceInline
     final
     byte rOpTemplate(byte v, FBinOp f) {
-        byte[] vec = getElements();
+        byte[] vec = vec();
         for (int i = 0; i < vec.length; i++) {
             v = f.apply(i, v, vec[i]);
         }
@@ -298,7 +298,7 @@
     final
     <M> ByteVector ldOp(M memory, int offset,
                                   FLdOp<M> f) {
-        //dummy; no vec = getElements();
+        //dummy; no vec = vec();
         byte[] res = new byte[length()];
         for (int i = 0; i < res.length; i++) {
             res[i] = f.apply(memory, offset, i);
@@ -312,7 +312,7 @@
     <M> ByteVector ldOp(M memory, int offset,
                                   VectorMask<Byte> m,
                                   FLdOp<M> f) {
-        //byte[] vec = getElements();
+        //byte[] vec = vec();
         byte[] res = new byte[length()];
         boolean[] mbits = ((AbstractMask<Byte>)m).getBits();
         for (int i = 0; i < res.length; i++) {
@@ -332,7 +332,7 @@
     final
     <M> void stOp(M memory, int offset,
                   FStOp<M> f) {
-        byte[] vec = getElements();
+        byte[] vec = vec();
         for (int i = 0; i < vec.length; i++) {
             f.apply(memory, offset, i, vec[i]);
         }
@@ -344,7 +344,7 @@
     <M> void stOp(M memory, int offset,
                   VectorMask<Byte> m,
                   FStOp<M> f) {
-        byte[] vec = getElements();
+        byte[] vec = vec();
         boolean[] mbits = ((AbstractMask<Byte>)m).getBits();
         for (int i = 0; i < vec.length; i++) {
             if (mbits[i]) {
@@ -366,8 +366,8 @@
     AbstractMask<Byte> bTest(int cond,
                                   Vector<Byte> o,
                                   FBinTest f) {
-        byte[] vec1 = getElements();
-        byte[] vec2 = ((ByteVector)o).getElements();
+        byte[] vec1 = vec();
+        byte[] vec2 = ((ByteVector)o).vec();
         boolean[] bits = new boolean[length()];
         for (int i = 0; i < length(); i++){
             bits[i] = f.apply(cond, i, vec1[i], vec2[i]);
@@ -2046,8 +2046,8 @@
     ByteVector sliceTemplate(int origin, Vector<Byte> v1) {
         ByteVector that = (ByteVector) v1;
         that.check(this);
-        byte[] a0 = this.getElements();
-        byte[] a1 = that.getElements();
+        byte[] a0 = this.vec();
+        byte[] a1 = that.vec();
         byte[] res = new byte[a0.length];
         int vlen = res.length;
         int firstPart = vlen - origin;
@@ -2089,8 +2089,8 @@
     unsliceTemplate(int origin, Vector<Byte> w, int part) {
         ByteVector that = (ByteVector) w;
         that.check(this);
-        byte[] slice = this.getElements();
-        byte[] res = that.getElements();
+        byte[] slice = this.vec();
+        byte[] res = that.vec().clone();
         int vlen = res.length;
         int firstPart = vlen - origin;
         switch (part) {
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Double128Vector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Double128Vector.java
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Double128Vector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Double128Vector.java
@@ -58,7 +58,7 @@
     static final Class<Double> ETYPE = double.class;
 
     // The JVM expects to find the state here.
-    private final double[] vec; // Don't access directly, use getElements() instead.
+    private final double[] vec; // Don't access directly, use vec() instead.
 
     Double128Vector(double[] v) {
         vec = v;
@@ -119,7 +119,7 @@
     /*package-private*/
     @ForceInline
     final @Override
-    double[] getElements() {
+    double[] vec() {
         return VectorIntrinsics.maybeRebox(this).vec;
     }
 
@@ -472,7 +472,7 @@
                                 VCLASS, ETYPE, VLENGTH,
                                 this, i,
                                 (vec, ix) -> {
-                                    double[] vecarr = vec.getElements();
+                                    double[] vecarr = vec.vec();
                                     return (long)Double.doubleToLongBits(vecarr[ix]);
                                 });
         return Double.longBitsToDouble(bits);
@@ -487,7 +487,7 @@
                                 VCLASS, ETYPE, VLENGTH,
                                 this, i, (long)Double.doubleToLongBits(e),
                                 (v, ix, bits) -> {
-                                    double[] res = v.getElements().clone();
+                                    double[] res = v.vec().clone();
                                     res[ix] = Double.longBitsToDouble((long)bits);
                                     return v.vectorFactory(res);
                                 });
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Double256Vector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Double256Vector.java
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Double256Vector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Double256Vector.java
@@ -58,7 +58,7 @@
     static final Class<Double> ETYPE = double.class;
 
     // The JVM expects to find the state here.
-    private final double[] vec; // Don't access directly, use getElements() instead.
+    private final double[] vec; // Don't access directly, use vec() instead.
 
     Double256Vector(double[] v) {
         vec = v;
@@ -119,7 +119,7 @@
     /*package-private*/
     @ForceInline
     final @Override
-    double[] getElements() {
+    double[] vec() {
         return VectorIntrinsics.maybeRebox(this).vec;
     }
 
@@ -472,7 +472,7 @@
                                 VCLASS, ETYPE, VLENGTH,
                                 this, i,
                                 (vec, ix) -> {
-                                    double[] vecarr = vec.getElements();
+                                    double[] vecarr = vec.vec();
                                     return (long)Double.doubleToLongBits(vecarr[ix]);
                                 });
         return Double.longBitsToDouble(bits);
@@ -487,7 +487,7 @@
                                 VCLASS, ETYPE, VLENGTH,
                                 this, i, (long)Double.doubleToLongBits(e),
                                 (v, ix, bits) -> {
-                                    double[] res = v.getElements().clone();
+                                    double[] res = v.vec().clone();
                                     res[ix] = Double.longBitsToDouble((long)bits);
                                     return v.vectorFactory(res);
                                 });
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Double512Vector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Double512Vector.java
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Double512Vector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Double512Vector.java
@@ -58,7 +58,7 @@
     static final Class<Double> ETYPE = double.class;
 
     // The JVM expects to find the state here.
-    private final double[] vec; // Don't access directly, use getElements() instead.
+    private final double[] vec; // Don't access directly, use vec() instead.
 
     Double512Vector(double[] v) {
         vec = v;
@@ -119,7 +119,7 @@
     /*package-private*/
     @ForceInline
     final @Override
-    double[] getElements() {
+    double[] vec() {
         return VectorIntrinsics.maybeRebox(this).vec;
     }
 
@@ -472,7 +472,7 @@
                                 VCLASS, ETYPE, VLENGTH,
                                 this, i,
                                 (vec, ix) -> {
-                                    double[] vecarr = vec.getElements();
+                                    double[] vecarr = vec.vec();
                                     return (long)Double.doubleToLongBits(vecarr[ix]);
                                 });
         return Double.longBitsToDouble(bits);
@@ -487,7 +487,7 @@
                                 VCLASS, ETYPE, VLENGTH,
                                 this, i, (long)Double.doubleToLongBits(e),
                                 (v, ix, bits) -> {
-                                    double[] res = v.getElements().clone();
+                                    double[] res = v.vec().clone();
                                     res[ix] = Double.longBitsToDouble((long)bits);
                                     return v.vectorFactory(res);
                                 });
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Double64Vector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Double64Vector.java
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Double64Vector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Double64Vector.java
@@ -58,7 +58,7 @@
     static final Class<Double> ETYPE = double.class;
 
     // The JVM expects to find the state here.
-    private final double[] vec; // Don't access directly, use getElements() instead.
+    private final double[] vec; // Don't access directly, use vec() instead.
 
     Double64Vector(double[] v) {
         vec = v;
@@ -119,7 +119,7 @@
     /*package-private*/
     @ForceInline
     final @Override
-    double[] getElements() {
+    double[] vec() {
         return VectorIntrinsics.maybeRebox(this).vec;
     }
 
@@ -472,7 +472,7 @@
                                 VCLASS, ETYPE, VLENGTH,
                                 this, i,
                                 (vec, ix) -> {
-                                    double[] vecarr = vec.getElements();
+                                    double[] vecarr = vec.vec();
                                     return (long)Double.doubleToLongBits(vecarr[ix]);
                                 });
         return Double.longBitsToDouble(bits);
@@ -487,7 +487,7 @@
                                 VCLASS, ETYPE, VLENGTH,
                                 this, i, (long)Double.doubleToLongBits(e),
                                 (v, ix, bits) -> {
-                                    double[] res = v.getElements().clone();
+                                    double[] res = v.vec().clone();
                                     res[ix] = Double.longBitsToDouble((long)bits);
                                     return v.vectorFactory(res);
                                 });
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/DoubleMaxVector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/DoubleMaxVector.java
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/DoubleMaxVector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/DoubleMaxVector.java
@@ -58,7 +58,7 @@
     static final Class<Double> ETYPE = double.class;
 
     // The JVM expects to find the state here.
-    private final double[] vec; // Don't access directly, use getElements() instead.
+    private final double[] vec; // Don't access directly, use vec() instead.
 
     DoubleMaxVector(double[] v) {
         vec = v;
@@ -119,7 +119,7 @@
     /*package-private*/
     @ForceInline
     final @Override
-    double[] getElements() {
+    double[] vec() {
         return VectorIntrinsics.maybeRebox(this).vec;
     }
 
@@ -472,7 +472,7 @@
                                 VCLASS, ETYPE, VLENGTH,
                                 this, i,
                                 (vec, ix) -> {
-                                    double[] vecarr = vec.getElements();
+                                    double[] vecarr = vec.vec();
                                     return (long)Double.doubleToLongBits(vecarr[ix]);
                                 });
         return Double.longBitsToDouble(bits);
@@ -487,7 +487,7 @@
                                 VCLASS, ETYPE, VLENGTH,
                                 this, i, (long)Double.doubleToLongBits(e),
                                 (v, ix, bits) -> {
-                                    double[] res = v.getElements().clone();
+                                    double[] res = v.vec().clone();
                                     res[ix] = Double.longBitsToDouble((long)bits);
                                     return v.vectorFactory(res);
                                 });
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/DoubleVector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/DoubleVector.java
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/DoubleVector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/DoubleVector.java
@@ -89,7 +89,7 @@
     // Virtualized getter
 
     /*package-private*/
-    abstract double[] getElements();
+    abstract double[] vec();
 
     // Virtualized constructors
 
@@ -153,7 +153,7 @@
     @ForceInline
     final
     DoubleVector uOpTemplate(FUnOp f) {
-        double[] vec = getElements();
+        double[] vec = vec();
         double[] res = new double[length()];
         for (int i = 0; i < res.length; i++) {
             res[i] = f.apply(i, vec[i]);
@@ -169,7 +169,7 @@
     final
     DoubleVector uOpTemplate(VectorMask<Double> m,
                                      FUnOp f) {
-        double[] vec = getElements();
+        double[] vec = vec();
         double[] res = new double[length()];
         boolean[] mbits = ((AbstractMask<Double>)m).getBits();
         for (int i = 0; i < res.length; i++) {
@@ -194,8 +194,8 @@
     DoubleVector bOpTemplate(Vector<Double> o,
                                      FBinOp f) {
         double[] res = new double[length()];
-        double[] vec1 = this.getElements();
-        double[] vec2 = ((DoubleVector)o).getElements();
+        double[] vec1 = this.vec();
+        double[] vec2 = ((DoubleVector)o).vec();
         for (int i = 0; i < res.length; i++) {
             res[i] = f.apply(i, vec1[i], vec2[i]);
         }
@@ -213,8 +213,8 @@
                                      VectorMask<Double> m,
                                      FBinOp f) {
         double[] res = new double[length()];
-        double[] vec1 = this.getElements();
-        double[] vec2 = ((DoubleVector)o).getElements();
+        double[] vec1 = this.vec();
+        double[] vec2 = ((DoubleVector)o).vec();
         boolean[] mbits = ((AbstractMask<Double>)m).getBits();
         for (int i = 0; i < res.length; i++) {
             res[i] = mbits[i] ? f.apply(i, vec1[i], vec2[i]) : vec1[i];
@@ -240,9 +240,9 @@
                                      Vector<Double> o2,
                                      FTriOp f) {
         double[] res = new double[length()];
-        double[] vec1 = this.getElements();
-        double[] vec2 = ((DoubleVector)o1).getElements();
-        double[] vec3 = ((DoubleVector)o2).getElements();
+        double[] vec1 = this.vec();
+        double[] vec2 = ((DoubleVector)o1).vec();
+        double[] vec3 = ((DoubleVector)o2).vec();
         for (int i = 0; i < res.length; i++) {
             res[i] = f.apply(i, vec1[i], vec2[i], vec3[i]);
         }
@@ -262,9 +262,9 @@
                                      VectorMask<Double> m,
                                      FTriOp f) {
         double[] res = new double[length()];
-        double[] vec1 = this.getElements();
-        double[] vec2 = ((DoubleVector)o1).getElements();
-        double[] vec3 = ((DoubleVector)o2).getElements();
+        double[] vec1 = this.vec();
+        double[] vec2 = ((DoubleVector)o1).vec();
+        double[] vec3 = ((DoubleVector)o2).vec();
         boolean[] mbits = ((AbstractMask<Double>)m).getBits();
         for (int i = 0; i < res.length; i++) {
             res[i] = mbits[i] ? f.apply(i, vec1[i], vec2[i], vec3[i]) : vec1[i];
@@ -280,7 +280,7 @@
     @ForceInline
     final
     double rOpTemplate(double v, FBinOp f) {
-        double[] vec = getElements();
+        double[] vec = vec();
         for (int i = 0; i < vec.length; i++) {
             v = f.apply(i, v, vec[i]);
         }
@@ -299,7 +299,7 @@
     final
     <M> DoubleVector ldOp(M memory, int offset,
                                   FLdOp<M> f) {
-        //dummy; no vec = getElements();
+        //dummy; no vec = vec();
         double[] res = new double[length()];
         for (int i = 0; i < res.length; i++) {
             res[i] = f.apply(memory, offset, i);
@@ -313,7 +313,7 @@
     <M> DoubleVector ldOp(M memory, int offset,
                                   VectorMask<Double> m,
                                   FLdOp<M> f) {
-        //double[] vec = getElements();
+        //double[] vec = vec();
         double[] res = new double[length()];
         boolean[] mbits = ((AbstractMask<Double>)m).getBits();
         for (int i = 0; i < res.length; i++) {
@@ -333,7 +333,7 @@
     final
     <M> void stOp(M memory, int offset,
                   FStOp<M> f) {
-        double[] vec = getElements();
+        double[] vec = vec();
         for (int i = 0; i < vec.length; i++) {
             f.apply(memory, offset, i, vec[i]);
         }
@@ -345,7 +345,7 @@
     <M> void stOp(M memory, int offset,
                   VectorMask<Double> m,
                   FStOp<M> f) {
-        double[] vec = getElements();
+        double[] vec = vec();
         boolean[] mbits = ((AbstractMask<Double>)m).getBits();
         for (int i = 0; i < vec.length; i++) {
             if (mbits[i]) {
@@ -367,8 +367,8 @@
     AbstractMask<Double> bTest(int cond,
                                   Vector<Double> o,
                                   FBinTest f) {
-        double[] vec1 = getElements();
-        double[] vec2 = ((DoubleVector)o).getElements();
+        double[] vec1 = vec();
+        double[] vec2 = ((DoubleVector)o).vec();
         boolean[] bits = new boolean[length()];
         for (int i = 0; i < length(); i++){
             bits[i] = f.apply(cond, i, vec1[i], vec2[i]);
@@ -1946,8 +1946,8 @@
     DoubleVector sliceTemplate(int origin, Vector<Double> v1) {
         DoubleVector that = (DoubleVector) v1;
         that.check(this);
-        double[] a0 = this.getElements();
-        double[] a1 = that.getElements();
+        double[] a0 = this.vec();
+        double[] a1 = that.vec();
         double[] res = new double[a0.length];
         int vlen = res.length;
         int firstPart = vlen - origin;
@@ -1989,8 +1989,8 @@
     unsliceTemplate(int origin, Vector<Double> w, int part) {
         DoubleVector that = (DoubleVector) w;
         that.check(this);
-        double[] slice = this.getElements();
-        double[] res = that.getElements();
+        double[] slice = this.vec();
+        double[] res = that.vec().clone();
         int vlen = res.length;
         int firstPart = vlen - origin;
         switch (part) {
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Float128Vector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Float128Vector.java
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Float128Vector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Float128Vector.java
@@ -58,7 +58,7 @@
     static final Class<Float> ETYPE = float.class;
 
     // The JVM expects to find the state here.
-    private final float[] vec; // Don't access directly, use getElements() instead.
+    private final float[] vec; // Don't access directly, use vec() instead.
 
     Float128Vector(float[] v) {
         vec = v;
@@ -119,7 +119,7 @@
     /*package-private*/
     @ForceInline
     final @Override
-    float[] getElements() {
+    float[] vec() {
         return VectorIntrinsics.maybeRebox(this).vec;
     }
 
@@ -472,7 +472,7 @@
                                 VCLASS, ETYPE, VLENGTH,
                                 this, i,
                                 (vec, ix) -> {
-                                    float[] vecarr = vec.getElements();
+                                    float[] vecarr = vec.vec();
                                     return (long)Float.floatToIntBits(vecarr[ix]);
                                 });
         return Float.intBitsToFloat(bits);
@@ -487,7 +487,7 @@
                                 VCLASS, ETYPE, VLENGTH,
                                 this, i, (long)Float.floatToIntBits(e),
                                 (v, ix, bits) -> {
-                                    float[] res = v.getElements().clone();
+                                    float[] res = v.vec().clone();
                                     res[ix] = Float.intBitsToFloat((int)bits);
                                     return v.vectorFactory(res);
                                 });
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Float256Vector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Float256Vector.java
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Float256Vector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Float256Vector.java
@@ -58,7 +58,7 @@
     static final Class<Float> ETYPE = float.class;
 
     // The JVM expects to find the state here.
-    private final float[] vec; // Don't access directly, use getElements() instead.
+    private final float[] vec; // Don't access directly, use vec() instead.
 
     Float256Vector(float[] v) {
         vec = v;
@@ -119,7 +119,7 @@
     /*package-private*/
     @ForceInline
     final @Override
-    float[] getElements() {
+    float[] vec() {
         return VectorIntrinsics.maybeRebox(this).vec;
     }
 
@@ -472,7 +472,7 @@
                                 VCLASS, ETYPE, VLENGTH,
                                 this, i,
                                 (vec, ix) -> {
-                                    float[] vecarr = vec.getElements();
+                                    float[] vecarr = vec.vec();
                                     return (long)Float.floatToIntBits(vecarr[ix]);
                                 });
         return Float.intBitsToFloat(bits);
@@ -487,7 +487,7 @@
                                 VCLASS, ETYPE, VLENGTH,
                                 this, i, (long)Float.floatToIntBits(e),
                                 (v, ix, bits) -> {
-                                    float[] res = v.getElements().clone();
+                                    float[] res = v.vec().clone();
                                     res[ix] = Float.intBitsToFloat((int)bits);
                                     return v.vectorFactory(res);
                                 });
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Float512Vector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Float512Vector.java
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Float512Vector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Float512Vector.java
@@ -58,7 +58,7 @@
     static final Class<Float> ETYPE = float.class;
 
     // The JVM expects to find the state here.
-    private final float[] vec; // Don't access directly, use getElements() instead.
+    private final float[] vec; // Don't access directly, use vec() instead.
 
     Float512Vector(float[] v) {
         vec = v;
@@ -119,7 +119,7 @@
     /*package-private*/
     @ForceInline
     final @Override
-    float[] getElements() {
+    float[] vec() {
         return VectorIntrinsics.maybeRebox(this).vec;
     }
 
@@ -472,7 +472,7 @@
                                 VCLASS, ETYPE, VLENGTH,
                                 this, i,
                                 (vec, ix) -> {
-                                    float[] vecarr = vec.getElements();
+                                    float[] vecarr = vec.vec();
                                     return (long)Float.floatToIntBits(vecarr[ix]);
                                 });
         return Float.intBitsToFloat(bits);
@@ -487,7 +487,7 @@
                                 VCLASS, ETYPE, VLENGTH,
                                 this, i, (long)Float.floatToIntBits(e),
                                 (v, ix, bits) -> {
-                                    float[] res = v.getElements().clone();
+                                    float[] res = v.vec().clone();
                                     res[ix] = Float.intBitsToFloat((int)bits);
                                     return v.vectorFactory(res);
                                 });
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Float64Vector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Float64Vector.java
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Float64Vector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Float64Vector.java
@@ -58,7 +58,7 @@
     static final Class<Float> ETYPE = float.class;
 
     // The JVM expects to find the state here.
-    private final float[] vec; // Don't access directly, use getElements() instead.
+    private final float[] vec; // Don't access directly, use vec() instead.
 
     Float64Vector(float[] v) {
         vec = v;
@@ -119,7 +119,7 @@
     /*package-private*/
     @ForceInline
     final @Override
-    float[] getElements() {
+    float[] vec() {
         return VectorIntrinsics.maybeRebox(this).vec;
     }
 
@@ -472,7 +472,7 @@
                                 VCLASS, ETYPE, VLENGTH,
                                 this, i,
                                 (vec, ix) -> {
-                                    float[] vecarr = vec.getElements();
+                                    float[] vecarr = vec.vec();
                                     return (long)Float.floatToIntBits(vecarr[ix]);
                                 });
         return Float.intBitsToFloat(bits);
@@ -487,7 +487,7 @@
                                 VCLASS, ETYPE, VLENGTH,
                                 this, i, (long)Float.floatToIntBits(e),
                                 (v, ix, bits) -> {
-                                    float[] res = v.getElements().clone();
+                                    float[] res = v.vec().clone();
                                     res[ix] = Float.intBitsToFloat((int)bits);
                                     return v.vectorFactory(res);
                                 });
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/FloatMaxVector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/FloatMaxVector.java
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/FloatMaxVector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/FloatMaxVector.java
@@ -58,7 +58,7 @@
     static final Class<Float> ETYPE = float.class;
 
     // The JVM expects to find the state here.
-    private final float[] vec; // Don't access directly, use getElements() instead.
+    private final float[] vec; // Don't access directly, use vec() instead.
 
     FloatMaxVector(float[] v) {
         vec = v;
@@ -119,7 +119,7 @@
     /*package-private*/
     @ForceInline
     final @Override
-    float[] getElements() {
+    float[] vec() {
         return VectorIntrinsics.maybeRebox(this).vec;
     }
 
@@ -472,7 +472,7 @@
                                 VCLASS, ETYPE, VLENGTH,
                                 this, i,
                                 (vec, ix) -> {
-                                    float[] vecarr = vec.getElements();
+                                    float[] vecarr = vec.vec();
                                     return (long)Float.floatToIntBits(vecarr[ix]);
                                 });
         return Float.intBitsToFloat(bits);
@@ -487,7 +487,7 @@
                                 VCLASS, ETYPE, VLENGTH,
                                 this, i, (long)Float.floatToIntBits(e),
                                 (v, ix, bits) -> {
-                                    float[] res = v.getElements().clone();
+                                    float[] res = v.vec().clone();
                                     res[ix] = Float.intBitsToFloat((int)bits);
                                     return v.vectorFactory(res);
                                 });
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/FloatVector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/FloatVector.java
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/FloatVector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/FloatVector.java
@@ -89,7 +89,7 @@
     // Virtualized getter
 
     /*package-private*/
-    abstract float[] getElements();
+    abstract float[] vec();
 
     // Virtualized constructors
 
@@ -153,7 +153,7 @@
     @ForceInline
     final
     FloatVector uOpTemplate(FUnOp f) {
-        float[] vec = getElements();
+        float[] vec = vec();
         float[] res = new float[length()];
         for (int i = 0; i < res.length; i++) {
             res[i] = f.apply(i, vec[i]);
@@ -169,7 +169,7 @@
     final
     FloatVector uOpTemplate(VectorMask<Float> m,
                                      FUnOp f) {
-        float[] vec = getElements();
+        float[] vec = vec();
         float[] res = new float[length()];
         boolean[] mbits = ((AbstractMask<Float>)m).getBits();
         for (int i = 0; i < res.length; i++) {
@@ -194,8 +194,8 @@
     FloatVector bOpTemplate(Vector<Float> o,
                                      FBinOp f) {
         float[] res = new float[length()];
-        float[] vec1 = this.getElements();
-        float[] vec2 = ((FloatVector)o).getElements();
+        float[] vec1 = this.vec();
+        float[] vec2 = ((FloatVector)o).vec();
         for (int i = 0; i < res.length; i++) {
             res[i] = f.apply(i, vec1[i], vec2[i]);
         }
@@ -213,8 +213,8 @@
                                      VectorMask<Float> m,
                                      FBinOp f) {
         float[] res = new float[length()];
-        float[] vec1 = this.getElements();
-        float[] vec2 = ((FloatVector)o).getElements();
+        float[] vec1 = this.vec();
+        float[] vec2 = ((FloatVector)o).vec();
         boolean[] mbits = ((AbstractMask<Float>)m).getBits();
         for (int i = 0; i < res.length; i++) {
             res[i] = mbits[i] ? f.apply(i, vec1[i], vec2[i]) : vec1[i];
@@ -240,9 +240,9 @@
                                      Vector<Float> o2,
                                      FTriOp f) {
         float[] res = new float[length()];
-        float[] vec1 = this.getElements();
-        float[] vec2 = ((FloatVector)o1).getElements();
-        float[] vec3 = ((FloatVector)o2).getElements();
+        float[] vec1 = this.vec();
+        float[] vec2 = ((FloatVector)o1).vec();
+        float[] vec3 = ((FloatVector)o2).vec();
         for (int i = 0; i < res.length; i++) {
             res[i] = f.apply(i, vec1[i], vec2[i], vec3[i]);
         }
@@ -262,9 +262,9 @@
                                      VectorMask<Float> m,
                                      FTriOp f) {
         float[] res = new float[length()];
-        float[] vec1 = this.getElements();
-        float[] vec2 = ((FloatVector)o1).getElements();
-        float[] vec3 = ((FloatVector)o2).getElements();
+        float[] vec1 = this.vec();
+        float[] vec2 = ((FloatVector)o1).vec();
+        float[] vec3 = ((FloatVector)o2).vec();
         boolean[] mbits = ((AbstractMask<Float>)m).getBits();
         for (int i = 0; i < res.length; i++) {
             res[i] = mbits[i] ? f.apply(i, vec1[i], vec2[i], vec3[i]) : vec1[i];
@@ -280,7 +280,7 @@
     @ForceInline
     final
     float rOpTemplate(float v, FBinOp f) {
-        float[] vec = getElements();
+        float[] vec = vec();
         for (int i = 0; i < vec.length; i++) {
             v = f.apply(i, v, vec[i]);
         }
@@ -299,7 +299,7 @@
     final
     <M> FloatVector ldOp(M memory, int offset,
                                   FLdOp<M> f) {
-        //dummy; no vec = getElements();
+        //dummy; no vec = vec();
         float[] res = new float[length()];
         for (int i = 0; i < res.length; i++) {
             res[i] = f.apply(memory, offset, i);
@@ -313,7 +313,7 @@
     <M> FloatVector ldOp(M memory, int offset,
                                   VectorMask<Float> m,
                                   FLdOp<M> f) {
-        //float[] vec = getElements();
+        //float[] vec = vec();
         float[] res = new float[length()];
         boolean[] mbits = ((AbstractMask<Float>)m).getBits();
         for (int i = 0; i < res.length; i++) {
@@ -333,7 +333,7 @@
     final
     <M> void stOp(M memory, int offset,
                   FStOp<M> f) {
-        float[] vec = getElements();
+        float[] vec = vec();
         for (int i = 0; i < vec.length; i++) {
             f.apply(memory, offset, i, vec[i]);
         }
@@ -345,7 +345,7 @@
     <M> void stOp(M memory, int offset,
                   VectorMask<Float> m,
                   FStOp<M> f) {
-        float[] vec = getElements();
+        float[] vec = vec();
         boolean[] mbits = ((AbstractMask<Float>)m).getBits();
         for (int i = 0; i < vec.length; i++) {
             if (mbits[i]) {
@@ -367,8 +367,8 @@
     AbstractMask<Float> bTest(int cond,
                                   Vector<Float> o,
                                   FBinTest f) {
-        float[] vec1 = getElements();
-        float[] vec2 = ((FloatVector)o).getElements();
+        float[] vec1 = vec();
+        float[] vec2 = ((FloatVector)o).vec();
         boolean[] bits = new boolean[length()];
         for (int i = 0; i < length(); i++){
             bits[i] = f.apply(cond, i, vec1[i], vec2[i]);
@@ -1946,8 +1946,8 @@
     FloatVector sliceTemplate(int origin, Vector<Float> v1) {
         FloatVector that = (FloatVector) v1;
         that.check(this);
-        float[] a0 = this.getElements();
-        float[] a1 = that.getElements();
+        float[] a0 = this.vec();
+        float[] a1 = that.vec();
         float[] res = new float[a0.length];
         int vlen = res.length;
         int firstPart = vlen - origin;
@@ -1989,8 +1989,8 @@
     unsliceTemplate(int origin, Vector<Float> w, int part) {
         FloatVector that = (FloatVector) w;
         that.check(this);
-        float[] slice = this.getElements();
-        float[] res = that.getElements();
+        float[] slice = this.vec();
+        float[] res = that.vec().clone();
         int vlen = res.length;
         int firstPart = vlen - origin;
         switch (part) {
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Int128Vector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Int128Vector.java
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Int128Vector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Int128Vector.java
@@ -58,7 +58,7 @@
     static final Class<Integer> ETYPE = int.class;
 
     // The JVM expects to find the state here.
-    private final int[] vec; // Don't access directly, use getElements() instead.
+    private final int[] vec; // Don't access directly, use vec() instead.
 
     Int128Vector(int[] v) {
         vec = v;
@@ -119,7 +119,7 @@
     /*package-private*/
     @ForceInline
     final @Override
-    int[] getElements() {
+    int[] vec() {
         return VectorIntrinsics.maybeRebox(this).vec;
     }
 
@@ -478,7 +478,7 @@
                                 VCLASS, ETYPE, VLENGTH,
                                 this, i,
                                 (vec, ix) -> {
-                                    int[] vecarr = vec.getElements();
+                                    int[] vecarr = vec.vec();
                                     return (long)vecarr[ix];
                                 });
     }
@@ -492,7 +492,7 @@
                                 VCLASS, ETYPE, VLENGTH,
                                 this, i, (long)e,
                                 (v, ix, bits) -> {
-                                    int[] res = v.getElements().clone();
+                                    int[] res = v.vec().clone();
                                     res[ix] = (int)bits;
                                     return v.vectorFactory(res);
                                 });
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Int256Vector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Int256Vector.java
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Int256Vector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Int256Vector.java
@@ -58,7 +58,7 @@
     static final Class<Integer> ETYPE = int.class;
 
     // The JVM expects to find the state here.
-    private final int[] vec; // Don't access directly, use getElements() instead.
+    private final int[] vec; // Don't access directly, use vec() instead.
 
     Int256Vector(int[] v) {
         vec = v;
@@ -119,7 +119,7 @@
     /*package-private*/
     @ForceInline
     final @Override
-    int[] getElements() {
+    int[] vec() {
         return VectorIntrinsics.maybeRebox(this).vec;
     }
 
@@ -478,7 +478,7 @@
                                 VCLASS, ETYPE, VLENGTH,
                                 this, i,
                                 (vec, ix) -> {
-                                    int[] vecarr = vec.getElements();
+                                    int[] vecarr = vec.vec();
                                     return (long)vecarr[ix];
                                 });
     }
@@ -492,7 +492,7 @@
                                 VCLASS, ETYPE, VLENGTH,
                                 this, i, (long)e,
                                 (v, ix, bits) -> {
-                                    int[] res = v.getElements().clone();
+                                    int[] res = v.vec().clone();
                                     res[ix] = (int)bits;
                                     return v.vectorFactory(res);
                                 });
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Int512Vector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Int512Vector.java
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Int512Vector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Int512Vector.java
@@ -58,7 +58,7 @@
     static final Class<Integer> ETYPE = int.class;
 
     // The JVM expects to find the state here.
-    private final int[] vec; // Don't access directly, use getElements() instead.
+    private final int[] vec; // Don't access directly, use vec() instead.
 
     Int512Vector(int[] v) {
         vec = v;
@@ -119,7 +119,7 @@
     /*package-private*/
     @ForceInline
     final @Override
-    int[] getElements() {
+    int[] vec() {
         return VectorIntrinsics.maybeRebox(this).vec;
     }
 
@@ -478,7 +478,7 @@
                                 VCLASS, ETYPE, VLENGTH,
                                 this, i,
                                 (vec, ix) -> {
-                                    int[] vecarr = vec.getElements();
+                                    int[] vecarr = vec.vec();
                                     return (long)vecarr[ix];
                                 });
     }
@@ -492,7 +492,7 @@
                                 VCLASS, ETYPE, VLENGTH,
                                 this, i, (long)e,
                                 (v, ix, bits) -> {
-                                    int[] res = v.getElements().clone();
+                                    int[] res = v.vec().clone();
                                     res[ix] = (int)bits;
                                     return v.vectorFactory(res);
                                 });
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Int64Vector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Int64Vector.java
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Int64Vector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Int64Vector.java
@@ -58,7 +58,7 @@
     static final Class<Integer> ETYPE = int.class;
 
     // The JVM expects to find the state here.
-    private final int[] vec; // Don't access directly, use getElements() instead.
+    private final int[] vec; // Don't access directly, use vec() instead.
 
     Int64Vector(int[] v) {
         vec = v;
@@ -119,7 +119,7 @@
     /*package-private*/
     @ForceInline
     final @Override
-    int[] getElements() {
+    int[] vec() {
         return VectorIntrinsics.maybeRebox(this).vec;
     }
 
@@ -478,7 +478,7 @@
                                 VCLASS, ETYPE, VLENGTH,
                                 this, i,
                                 (vec, ix) -> {
-                                    int[] vecarr = vec.getElements();
+                                    int[] vecarr = vec.vec();
                                     return (long)vecarr[ix];
                                 });
     }
@@ -492,7 +492,7 @@
                                 VCLASS, ETYPE, VLENGTH,
                                 this, i, (long)e,
                                 (v, ix, bits) -> {
-                                    int[] res = v.getElements().clone();
+                                    int[] res = v.vec().clone();
                                     res[ix] = (int)bits;
                                     return v.vectorFactory(res);
                                 });
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/IntMaxVector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/IntMaxVector.java
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/IntMaxVector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/IntMaxVector.java
@@ -58,7 +58,7 @@
     static final Class<Integer> ETYPE = int.class;
 
     // The JVM expects to find the state here.
-    private final int[] vec; // Don't access directly, use getElements() instead.
+    private final int[] vec; // Don't access directly, use vec() instead.
 
     IntMaxVector(int[] v) {
         vec = v;
@@ -119,7 +119,7 @@
     /*package-private*/
     @ForceInline
     final @Override
-    int[] getElements() {
+    int[] vec() {
         return VectorIntrinsics.maybeRebox(this).vec;
     }
 
@@ -478,7 +478,7 @@
                                 VCLASS, ETYPE, VLENGTH,
                                 this, i,
                                 (vec, ix) -> {
-                                    int[] vecarr = vec.getElements();
+                                    int[] vecarr = vec.vec();
                                     return (long)vecarr[ix];
                                 });
     }
@@ -492,7 +492,7 @@
                                 VCLASS, ETYPE, VLENGTH,
                                 this, i, (long)e,
                                 (v, ix, bits) -> {
-                                    int[] res = v.getElements().clone();
+                                    int[] res = v.vec().clone();
                                     res[ix] = (int)bits;
                                     return v.vectorFactory(res);
                                 });
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/IntVector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/IntVector.java
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/IntVector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/IntVector.java
@@ -89,7 +89,7 @@
     // Virtualized getter
 
     /*package-private*/
-    abstract int[] getElements();
+    abstract int[] vec();
 
     // Virtualized constructors
 
@@ -153,7 +153,7 @@
     @ForceInline
     final
     IntVector uOpTemplate(FUnOp f) {
-        int[] vec = getElements();
+        int[] vec = vec();
         int[] res = new int[length()];
         for (int i = 0; i < res.length; i++) {
             res[i] = f.apply(i, vec[i]);
@@ -169,7 +169,7 @@
     final
     IntVector uOpTemplate(VectorMask<Integer> m,
                                      FUnOp f) {
-        int[] vec = getElements();
+        int[] vec = vec();
         int[] res = new int[length()];
         boolean[] mbits = ((AbstractMask<Integer>)m).getBits();
         for (int i = 0; i < res.length; i++) {
@@ -194,8 +194,8 @@
     IntVector bOpTemplate(Vector<Integer> o,
                                      FBinOp f) {
         int[] res = new int[length()];
-        int[] vec1 = this.getElements();
-        int[] vec2 = ((IntVector)o).getElements();
+        int[] vec1 = this.vec();
+        int[] vec2 = ((IntVector)o).vec();
         for (int i = 0; i < res.length; i++) {
             res[i] = f.apply(i, vec1[i], vec2[i]);
         }
@@ -213,8 +213,8 @@
                                      VectorMask<Integer> m,
                                      FBinOp f) {
         int[] res = new int[length()];
-        int[] vec1 = this.getElements();
-        int[] vec2 = ((IntVector)o).getElements();
+        int[] vec1 = this.vec();
+        int[] vec2 = ((IntVector)o).vec();
         boolean[] mbits = ((AbstractMask<Integer>)m).getBits();
         for (int i = 0; i < res.length; i++) {
             res[i] = mbits[i] ? f.apply(i, vec1[i], vec2[i]) : vec1[i];
@@ -240,9 +240,9 @@
                                      Vector<Integer> o2,
                                      FTriOp f) {
         int[] res = new int[length()];
-        int[] vec1 = this.getElements();
-        int[] vec2 = ((IntVector)o1).getElements();
-        int[] vec3 = ((IntVector)o2).getElements();
+        int[] vec1 = this.vec();
+        int[] vec2 = ((IntVector)o1).vec();
+        int[] vec3 = ((IntVector)o2).vec();
         for (int i = 0; i < res.length; i++) {
             res[i] = f.apply(i, vec1[i], vec2[i], vec3[i]);
         }
@@ -262,9 +262,9 @@
                                      VectorMask<Integer> m,
                                      FTriOp f) {
         int[] res = new int[length()];
-        int[] vec1 = this.getElements();
-        int[] vec2 = ((IntVector)o1).getElements();
-        int[] vec3 = ((IntVector)o2).getElements();
+        int[] vec1 = this.vec();
+        int[] vec2 = ((IntVector)o1).vec();
+        int[] vec3 = ((IntVector)o2).vec();
         boolean[] mbits = ((AbstractMask<Integer>)m).getBits();
         for (int i = 0; i < res.length; i++) {
             res[i] = mbits[i] ? f.apply(i, vec1[i], vec2[i], vec3[i]) : vec1[i];
@@ -280,7 +280,7 @@
     @ForceInline
     final
     int rOpTemplate(int v, FBinOp f) {
-        int[] vec = getElements();
+        int[] vec = vec();
         for (int i = 0; i < vec.length; i++) {
             v = f.apply(i, v, vec[i]);
         }
@@ -299,7 +299,7 @@
     final
     <M> IntVector ldOp(M memory, int offset,
                                   FLdOp<M> f) {
-        //dummy; no vec = getElements();
+        //dummy; no vec = vec();
         int[] res = new int[length()];
         for (int i = 0; i < res.length; i++) {
             res[i] = f.apply(memory, offset, i);
@@ -313,7 +313,7 @@
     <M> IntVector ldOp(M memory, int offset,
                                   VectorMask<Integer> m,
                                   FLdOp<M> f) {
-        //int[] vec = getElements();
+        //int[] vec = vec();
         int[] res = new int[length()];
         boolean[] mbits = ((AbstractMask<Integer>)m).getBits();
         for (int i = 0; i < res.length; i++) {
@@ -333,7 +333,7 @@
     final
     <M> void stOp(M memory, int offset,
                   FStOp<M> f) {
-        int[] vec = getElements();
+        int[] vec = vec();
         for (int i = 0; i < vec.length; i++) {
             f.apply(memory, offset, i, vec[i]);
         }
@@ -345,7 +345,7 @@
     <M> void stOp(M memory, int offset,
                   VectorMask<Integer> m,
                   FStOp<M> f) {
-        int[] vec = getElements();
+        int[] vec = vec();
         boolean[] mbits = ((AbstractMask<Integer>)m).getBits();
         for (int i = 0; i < vec.length; i++) {
             if (mbits[i]) {
@@ -367,8 +367,8 @@
     AbstractMask<Integer> bTest(int cond,
                                   Vector<Integer> o,
                                   FBinTest f) {
-        int[] vec1 = getElements();
-        int[] vec2 = ((IntVector)o).getElements();
+        int[] vec1 = vec();
+        int[] vec2 = ((IntVector)o).vec();
         boolean[] bits = new boolean[length()];
         for (int i = 0; i < length(); i++){
             bits[i] = f.apply(cond, i, vec1[i], vec2[i]);
@@ -2046,8 +2046,8 @@
     IntVector sliceTemplate(int origin, Vector<Integer> v1) {
         IntVector that = (IntVector) v1;
         that.check(this);
-        int[] a0 = this.getElements();
-        int[] a1 = that.getElements();
+        int[] a0 = this.vec();
+        int[] a1 = that.vec();
         int[] res = new int[a0.length];
         int vlen = res.length;
         int firstPart = vlen - origin;
@@ -2089,8 +2089,8 @@
     unsliceTemplate(int origin, Vector<Integer> w, int part) {
         IntVector that = (IntVector) w;
         that.check(this);
-        int[] slice = this.getElements();
-        int[] res = that.getElements();
+        int[] slice = this.vec();
+        int[] res = that.vec().clone();
         int vlen = res.length;
         int firstPart = vlen - origin;
         switch (part) {
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Long128Vector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Long128Vector.java
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Long128Vector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Long128Vector.java
@@ -58,7 +58,7 @@
     static final Class<Long> ETYPE = long.class;
 
     // The JVM expects to find the state here.
-    private final long[] vec; // Don't access directly, use getElements() instead.
+    private final long[] vec; // Don't access directly, use vec() instead.
 
     Long128Vector(long[] v) {
         vec = v;
@@ -119,7 +119,7 @@
     /*package-private*/
     @ForceInline
     final @Override
-    long[] getElements() {
+    long[] vec() {
         return VectorIntrinsics.maybeRebox(this).vec;
     }
 
@@ -468,7 +468,7 @@
                                 VCLASS, ETYPE, VLENGTH,
                                 this, i,
                                 (vec, ix) -> {
-                                    long[] vecarr = vec.getElements();
+                                    long[] vecarr = vec.vec();
                                     return (long)vecarr[ix];
                                 });
     }
@@ -482,7 +482,7 @@
                                 VCLASS, ETYPE, VLENGTH,
                                 this, i, (long)e,
                                 (v, ix, bits) -> {
-                                    long[] res = v.getElements().clone();
+                                    long[] res = v.vec().clone();
                                     res[ix] = (long)bits;
                                     return v.vectorFactory(res);
                                 });
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Long256Vector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Long256Vector.java
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Long256Vector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Long256Vector.java
@@ -58,7 +58,7 @@
     static final Class<Long> ETYPE = long.class;
 
     // The JVM expects to find the state here.
-    private final long[] vec; // Don't access directly, use getElements() instead.
+    private final long[] vec; // Don't access directly, use vec() instead.
 
     Long256Vector(long[] v) {
         vec = v;
@@ -119,7 +119,7 @@
     /*package-private*/
     @ForceInline
     final @Override
-    long[] getElements() {
+    long[] vec() {
         return VectorIntrinsics.maybeRebox(this).vec;
     }
 
@@ -468,7 +468,7 @@
                                 VCLASS, ETYPE, VLENGTH,
                                 this, i,
                                 (vec, ix) -> {
-                                    long[] vecarr = vec.getElements();
+                                    long[] vecarr = vec.vec();
                                     return (long)vecarr[ix];
                                 });
     }
@@ -482,7 +482,7 @@
                                 VCLASS, ETYPE, VLENGTH,
                                 this, i, (long)e,
                                 (v, ix, bits) -> {
-                                    long[] res = v.getElements().clone();
+                                    long[] res = v.vec().clone();
                                     res[ix] = (long)bits;
                                     return v.vectorFactory(res);
                                 });
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Long512Vector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Long512Vector.java
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Long512Vector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Long512Vector.java
@@ -58,7 +58,7 @@
     static final Class<Long> ETYPE = long.class;
 
     // The JVM expects to find the state here.
-    private final long[] vec; // Don't access directly, use getElements() instead.
+    private final long[] vec; // Don't access directly, use vec() instead.
 
     Long512Vector(long[] v) {
         vec = v;
@@ -119,7 +119,7 @@
     /*package-private*/
     @ForceInline
     final @Override
-    long[] getElements() {
+    long[] vec() {
         return VectorIntrinsics.maybeRebox(this).vec;
     }
 
@@ -468,7 +468,7 @@
                                 VCLASS, ETYPE, VLENGTH,
                                 this, i,
                                 (vec, ix) -> {
-                                    long[] vecarr = vec.getElements();
+                                    long[] vecarr = vec.vec();
                                     return (long)vecarr[ix];
                                 });
     }
@@ -482,7 +482,7 @@
                                 VCLASS, ETYPE, VLENGTH,
                                 this, i, (long)e,
                                 (v, ix, bits) -> {
-                                    long[] res = v.getElements().clone();
+                                    long[] res = v.vec().clone();
                                     res[ix] = (long)bits;
                                     return v.vectorFactory(res);
                                 });
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Long64Vector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Long64Vector.java
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Long64Vector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Long64Vector.java
@@ -58,7 +58,7 @@
     static final Class<Long> ETYPE = long.class;
 
     // The JVM expects to find the state here.
-    private final long[] vec; // Don't access directly, use getElements() instead.
+    private final long[] vec; // Don't access directly, use vec() instead.
 
     Long64Vector(long[] v) {
         vec = v;
@@ -119,7 +119,7 @@
     /*package-private*/
     @ForceInline
     final @Override
-    long[] getElements() {
+    long[] vec() {
         return VectorIntrinsics.maybeRebox(this).vec;
     }
 
@@ -468,7 +468,7 @@
                                 VCLASS, ETYPE, VLENGTH,
                                 this, i,
                                 (vec, ix) -> {
-                                    long[] vecarr = vec.getElements();
+                                    long[] vecarr = vec.vec();
                                     return (long)vecarr[ix];
                                 });
     }
@@ -482,7 +482,7 @@
                                 VCLASS, ETYPE, VLENGTH,
                                 this, i, (long)e,
                                 (v, ix, bits) -> {
-                                    long[] res = v.getElements().clone();
+                                    long[] res = v.vec().clone();
                                     res[ix] = (long)bits;
                                     return v.vectorFactory(res);
                                 });
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/LongMaxVector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/LongMaxVector.java
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/LongMaxVector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/LongMaxVector.java
@@ -58,7 +58,7 @@
     static final Class<Long> ETYPE = long.class;
 
     // The JVM expects to find the state here.
-    private final long[] vec; // Don't access directly, use getElements() instead.
+    private final long[] vec; // Don't access directly, use vec() instead.
 
     LongMaxVector(long[] v) {
         vec = v;
@@ -119,7 +119,7 @@
     /*package-private*/
     @ForceInline
     final @Override
-    long[] getElements() {
+    long[] vec() {
         return VectorIntrinsics.maybeRebox(this).vec;
     }
 
@@ -468,7 +468,7 @@
                                 VCLASS, ETYPE, VLENGTH,
                                 this, i,
                                 (vec, ix) -> {
-                                    long[] vecarr = vec.getElements();
+                                    long[] vecarr = vec.vec();
                                     return (long)vecarr[ix];
                                 });
     }
@@ -482,7 +482,7 @@
                                 VCLASS, ETYPE, VLENGTH,
                                 this, i, (long)e,
                                 (v, ix, bits) -> {
-                                    long[] res = v.getElements().clone();
+                                    long[] res = v.vec().clone();
                                     res[ix] = (long)bits;
                                     return v.vectorFactory(res);
                                 });
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/LongVector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/LongVector.java
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/LongVector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/LongVector.java
@@ -89,7 +89,7 @@
     // Virtualized getter
 
     /*package-private*/
-    abstract long[] getElements();
+    abstract long[] vec();
 
     // Virtualized constructors
 
@@ -153,7 +153,7 @@
     @ForceInline
     final
     LongVector uOpTemplate(FUnOp f) {
-        long[] vec = getElements();
+        long[] vec = vec();
         long[] res = new long[length()];
         for (int i = 0; i < res.length; i++) {
             res[i] = f.apply(i, vec[i]);
@@ -169,7 +169,7 @@
     final
     LongVector uOpTemplate(VectorMask<Long> m,
                                      FUnOp f) {
-        long[] vec = getElements();
+        long[] vec = vec();
         long[] res = new long[length()];
         boolean[] mbits = ((AbstractMask<Long>)m).getBits();
         for (int i = 0; i < res.length; i++) {
@@ -194,8 +194,8 @@
     LongVector bOpTemplate(Vector<Long> o,
                                      FBinOp f) {
         long[] res = new long[length()];
-        long[] vec1 = this.getElements();
-        long[] vec2 = ((LongVector)o).getElements();
+        long[] vec1 = this.vec();
+        long[] vec2 = ((LongVector)o).vec();
         for (int i = 0; i < res.length; i++) {
             res[i] = f.apply(i, vec1[i], vec2[i]);
         }
@@ -213,8 +213,8 @@
                                      VectorMask<Long> m,
                                      FBinOp f) {
         long[] res = new long[length()];
-        long[] vec1 = this.getElements();
-        long[] vec2 = ((LongVector)o).getElements();
+        long[] vec1 = this.vec();
+        long[] vec2 = ((LongVector)o).vec();
         boolean[] mbits = ((AbstractMask<Long>)m).getBits();
         for (int i = 0; i < res.length; i++) {
             res[i] = mbits[i] ? f.apply(i, vec1[i], vec2[i]) : vec1[i];
@@ -240,9 +240,9 @@
                                      Vector<Long> o2,
                                      FTriOp f) {
         long[] res = new long[length()];
-        long[] vec1 = this.getElements();
-        long[] vec2 = ((LongVector)o1).getElements();
-        long[] vec3 = ((LongVector)o2).getElements();
+        long[] vec1 = this.vec();
+        long[] vec2 = ((LongVector)o1).vec();
+        long[] vec3 = ((LongVector)o2).vec();
         for (int i = 0; i < res.length; i++) {
             res[i] = f.apply(i, vec1[i], vec2[i], vec3[i]);
         }
@@ -262,9 +262,9 @@
                                      VectorMask<Long> m,
                                      FTriOp f) {
         long[] res = new long[length()];
-        long[] vec1 = this.getElements();
-        long[] vec2 = ((LongVector)o1).getElements();
-        long[] vec3 = ((LongVector)o2).getElements();
+        long[] vec1 = this.vec();
+        long[] vec2 = ((LongVector)o1).vec();
+        long[] vec3 = ((LongVector)o2).vec();
         boolean[] mbits = ((AbstractMask<Long>)m).getBits();
         for (int i = 0; i < res.length; i++) {
             res[i] = mbits[i] ? f.apply(i, vec1[i], vec2[i], vec3[i]) : vec1[i];
@@ -280,7 +280,7 @@
     @ForceInline
     final
     long rOpTemplate(long v, FBinOp f) {
-        long[] vec = getElements();
+        long[] vec = vec();
         for (int i = 0; i < vec.length; i++) {
             v = f.apply(i, v, vec[i]);
         }
@@ -299,7 +299,7 @@
     final
     <M> LongVector ldOp(M memory, int offset,
                                   FLdOp<M> f) {
-        //dummy; no vec = getElements();
+        //dummy; no vec = vec();
         long[] res = new long[length()];
         for (int i = 0; i < res.length; i++) {
             res[i] = f.apply(memory, offset, i);
@@ -313,7 +313,7 @@
     <M> LongVector ldOp(M memory, int offset,
                                   VectorMask<Long> m,
                                   FLdOp<M> f) {
-        //long[] vec = getElements();
+        //long[] vec = vec();
         long[] res = new long[length()];
         boolean[] mbits = ((AbstractMask<Long>)m).getBits();
         for (int i = 0; i < res.length; i++) {
@@ -333,7 +333,7 @@
     final
     <M> void stOp(M memory, int offset,
                   FStOp<M> f) {
-        long[] vec = getElements();
+        long[] vec = vec();
         for (int i = 0; i < vec.length; i++) {
             f.apply(memory, offset, i, vec[i]);
         }
@@ -345,7 +345,7 @@
     <M> void stOp(M memory, int offset,
                   VectorMask<Long> m,
                   FStOp<M> f) {
-        long[] vec = getElements();
+        long[] vec = vec();
         boolean[] mbits = ((AbstractMask<Long>)m).getBits();
         for (int i = 0; i < vec.length; i++) {
             if (mbits[i]) {
@@ -367,8 +367,8 @@
     AbstractMask<Long> bTest(int cond,
                                   Vector<Long> o,
                                   FBinTest f) {
-        long[] vec1 = getElements();
-        long[] vec2 = ((LongVector)o).getElements();
+        long[] vec1 = vec();
+        long[] vec2 = ((LongVector)o).vec();
         boolean[] bits = new boolean[length()];
         for (int i = 0; i < length(); i++){
             bits[i] = f.apply(cond, i, vec1[i], vec2[i]);
@@ -1918,8 +1918,8 @@
     LongVector sliceTemplate(int origin, Vector<Long> v1) {
         LongVector that = (LongVector) v1;
         that.check(this);
-        long[] a0 = this.getElements();
-        long[] a1 = that.getElements();
+        long[] a0 = this.vec();
+        long[] a1 = that.vec();
         long[] res = new long[a0.length];
         int vlen = res.length;
         int firstPart = vlen - origin;
@@ -1961,8 +1961,8 @@
     unsliceTemplate(int origin, Vector<Long> w, int part) {
         LongVector that = (LongVector) w;
         that.check(this);
-        long[] slice = this.getElements();
-        long[] res = that.getElements();
+        long[] slice = this.vec();
+        long[] res = that.vec().clone();
         int vlen = res.length;
         int firstPart = vlen - origin;
         switch (part) {
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Short128Vector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Short128Vector.java
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Short128Vector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Short128Vector.java
@@ -58,7 +58,7 @@
     static final Class<Short> ETYPE = short.class;
 
     // The JVM expects to find the state here.
-    private final short[] vec; // Don't access directly, use getElements() instead.
+    private final short[] vec; // Don't access directly, use vec() instead.
 
     Short128Vector(short[] v) {
         vec = v;
@@ -119,7 +119,7 @@
     /*package-private*/
     @ForceInline
     final @Override
-    short[] getElements() {
+    short[] vec() {
         return VectorIntrinsics.maybeRebox(this).vec;
     }
 
@@ -478,7 +478,7 @@
                                 VCLASS, ETYPE, VLENGTH,
                                 this, i,
                                 (vec, ix) -> {
-                                    short[] vecarr = vec.getElements();
+                                    short[] vecarr = vec.vec();
                                     return (long)vecarr[ix];
                                 });
     }
@@ -492,7 +492,7 @@
                                 VCLASS, ETYPE, VLENGTH,
                                 this, i, (long)e,
                                 (v, ix, bits) -> {
-                                    short[] res = v.getElements().clone();
+                                    short[] res = v.vec().clone();
                                     res[ix] = (short)bits;
                                     return v.vectorFactory(res);
                                 });
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Short256Vector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Short256Vector.java
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Short256Vector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Short256Vector.java
@@ -58,7 +58,7 @@
     static final Class<Short> ETYPE = short.class;
 
     // The JVM expects to find the state here.
-    private final short[] vec; // Don't access directly, use getElements() instead.
+    private final short[] vec; // Don't access directly, use vec() instead.
 
     Short256Vector(short[] v) {
         vec = v;
@@ -119,7 +119,7 @@
     /*package-private*/
     @ForceInline
     final @Override
-    short[] getElements() {
+    short[] vec() {
         return VectorIntrinsics.maybeRebox(this).vec;
     }
 
@@ -478,7 +478,7 @@
                                 VCLASS, ETYPE, VLENGTH,
                                 this, i,
                                 (vec, ix) -> {
-                                    short[] vecarr = vec.getElements();
+                                    short[] vecarr = vec.vec();
                                     return (long)vecarr[ix];
                                 });
     }
@@ -492,7 +492,7 @@
                                 VCLASS, ETYPE, VLENGTH,
                                 this, i, (long)e,
                                 (v, ix, bits) -> {
-                                    short[] res = v.getElements().clone();
+                                    short[] res = v.vec().clone();
                                     res[ix] = (short)bits;
                                     return v.vectorFactory(res);
                                 });
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Short512Vector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Short512Vector.java
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Short512Vector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Short512Vector.java
@@ -58,7 +58,7 @@
     static final Class<Short> ETYPE = short.class;
 
     // The JVM expects to find the state here.
-    private final short[] vec; // Don't access directly, use getElements() instead.
+    private final short[] vec; // Don't access directly, use vec() instead.
 
     Short512Vector(short[] v) {
         vec = v;
@@ -119,7 +119,7 @@
     /*package-private*/
     @ForceInline
     final @Override
-    short[] getElements() {
+    short[] vec() {
         return VectorIntrinsics.maybeRebox(this).vec;
     }
 
@@ -478,7 +478,7 @@
                                 VCLASS, ETYPE, VLENGTH,
                                 this, i,
                                 (vec, ix) -> {
-                                    short[] vecarr = vec.getElements();
+                                    short[] vecarr = vec.vec();
                                     return (long)vecarr[ix];
                                 });
     }
@@ -492,7 +492,7 @@
                                 VCLASS, ETYPE, VLENGTH,
                                 this, i, (long)e,
                                 (v, ix, bits) -> {
-                                    short[] res = v.getElements().clone();
+                                    short[] res = v.vec().clone();
                                     res[ix] = (short)bits;
                                     return v.vectorFactory(res);
                                 });
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Short64Vector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Short64Vector.java
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Short64Vector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/Short64Vector.java
@@ -58,7 +58,7 @@
     static final Class<Short> ETYPE = short.class;
 
     // The JVM expects to find the state here.
-    private final short[] vec; // Don't access directly, use getElements() instead.
+    private final short[] vec; // Don't access directly, use vec() instead.
 
     Short64Vector(short[] v) {
         vec = v;
@@ -119,7 +119,7 @@
     /*package-private*/
     @ForceInline
     final @Override
-    short[] getElements() {
+    short[] vec() {
         return VectorIntrinsics.maybeRebox(this).vec;
     }
 
@@ -478,7 +478,7 @@
                                 VCLASS, ETYPE, VLENGTH,
                                 this, i,
                                 (vec, ix) -> {
-                                    short[] vecarr = vec.getElements();
+                                    short[] vecarr = vec.vec();
                                     return (long)vecarr[ix];
                                 });
     }
@@ -492,7 +492,7 @@
                                 VCLASS, ETYPE, VLENGTH,
                                 this, i, (long)e,
                                 (v, ix, bits) -> {
-                                    short[] res = v.getElements().clone();
+                                    short[] res = v.vec().clone();
                                     res[ix] = (short)bits;
                                     return v.vectorFactory(res);
                                 });
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/ShortMaxVector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/ShortMaxVector.java
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/ShortMaxVector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/ShortMaxVector.java
@@ -58,7 +58,7 @@
     static final Class<Short> ETYPE = short.class;
 
     // The JVM expects to find the state here.
-    private final short[] vec; // Don't access directly, use getElements() instead.
+    private final short[] vec; // Don't access directly, use vec() instead.
 
     ShortMaxVector(short[] v) {
         vec = v;
@@ -119,7 +119,7 @@
     /*package-private*/
     @ForceInline
     final @Override
-    short[] getElements() {
+    short[] vec() {
         return VectorIntrinsics.maybeRebox(this).vec;
     }
 
@@ -478,7 +478,7 @@
                                 VCLASS, ETYPE, VLENGTH,
                                 this, i,
                                 (vec, ix) -> {
-                                    short[] vecarr = vec.getElements();
+                                    short[] vecarr = vec.vec();
                                     return (long)vecarr[ix];
                                 });
     }
@@ -492,7 +492,7 @@
                                 VCLASS, ETYPE, VLENGTH,
                                 this, i, (long)e,
                                 (v, ix, bits) -> {
-                                    short[] res = v.getElements().clone();
+                                    short[] res = v.vec().clone();
                                     res[ix] = (short)bits;
                                     return v.vectorFactory(res);
                                 });
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/ShortVector.java b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/ShortVector.java
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/ShortVector.java
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/ShortVector.java
@@ -89,7 +89,7 @@
     // Virtualized getter
 
     /*package-private*/
-    abstract short[] getElements();
+    abstract short[] vec();
 
     // Virtualized constructors
 
@@ -153,7 +153,7 @@
     @ForceInline
     final
     ShortVector uOpTemplate(FUnOp f) {
-        short[] vec = getElements();
+        short[] vec = vec();
         short[] res = new short[length()];
         for (int i = 0; i < res.length; i++) {
             res[i] = f.apply(i, vec[i]);
@@ -169,7 +169,7 @@
     final
     ShortVector uOpTemplate(VectorMask<Short> m,
                                      FUnOp f) {
-        short[] vec = getElements();
+        short[] vec = vec();
         short[] res = new short[length()];
         boolean[] mbits = ((AbstractMask<Short>)m).getBits();
         for (int i = 0; i < res.length; i++) {
@@ -194,8 +194,8 @@
     ShortVector bOpTemplate(Vector<Short> o,
                                      FBinOp f) {
         short[] res = new short[length()];
-        short[] vec1 = this.getElements();
-        short[] vec2 = ((ShortVector)o).getElements();
+        short[] vec1 = this.vec();
+        short[] vec2 = ((ShortVector)o).vec();
         for (int i = 0; i < res.length; i++) {
             res[i] = f.apply(i, vec1[i], vec2[i]);
         }
@@ -213,8 +213,8 @@
                                      VectorMask<Short> m,
                                      FBinOp f) {
         short[] res = new short[length()];
-        short[] vec1 = this.getElements();
-        short[] vec2 = ((ShortVector)o).getElements();
+        short[] vec1 = this.vec();
+        short[] vec2 = ((ShortVector)o).vec();
         boolean[] mbits = ((AbstractMask<Short>)m).getBits();
         for (int i = 0; i < res.length; i++) {
             res[i] = mbits[i] ? f.apply(i, vec1[i], vec2[i]) : vec1[i];
@@ -240,9 +240,9 @@
                                      Vector<Short> o2,
                                      FTriOp f) {
         short[] res = new short[length()];
-        short[] vec1 = this.getElements();
-        short[] vec2 = ((ShortVector)o1).getElements();
-        short[] vec3 = ((ShortVector)o2).getElements();
+        short[] vec1 = this.vec();
+        short[] vec2 = ((ShortVector)o1).vec();
+        short[] vec3 = ((ShortVector)o2).vec();
         for (int i = 0; i < res.length; i++) {
             res[i] = f.apply(i, vec1[i], vec2[i], vec3[i]);
         }
@@ -262,9 +262,9 @@
                                      VectorMask<Short> m,
                                      FTriOp f) {
         short[] res = new short[length()];
-        short[] vec1 = this.getElements();
-        short[] vec2 = ((ShortVector)o1).getElements();
-        short[] vec3 = ((ShortVector)o2).getElements();
+        short[] vec1 = this.vec();
+        short[] vec2 = ((ShortVector)o1).vec();
+        short[] vec3 = ((ShortVector)o2).vec();
         boolean[] mbits = ((AbstractMask<Short>)m).getBits();
         for (int i = 0; i < res.length; i++) {
             res[i] = mbits[i] ? f.apply(i, vec1[i], vec2[i], vec3[i]) : vec1[i];
@@ -280,7 +280,7 @@
     @ForceInline
     final
     short rOpTemplate(short v, FBinOp f) {
-        short[] vec = getElements();
+        short[] vec = vec();
         for (int i = 0; i < vec.length; i++) {
             v = f.apply(i, v, vec[i]);
         }
@@ -299,7 +299,7 @@
     final
     <M> ShortVector ldOp(M memory, int offset,
                                   FLdOp<M> f) {
-        //dummy; no vec = getElements();
+        //dummy; no vec = vec();
         short[] res = new short[length()];
         for (int i = 0; i < res.length; i++) {
             res[i] = f.apply(memory, offset, i);
@@ -313,7 +313,7 @@
     <M> ShortVector ldOp(M memory, int offset,
                                   VectorMask<Short> m,
                                   FLdOp<M> f) {
-        //short[] vec = getElements();
+        //short[] vec = vec();
         short[] res = new short[length()];
         boolean[] mbits = ((AbstractMask<Short>)m).getBits();
         for (int i = 0; i < res.length; i++) {
@@ -333,7 +333,7 @@
     final
     <M> void stOp(M memory, int offset,
                   FStOp<M> f) {
-        short[] vec = getElements();
+        short[] vec = vec();
         for (int i = 0; i < vec.length; i++) {
             f.apply(memory, offset, i, vec[i]);
         }
@@ -345,7 +345,7 @@
     <M> void stOp(M memory, int offset,
                   VectorMask<Short> m,
                   FStOp<M> f) {
-        short[] vec = getElements();
+        short[] vec = vec();
         boolean[] mbits = ((AbstractMask<Short>)m).getBits();
         for (int i = 0; i < vec.length; i++) {
             if (mbits[i]) {
@@ -367,8 +367,8 @@
     AbstractMask<Short> bTest(int cond,
                                   Vector<Short> o,
                                   FBinTest f) {
-        short[] vec1 = getElements();
-        short[] vec2 = ((ShortVector)o).getElements();
+        short[] vec1 = vec();
+        short[] vec2 = ((ShortVector)o).vec();
         boolean[] bits = new boolean[length()];
         for (int i = 0; i < length(); i++){
             bits[i] = f.apply(cond, i, vec1[i], vec2[i]);
@@ -2047,8 +2047,8 @@
     ShortVector sliceTemplate(int origin, Vector<Short> v1) {
         ShortVector that = (ShortVector) v1;
         that.check(this);
-        short[] a0 = this.getElements();
-        short[] a1 = that.getElements();
+        short[] a0 = this.vec();
+        short[] a1 = that.vec();
         short[] res = new short[a0.length];
         int vlen = res.length;
         int firstPart = vlen - origin;
@@ -2090,8 +2090,8 @@
     unsliceTemplate(int origin, Vector<Short> w, int part) {
         ShortVector that = (ShortVector) w;
         that.check(this);
-        short[] slice = this.getElements();
-        short[] res = that.getElements();
+        short[] slice = this.vec();
+        short[] res = that.vec().clone();
         int vlen = res.length;
         int firstPart = vlen - origin;
         switch (part) {
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/X-Vector.java.template b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/X-Vector.java.template
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/X-Vector.java.template
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/X-Vector.java.template
@@ -95,7 +95,7 @@
     // Virtualized getter
 
     /*package-private*/
-    abstract $type$[] getElements();
+    abstract $type$[] vec();
 
     // Virtualized constructors
 
@@ -159,7 +159,7 @@
     @ForceInline
     final
     $abstractvectortype$ uOpTemplate(FUnOp f) {
-        $type$[] vec = getElements();
+        $type$[] vec = vec();
         $type$[] res = new $type$[length()];
         for (int i = 0; i < res.length; i++) {
             res[i] = f.apply(i, vec[i]);
@@ -175,7 +175,7 @@
     final
     $abstractvectortype$ uOpTemplate(VectorMask<$Boxtype$> m,
                                      FUnOp f) {
-        $type$[] vec = getElements();
+        $type$[] vec = vec();
         $type$[] res = new $type$[length()];
         boolean[] mbits = ((AbstractMask<$Boxtype$>)m).getBits();
         for (int i = 0; i < res.length; i++) {
@@ -200,8 +200,8 @@
     $abstractvectortype$ bOpTemplate(Vector<$Boxtype$> o,
                                      FBinOp f) {
         $type$[] res = new $type$[length()];
-        $type$[] vec1 = this.getElements();
-        $type$[] vec2 = (($abstractvectortype$)o).getElements();
+        $type$[] vec1 = this.vec();
+        $type$[] vec2 = (($abstractvectortype$)o).vec();
         for (int i = 0; i < res.length; i++) {
             res[i] = f.apply(i, vec1[i], vec2[i]);
         }
@@ -219,8 +219,8 @@
                                      VectorMask<$Boxtype$> m,
                                      FBinOp f) {
         $type$[] res = new $type$[length()];
-        $type$[] vec1 = this.getElements();
-        $type$[] vec2 = (($abstractvectortype$)o).getElements();
+        $type$[] vec1 = this.vec();
+        $type$[] vec2 = (($abstractvectortype$)o).vec();
         boolean[] mbits = ((AbstractMask<$Boxtype$>)m).getBits();
         for (int i = 0; i < res.length; i++) {
             res[i] = mbits[i] ? f.apply(i, vec1[i], vec2[i]) : vec1[i];
@@ -246,9 +246,9 @@
                                      Vector<$Boxtype$> o2,
                                      FTriOp f) {
         $type$[] res = new $type$[length()];
-        $type$[] vec1 = this.getElements();
-        $type$[] vec2 = (($abstractvectortype$)o1).getElements();
-        $type$[] vec3 = (($abstractvectortype$)o2).getElements();
+        $type$[] vec1 = this.vec();
+        $type$[] vec2 = (($abstractvectortype$)o1).vec();
+        $type$[] vec3 = (($abstractvectortype$)o2).vec();
         for (int i = 0; i < res.length; i++) {
             res[i] = f.apply(i, vec1[i], vec2[i], vec3[i]);
         }
@@ -268,9 +268,9 @@
                                      VectorMask<$Boxtype$> m,
                                      FTriOp f) {
         $type$[] res = new $type$[length()];
-        $type$[] vec1 = this.getElements();
-        $type$[] vec2 = (($abstractvectortype$)o1).getElements();
-        $type$[] vec3 = (($abstractvectortype$)o2).getElements();
+        $type$[] vec1 = this.vec();
+        $type$[] vec2 = (($abstractvectortype$)o1).vec();
+        $type$[] vec3 = (($abstractvectortype$)o2).vec();
         boolean[] mbits = ((AbstractMask<$Boxtype$>)m).getBits();
         for (int i = 0; i < res.length; i++) {
             res[i] = mbits[i] ? f.apply(i, vec1[i], vec2[i], vec3[i]) : vec1[i];
@@ -286,7 +286,7 @@
     @ForceInline
     final
     $type$ rOpTemplate($type$ v, FBinOp f) {
-        $type$[] vec = getElements();
+        $type$[] vec = vec();
         for (int i = 0; i < vec.length; i++) {
             v = f.apply(i, v, vec[i]);
         }
@@ -305,7 +305,7 @@
     final
     <M> $abstractvectortype$ ldOp(M memory, int offset,
                                   FLdOp<M> f) {
-        //dummy; no vec = getElements();
+        //dummy; no vec = vec();
         $type$[] res = new $type$[length()];
         for (int i = 0; i < res.length; i++) {
             res[i] = f.apply(memory, offset, i);
@@ -319,7 +319,7 @@
     <M> $abstractvectortype$ ldOp(M memory, int offset,
                                   VectorMask<$Boxtype$> m,
                                   FLdOp<M> f) {
-        //$type$[] vec = getElements();
+        //$type$[] vec = vec();
         $type$[] res = new $type$[length()];
         boolean[] mbits = ((AbstractMask<$Boxtype$>)m).getBits();
         for (int i = 0; i < res.length; i++) {
@@ -339,7 +339,7 @@
     final
     <M> void stOp(M memory, int offset,
                   FStOp<M> f) {
-        $type$[] vec = getElements();
+        $type$[] vec = vec();
         for (int i = 0; i < vec.length; i++) {
             f.apply(memory, offset, i, vec[i]);
         }
@@ -351,7 +351,7 @@
     <M> void stOp(M memory, int offset,
                   VectorMask<$Boxtype$> m,
                   FStOp<M> f) {
-        $type$[] vec = getElements();
+        $type$[] vec = vec();
         boolean[] mbits = ((AbstractMask<$Boxtype$>)m).getBits();
         for (int i = 0; i < vec.length; i++) {
             if (mbits[i]) {
@@ -373,8 +373,8 @@
     AbstractMask<$Boxtype$> bTest(int cond,
                                   Vector<$Boxtype$> o,
                                   FBinTest f) {
-        $type$[] vec1 = getElements();
-        $type$[] vec2 = (($abstractvectortype$)o).getElements();
+        $type$[] vec1 = vec();
+        $type$[] vec2 = (($abstractvectortype$)o).vec();
         boolean[] bits = new boolean[length()];
         for (int i = 0; i < length(); i++){
             bits[i] = f.apply(cond, i, vec1[i], vec2[i]);
@@ -2305,8 +2305,8 @@
     $abstractvectortype$ sliceTemplate(int origin, Vector<$Boxtype$> v1) {
         $abstractvectortype$ that = ($abstractvectortype$) v1;
         that.check(this);
-        $type$[] a0 = this.getElements();
-        $type$[] a1 = that.getElements();
+        $type$[] a0 = this.vec();
+        $type$[] a1 = that.vec();
         $type$[] res = new $type$[a0.length];
         int vlen = res.length;
         int firstPart = vlen - origin;
@@ -2348,8 +2348,8 @@
     unsliceTemplate(int origin, Vector<$Boxtype$> w, int part) {
         $abstractvectortype$ that = ($abstractvectortype$) w;
         that.check(this);
-        $type$[] slice = this.getElements();
-        $type$[] res = that.getElements();
+        $type$[] slice = this.vec();
+        $type$[] res = that.vec().clone();
         int vlen = res.length;
         int firstPart = vlen - origin;
         switch (part) {
diff --git a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/X-VectorBits.java.template b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/X-VectorBits.java.template
--- a/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/X-VectorBits.java.template
+++ b/src/jdk.incubator.vector/share/classes/jdk/incubator/vector/X-VectorBits.java.template
@@ -60,7 +60,7 @@
     static final Class<$Boxtype$> ETYPE = $type$.class;
 
     // The JVM expects to find the state here.
-    private final $type$[] vec; // Don't access directly, use getElements() instead.
+    private final $type$[] vec; // Don't access directly, use vec() instead.
 
     $vectortype$($type$[] v) {
         vec = v;
@@ -121,7 +121,7 @@
     /*package-private*/
     @ForceInline
     final @Override
-    $type$[] getElements() {
+    $type$[] vec() {
         return VectorIntrinsics.maybeRebox(this).vec;
     }
 
@@ -487,7 +487,7 @@
                                 VCLASS, ETYPE, VLENGTH,
                                 this, i,
                                 (vec, ix) -> {
-                                    $type$[] vecarr = vec.getElements();
+                                    $type$[] vecarr = vec.vec();
                                     return (long)$Type$.$type$To$Bitstype$Bits(vecarr[ix]);
                                 });
         return $Type$.$bitstype$BitsTo$Fptype$(bits);
@@ -502,7 +502,7 @@
                                 VCLASS, ETYPE, VLENGTH,
                                 this, i, (long)$Type$.$type$To$Bitstype$Bits(e),
                                 (v, ix, bits) -> {
-                                    $type$[] res = v.getElements().clone();
+                                    $type$[] res = v.vec().clone();
                                     res[ix] = $Type$.$bitstype$BitsTo$Type$(($bitstype$)bits);
                                     return v.vectorFactory(res);
                                 });
@@ -517,7 +517,7 @@
                                 VCLASS, ETYPE, VLENGTH,
                                 this, i,
                                 (vec, ix) -> {
-                                    $type$[] vecarr = vec.getElements();
+                                    $type$[] vecarr = vec.vec();
                                     return (long)vecarr[ix];
                                 });
     }
@@ -531,7 +531,7 @@
                                 VCLASS, ETYPE, VLENGTH,
                                 this, i, (long)e,
                                 (v, ix, bits) -> {
-                                    $type$[] res = v.getElements().clone();
+                                    $type$[] res = v.vec().clone();
                                     res[ix] = ($type$)bits;
                                     return v.vectorFactory(res);
                                 });