Remove name collisions in the vertex and fragment shader

Change-Id: I6885f73f2a0444c21d08a4f225b8e4d74b7cf2c9
diff --git a/tests/src/android/renderscript/cts/structs.rsh b/tests/src/android/renderscript/cts/structs.rsh
index 58f6186..e7d2efd 100755
--- a/tests/src/android/renderscript/cts/structs.rsh
+++ b/tests/src/android/renderscript/cts/structs.rsh
@@ -13,12 +13,12 @@
 // limitations under the License.
 
 typedef struct ConstMatrix {
-    rs_matrix4x4 MVP;
+    rs_matrix4x4 MATRIX;
 } ConstMatrix_s;
 ConstMatrix_s *c1;
 
 typedef struct ConstComplex {
-    rs_matrix4x4 MVP;
+    rs_matrix4x4 MATRIX;
     rs_matrix4x4 EXTRA;
     float extra1;
     float2 extra2;
diff --git a/tests/tests/renderscript/src/android/renderscript/cts/ProgramFragmentTest.java b/tests/tests/renderscript/src/android/renderscript/cts/ProgramFragmentTest.java
index d6a7f0d..9a71386 100644
--- a/tests/tests/renderscript/src/android/renderscript/cts/ProgramFragmentTest.java
+++ b/tests/tests/renderscript/src/android/renderscript/cts/ProgramFragmentTest.java
@@ -131,7 +131,7 @@
 
         String simpleUni = "void main() {\n"+
                            "  vec4 col = vec4(0.1, 0.2, 0.3, 0.4);\n"+
-                           "  col = UNI_MVP * col;\n"+
+                           "  col = UNI_MATRIX * col;\n"+
                            "  gl_FragColor = col;\n"+
                            "}";
 
@@ -139,13 +139,13 @@
                               "  vec4 col = vec4(0.1, 0.2, 0.3, 0.4);"+
                               "  col += texture2D(UNI_Tex0, vec2(0.1, 0.1));\n"+
                               "  col += textureCube(UNI_Tex1, vec3(0.1, 0.2, 0.3));\n"+
-                              "  col = UNI_MVP * col;\n"+
+                              "  col = UNI_MATRIX * col;\n"+
                               "  gl_FragColor = col;\n"+
                               "}";
 
         String multiUni = "void main() {\n"+
                           "  vec4 col = vec4(0.1, 0.2, 0.3, 0.4);"+
-                          "  col = UNI_MVP * col;\n"+
+                          "  col = UNI_MATRIX * col;\n"+
                           "  col = UNI_EXTRA * col;\n"+
                           "  col += UNI_extra4;\n"+
                           "  col.xyz += UNI_extra3;\n "+
diff --git a/tests/tests/renderscript/src/android/renderscript/cts/ProgramVertexTest.java b/tests/tests/renderscript/src/android/renderscript/cts/ProgramVertexTest.java
index 0a5c60e..3c2c188 100644
--- a/tests/tests/renderscript/src/android/renderscript/cts/ProgramVertexTest.java
+++ b/tests/tests/renderscript/src/android/renderscript/cts/ProgramVertexTest.java
@@ -143,11 +143,11 @@
                             "}";
 
         String simpleAttrSimpleUni = "void main() {\n"+
-                                     "  gl_Position = UNI_MVP * ATTRIB_position;\n"+
+                                     "  gl_Position = UNI_MATRIX * ATTRIB_position;\n"+
                                      "}";
 
         String multiAttrMultiUni = "void main() {\n"+
-                                   "  vec4 temp = UNI_MVP * ATTRIB_position;\n"+
+                                   "  vec4 temp = UNI_MATRIX * ATTRIB_position;\n"+
                                    "  temp = UNI_EXTRA * temp;\n"+
                                    "  temp.xyz += ATTRIB_normal;\n"+
                                    "  temp.xy += ATTRIB_texture0;\n"+