diff --git a/tests/opencl/Makefile b/tests/opencl/Makefile
index 88236559..27ef6f38 100644
--- a/tests/opencl/Makefile
+++ b/tests/opencl/Makefile
@@ -17,7 +17,7 @@ all:
 	$(MAKE) -C lbm
 	$(MAKE) -C oclprintf
 	$(MAKE) -C blackscholes
-	$(MAKE) -C matmul
+	$(MAKE) -C sgemm2
 	$(MAKE) -C convolution
 
 run-simx:
@@ -38,7 +38,7 @@ run-simx:
 	$(MAKE) -C transpose run-simx
 	$(MAKE) -C convolution run-simx
 	$(MAKE) -C cutcp run-simx
-	$(MAKE) -C matmul run-simx
+	$(MAKE) -C sgemm2 run-simx
 	$(MAKE) -C vectorhypot run-simx	
 	$(MAKE) -C mri-q run-simx
 
@@ -60,7 +60,7 @@ run-rtlsim:
 	$(MAKE) -C blackscholes run-rtlsim
 	$(MAKE) -C convolution run-rtlsim
 #	$(MAKE) -C cutcp run-rtlsim
-#	$(MAKE) -C matmul run-rtlsim
+#	$(MAKE) -C sgemm2 run-rtlsim
 #	$(MAKE) -C vectorhypot run-rtlsim
 #	$(MAKE) -C mri-q run-rtlsim
 
@@ -82,7 +82,7 @@ run-opae:
 	$(MAKE) -C blackscholes run-opae
 	$(MAKE) -C convolution run-opae
 #	$(MAKE) -C cutcp run-opae
-#	$(MAKE) -C matmul run-opae
+#	$(MAKE) -C sgemm2 run-opae
 #	$(MAKE) -C vectorhypot run-opae
 #	$(MAKE) -C mri-q run-opae
 
@@ -105,7 +105,7 @@ clean:
 	$(MAKE) -C lbm clean
 	$(MAKE) -C oclprintf clean
 	$(MAKE) -C blackscholes clean
-	$(MAKE) -C matmul clean
+	$(MAKE) -C sgemm2 clean
 	$(MAKE) -C convolution clean
 
 clean-all:
@@ -128,5 +128,5 @@ clean-all:
 	$(MAKE) -C lbm clean-all
 	$(MAKE) -C oclprintf clean-all
 	$(MAKE) -C blackscholes clean-all
-	$(MAKE) -C matmul clean-all
+	$(MAKE) -C sgemm2 clean-all
 	$(MAKE) -C convolution clean-all
diff --git a/tests/opencl/matmul/Makefile b/tests/opencl/sgemm2/Makefile
similarity index 75%
rename from tests/opencl/matmul/Makefile
rename to tests/opencl/sgemm2/Makefile
index 39b92b36..f507d9ed 100644
--- a/tests/opencl/matmul/Makefile
+++ b/tests/opencl/sgemm2/Makefile
@@ -1,4 +1,4 @@
-PROJECT = matmul
+PROJECT = sgemm2
 
 SRCS = main.cc
 
diff --git a/tests/opencl/matmul/kernel.cl b/tests/opencl/sgemm2/kernel.cl
similarity index 96%
rename from tests/opencl/matmul/kernel.cl
rename to tests/opencl/sgemm2/kernel.cl
index 007a233f..6a764820 100644
--- a/tests/opencl/matmul/kernel.cl
+++ b/tests/opencl/sgemm2/kernel.cl
@@ -1,4 +1,4 @@
-__kernel void matmul(__global float *A, 
+__kernel void sgemm2(__global float *A, 
                      __global float *B, 
                      __global float *C, 
                      const unsigned int N, 
@@ -36,7 +36,7 @@ __kernel void matmul(__global float *A,
     C[globalRow * N + globalCol] = sum;
 }
 
-/*__kernel void matmul(__global float *A, 
+/*__kernel void sgemm2(__global float *A, 
                        __global float *B, 
                        __global float *C, 
                        const unsigned int N)
diff --git a/tests/opencl/matmul/main.cc b/tests/opencl/sgemm2/main.cc
similarity index 99%
rename from tests/opencl/matmul/main.cc
rename to tests/opencl/sgemm2/main.cc
index 3d26ff0c..21ec3a54 100644
--- a/tests/opencl/matmul/main.cc
+++ b/tests/opencl/sgemm2/main.cc
@@ -12,7 +12,7 @@
 
 #define FLOAT_ULP 6
 
-#define KERNEL_NAME "matmul"
+#define KERNEL_NAME "sgemm2"
 
 #define CL_CHECK(_expr)                                                \
    do {                                                                \