rename method arguments for clarity (#1716)

* rename method arguments for clarity

* Transform:  rename 2 args

* Quaternion:  rename 3 args

* rename "JmeImporter e" arguments

* Vector3f:  vector arguments named "scalar"???

* Vector4f:  vector arguments named "scalar"???

* Google style prohibits underscores in argument names

* jme3-core:  "Amnt" -> "Amount"

jme3-android/src/main/java/com/jme3/renderer/android/AndroidGL.java

@@ -138,8 +138,8 @@ public class AndroidGL implements GL, GL2, GLES_30, GLExt, GLFbo {
     }
 
     @Override
-    public void glBufferData(int target, long data_size, int usage) {
-        GLES20.glBufferData(target, (int) data_size, null, usage);
+    public void glBufferData(int target, long dataSize, int usage) {
+        GLES20.glBufferData(target, (int) dataSize, null, usage);
     }
 
     @Override
@@ -565,8 +565,8 @@ public class AndroidGL implements GL, GL2, GLES_30, GLExt, GLFbo {
     }
 
     @Override
-    public void glDrawElementsInstancedARB(int mode, int indices_count, int type, long indices_buffer_offset, int primcount) {
-        GLES30.glDrawElementsInstanced(mode, indices_count, type, (int)indices_buffer_offset, primcount);
+    public void glDrawElementsInstancedARB(int mode, int indicesCount, int type, long indicesBufferOffset, int primcount) {
+        GLES30.glDrawElementsInstanced(mode, indicesCount, type, (int)indicesBufferOffset, primcount);
     }
 
     @Override

jme3-core/src/main/java/com/jme3/bounding/BoundingBox.java

@@ -1136,9 +1136,9 @@ public class BoundingBox extends BoundingVolume {
     }
 
     @Override
-    public void read(JmeImporter e) throws IOException {
-        super.read(e);
-        InputCapsule capsule = e.getCapsule(this);
+    public void read(JmeImporter importer) throws IOException {
+        super.read(importer);
+        InputCapsule capsule = importer.getCapsule(this);
         xExtent = capsule.readFloat("xExtent", 0);
         yExtent = capsule.readFloat("yExtent", 0);
         zExtent = capsule.readFloat("zExtent", 0);

jme3-core/src/main/java/com/jme3/bounding/BoundingSphere.java

@@ -1062,10 +1062,10 @@ public class BoundingSphere extends BoundingVolume {
     }
 
     @Override
-    public void read(JmeImporter e) throws IOException {
-        super.read(e);
+    public void read(JmeImporter importer) throws IOException {
+        super.read(importer);
         try {
-            radius = e.getCapsule(this).readFloat("radius", 0);
+            radius = importer.getCapsule(this).readFloat("radius", 0);
         } catch (IOException ex) {
             logger.logp(Level.SEVERE, this.getClass().toString(), "read(JMEImporter)", "Exception", ex);
         }

jme3-core/src/main/java/com/jme3/bounding/BoundingVolume.java

@@ -318,8 +318,8 @@ public abstract class BoundingVolume implements Savable, Cloneable, Collidable {
     }
 
     @Override
-    public void read(JmeImporter e) throws IOException {
-        center = (Vector3f) e.getCapsule(this).readSavable("center", Vector3f.ZERO.clone());
+    public void read(JmeImporter importer) throws IOException {
+        center = (Vector3f) importer.getCapsule(this).readSavable("center", Vector3f.ZERO.clone());
     }
 
     public int collideWith(Collidable other) {

jme3-core/src/main/java/com/jme3/math/ColorRGBA.java

@@ -547,12 +547,12 @@ public final class ColorRGBA implements Savable, Cloneable, java.io.Serializable
      * De-serialize this color from the specified importer, for example when
      * loading from a J3O file.
      *
-     * @param e (not null)
+     * @param importer (not null)
      * @throws IOException from the importer
      */
     @Override
-    public void read(JmeImporter e) throws IOException {
-        InputCapsule capsule = e.getCapsule(this);
+    public void read(JmeImporter importer) throws IOException {
+        InputCapsule capsule = importer.getCapsule(this);
         r = capsule.readFloat("r", 0);
         g = capsule.readFloat("g", 0);
         b = capsule.readFloat("b", 0);

jme3-core/src/main/java/com/jme3/math/Line.java

@@ -248,12 +248,12 @@ public class Line implements Savable, Cloneable, java.io.Serializable {
      * De-serialize this line from the specified importer, for example when
      * loading from a J3O file.
      *
-     * @param e (not null)
+     * @param importer (not null)
      * @throws IOException from the importer
      */
     @Override
-    public void read(JmeImporter e) throws IOException {
-        InputCapsule capsule = e.getCapsule(this);
+    public void read(JmeImporter importer) throws IOException {
+        InputCapsule capsule = importer.getCapsule(this);
         origin = (Vector3f) capsule.readSavable("origin", Vector3f.ZERO.clone());
         direction = (Vector3f) capsule.readSavable("direction", Vector3f.ZERO.clone());
     }

jme3-core/src/main/java/com/jme3/math/LineSegment.java

@@ -692,12 +692,12 @@ public class LineSegment implements Cloneable, Savable, java.io.Serializable {
      * De-serialize this segment from the specified importer, for example
      * when loading from a J3O file.
      *
-     * @param e (not null)
+     * @param importer (not null)
      * @throws IOException from the importer
      */
     @Override
-    public void read(JmeImporter e) throws IOException {
-        InputCapsule capsule = e.getCapsule(this);
+    public void read(JmeImporter importer) throws IOException {
+        InputCapsule capsule = importer.getCapsule(this);
         origin = (Vector3f) capsule.readSavable("origin", Vector3f.ZERO.clone());
         direction = (Vector3f) capsule.readSavable("direction", Vector3f.ZERO.clone());
         extent = capsule.readFloat("extent", 0);

jme3-core/src/main/java/com/jme3/math/Matrix3f.java

@@ -1293,12 +1293,12 @@ public final class Matrix3f implements Savable, Cloneable, java.io.Serializable
      * De-serialize this matrix from the specified importer, for example
      * when loading from a J3O file.
      *
-     * @param e (not null)
+     * @param importer (not null)
      * @throws IOException from the importer
      */
     @Override
-    public void read(JmeImporter e) throws IOException {
-        InputCapsule cap = e.getCapsule(this);
+    public void read(JmeImporter importer) throws IOException {
+        InputCapsule cap = importer.getCapsule(this);
         m00 = cap.readFloat("m00", 1);
         m01 = cap.readFloat("m01", 0);
         m02 = cap.readFloat("m02", 0);

jme3-core/src/main/java/com/jme3/math/Matrix4f.java

@@ -2335,12 +2335,12 @@ public final class Matrix4f implements Savable, Cloneable, java.io.Serializable
      * De-serialize from the specified importer, for example when loading from a
      * J3O file.
      *
-     * @param e (not null)
+     * @param importer (not null)
      * @throws IOException from the importer
      */
     @Override
-    public void read(JmeImporter e) throws IOException {
-        InputCapsule cap = e.getCapsule(this);
+    public void read(JmeImporter importer) throws IOException {
+        InputCapsule cap = importer.getCapsule(this);
         m00 = cap.readFloat("m00", 1);
         m01 = cap.readFloat("m01", 0);
         m02 = cap.readFloat("m02", 0);

jme3-core/src/main/java/com/jme3/math/Plane.java

@@ -323,12 +323,12 @@ public class Plane implements Savable, Cloneable, java.io.Serializable {
      * De-serialize this plane from the specified importer, for example when
      * loading from a J3O file.
      *
-     * @param e (not null)
+     * @param importer (not null)
      * @throws IOException from the importer
      */
     @Override
-    public void read(JmeImporter e) throws IOException {
-        InputCapsule capsule = e.getCapsule(this);
+    public void read(JmeImporter importer) throws IOException {
+        InputCapsule capsule = importer.getCapsule(this);
         normal = (Vector3f) capsule.readSavable("normal", Vector3f.ZERO.clone());
         constant = capsule.readFloat("constant", 0);
     }

jme3-core/src/main/java/com/jme3/math/Quaternion.java

@@ -800,14 +800,14 @@ public final class Quaternion implements Savable, Cloneable, java.io.Serializabl
 
     /**
      * Sets the values of this quaternion to the slerp from itself to q2 by
-     * changeAmnt
+     * changeAmount
      *
      * @param q2
      *            Final interpolation value
-     * @param changeAmnt
+     * @param changeAmount
      *            The amount difference
      */
-    public void slerp(Quaternion q2, float changeAmnt) {
+    public void slerp(Quaternion q2, float changeAmount) {
         if (this.x == q2.x && this.y == q2.y && this.z == q2.z
                 && this.w == q2.w) {
             return;
@@ -826,8 +826,8 @@ public final class Quaternion implements Savable, Cloneable, java.io.Serializabl
         }
 
         // Set the first and second scale for the interpolation
-        float scale0 = 1 - changeAmnt;
-        float scale1 = changeAmnt;
+        float scale0 = 1 - changeAmount;
+        float scale1 = changeAmount;
 
         // Check if the angle between the 2 quaternions was big enough to
         // warrant such calculations
@@ -839,8 +839,8 @@ public final class Quaternion implements Savable, Cloneable, java.io.Serializabl
 
             // Calculate the scale for q1 and q2, according to the angle and
             // its sine
-            scale0 = FastMath.sin((1 - changeAmnt) * theta) * invSinTheta;
-            scale1 = FastMath.sin((changeAmnt * theta)) * invSinTheta;
+            scale0 = FastMath.sin((1 - changeAmount) * theta) * invSinTheta;
+            scale1 = FastMath.sin((changeAmount * theta)) * invSinTheta;
         }
 
         // Calculate the x, y, z and w values for the quaternion by using a
@@ -945,24 +945,24 @@ public final class Quaternion implements Savable, Cloneable, java.io.Serializabl
      * The result is returned as a new quaternion. It should be noted that
      * quaternion multiplication is not commutative so q * p != p * q.
      *
-     * It IS safe for q and res to be the same object.
-     * It IS NOT safe for this and res to be the same object.
+     * It IS safe for q and storeResult to be the same object.
+     * It IS NOT safe for this and storeResult to be the same object.
      *
      * @param q   the quaternion to multiply this quaternion by.
-     * @param res
+     * @param storeResult
      *            the quaternion to store the result in.
      * @return the new quaternion.
      */
-    public Quaternion mult(Quaternion q, Quaternion res) {
-        if (res == null) {
-            res = new Quaternion();
+    public Quaternion mult(Quaternion q, Quaternion storeResult) {
+        if (storeResult == null) {
+            storeResult = new Quaternion();
         }
         float qw = q.w, qx = q.x, qy = q.y, qz = q.z;
-        res.x = x * qw + y * qz - z * qy + w * qx;
-        res.y = -x * qz + y * qw + z * qx + w * qy;
-        res.z = x * qy - y * qx + z * qw + w * qz;
-        res.w = -x * qx - y * qy - z * qz + w * qw;
-        return res;
+        storeResult.x = x * qw + y * qz - z * qy + w * qx;
+        storeResult.y = -x * qz + y * qw + z * qx + w * qy;
+        storeResult.z = x * qy - y * qx + z * qw + w * qz;
+        storeResult.w = -x * qx - y * qy - z * qz + w * qw;
+        return storeResult;
     }
 
     /**
@@ -1461,12 +1461,12 @@ public final class Quaternion implements Savable, Cloneable, java.io.Serializabl
      * De-serialize this quaternion from the specified importer, for example
      * when loading from a J3O file.
      *
-     * @param e (not null)
+     * @param importer (not null)
      * @throws IOException from the importer
      */
     @Override
-    public void read(JmeImporter e) throws IOException {
-        InputCapsule cap = e.getCapsule(this);
+    public void read(JmeImporter importer) throws IOException {
+        InputCapsule cap = importer.getCapsule(this);
         x = cap.readFloat("x", 0);
         y = cap.readFloat("y", 0);
         z = cap.readFloat("z", 0);

jme3-core/src/main/java/com/jme3/math/Ray.java

@@ -533,12 +533,12 @@ public final class Ray implements Savable, Cloneable, Collidable, java.io.Serial
      * De-serialize this ray from the specified importer, for example
      * when loading from a J3O file.
      *
-     * @param e (not null)
+     * @param importer (not null)
      * @throws IOException from the importer
      */
     @Override
-    public void read(JmeImporter e) throws IOException {
-        InputCapsule capsule = e.getCapsule(this);
+    public void read(JmeImporter importer) throws IOException {
+        InputCapsule capsule = importer.getCapsule(this);
         origin = (Vector3f) capsule.readSavable("origin", Vector3f.ZERO.clone());
         direction = (Vector3f) capsule.readSavable("direction", Vector3f.ZERO.clone());
     }

jme3-core/src/main/java/com/jme3/math/Rectangle.java

@@ -225,12 +225,12 @@ public final class Rectangle implements Savable, Cloneable, java.io.Serializable
      * De-serialize this rectangle from the specified importer, for example
      * when loading from a J3O file.
      *
-     * @param e (not null)
+     * @param importer (not null)
      * @throws IOException from the importer
      */
     @Override
-    public void read(JmeImporter e) throws IOException {
-        InputCapsule capsule = e.getCapsule(this);
+    public void read(JmeImporter importer) throws IOException {
+        InputCapsule capsule = importer.getCapsule(this);
         a = (Vector3f) capsule.readSavable("a", Vector3f.ZERO.clone());
         b = (Vector3f) capsule.readSavable("b", Vector3f.ZERO.clone());
         c = (Vector3f) capsule.readSavable("c", Vector3f.ZERO.clone());

jme3-core/src/main/java/com/jme3/math/Ring.java

@@ -214,12 +214,12 @@ public final class Ring implements Savable, Cloneable, java.io.Serializable {
      * De-serialize this ring from the specified importer, for example
      * when loading from a J3O file.
      *
-     * @param e (not null)
+     * @param importer (not null)
      * @throws IOException from the importer
      */
     @Override
-    public void read(JmeImporter e) throws IOException {
-        InputCapsule capsule = e.getCapsule(this);
+    public void read(JmeImporter importer) throws IOException {
+        InputCapsule capsule = importer.getCapsule(this);
         center = (Vector3f) capsule.readSavable("center", Vector3f.ZERO.clone());
         up = (Vector3f) capsule.readSavable("up", Vector3f.UNIT_Z.clone());
         innerRadius = capsule.readFloat("innerRadius", 0f);

jme3-core/src/main/java/com/jme3/math/Transform.java

@@ -485,13 +485,13 @@ public final class Transform implements Savable, Cloneable, java.io.Serializable
     /**
      * Copies all 3 components from the argument.
      *
-     * @param matrixQuat The Transform to copy (not null, unaffected)
+     * @param transform The Transform to copy (not null, unaffected)
      * @return the (modified) current instance (for chaining)
      */
-    public Transform set(Transform matrixQuat) {
-        this.translation.set(matrixQuat.translation);
-        this.rot.set(matrixQuat.rot);
-        this.scale.set(matrixQuat.scale);
+    public Transform set(Transform transform) {
+        this.translation.set(transform.translation);
+        this.rot.set(transform.rot);
+        this.scale.set(transform.scale);
         return this;
     }
 
@@ -514,12 +514,12 @@ public final class Transform implements Savable, Cloneable, java.io.Serializable
      * De-serializes from the argument, for example when loading from a J3O
      * file.
      *
-     * @param e (not null)
+     * @param importer (not null)
      * @throws IOException from the importer
      */
     @Override
-    public void read(JmeImporter e) throws IOException {
-        InputCapsule capsule = e.getCapsule(this);
+    public void read(JmeImporter importer) throws IOException {
+        InputCapsule capsule = importer.getCapsule(this);
 
         rot.set((Quaternion) capsule.readSavable("rot", Quaternion.IDENTITY));
         translation.set((Vector3f) capsule.readSavable("translation", Vector3f.ZERO));

jme3-core/src/main/java/com/jme3/math/Triangle.java

@@ -368,14 +368,14 @@ public class Triangle extends AbstractTriangle implements Savable, Cloneable, ja
      * De-serialize this triangle from the specified importer, for example when
      * loading from a J3O file.
      *
-     * @param e (not null)
+     * @param importer (not null)
      * @throws IOException from the importer
      */
     @Override
-    public void read(JmeImporter e) throws IOException {
-        pointa = (Vector3f) e.getCapsule(this).readSavable("pointa", Vector3f.ZERO.clone());
-        pointb = (Vector3f) e.getCapsule(this).readSavable("pointb", Vector3f.ZERO.clone());
-        pointc = (Vector3f) e.getCapsule(this).readSavable("pointc", Vector3f.ZERO.clone());
+    public void read(JmeImporter importer) throws IOException {
+        pointa = (Vector3f) importer.getCapsule(this).readSavable("pointa", Vector3f.ZERO.clone());
+        pointb = (Vector3f) importer.getCapsule(this).readSavable("pointb", Vector3f.ZERO.clone());
+        pointc = (Vector3f) importer.getCapsule(this).readSavable("pointc", Vector3f.ZERO.clone());
     }
 
     /**

jme3-core/src/main/java/com/jme3/math/Vector2f.java

@@ -226,39 +226,39 @@ public final class Vector2f implements Savable, Cloneable, java.io.Serializable
     }
 
     /**
-     * Sets this vector to the interpolation by changeAmnt from this to the
-     * finalVec this=(1-changeAmnt)*this + changeAmnt * finalVec
+     * Sets this vector to the interpolation by changeAmount from this to the
+     * finalVec this=(1-changeAmount)*this + changeAmount * finalVec
      *
      * @param finalVec
      *            The final vector to interpolate towards
-     * @param changeAmnt
+     * @param changeAmount
      *            An amount between 0.0 - 1.0 representing a percentage change
      *            from this towards finalVec
      * @return this
      */
-    public Vector2f interpolateLocal(Vector2f finalVec, float changeAmnt) {
-        this.x = (1 - changeAmnt) * this.x + changeAmnt * finalVec.x;
-        this.y = (1 - changeAmnt) * this.y + changeAmnt * finalVec.y;
+    public Vector2f interpolateLocal(Vector2f finalVec, float changeAmount) {
+        this.x = (1 - changeAmount) * this.x + changeAmount * finalVec.x;
+        this.y = (1 - changeAmount) * this.y + changeAmount * finalVec.y;
         return this;
     }
 
     /**
-     * Sets this vector to the interpolation by changeAmnt from beginVec to
-     * finalVec this=(1-changeAmnt)*beginVec + changeAmnt * finalVec
+     * Sets this vector to the interpolation by changeAmount from beginVec to
+     * finalVec this=(1-changeAmount)*beginVec + changeAmount * finalVec
      *
      * @param beginVec
      *            The beginning vector (delta=0)
      * @param finalVec
      *            The final vector to interpolate towards (delta=1)
-     * @param changeAmnt
+     * @param changeAmount
      *            An amount between 0.0 - 1.0 representing a percentage change
      *            from beginVec towards finalVec
      * @return this
      */
     public Vector2f interpolateLocal(Vector2f beginVec, Vector2f finalVec,
-            float changeAmnt) {
-        this.x = (1 - changeAmnt) * beginVec.x + changeAmnt * finalVec.x;
-        this.y = (1 - changeAmnt) * beginVec.y + changeAmnt * finalVec.y;
+            float changeAmount) {
+        this.x = (1 - changeAmount) * beginVec.x + changeAmount * finalVec.x;
+        this.y = (1 - changeAmount) * beginVec.y + changeAmount * finalVec.y;
         return this;
     }
 
@@ -814,12 +814,12 @@ public final class Vector2f implements Savable, Cloneable, java.io.Serializable
      * De-serialize this vector from the specified importer, for example
      * when loading from a J3O file.
      *
-     * @param e (not null)
+     * @param importer (not null)
      * @throws IOException from the importer
      */
     @Override
-    public void read(JmeImporter e) throws IOException {
-        InputCapsule capsule = e.getCapsule(this);
+    public void read(JmeImporter importer) throws IOException {
+        InputCapsule capsule = importer.getCapsule(this);
         x = capsule.readFloat("x", 0);
         y = capsule.readFloat("y", 0);
     }

jme3-core/src/main/java/com/jme3/math/Vector3f.java

@@ -622,24 +622,24 @@ public final class Vector3f implements Savable, Cloneable, java.io.Serializable
      * Divides component-wise by the argument and returns the quotient as a new
      * instance. The current instance is unaffected.
      *
-     * @param scalar the divisor (not null, unaffected) TODO rename argument!
+     * @param divisor the divisor (not null, unaffected)
      * @return a new Vector3f
      */
-    public Vector3f divide(Vector3f scalar) {
-        return new Vector3f(x / scalar.x, y / scalar.y, z / scalar.z);
+    public Vector3f divide(Vector3f divisor) {
+        return new Vector3f(x / divisor.x, y / divisor.y, z / divisor.z);
     }
 
     /**
      * Divides component-wise by the argument and returns the (modified) current
      * instance.
      *
-     * @param scalar the divisor (not null, unaffected) TODO rename argument!
+     * @param divisor the divisor (not null, unaffected)
      * @return the (modified) current instance (for chaining)
      */
-    public Vector3f divideLocal(Vector3f scalar) {
-        x /= scalar.x;
-        y /= scalar.y;
-        z /= scalar.z;
+    public Vector3f divideLocal(Vector3f divisor) {
+        x /= divisor.x;
+        y /= divisor.y;
+        z /= divisor.z;
         return this;
     }
 
@@ -842,17 +842,17 @@ public final class Vector3f implements Savable, Cloneable, java.io.Serializable
      * Interpolates linearly between this vector and the specified vector,
      * returning the (modified) current instance.
      *
-     * <p>this = (1 - changeAmnt) * this + changeAmnt * finalVec
+     * <p>this = (1 - changeAmount) * this + changeAmount * finalVec
      *
-     * @param finalVec the desired value when changeAmnt=1 (not null, unaffected
+     * @param finalVec the desired value when changeAmount=1 (not null, unaffected
      *     unless it's <code>this</code>)
-     * @param changeAmnt the fractional change amount
+     * @param changeAmount the fractional change amount
      * @return the (modified) current instance (for chaining)
      */
-    public Vector3f interpolateLocal(Vector3f finalVec, float changeAmnt) {
-        this.x = (1 - changeAmnt) * this.x + changeAmnt * finalVec.x;
-        this.y = (1 - changeAmnt) * this.y + changeAmnt * finalVec.y;
-        this.z = (1 - changeAmnt) * this.z + changeAmnt * finalVec.z;
+    public Vector3f interpolateLocal(Vector3f finalVec, float changeAmount) {
+        this.x = (1 - changeAmount) * this.x + changeAmount * finalVec.x;
+        this.y = (1 - changeAmount) * this.y + changeAmount * finalVec.y;
+        this.z = (1 - changeAmount) * this.z + changeAmount * finalVec.z;
         return this;
     }
 
@@ -860,19 +860,19 @@ public final class Vector3f implements Savable, Cloneable, java.io.Serializable
      * Interpolates linearly between the specified beginning and final vectors,
      * returning the (modified) current instance.
      *
-     * <p>this = (1 - changeAmnt) * beginVec + changeAmnt * finalVec
+     * <p>this = (1 - changeAmount) * beginVec + changeAmount * finalVec
      *
-     * @param beginVec the desired value when changeAmnt=0 (not null, unaffected
+     * @param beginVec the desired value when changeAmount=0 (not null, unaffected
      *     unless it's <code>this</code>)
-     * @param finalVec the desired value when changeAmnt=1 (not null, unaffected
+     * @param finalVec the desired value when changeAmount=1 (not null, unaffected
      *     unless it's <code>this</code>)
-     * @param changeAmnt the fractional change amount
+     * @param changeAmount the fractional change amount
      * @return the (modified) current instance (for chaining)
      */
-    public Vector3f interpolateLocal(Vector3f beginVec, Vector3f finalVec, float changeAmnt) {
-        this.x = (1 - changeAmnt) * beginVec.x + changeAmnt * finalVec.x;
-        this.y = (1 - changeAmnt) * beginVec.y + changeAmnt * finalVec.y;
-        this.z = (1 - changeAmnt) * beginVec.z + changeAmnt * finalVec.z;
+    public Vector3f interpolateLocal(Vector3f beginVec, Vector3f finalVec, float changeAmount) {
+        this.x = (1 - changeAmount) * beginVec.x + changeAmount * finalVec.x;
+        this.y = (1 - changeAmount) * beginVec.y + changeAmount * finalVec.y;
+        this.z = (1 - changeAmount) * beginVec.z + changeAmount * finalVec.z;
         return this;
     }
 
@@ -1063,12 +1063,12 @@ public final class Vector3f implements Savable, Cloneable, java.io.Serializable
      * De-serializes from the argument, for example when loading from a J3O
      * file.
      *
-     * @param e the importer to use (not null)
+     * @param importer the importer to use (not null)
      * @throws IOException from the importer
      */
     @Override
-    public void read(JmeImporter e) throws IOException {
-        InputCapsule capsule = e.getCapsule(this);
+    public void read(JmeImporter importer) throws IOException {
+        InputCapsule capsule = importer.getCapsule(this);
         x = capsule.readFloat("x", 0);
         y = capsule.readFloat("y", 0);
         z = capsule.readFloat("z", 0);

jme3-core/src/main/java/com/jme3/math/Vector4f.java

@@ -552,12 +552,12 @@ public final class Vector4f implements Savable, Cloneable, java.io.Serializable
      * <code>divide</code> divides the values of this vector by a scalar and
      * returns the result. The values of this vector remain untouched.
      *
-     * @param scalar
+     * @param divisor
      *            the value to divide this vectors attributes by.
      * @return the result <code>Vector</code>.
      */
-    public Vector4f divide(Vector4f scalar) {
-        return new Vector4f(x / scalar.x, y / scalar.y, z / scalar.z, w / scalar.w);
+    public Vector4f divide(Vector4f divisor) {
+        return new Vector4f(x / divisor.x, y / divisor.y, z / divisor.z, w / divisor.w);
     }
 
     /**
@@ -565,15 +565,15 @@ public final class Vector4f implements Savable, Cloneable, java.io.Serializable
      * and returns a handle to this vector for easy chaining of calls. Dividing
      * by zero will result in an exception.
      *
-     * @param scalar
+     * @param divisor
      *            the value to divides this vector by.
      * @return this
      */
-    public Vector4f divideLocal(Vector4f scalar) {
-        x /= scalar.x;
-        y /= scalar.y;
-        z /= scalar.z;
-        w /= scalar.w;
+    public Vector4f divideLocal(Vector4f divisor) {
+        x /= divisor.x;
+        y /= divisor.y;
+        z /= divisor.z;
+        w /= divisor.w;
         return this;
     }
 
@@ -995,12 +995,12 @@ public final class Vector4f implements Savable, Cloneable, java.io.Serializable
      * De-serialize this vector from the specified importer, for example
      * when loading from a J3O file.
      *
-     * @param e (not null)
+     * @param importer (not null)
      * @throws IOException from the importer
      */
     @Override
-    public void read(JmeImporter e) throws IOException {
-        InputCapsule capsule = e.getCapsule(this);
+    public void read(JmeImporter importer) throws IOException {
+        InputCapsule capsule = importer.getCapsule(this);
         x = capsule.readFloat("x", 0);
         y = capsule.readFloat("y", 0);
         z = capsule.readFloat("z", 0);

jme3-core/src/main/java/com/jme3/renderer/Camera.java

@@ -1607,8 +1607,8 @@ public class Camera implements Savable, Cloneable {
     }
 
     @Override
-    public void read(JmeImporter e) throws IOException {
-        InputCapsule capsule = e.getCapsule(this);
+    public void read(JmeImporter importer) throws IOException {
+        InputCapsule capsule = importer.getCapsule(this);
         location = (Vector3f) capsule.readSavable("location", Vector3f.ZERO.clone());
         rotation = (Quaternion) capsule.readSavable("rotation", Quaternion.DIRECTION_Z.clone());
         frustumNear = capsule.readFloat("frustumNear", 1);

jme3-core/src/main/java/com/jme3/scene/AssetLinkNode.java

@@ -164,11 +164,11 @@ public class AssetLinkNode extends Node {
 
     @Override
     @SuppressWarnings("unchecked")
-    public void read(JmeImporter e) throws IOException {
-        super.read(e);
+    public void read(JmeImporter importer) throws IOException {
+        super.read(importer);
 
-        final InputCapsule capsule = e.getCapsule(this);
-        final AssetManager assetManager = e.getAssetManager();
+        final InputCapsule capsule = importer.getCapsule(this);
+        final AssetManager assetManager = importer.getAssetManager();
 
         assetLoaderKeys = capsule.readSavableArrayList("assetLoaderKeyList", new ArrayList<>());
 

jme3-core/src/main/java/com/jme3/scene/Node.java

@@ -760,12 +760,12 @@ public class Node extends Spatial {
 
     @Override
     @SuppressWarnings("unchecked")
-    public void read(JmeImporter e) throws IOException {
+    public void read(JmeImporter importer) throws IOException {
         // XXX: Load children before loading itself!!
         // This prevents empty children list if controls query
         // it in Control.setSpatial().
         children = new SafeArrayList(Spatial.class,
-                e.getCapsule(this).readSavableArrayList("children", null));
+                importer.getCapsule(this).readSavableArrayList("children", null));
 
         // go through children and set parent to this node
         if (children != null) {
@@ -773,7 +773,7 @@ public class Node extends Spatial {
                 child.parent = this;
             }
         }
-        super.read(e);
+        super.read(importer);
     }
 
     @Override

jme3-core/src/main/java/com/jme3/scene/control/BillboardControl.java

@@ -297,9 +297,9 @@ public class BillboardControl extends AbstractControl {
     }
 
     @Override
-    public void read(JmeImporter e) throws IOException {
-        super.read(e);
-        InputCapsule capsule = e.getCapsule(this);
+    public void read(JmeImporter importer) throws IOException {
+        super.read(importer);
+        InputCapsule capsule = importer.getCapsule(this);
         orient = (Matrix3f) capsule.readSavable("orient", null);
         look = (Vector3f) capsule.readSavable("look", null);
         left = (Vector3f) capsule.readSavable("left", null);

jme3-core/src/main/java/com/jme3/scene/shape/AbstractBox.java

@@ -195,9 +195,9 @@ public abstract class AbstractBox extends Mesh {
     }
 
     @Override
-    public void read(JmeImporter e) throws IOException {
-        super.read(e);
-        InputCapsule capsule = e.getCapsule(this);
+    public void read(JmeImporter importer) throws IOException {
+        super.read(importer);
+        InputCapsule capsule = importer.getCapsule(this);
         xExtent = capsule.readFloat("xExtent", 0);
         yExtent = capsule.readFloat("yExtent", 0);
         zExtent = capsule.readFloat("zExtent", 0);

jme3-core/src/main/java/com/jme3/scene/shape/Cylinder.java

@@ -420,9 +420,9 @@ public class Cylinder extends Mesh {
     }
 
     @Override
-    public void read(JmeImporter e) throws IOException {
-        super.read(e);
-        InputCapsule capsule = e.getCapsule(this);
+    public void read(JmeImporter importer) throws IOException {
+        super.read(importer);
+        InputCapsule capsule = importer.getCapsule(this);
         axisSamples = capsule.readInt("axisSamples", 0);
         radialSamples = capsule.readInt("radialSamples", 0);
         radius = capsule.readFloat("radius", 0);

jme3-core/src/main/java/com/jme3/scene/shape/Dome.java

@@ -326,9 +326,9 @@ public class Dome extends Mesh {
     }
 
     @Override
-    public void read(JmeImporter e) throws IOException {
-        super.read(e);
-        InputCapsule capsule = e.getCapsule(this);
+    public void read(JmeImporter importer) throws IOException {
+        super.read(importer);
+        InputCapsule capsule = importer.getCapsule(this);
         planes = capsule.readInt("planes", 0);
         radialSamples = capsule.readInt("radialSamples", 0);
         radius = capsule.readFloat("radius", 0);

jme3-core/src/main/java/com/jme3/scene/shape/PQTorus.java

@@ -215,9 +215,9 @@ public class PQTorus extends Mesh {
     }
 
     @Override
-    public void read(JmeImporter e) throws IOException {
-        super.read(e);
-        InputCapsule capsule = e.getCapsule(this);
+    public void read(JmeImporter importer) throws IOException {
+        super.read(importer);
+        InputCapsule capsule = importer.getCapsule(this);
         p = capsule.readFloat("p", 0);
         q = capsule.readFloat("q", 0);
         radius = capsule.readFloat("radius", 0);

jme3-core/src/main/java/com/jme3/scene/shape/Quad.java

@@ -133,9 +133,9 @@ public class Quad extends Mesh {
     }
     
     @Override
-    public void read(JmeImporter e) throws IOException {
-        super.read(e);
-        InputCapsule capsule = e.getCapsule(this);
+    public void read(JmeImporter importer) throws IOException {
+        super.read(importer);
+        InputCapsule capsule = importer.getCapsule(this);
         width = capsule.readFloat("width", 0);
         height = capsule.readFloat("height", 0);
     }

jme3-core/src/main/java/com/jme3/scene/shape/RectangleMesh.java

@@ -241,9 +241,9 @@ public class RectangleMesh extends Mesh {
     }
 
     @Override
-    public void read(JmeImporter e) throws IOException {
-        super.read(e);
-        final InputCapsule capsule = e.getCapsule(this);
+    public void read(JmeImporter importer) throws IOException {
+        super.read(importer);
+        final InputCapsule capsule = importer.getCapsule(this);
         rectangle = (Rectangle) capsule.readSavable("rectangle", new Rectangle(
                 new Vector3f(),
                 new Vector3f(1, 0, 0),

jme3-core/src/main/java/com/jme3/scene/shape/Sphere.java

@@ -403,9 +403,9 @@ public class Sphere extends Mesh {
     }
 
     @Override
-    public void read(JmeImporter e) throws IOException {
-        super.read(e);
-        InputCapsule capsule = e.getCapsule(this);
+    public void read(JmeImporter importer) throws IOException {
+        super.read(importer);
+        InputCapsule capsule = importer.getCapsule(this);
         zSamples = capsule.readInt("zSamples", 0);
         radialSamples = capsule.readInt("radialSamples", 0);
         radius = capsule.readFloat("radius", 0);

jme3-core/src/main/java/com/jme3/scene/shape/Torus.java

@@ -103,9 +103,9 @@ public class Torus extends Mesh {
     }
 
     @Override
-    public void read(JmeImporter e) throws IOException {
-        super.read(e);
-        InputCapsule capsule = e.getCapsule(this);
+    public void read(JmeImporter importer) throws IOException {
+        super.read(importer);
+        InputCapsule capsule = importer.getCapsule(this);
         circleSamples = capsule.readInt("circleSamples", 0);
         radialSamples = capsule.readInt("radialSamples", 0);
         innerRadius = capsule.readFloat("innerRadius", 0);

jme3-core/src/main/java/com/jme3/texture/Image.java

@@ -1265,8 +1265,8 @@ public class Image extends NativeObject implements Savable /*, Cloneable*/ {
     }
 
     @Override
-    public void read(JmeImporter e) throws IOException {
-        InputCapsule capsule = e.getCapsule(this);
+    public void read(JmeImporter importer) throws IOException {
+        InputCapsule capsule = importer.getCapsule(this);
         format = capsule.readEnum("format", Format.class, Format.RGBA8);
         width = capsule.readInt("width", 0);
         height = capsule.readInt("height", 0);

jme3-core/src/main/java/com/jme3/texture/Texture.java

@@ -611,8 +611,8 @@ public abstract class Texture implements CloneableSmartAsset, Savable, Cloneable
     }
 
     @Override
-    public void read(JmeImporter e) throws IOException {
-        InputCapsule capsule = e.getCapsule(this);
+    public void read(JmeImporter importer) throws IOException {
+        InputCapsule capsule = importer.getCapsule(this);
         name = capsule.readString("name", null);
         key = (TextureKey) capsule.readSavable("key", null);
         
@@ -620,11 +620,11 @@ public abstract class Texture implements CloneableSmartAsset, Savable, Cloneable
         if (key != null) {
             // key is available, so try the texture from there.
             try {
-                Texture loadedTex = e.getAssetManager().loadTexture(key);
+                Texture loadedTex = importer.getAssetManager().loadTexture(key);
                 image = loadedTex.getImage();
             } catch (AssetNotFoundException ex){
                 Logger.getLogger(Texture.class.getName()).log(Level.SEVERE, "Cannot locate texture {0}", key);
-                image = PlaceholderAssets.getPlaceholderImage(e.getAssetManager());
+                image = PlaceholderAssets.getPlaceholderImage(importer.getAssetManager());
             }
         }else{
             // no key is set on the texture. Attempt to load an embedded image

jme3-core/src/main/java/com/jme3/texture/Texture2D.java

@@ -214,9 +214,9 @@ public class Texture2D extends Texture {
     }
 
     @Override
-    public void read(JmeImporter e) throws IOException {
-        super.read(e);
-        InputCapsule capsule = e.getCapsule(this);
+    public void read(JmeImporter importer) throws IOException {
+        super.read(importer);
+        InputCapsule capsule = importer.getCapsule(this);
         wrapS = capsule.readEnum("wrapS", WrapMode.class, WrapMode.EdgeClamp);
         wrapT = capsule.readEnum("wrapT", WrapMode.class, WrapMode.EdgeClamp);
     }

jme3-core/src/main/java/com/jme3/texture/Texture3D.java

@@ -219,9 +219,9 @@ public class Texture3D extends Texture {
     }
 
     @Override
-    public void read(JmeImporter e) throws IOException {
-        super.read(e);
-        InputCapsule capsule = e.getCapsule(this);
+    public void read(JmeImporter importer) throws IOException {
+        super.read(importer);
+        InputCapsule capsule = importer.getCapsule(this);
         wrapS = capsule.readEnum("wrapS", WrapMode.class, WrapMode.EdgeClamp);
         wrapT = capsule.readEnum("wrapT", WrapMode.class, WrapMode.EdgeClamp);
         wrapR = capsule.readEnum("wrapR", WrapMode.class, WrapMode.EdgeClamp);

jme3-core/src/main/java/com/jme3/texture/TextureCubeMap.java

@@ -217,9 +217,9 @@ public class TextureCubeMap extends Texture {
     }
 
     @Override
-    public void read(JmeImporter e) throws IOException {
-        super.read(e);
-        InputCapsule capsule = e.getCapsule(this);
+    public void read(JmeImporter importer) throws IOException {
+        super.read(importer);
+        InputCapsule capsule = importer.getCapsule(this);
         wrapS = capsule.readEnum("wrapS", WrapMode.class, WrapMode.EdgeClamp);
         wrapT = capsule.readEnum("wrapT", WrapMode.class, WrapMode.EdgeClamp);
         wrapR = capsule.readEnum("wrapR", WrapMode.class, WrapMode.EdgeClamp);

jme3-core/src/main/java/com/jme3/util/TangentBinormalGenerator.java

@@ -271,7 +271,7 @@ public class TangentBinormalGenerator {
     // Don't remove the split mirrored boolean. It's not used right now, but I intend to
     // make this method also split vertices with rotated tangent space, and I'll
     // add another splitRotated boolean.
-    private static List<VertexData> splitVertices(Mesh mesh, List<VertexData> vertexData, boolean splitMirorred) {
+    private static List<VertexData> splitVertices(Mesh mesh, List<VertexData> vertexData, boolean splitMirrored) {
         
         int nbVertices = mesh.getBuffer(Type.Position).getNumElements();
         List<VertexData> newVertices = new ArrayList<>();

jme3-jbullet/src/main/java/com/jme3/bullet/collision/PhysicsCollisionObject.java

@@ -162,8 +162,8 @@ public abstract class PhysicsCollisionObject implements Savable {
     }
 
     @Override
-    public void read(JmeImporter e) throws IOException {
-        InputCapsule capsule = e.getCapsule(this);
+    public void read(JmeImporter importer) throws IOException {
+        InputCapsule capsule = importer.getCapsule(this);
         collisionGroup = capsule.readInt("collisionGroup", 0x00000001);
         collisionGroupsMask = capsule.readInt("collisionGroupsMask", 0x00000001);
         CollisionShape shape = (CollisionShape) capsule.readSavable("collisionShape", null);

jme3-jbullet/src/main/java/com/jme3/bullet/objects/PhysicsCharacter.java

@@ -298,9 +298,9 @@ public class PhysicsCharacter extends PhysicsCollisionObject {
     }
 
     @Override
-    public void read(JmeImporter e) throws IOException {
-        super.read(e);
-        InputCapsule capsule = e.getCapsule(this);
+    public void read(JmeImporter importer) throws IOException {
+        super.read(importer);
+        InputCapsule capsule = importer.getCapsule(this);
         stepHeight = capsule.readFloat("stepHeight", 1.0f);
         buildObject();
         character = new KinematicCharacterController(gObject, (ConvexShape) collisionShape.getCShape(), stepHeight);

jme3-jbullet/src/main/java/com/jme3/bullet/objects/PhysicsGhostObject.java

@@ -277,9 +277,9 @@ public class PhysicsGhostObject extends PhysicsCollisionObject {
     }
 
     @Override
-    public void read(JmeImporter e) throws IOException {
-        super.read(e);
-        InputCapsule capsule = e.getCapsule(this);
+    public void read(JmeImporter importer) throws IOException {
+        super.read(importer);
+        InputCapsule capsule = importer.getCapsule(this);
         buildObject();
         setPhysicsLocation((Vector3f) capsule.readSavable("physicsLocation", new Vector3f()));
         setPhysicsRotation(((Matrix3f) capsule.readSavable("physicsRotation", new Matrix3f())));

jme3-jbullet/src/main/java/com/jme3/bullet/objects/PhysicsRigidBody.java

@@ -538,10 +538,10 @@ public class PhysicsRigidBody extends PhysicsCollisionObject {
     /**
      * Apply an impulse to the PhysicsRigidBody in the next physics update.
      * @param impulse applied impulse
-     * @param rel_pos location relative to object
+     * @param relativePosition location relative to object
      */
-    public void applyImpulse(final Vector3f impulse, final Vector3f rel_pos) {
-        rBody.applyImpulse(Converter.convert(impulse, tempVec), Converter.convert(rel_pos, tempVec2));
+    public void applyImpulse(final Vector3f impulse, final Vector3f relativePosition) {
+        rBody.applyImpulse(Converter.convert(impulse, tempVec), Converter.convert(relativePosition, tempVec2));
         rBody.activate();
     }
 
@@ -709,15 +709,15 @@ public class PhysicsRigidBody extends PhysicsCollisionObject {
     /**
      * De-serialize this body, for example when loading from a J3O file.
      *
-     * @param e importer (not null)
+     * @param importer importer (not null)
      * @throws IOException from importer
      */
     @Override
     @SuppressWarnings("unchecked")
-    public void read(JmeImporter e) throws IOException {
-        super.read(e);
+    public void read(JmeImporter importer) throws IOException {
+        super.read(importer);
 
-        InputCapsule capsule = e.getCapsule(this);
+        InputCapsule capsule = importer.getCapsule(this);
         float mass = capsule.readFloat("mass", 1.0f);
         this.mass = mass;
         rebuildRigidBody();

jme3-lwjgl/src/main/java/com/jme3/renderer/lwjgl/LwjglGLExt.java

@@ -51,8 +51,8 @@ public final class LwjglGLExt implements GLExt {
     }
 
     @Override
-    public void glDrawElementsInstancedARB(int mode, int indices_count, int type, long indices_buffer_offset, int primcount) {
-        ARBDrawInstanced.glDrawElementsInstancedARB(mode, indices_count, type, indices_buffer_offset, primcount);
+    public void glDrawElementsInstancedARB(int mode, int indicesCount, int type, long indicesBufferOffset, int primcount) {
+        ARBDrawInstanced.glDrawElementsInstancedARB(mode, indicesCount, type, indicesBufferOffset, primcount);
     }
 
     @Override

jme3-lwjgl3/src/main/java/com/jme3/opencl/lwjgl/LwjglPlatform.java

@@ -75,12 +75,12 @@ public final class LwjglPlatform implements Platform {
      * 
      * Copied from the old release.
      *
-     * @param device_type the device type
+     * @param deviceType the device type
      * @return the available devices
      */
-    private long[] getDevices(int device_type) {
+    private long[] getDevices(int deviceType) {
         int[] count = new int[1];
-        int errcode = CL10.clGetDeviceIDs(platform, device_type, null, count);
+        int errcode = CL10.clGetDeviceIDs(platform, deviceType, null, count);
         if (errcode == CL10.CL_DEVICE_NOT_FOUND) {
             return new long[0];
         }
@@ -93,7 +93,7 @@ public final class LwjglPlatform implements Platform {
 
         PointerBuffer devices = PointerBuffer.allocateDirect(num_devices);
 
-        errcode = CL10.clGetDeviceIDs(platform, device_type,devices, (IntBuffer) null);
+        errcode = CL10.clGetDeviceIDs(platform, deviceType, devices, (IntBuffer) null);
         Utils.checkError(errcode, "clGetDeviceIDs");
 
         long[] deviceIDs = new long[num_devices];

jme3-lwjgl3/src/main/java/com/jme3/opencl/lwjgl/info/CLUtil.java

@@ -60,12 +60,12 @@ public final class CLUtil {
      * specified {@code errcode_ret} buffer and throws an
      * {@link OpenCLException} if it's not equal to {@link CL10#CL_SUCCESS}.
      *
-     * @param errcode_ret the {@code errcode} buffer
+     * @param errorCodeBuffer the {@code errcode} buffer
      *
      * @throws OpenCLException
      */
-    public static void checkCLError(ByteBuffer errcode_ret) {
-        checkCLError(errcode_ret.getInt(errcode_ret.position()));
+    public static void checkCLError(ByteBuffer errorCodeBuffer) {
+        checkCLError(errorCodeBuffer.getInt(errorCodeBuffer.position()));
     }
 
     /**
@@ -73,12 +73,12 @@ public final class CLUtil {
      * specified {@code errcode_ret} buffer and throws an
      * {@link OpenCLException} if it's not equal to {@link CL10#CL_SUCCESS}.
      *
-     * @param errcode_ret the {@code errcode} buffer
+     * @param errorCodeBuffer the {@code errcode} buffer
      *
      * @throws OpenCLException
      */
-    public static void checkCLError(IntBuffer errcode_ret) {
-        checkCLError(errcode_ret.get(errcode_ret.position()));
+    public static void checkCLError(IntBuffer errorCodeBuffer) {
+        checkCLError(errorCodeBuffer.get(errorCodeBuffer.position()));
     }
 
     /**

jme3-lwjgl3/src/main/java/com/jme3/opencl/lwjgl/info/Info.java

@@ -523,45 +523,45 @@ public final class Info {
      * Single int value version of:
      * {@link org.lwjgl.opencl.CL12#clGetKernelArgInfo GetKernelArgInfo}
      */
-    public static int clGetKernelArgInfoInt(long kernel, int arg_indx, int param_name) {
-        return KERNEL_ARG.getInt(kernel, arg_indx, param_name);
+    public static int clGetKernelArgInfoInt(long kernel, int argIndex, int param_name) {
+        return KERNEL_ARG.getInt(kernel, argIndex, param_name);
     }
 
     /**
      * Single long value version of:
      * {@link org.lwjgl.opencl.CL12#clGetKernelArgInfo GetKernelArgInfo}
      */
-    public static long clGetKernelArgInfoLong(long kernel, int arg_indx, int param_name) {
-        return KERNEL_ARG.getLong(kernel, arg_indx, param_name);
+    public static long clGetKernelArgInfoLong(long kernel, int argIndex, int param_name) {
+        return KERNEL_ARG.getLong(kernel, argIndex, param_name);
     }
 
     /**
      * String version of: {@link org.lwjgl.opencl.CL12#clGetKernelArgInfo GetKernelArgInfo}
      */
-    public static String clGetKernelArgInfoStringASCII(long kernel, int arg_indx, int param_name) {
-        return KERNEL_ARG.getStringASCII(kernel, arg_indx, param_name);
+    public static String clGetKernelArgInfoStringASCII(long kernel, int argIndex, int param_name) {
+        return KERNEL_ARG.getStringASCII(kernel, argIndex, param_name);
     }
 
     /**
      * String with explicit length version of: {@link org.lwjgl.opencl.CL12#clGetKernelArgInfo GetKernelArgInfo}
      */
-    public static String clGetKernelArgInfoStringASCII(long kernel, int arg_indx, int param_name, int param_value_size) {
-        return KERNEL_ARG.getStringASCII(kernel, arg_indx, param_name, param_value_size);
+    public static String clGetKernelArgInfoStringASCII(long kernel, int argIndex, int param_name, int param_value_size) {
+        return KERNEL_ARG.getStringASCII(kernel, argIndex, param_name, param_value_size);
     }
 
     /**
      * UTF-8 string version of: {@link org.lwjgl.opencl.CL12#clGetKernelArgInfo GetKernelArgInfo}
      */
-    public static String clGetKernelArgInfoStringUTF8(long kernel, int arg_indx, int param_name) {
-        return KERNEL_ARG.getStringUTF8(kernel, arg_indx, param_name);
+    public static String clGetKernelArgInfoStringUTF8(long kernel, int argIndex, int param_name) {
+        return KERNEL_ARG.getStringUTF8(kernel, argIndex, param_name);
     }
 
     /**
      * UTF-8 string with explicit length version of:
      * {@link org.lwjgl.opencl.CL12#clGetKernelArgInfo GetKernelArgInfo}
      */
-    public static String clGetKernelArgInfoStringUTF8(long kernel, int arg_indx, int param_name, int param_value_size) {
-        return KERNEL_ARG.getStringUTF8(kernel, arg_indx, param_name, param_value_size);
+    public static String clGetKernelArgInfoStringUTF8(long kernel, int argIndex, int param_name, int param_value_size) {
+        return KERNEL_ARG.getStringUTF8(kernel, argIndex, param_name, param_value_size);
     }
 
     // ------------------------------------

jme3-lwjgl3/src/main/java/com/jme3/opencl/lwjgl/info/InfoQuery.java

@@ -23,38 +23,38 @@ import static org.lwjgl.system.Pointer.*;
  */
 abstract class InfoQuery {
 
-    protected abstract int get(long pointer, int param_name, long param_value_size, long param_value, long param_value_size_ret);
+    protected abstract int get(long pointer, int parameterName, long parameterValueSize, long parameterValue, long parameterValueSizeRet);
 
     InfoQuery() {
     }
 
     /**
-     * Returns the integer value for the specified {@code param_name}, converted
+     * Returns the integer value for the specified {@code parameterName}, converted
      * to a boolean.
      *
      * @param object the object to query
-     * @param param_name the parameter to query
+     * @param parameterName the parameter to query
      *
      * @return the parameter's boolean value
      */
-    boolean getBoolean(long object, int param_name) {
-        return getInt(object, param_name) != 0;
+    boolean getBoolean(long object, int parameterName) {
+        return getInt(object, parameterName) != 0;
     }
 
     /**
-     * Returns the integer value for the specified {@code param_name}.
+     * Returns the integer value for the specified {@code parameterName}.
      * <p/>
      * For integer parameters that may be 32 or 64 bits (e.g. {@code size_t}),
      * {@link #getPointer} should be used instead.
      *
      * @param object the object to query
-     * @param param_name the parameter to query
+     * @param parameterName the parameter to query
      *
      * @return the parameter's int value
      */
-    int getInt(long object, int param_name) {
+    int getInt(long object, int parameterName) {
         APIBuffer __buffer = apiBuffer();
-        int errcode = get(object, param_name, 4L, __buffer.address(), NULL);
+        int errcode = get(object, parameterName, 4L, __buffer.address(), NULL);
         if (DEBUG) {
             checkCLError(errcode);
         }
@@ -62,19 +62,19 @@ abstract class InfoQuery {
     }
 
     /**
-     * Returns the long value for the specified {@code param_name}.
+     * Returns the long value for the specified {@code parameterName}.
      * <p/>
      * For integer parameters that may be 32 or 64 bits (e.g. {@code size_t}),
      * {@link #getPointer} should be used instead.
      *
      * @param object the object to query
-     * @param param_name the parameter to query
+     * @param parameterName the parameter to query
      *
      * @return the parameter's long value
      */
-    long getLong(long object, int param_name) {
+    long getLong(long object, int parameterName) {
         APIBuffer __buffer = apiBuffer();
-        int errcode = get(object, param_name, 8L, __buffer.address(), NULL);
+        int errcode = get(object, parameterName, 8L, __buffer.address(), NULL);
         if (DEBUG) {
             checkCLError(errcode);
         }
@@ -82,19 +82,19 @@ abstract class InfoQuery {
     }
 
     /**
-     * Returns the pointer value for the specified {@code param_name}.
+     * Returns the pointer value for the specified {@code parameterName}.
      * <p/>
      * This method should also be used for integer parameters that may be 32 or
      * 64 bits (e.g. {@code size_t}).
      *
      * @param object the object to query
-     * @param param_name the parameter to query
+     * @param parameterName the parameter to query
      *
      * @return the parameter's pointer value
      */
-    long getPointer(long object, int param_name) {
+    long getPointer(long object, int parameterName) {
         APIBuffer __buffer = apiBuffer();
-        int errcode = get(object, param_name, POINTER_SIZE, __buffer.address(), NULL);
+        int errcode = get(object, parameterName, POINTER_SIZE, __buffer.address(), NULL);
         if (DEBUG) {
             checkCLError(errcode);
         }
@@ -102,21 +102,21 @@ abstract class InfoQuery {
     }
 
     /**
-     * Writes the pointer list for the specified {@code param_name} into
+     * Writes the pointer list for the specified {@code parameterName} into
      * {@code target}.
      * <p/>
      * This method should also be used for integer parameters that may be 32 or
      * 64 bits (e.g. {@code size_t}).
      *
      * @param object the object to query
-     * @param param_name the parameter to query
+     * @param parameterName the parameter to query
      * @param target the buffer in which to put the returned pointer list
      *
      * @return how many pointers were actually returned
      */
-    int getPointers(long object, int param_name, PointerBuffer target) {
+    int getPointers(long object, int parameterName, PointerBuffer target) {
         APIBuffer __buffer = apiBuffer();
-        int errcode = get(object, param_name, target.remaining() * POINTER_SIZE, memAddress(target), __buffer.address());
+        int errcode = get(object, parameterName, target.remaining() * POINTER_SIZE, memAddress(target), __buffer.address());
         if (DEBUG) {
             checkCLError(errcode);
         }
@@ -124,87 +124,87 @@ abstract class InfoQuery {
     }
 
     /**
-     * Returns the string value for the specified {@code param_name}. The raw
+     * Returns the string value for the specified {@code parameterName}. The raw
      * bytes returned are assumed to be ASCII encoded.
      *
      * @param object the object to query
-     * @param param_name the parameter to query
+     * @param parameterName the parameter to query
      *
      * @return the parameter's string value
      */
-    String getStringASCII(long object, int param_name) {
+    String getStringASCII(long object, int parameterName) {
         APIBuffer __buffer = apiBuffer();
-        int bytes = getString(object, param_name, __buffer);
+        int bytes = getString(object, parameterName, __buffer);
         return __buffer.stringValueASCII(0, bytes);
     }
 
     /**
-     * Returns the string value for the specified {@code param_name}. The raw
+     * Returns the string value for the specified {@code parameterName}. The raw
      * bytes returned are assumed to be ASCII encoded and have length equal to {@code
-     * param_value_size}.
+     * parameterValueSize}.
      *
      * @param object the object to query
-     * @param param_name the parameter to query
-     * @param param_value_size the explicit string length
+     * @param parameterName the parameter to query
+     * @param parameterValueSize the explicit string length
      *
      * @return the parameter's string value
      */
-    String getStringASCII(long object, int param_name, int param_value_size) {
+    String getStringASCII(long object, int parameterName, int parameterValueSize) {
         APIBuffer __buffer = apiBuffer();
-        int errcode = get(object, param_name, param_value_size, __buffer.address(), NULL);
+        int errcode = get(object, parameterName, parameterValueSize, __buffer.address(), NULL);
         if (DEBUG) {
             checkCLError(errcode);
         }
-        return __buffer.stringValueASCII(0, param_value_size);
+        return __buffer.stringValueASCII(0, parameterValueSize);
     }
 
     /**
-     * Returns the string value for the specified {@code param_name}. The raw
+     * Returns the string value for the specified {@code parameterName}. The raw
      * bytes returned are assumed to be UTF-8 encoded.
      *
      * @param object the object to query
-     * @param param_name the parameter to query
+     * @param parameterName the parameter to query
      *
      * @return the parameter's string value
      */
-    String getStringUTF8(long object, int param_name) {
+    String getStringUTF8(long object, int parameterName) {
         APIBuffer __buffer = apiBuffer();
-        int bytes = getString(object, param_name, __buffer);
+        int bytes = getString(object, parameterName, __buffer);
         return __buffer.stringValueUTF8(0, bytes);
     }
 
     /**
-     * Returns the string value for the specified {@code param_name}. The raw
+     * Returns the string value for the specified {@code parameterName}. The raw
      * bytes returned are assumed to be UTF-8 encoded and have length equal to {@code
-     * param_value_size}.
+     * parameterValueSize}.
      *
      * @param object the object to query
-     * @param param_name the parameter to query
-     * @param param_value_size the explicit string length
+     * @param parameterName the parameter to query
+     * @param parameterValueSize the explicit string length
      *
      * @return the parameter's string value
      */
-    String getStringUTF8(long object, int param_name, int param_value_size) {
+    String getStringUTF8(long object, int parameterName, int parameterValueSize) {
         APIBuffer __buffer = apiBuffer();
-        int errcode = get(object, param_name, param_value_size, __buffer.address(), NULL);
+        int errcode = get(object, parameterName, parameterValueSize, __buffer.address(), NULL);
         if (DEBUG) {
             checkCLError(errcode);
         }
-        return __buffer.stringValueUTF8(0, param_value_size);
+        return __buffer.stringValueUTF8(0, parameterValueSize);
     }
 
-    private int getString(long object, int param_name, APIBuffer __buffer) {
+    private int getString(long object, int parameterName, APIBuffer buffer) {
         // Get string length
-        int errcode = get(object, param_name, 0, NULL, __buffer.address());
+        int errcode = get(object, parameterName, 0, NULL, buffer.address());
         if (DEBUG) {
             checkCLError(errcode);
         }
 
-        int bytes = (int) __buffer.pointerValue(0);
-        __buffer.bufferParam(bytes);
+        int bytes = (int) buffer.pointerValue(0);
+        buffer.bufferParam(bytes);
 
         // Get string
-        errcode = get(object, param_name, bytes, __buffer.address(), NULL);
+        errcode = get(object, parameterName, bytes, buffer.address(), NULL);
         if (DEBUG) {
             checkCLError(errcode);
         }

jme3-lwjgl3/src/main/java/com/jme3/opencl/lwjgl/info/InfoQueryInt.java

@@ -23,40 +23,40 @@ import static org.lwjgl.system.Pointer.*;
  */
 abstract class InfoQueryInt {
 
-    protected abstract int get(long pointer, int arg, int param_name, long param_value_size, long param_value, long param_value_size_ret);
+    protected abstract int get(long pointer, int arg, int parameterName, long parameterValueSize, long parameterValue, long parameterValueSizeRet);
 
     InfoQueryInt() {
     }
 
     /**
-     * Returns the integer value for the specified {@code param_name}, converted
+     * Returns the integer value for the specified {@code parameterName}, converted
      * to a boolean.
      *
      * @param object the object to query
      * @param arg an integer argument
-     * @param param_name the parameter to query
+     * @param parameterName the parameter to query
      *
      * @return the parameter's boolean value
      */
-    boolean getBoolean(long object, int arg, int param_name) {
-        return getInt(object, arg, param_name) != 0;
+    boolean getBoolean(long object, int arg, int parameterName) {
+        return getInt(object, arg, parameterName) != 0;
     }
 
     /**
-     * Returns the integer value for the specified {@code param_name}.
+     * Returns the integer value for the specified {@code parameterName}.
      * <p/>
      * For integer parameters that may be 32 or 64 bits (e.g. {@code size_t}),
      * {@link #getPointer} should be used instead.
      *
      * @param object the object to query
      * @param arg an integer argument
-     * @param param_name the parameter to query
+     * @param parameterName the parameter to query
      *
      * @return the parameter's int value
      */
-    int getInt(long object, int arg, int param_name) {
+    int getInt(long object, int arg, int parameterName) {
         APIBuffer __buffer = apiBuffer();
-        int errcode = get(object, arg, param_name, 4L, __buffer.address(), NULL);
+        int errcode = get(object, arg, parameterName, 4L, __buffer.address(), NULL);
         if (DEBUG) {
             checkCLError(errcode);
         }
@@ -64,20 +64,20 @@ abstract class InfoQueryInt {
     }
 
     /**
-     * Returns the long value for the specified {@code param_name}.
+     * Returns the long value for the specified {@code parameterName}.
      * <p/>
      * For integer parameters that may be 32 or 64 bits (e.g. {@code size_t}),
      * {@link #getPointer} should be used instead.
      *
      * @param object the object to query
      * @param arg an integer argument
-     * @param param_name the parameter to query
+     * @param parameterName the parameter to query
      *
      * @return the parameter's long value
      */
-    long getLong(long object, int arg, int param_name) {
+    long getLong(long object, int arg, int parameterName) {
         APIBuffer __buffer = apiBuffer();
-        int errcode = get(object, arg, param_name, 8L, __buffer.address(), NULL);
+        int errcode = get(object, arg, parameterName, 8L, __buffer.address(), NULL);
         if (DEBUG) {
             checkCLError(errcode);
         }
@@ -85,20 +85,20 @@ abstract class InfoQueryInt {
     }
 
     /**
-     * Returns the pointer value for the specified {@code param_name}.
+     * Returns the pointer value for the specified {@code parameterName}.
      * <p/>
      * This method should also be used for integer parameters that may be 32 or
      * 64 bits (e.g. {@code size_t}).
      *
      * @param object the object to query
      * @param arg an integer argument
-     * @param param_name the parameter to query
+     * @param parameterName the parameter to query
      *
      * @return the parameter's pointer value
      */
-    long getPointer(long object, int arg, int param_name) {
+    long getPointer(long object, int arg, int parameterName) {
         APIBuffer __buffer = apiBuffer();
-        int errcode = get(object, arg, param_name, POINTER_SIZE, __buffer.address(), NULL);
+        int errcode = get(object, arg, parameterName, POINTER_SIZE, __buffer.address(), NULL);
         if (DEBUG) {
             checkCLError(errcode);
         }
@@ -106,7 +106,7 @@ abstract class InfoQueryInt {
     }
 
     /**
-     * Writes the pointer list for the specified {@code param_name} into
+     * Writes the pointer list for the specified {@code parameterName} into
      * {@code target}.
      * <p/>
      * This method should also be used for integer parameters that may be 32 or
@@ -114,14 +114,14 @@ abstract class InfoQueryInt {
      *
      * @param object the object to query
      * @param arg an integer argument
-     * @param param_name the parameter to query
+     * @param parameterName the parameter to query
      * @param target the buffer in which to put the returned pointer list
      *
      * @return how many pointers were actually returned
      */
-    int getPointers(long object, int arg, int param_name, PointerBuffer target) {
+    int getPointers(long object, int arg, int parameterName, PointerBuffer target) {
         APIBuffer __buffer = apiBuffer();
-        int errcode = get(object, arg, param_name, target.remaining() * POINTER_SIZE, memAddress(target), __buffer.address());
+        int errcode = get(object, arg, parameterName, target.remaining() * POINTER_SIZE, memAddress(target), __buffer.address());
         if (DEBUG) {
             checkCLError(errcode);
         }
@@ -129,91 +129,91 @@ abstract class InfoQueryInt {
     }
 
     /**
-     * Returns the string value for the specified {@code param_name}. The raw
+     * Returns the string value for the specified {@code parameterName}. The raw
      * bytes returned are assumed to be ASCII encoded.
      *
      * @param object the object to query
      * @param arg an integer argument
-     * @param param_name the parameter to query
+     * @param parameterName the parameter to query
      *
      * @return the parameter's string value
      */
-    String getStringASCII(long object, int arg, int param_name) {
+    String getStringASCII(long object, int arg, int parameterName) {
         APIBuffer __buffer = apiBuffer();
-        int bytes = getString(object, arg, param_name, __buffer);
+        int bytes = getString(object, arg, parameterName, __buffer);
         return __buffer.stringValueASCII(0, bytes);
     }
 
     /**
-     * Returns the string value for the specified {@code param_name}. The raw
+     * Returns the string value for the specified {@code parameterName}. The raw
      * bytes returned are assumed to be ASCII encoded and have length equal to {@code
-     * param_value_size}.
+     * parameterValueSize}.
      *
      * @param object the object to query
      * @param arg an integer argument
-     * @param param_name the parameter to query
-     * @param param_value_size the explicit string length
+     * @param parameterName the parameter to query
+     * @param parameterValueSize the explicit string length
      *
      * @return the parameter's string value
      */
-    String getStringASCII(long object, int arg, int param_name, int param_value_size) {
+    String getStringASCII(long object, int arg, int parameterName, int parameterValueSize) {
         APIBuffer __buffer = apiBuffer();
-        int errcode = get(object, arg, param_name, param_value_size, __buffer.address(), NULL);
+        int errcode = get(object, arg, parameterName, parameterValueSize, __buffer.address(), NULL);
         if (DEBUG) {
             checkCLError(errcode);
         }
-        return __buffer.stringValueASCII(0, param_value_size);
+        return __buffer.stringValueASCII(0, parameterValueSize);
     }
 
     /**
-     * Returns the string value for the specified {@code param_name}. The raw
+     * Returns the string value for the specified {@code parameterName}. The raw
      * bytes returned are assumed to be UTF-8 encoded.
      *
      * @param object the object to query
      * @param arg an integer argument
-     * @param param_name the parameter to query
+     * @param parameterName the parameter to query
      *
      * @return the parameter's string value
      */
-    String getStringUTF8(long object, int arg, int param_name) {
+    String getStringUTF8(long object, int arg, int parameterName) {
         APIBuffer __buffer = apiBuffer();
-        int bytes = getString(object, arg, param_name, __buffer);
+        int bytes = getString(object, arg, parameterName, __buffer);
         return __buffer.stringValueUTF8(0, bytes);
     }
 
     /**
-     * Returns the string value for the specified {@code param_name}. The raw
+     * Returns the string value for the specified {@code parameterName}. The raw
      * bytes returned are assumed to be UTF-8 encoded and have length equal to {@code
-     * param_value_size}.
+     * parameterValueSize}.
      *
      * @param object the object to query
      * @param arg an integer argument
-     * @param param_name the parameter to query
-     * @param param_value_size the explicit string length
+     * @param parameterName the parameter to query
+     * @param parameterValueSize the explicit string length
      *
      * @return the parameter's string value
      */
-    String getStringUTF8(long object, int arg, int param_name, int param_value_size) {
+    String getStringUTF8(long object, int arg, int parameterName, int parameterValueSize) {
         APIBuffer __buffer = apiBuffer();
-        int errcode = get(object, arg, param_name, param_value_size, __buffer.address(), NULL);
+        int errcode = get(object, arg, parameterName, parameterValueSize, __buffer.address(), NULL);
         if (DEBUG) {
             checkCLError(errcode);
         }
-        return __buffer.stringValueUTF8(0, param_value_size);
+        return __buffer.stringValueUTF8(0, parameterValueSize);
     }
 
-    private int getString(long object, int arg, int param_name, APIBuffer __buffer) {
+    private int getString(long object, int arg, int parameterName, APIBuffer buffer) {
         // Get string length
-        int errcode = get(object, arg, param_name, 0, NULL, __buffer.address());
+        int errcode = get(object, arg, parameterName, 0, NULL, buffer.address());
         if (DEBUG) {
             checkCLError(errcode);
         }
 
-        int bytes = (int) __buffer.pointerValue(0);
-        __buffer.bufferParam(bytes + POINTER_SIZE);
+        int bytes = (int) buffer.pointerValue(0);
+        buffer.bufferParam(bytes + POINTER_SIZE);
 
         // Get string
-        errcode = get(object, arg, param_name, bytes, __buffer.address(), NULL);
+        errcode = get(object, arg, parameterName, bytes, buffer.address(), NULL);
         if (DEBUG) {
             checkCLError(errcode);
         }

jme3-lwjgl3/src/main/java/com/jme3/opencl/lwjgl/info/InfoQueryObject.java

@@ -23,40 +23,41 @@ import static org.lwjgl.system.Pointer.*;
  */
 abstract class InfoQueryObject {
 
-    protected abstract int get(long pointer, long arg, int param_name, long param_value_size, long param_value, long param_value_size_ret);
+    protected abstract int get(long pointer, long arg, int parameterName,
+            long parameterValueSize, long parameterValue, long parameterValueSizeRet);
 
     InfoQueryObject() {
     }
 
     /**
-     * Returns the integer value for the specified {@code param_name}, converted
+     * Returns the integer value for the specified {@code parameterName}, converted
      * to a boolean.
      *
      * @param object the object to query
      * @param arg an object argument
-     * @param param_name the parameter to query
+     * @param parameterName the parameter to query
      *
      * @return the parameter's boolean value
      */
-    boolean getBoolean(long object, long arg, int param_name) {
-        return getInt(object, arg, param_name) != 0;
+    boolean getBoolean(long object, long arg, int parameterName) {
+        return getInt(object, arg, parameterName) != 0;
     }
 
     /**
-     * Returns the integer value for the specified {@code param_name}.
+     * Returns the integer value for the specified {@code parameterName}.
      * <p/>
      * For integer parameters that may be 32 or 64 bits (e.g. {@code size_t}),
      * {@link #getPointer} should be used instead.
      *
      * @param object the object to query
      * @param arg an object argument
-     * @param param_name the parameter to query
+     * @param parameterName the parameter to query
      *
      * @return the parameter's int value
      */
-    int getInt(long object, long arg, int param_name) {
+    int getInt(long object, long arg, int parameterName) {
         APIBuffer __buffer = apiBuffer();
-        int errcode = get(object, arg, param_name, 4L, __buffer.address(), NULL);
+        int errcode = get(object, arg, parameterName, 4L, __buffer.address(), NULL);
         if (DEBUG) {
             checkCLError(errcode);
         }
@@ -64,20 +65,20 @@ abstract class InfoQueryObject {
     }
 
     /**
-     * Returns the long value for the specified {@code param_name}.
+     * Returns the long value for the specified {@code parameterName}.
      * <p/>
      * For integer parameters that may be 32 or 64 bits (e.g. {@code size_t}),
      * {@link #getPointer} should be used instead.
      *
      * @param object the object to query
      * @param arg an object argument
-     * @param param_name the parameter to query
+     * @param parameterName the parameter to query
      *
      * @return the parameter's long value
      */
-    long getLong(long object, long arg, int param_name) {
+    long getLong(long object, long arg, int parameterName) {
         APIBuffer __buffer = apiBuffer();
-        int errcode = get(object, arg, param_name, 8L, __buffer.address(), NULL);
+        int errcode = get(object, arg, parameterName, 8L, __buffer.address(), NULL);
         if (DEBUG) {
             checkCLError(errcode);
         }
@@ -85,20 +86,20 @@ abstract class InfoQueryObject {
     }
 
     /**
-     * Returns the pointer value for the specified {@code param_name}.
+     * Returns the pointer value for the specified {@code parameterName}.
      * <p/>
      * This method should also be used for integer parameters that may be 32 or
      * 64 bits (e.g. {@code size_t}).
      *
      * @param object the object to query
      * @param arg an object argument
-     * @param param_name the parameter to query
+     * @param parameterName the parameter to query
      *
      * @return the parameter's pointer value
      */
-    long getPointer(long object, long arg, int param_name) {
+    long getPointer(long object, long arg, int parameterName) {
         APIBuffer __buffer = apiBuffer();
-        int errcode = get(object, arg, param_name, POINTER_SIZE, __buffer.address(), NULL);
+        int errcode = get(object, arg, parameterName, POINTER_SIZE, __buffer.address(), NULL);
         if (DEBUG) {
             checkCLError(errcode);
         }
@@ -106,7 +107,7 @@ abstract class InfoQueryObject {
     }
 
     /**
-     * Writes the pointer list for the specified {@code param_name} into
+     * Writes the pointer list for the specified {@code parameterName} into
      * {@code target}.
      * <p/>
      * This method should also be used for integer parameters that may be 32 or
@@ -114,14 +115,14 @@ abstract class InfoQueryObject {
      *
      * @param object the object to query
      * @param arg an object argument
-     * @param param_name the parameter to query
+     * @param parameterName the parameter to query
      * @param target the buffer in which to put the returned pointer list
      *
      * @return how many pointers were actually returned
      */
-    int getPointers(long object, long arg, int param_name, PointerBuffer target) {
+    int getPointers(long object, long arg, int parameterName, PointerBuffer target) {
         APIBuffer __buffer = apiBuffer();
-        int errcode = get(object, arg, param_name, target.remaining() * POINTER_SIZE, memAddress(target), __buffer.address());
+        int errcode = get(object, arg, parameterName, target.remaining() * POINTER_SIZE, memAddress(target), __buffer.address());
         if (DEBUG) {
             checkCLError(errcode);
         }
@@ -129,91 +130,91 @@ abstract class InfoQueryObject {
     }
 
     /**
-     * Returns the string value for the specified {@code param_name}. The raw
+     * Returns the string value for the specified {@code parameterName}. The raw
      * bytes returned are assumed to be ASCII encoded.
      *
      * @param object the object to query
      * @param arg an object argument
-     * @param param_name the parameter to query
+     * @param parameterName the parameter to query
      *
      * @return the parameter's string value
      */
-    String getStringASCII(long object, long arg, int param_name) {
+    String getStringASCII(long object, long arg, int parameterName) {
         APIBuffer __buffer = apiBuffer();
-        int bytes = getString(object, arg, param_name, __buffer);
+        int bytes = getString(object, arg, parameterName, __buffer);
         return __buffer.stringValueASCII(0, bytes);
     }
 
     /**
-     * Returns the string value for the specified {@code param_name}. The raw
+     * Returns the string value for the specified {@code parameterName}. The raw
      * bytes returned are assumed to be ASCII encoded and have length equal to {@code
-     * param_value_size}.
+     * parameterValueSize}.
      *
      * @param object the object to query
      * @param arg an object argument
-     * @param param_name the parameter to query
-     * @param param_value_size the explicit string length
+     * @param parameterName the parameter to query
+     * @param parameterValueSize the explicit string length
      *
      * @return the parameter's string value
      */
-    String getStringASCII(long object, long arg, int param_name, int param_value_size) {
+    String getStringASCII(long object, long arg, int parameterName, int parameterValueSize) {
         APIBuffer __buffer = apiBuffer();
-        int errcode = get(object, arg, param_name, param_value_size, __buffer.address(), NULL);
+        int errcode = get(object, arg, parameterName, parameterValueSize, __buffer.address(), NULL);
         if (DEBUG) {
             checkCLError(errcode);
         }
-        return __buffer.stringValueASCII(0, param_value_size);
+        return __buffer.stringValueASCII(0, parameterValueSize);
     }
 
     /**
-     * Returns the string value for the specified {@code param_name}. The raw
+     * Returns the string value for the specified {@code parameterName}. The raw
      * bytes returned are assumed to be UTF-8 encoded.
      *
      * @param object the object to query
      * @param arg an object argument
-     * @param param_name the parameter to query
+     * @param parameterName the parameter to query
      *
      * @return the parameter's string value
      */
-    String getStringUTF8(long object, long arg, int param_name) {
+    String getStringUTF8(long object, long arg, int parameterName) {
         APIBuffer __buffer = apiBuffer();
-        int bytes = getString(object, arg, param_name, __buffer);
+        int bytes = getString(object, arg, parameterName, __buffer);
         return __buffer.stringValueUTF8(0, bytes);
     }
 
     /**
-     * Returns the string value for the specified {@code param_name}. The raw
+     * Returns the string value for the specified {@code parameterName}. The raw
      * bytes returned are assumed to be UTF-8 encoded and have length equal to {@code
-     * param_value_size}.
+     * parameterValueSize}.
      *
      * @param object the object to query
      * @param arg an object argument
-     * @param param_name the parameter to query
-     * @param param_value_size the explicit string length
+     * @param parameterName the parameter to query
+     * @param parameterValueSize the explicit string length
      *
      * @return the parameter's string value
      */
-    String getStringUTF8(long object, long arg, int param_name, int param_value_size) {
+    String getStringUTF8(long object, long arg, int parameterName, int parameterValueSize) {
         APIBuffer __buffer = apiBuffer();
-        int errcode = get(object, arg, param_name, param_value_size, __buffer.address(), NULL);
+        int errcode = get(object, arg, parameterName, parameterValueSize, __buffer.address(), NULL);
         if (DEBUG) {
             checkCLError(errcode);
         }
-        return __buffer.stringValueUTF8(0, param_value_size);
+        return __buffer.stringValueUTF8(0, parameterValueSize);
     }
 
-    private int getString(long object, long arg, int param_name, APIBuffer __buffer) {
+    private int getString(long object, long arg, int parameterName, APIBuffer buffer) {
         // Get string length
-        int errcode = get(object, arg, param_name, 0, NULL, __buffer.address());
+        int errcode = get(object, arg, parameterName, 0, NULL, buffer.address());
         if (DEBUG) {
             checkCLError(errcode);
         }
 
-        int bytes = (int) __buffer.pointerValue(0);
-        __buffer.bufferParam(bytes + POINTER_SIZE);
+        int bytes = (int) buffer.pointerValue(0);
+        buffer.bufferParam(bytes + POINTER_SIZE);
 
         // Get string
-        errcode = get(object, arg, param_name, bytes, __buffer.address(), NULL);
+        errcode = get(object, arg, parameterName, bytes, buffer.address(), NULL);
         if (DEBUG) {
             checkCLError(errcode);
         }

jme3-plugins/src/ogre/java/com/jme3/scene/plugins/ogre/MeshLoader.java

@@ -519,10 +519,10 @@ public class MeshLoader extends DefaultHandler implements AssetLoader {
         buf.put(color.r).put(color.g).put(color.b).put(color.a);
     }
 
-    private void startLodFaceList(String submeshindex, String numfaces) {
-        int index = Integer.parseInt(submeshindex);
+    private void startLodFaceList(String submeshIndex, String numFaces) {
+        int index = Integer.parseInt(submeshIndex);
         mesh = geoms.get(index).getMesh();
-        int faceCount = Integer.parseInt(numfaces);
+        int faceCount = Integer.parseInt(numFaces);
 
         VertexBuffer originalIndexBuffer = mesh.getBuffer(Type.Index);
         vb = new VertexBuffer(VertexBuffer.Type.Index);

jme3-terrain/src/main/java/com/jme3/terrain/geomipmap/TerrainQuad.java

@@ -1725,9 +1725,9 @@ public class TerrainQuad extends Node implements Terrain {
     }
 
     @Override
-    public void read(JmeImporter e) throws IOException {
-        super.read(e);
-        InputCapsule c = e.getCapsule(this);
+    public void read(JmeImporter importer) throws IOException {
+        super.read(importer);
+        InputCapsule c = importer.getCapsule(this);
         size = c.readInt("size", 0);
         stepScale = (Vector3f) c.readSavable("stepScale", null);
         offset = (Vector2f) c.readSavable("offset", new Vector2f(0,0));

jme3-terrain/src/main/java/com/jme3/terrain/heightmap/RawHeightMap.java

@@ -88,14 +88,14 @@ public class RawHeightMap extends AbstractHeightMap {
         this.format = FORMAT_8BIT;
     }
 
-    public RawHeightMap(String filename, int size, int format, boolean swapxy) throws Exception {
-        // varify that filename and size are valid.
+    public RawHeightMap(String filename, int size, int format, boolean swapXy) throws Exception {
+        // Verify that filename and size are valid.
         if (null == filename || size <= 0) {
             throw new Exception("Must supply valid filename and "
                     + "size (> 0)");
         }
         try {
-            setup(new FileInputStream(filename), size, format, swapxy);
+            setup(new FileInputStream(filename), size, format, swapXy);
         } catch (FileNotFoundException e) {
             throw new Exception("height file not found: " + filename);
         }

jme3-terrain/src/main/java/com/jme3/terrain/noise/ShaderUtils.java

@@ -194,9 +194,9 @@ public class ShaderUtils {
         return x < 0.5 ? ShaderUtils.bias(1 - g, 2 * x) / 2 : 1 - ShaderUtils.bias(1 - g, 2 - 2 * x) / 2;
     }
 
-    public static final float sinValue(final float s, final float minFreq, final float maxFreq, final float swidth) {
+    public static final float sinValue(final float s, final float minFreq, final float maxFreq, final float sWidth) {
         float value = 0;
-        float cutoff = ShaderUtils.clamp(0.5f / swidth, 0, maxFreq);
+        float cutoff = ShaderUtils.clamp(0.5f / sWidth, 0, maxFreq);
         float f;
         for (f = minFreq; f < 0.5 * cutoff; f *= 2) {
             value += Math.sin(2 * Math.PI * f * s) / f;

jme3-vr/src/main/java/com/jme3/util/VRGuiManager.java

@@ -340,17 +340,17 @@ public class VRGuiManager {
 
     /**
      * Set up the GUI.
-     * @param leftcam the left eye camera.
-     * @param rightcam the right eye camera.
-     * @param left the left eye viewport.
-     * @param right the right eye viewport.
+     * @param leftCam the left-eye camera.
+     * @param rightCam the right-eye camera.
+     * @param left the left-eye viewport.
+     * @param right the right-eye viewport.
      */
-    public void setupGui(Camera leftcam, Camera rightcam, ViewPort left, ViewPort right) {
+    public void setupGui(Camera leftCam, Camera rightCam, ViewPort left, ViewPort right) {
 
         if (environment != null){
             if( environment.hasTraditionalGUIOverlay() ) {
-                camLeft = leftcam;
-                camRight = rightcam;
+                camLeft = leftCam;
+                camRight = rightCam;
                 Spatial guiScene = getGuiQuad(camLeft);
                 left.attachScene(guiScene);
                 if( right != null ) right.attachScene(guiScene);