diff --git a/android/core/src/processing/opengl/PShader.java b/android/core/src/processing/opengl/PShader.java
index 3a516c35d..f839537b1 100644
--- a/android/core/src/processing/opengl/PShader.java
+++ b/android/core/src/processing/opengl/PShader.java
@@ -205,57 +205,57 @@ public class PShader {
   }
   
   
-  public void setUniform(String name, int x) {    
+  public void set(String name, int x) {    
     setUniformImpl(name, UniformValue.INT1, new int[] { x });
   }
   
   
-  public void setUniform(String name, int x, int y) {
+  public void set(String name, int x, int y) {
     setUniformImpl(name, UniformValue.INT2, new int[] { x, y });
   }
   
   
-  public void setUniform(String name, int x, int y, int z) {
+  public void set(String name, int x, int y, int z) {
     setUniformImpl(name, UniformValue.INT3, new int[] { x, y, z });
   }
   
   
-  public void setUniform(String name, int x, int y, int z, int w) {
+  public void set(String name, int x, int y, int z, int w) {
     setUniformImpl(name, UniformValue.INT4, new int[] { x, y, z });
   }
   
   
-  public void setUniform(String name, float x) {
+  public void set(String name, float x) {
     setUniformImpl(name, UniformValue.FLOAT1, new float[] { x });
   }
   
   
-  public void setUniform(String name, float x, float y) {
+  public void set(String name, float x, float y) {
     setUniformImpl(name, UniformValue.FLOAT2, new float[] { x, y });
   }
   
   
-  public void setUniform(String name, float x, float y, float z) {
+  public void set(String name, float x, float y, float z) {
     setUniformImpl(name, UniformValue.FLOAT3, new float[] { x, y, z });
   }
   
   
-  public void setUniform(String name, float x, float y, float z, float w) {
+  public void set(String name, float x, float y, float z, float w) {
     setUniformImpl(name, UniformValue.FLOAT4, new float[] { x, y, z, w });
   }
   
   
-  public void setUniform(String name, PVector vec) {
+  public void set(String name, PVector vec) {
     setUniformImpl(name, UniformValue.FLOAT3, new float[] { vec.x, vec.y, vec.z });
   }
   
   
-  public void setUniform(String name, int[] vec) {
-    setUniform(name, vec, 1);
+  public void set(String name, int[] vec) {
+    set(name, vec, 1);
   }   
 
   
-  public void setUniform(String name, int[] vec, int ncoords) {
+  public void set(String name, int[] vec, int ncoords) {
     if (ncoords == 1) {
       setUniformImpl(name, UniformValue.INT1VEC, vec);
     } else if (ncoords == 2) {
@@ -272,12 +272,12 @@ public class PShader {
   }     
   
   
-  public void setUniform(String name, float[] vec) {
-    setUniform(name, vec, 1);
+  public void set(String name, float[] vec) {
+    set(name, vec, 1);
   }  
   
   
-  public void setUniform(String name, float[] vec, int ncoords) {    
+  public void set(String name, float[] vec, int ncoords) {    
     if (ncoords == 1) {
       setUniformImpl(name, UniformValue.FLOAT1VEC, vec);
     } else if (ncoords == 2) {
@@ -294,19 +294,19 @@ public class PShader {
   }
   
   
-  public void setUniform(String name, PMatrix2D mat) {
+  public void set(String name, PMatrix2D mat) {
     float[] matv = { mat.m00, mat.m01, 
                      mat.m10, mat.m11 };
     setUniformImpl(name, UniformValue.MAT2, matv);
   }
   
   
-  public void setUniform(String name, PMatrix3D mat) {
-    setUniform(name, mat, false);
+  public void set(String name, PMatrix3D mat) {
+    set(name, mat, false);
   }
   
   
-  public void setUniform(String name, PMatrix3D mat, boolean use3x3) {
+  public void set(String name, PMatrix3D mat, boolean use3x3) {
     if (use3x3) {
       float[] matv = { mat.m00, mat.m01, mat.m02, 
                        mat.m10, mat.m11, mat.m12,
diff --git a/java/libraries/opengl/examples/Shaders/BadPrint/BadPrint.pde b/java/libraries/opengl/examples/Shaders/BadPrint/BadPrint.pde
index 046f3e46c..ce7a85fd9 100644
--- a/java/libraries/opengl/examples/Shaders/BadPrint/BadPrint.pde
+++ b/java/libraries/opengl/examples/Shaders/BadPrint/BadPrint.pde
@@ -48,10 +48,10 @@ public void draw() {
   if (enabled) {
     pg.setShader(shader, PShader.LIT);
    
-    shader.setUniform("Scale", scaleR, scaleG, scaleB);
-    shader.setUniform("Offset", offsetR, offsetG, offsetB);
-    shader.setUniform("Register", registerR, registerG, registerB);
-    shader.setUniform("Size", sizeR, sizeG, sizeB);
+    shader.set("Scale", scaleR, scaleG, scaleB);
+    shader.set("Offset", offsetR, offsetG, offsetB);
+    shader.set("Register", registerR, registerG, registerB);
+    shader.set("Size", sizeR, sizeG, sizeB);
   } else {
     pg.defaultShader(PShader.LIT); 
   }
diff --git a/java/libraries/opengl/examples/Shaders/FishEye/FishEye.pde b/java/libraries/opengl/examples/Shaders/FishEye/FishEye.pde
index 1614fc254..ab4c9182c 100644
--- a/java/libraries/opengl/examples/Shaders/FishEye/FishEye.pde
+++ b/java/libraries/opengl/examples/Shaders/FishEye/FishEye.pde
@@ -10,7 +10,7 @@ void setup() {
 
   PGraphicsOpenGL pg = (PGraphicsOpenGL)g;
   fisheye = pg.loadShader("FishEye.glsl", PShader.TEXTURED);
-  fisheye.setUniform("aperture", 180.0);
+  fisheye.set("aperture", 180.0);
   pg.setShader(fisheye, PShader.TEXTURED);
 }
 
diff --git a/java/libraries/opengl/examples/Shaders/GlossyFishEye/GlossyFishEye.pde b/java/libraries/opengl/examples/Shaders/GlossyFishEye/GlossyFishEye.pde
index 19fc1513c..6cbf8742c 100644
--- a/java/libraries/opengl/examples/Shaders/GlossyFishEye/GlossyFishEye.pde
+++ b/java/libraries/opengl/examples/Shaders/GlossyFishEye/GlossyFishEye.pde
@@ -15,19 +15,19 @@ void setup() {
 
   PGraphicsOpenGL pg = (PGraphicsOpenGL)g;
   fisheye = pg.loadShader("FishEye.glsl", PShader.TEXTURED);
-  fisheye.setUniform("aperture", 180.0);
+  fisheye.set("aperture", 180.0);
   pg.setShader(fisheye, PShader.TEXTURED);
   usingFishEye = true;
   
   glossy = pg.loadShader("GlossyVert.glsl", "GlossyFrag.glsl", PShader.LIT);  
-  glossy.setUniform("AmbientColour", 0, 0, 0);
-  glossy.setUniform("DiffuseColour", 0.9, 0.2, 0.2);
-  glossy.setUniform("SpecularColour", 1.0, 1.0, 1.0);
-  glossy.setUniform("AmbientIntensity", 1.0);
-  glossy.setUniform("DiffuseIntensity", 1.0);
-  glossy.setUniform("SpecularIntensity", 0.7);
-  glossy.setUniform("Roughness", 0.7);
-  glossy.setUniform("Sharpness", 0.0);
+  glossy.set("AmbientColour", 0, 0, 0);
+  glossy.set("DiffuseColour", 0.9, 0.2, 0.2);
+  glossy.set("SpecularColour", 1.0, 1.0, 1.0);
+  glossy.set("AmbientIntensity", 1.0);
+  glossy.set("DiffuseIntensity", 1.0);
+  glossy.set("SpecularIntensity", 0.7);
+  glossy.set("Roughness", 0.7);
+  glossy.set("Sharpness", 0.0);
   ((PGraphicsOpenGL)canvas).setShader(glossy, PShader.LIT);
   
   ball = createShape(SPHERE, 50);
diff --git a/java/libraries/opengl/examples/Shaders/SepBlur/SepBlur.pde b/java/libraries/opengl/examples/Shaders/SepBlur/SepBlur.pde
index 2dc11475c..607332abe 100644
--- a/java/libraries/opengl/examples/Shaders/SepBlur/SepBlur.pde
+++ b/java/libraries/opengl/examples/Shaders/SepBlur/SepBlur.pde
@@ -9,8 +9,8 @@ void setup() {
   size(200, 200, P2D);
   
   shader = ((PGraphicsOpenGL)g).loadShader("blur.glsl", PShader.TEXTURED);
-  shader.setUniform("blurSize", 9);
-  shader.setUniform("sigma", 5.0f);  
+  shader.set("blurSize", 9);
+  shader.set("sigma", 5.0f);  
   
   src = (PGraphicsOpenGL)createGraphics(width, height, P2D); 
   
@@ -31,13 +31,13 @@ void draw() {
   src.endDraw();
     
   // Applying the blur shader along the vertical direction   
-  shader.setUniform("horizontalPass", 0);
+  shader.set("horizontalPass", 0);
   pass1.beginDraw();                
   pass1.image(src, 0, 0);
   pass1.endDraw();
   
   // Applying the blur shader along the horizontal direction      
-  shader.setUniform("horizontalPass", 1);
+  shader.set("horizontalPass", 1);
   pass2.beginDraw();                
   pass2.image(pass1, 0, 0);
   pass2.endDraw();    
@@ -47,16 +47,16 @@ void draw() {
 
 void keyPressed() {
   if (key == '9') {
-    shader.setUniform("blurSize", 9);
-    shader.setUniform("sigma", 5.0);
+    shader.set("blurSize", 9);
+    shader.set("sigma", 5.0);
   } else if (key == '7') {
-    shader.setUniform("blurSize", 7);
-    shader.setUniform("sigma", 3.0);
+    shader.set("blurSize", 7);
+    shader.set("sigma", 3.0);
   } else if (key == '5') {
-    shader.setUniform("blurSize", 5);
-    shader.setUniform("sigma", 2.0);  
+    shader.set("blurSize", 5);
+    shader.set("sigma", 2.0);  
   } else if (key == '3') {
-    shader.setUniform("blurSize", 5);
-    shader.setUniform("sigma", 1.0);  
+    shader.set("blurSize", 5);
+    shader.set("sigma", 1.0);  
   }  
 } 
diff --git a/java/libraries/opengl/src/processing/opengl/PShader.java b/java/libraries/opengl/src/processing/opengl/PShader.java
index 3a516c35d..f839537b1 100644
--- a/java/libraries/opengl/src/processing/opengl/PShader.java
+++ b/java/libraries/opengl/src/processing/opengl/PShader.java
@@ -205,57 +205,57 @@ public class PShader {
   }
   
   
-  public void setUniform(String name, int x) {    
+  public void set(String name, int x) {    
     setUniformImpl(name, UniformValue.INT1, new int[] { x });
   }
   
   
-  public void setUniform(String name, int x, int y) {
+  public void set(String name, int x, int y) {
     setUniformImpl(name, UniformValue.INT2, new int[] { x, y });
   }
   
   
-  public void setUniform(String name, int x, int y, int z) {
+  public void set(String name, int x, int y, int z) {
     setUniformImpl(name, UniformValue.INT3, new int[] { x, y, z });
   }
   
   
-  public void setUniform(String name, int x, int y, int z, int w) {
+  public void set(String name, int x, int y, int z, int w) {
     setUniformImpl(name, UniformValue.INT4, new int[] { x, y, z });
   }
   
   
-  public void setUniform(String name, float x) {
+  public void set(String name, float x) {
     setUniformImpl(name, UniformValue.FLOAT1, new float[] { x });
   }
   
   
-  public void setUniform(String name, float x, float y) {
+  public void set(String name, float x, float y) {
     setUniformImpl(name, UniformValue.FLOAT2, new float[] { x, y });
   }
   
   
-  public void setUniform(String name, float x, float y, float z) {
+  public void set(String name, float x, float y, float z) {
     setUniformImpl(name, UniformValue.FLOAT3, new float[] { x, y, z });
   }
   
   
-  public void setUniform(String name, float x, float y, float z, float w) {
+  public void set(String name, float x, float y, float z, float w) {
     setUniformImpl(name, UniformValue.FLOAT4, new float[] { x, y, z, w });
   }
   
   
-  public void setUniform(String name, PVector vec) {
+  public void set(String name, PVector vec) {
     setUniformImpl(name, UniformValue.FLOAT3, new float[] { vec.x, vec.y, vec.z });
   }
   
   
-  public void setUniform(String name, int[] vec) {
-    setUniform(name, vec, 1);
+  public void set(String name, int[] vec) {
+    set(name, vec, 1);
   }   
 
   
-  public void setUniform(String name, int[] vec, int ncoords) {
+  public void set(String name, int[] vec, int ncoords) {
     if (ncoords == 1) {
       setUniformImpl(name, UniformValue.INT1VEC, vec);
     } else if (ncoords == 2) {
@@ -272,12 +272,12 @@ public class PShader {
   }     
   
   
-  public void setUniform(String name, float[] vec) {
-    setUniform(name, vec, 1);
+  public void set(String name, float[] vec) {
+    set(name, vec, 1);
   }  
   
   
-  public void setUniform(String name, float[] vec, int ncoords) {    
+  public void set(String name, float[] vec, int ncoords) {    
     if (ncoords == 1) {
       setUniformImpl(name, UniformValue.FLOAT1VEC, vec);
     } else if (ncoords == 2) {
@@ -294,19 +294,19 @@ public class PShader {
   }
   
   
-  public void setUniform(String name, PMatrix2D mat) {
+  public void set(String name, PMatrix2D mat) {
     float[] matv = { mat.m00, mat.m01, 
                      mat.m10, mat.m11 };
     setUniformImpl(name, UniformValue.MAT2, matv);
   }
   
   
-  public void setUniform(String name, PMatrix3D mat) {
-    setUniform(name, mat, false);
+  public void set(String name, PMatrix3D mat) {
+    set(name, mat, false);
   }
   
   
-  public void setUniform(String name, PMatrix3D mat, boolean use3x3) {
+  public void set(String name, PMatrix3D mat, boolean use3x3) {
     if (use3x3) {
       float[] matv = { mat.m00, mat.m01, mat.m02, 
                        mat.m10, mat.m11, mat.m12,