diff --git a/MATRIX/F_mmtest.cu b/MATRIX/F_mmlatte.cu
similarity index 95%
rename from MATRIX/F_mmtest.cu
rename to MATRIX/F_mmlatte.cu
index 94ff603..aec2a32 100644
--- a/MATRIX/F_mmtest.cu
+++ b/MATRIX/F_mmlatte.cu
@@ -21,7 +21,7 @@
 
 #include "Matrix.h"
 
-extern "C" void mmtest_(int *hdim, void *bo_pointer, void *h_pointer) {
+extern "C" void mmlatte_(int *hdim, void *bo_pointer, void *h_pointer) {
   runmatmult(*hdim, (double *)bo_pointer, (double *)h_pointer);
     }
 
diff --git a/MATRIX/F_mmtest.c b/MATRIX/F_mmtest.c
deleted file mode 100644
index 1dde0db..0000000
--- a/MATRIX/F_mmtest.c
+++ /dev/null
@@ -1,27 +0,0 @@
-/*!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-! Copyright 2010.  Los Alamos National Security, LLC. This material was    !
-! produced under U.S. Government contract DE-AC52-06NA25396 for Los Alamos !
-! National Laboratory (LANL), which is operated by Los Alamos National     !
-! Security, LLC for the U.S. Department of Energy. The U.S. Government has !
-! rights to use, reproduce, and distribute this software.  NEITHER THE     !
-! GOVERNMENT NOR LOS ALAMOS NATIONAL SECURITY, LLC MAKES ANY WARRANTY,     !
-! EXPRESS OR IMPLIED, OR ASSUMES ANY LIABILITY FOR THE USE OF THIS         !
-! SOFTWARE.  If software is modified to produce derivative works, such     !
-! modified software should be clearly marked, so as not to confuse it      !
-! with the version available from LANL.                                    !
-!                                                                          !
-! Additionally, this program is free software; you can redistribute it     !
-! and/or modify it under the terms of the GNU General Public License as    !
-! published by the Free Software Foundation; version 2.0 of the License.   !
-! Accordingly, this program is distributed in the hope that it will be     !
-! useful, but WITHOUT ANY WARRANTY; without even the implied warranty of   !
-! MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General !
-! Public License for more details.                                         !
-!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*/
-
-#include "Matrix.h"
-
-extern "C" void mmtest_(int *hdim, void *bo_pointer, void *h_pointer) {
-  runmatmult(*hdim, (double *)bo_pointer, (double *)h_pointer)
-    }
-
diff --git a/makefile.CHOICES b/makefile.CHOICES
index 9000389..e5e0ccd 100644
--- a/makefile.CHOICES
+++ b/makefile.CHOICES
@@ -89,5 +89,5 @@ endif
 # GPU options
 #
 
-GPU_CUDA_LIB = -L/opt/cudatoolkit-5.5/lib64 -lcublas -lcudart
-GPU_ARCH = sm_20 
+GPU_CUDA_LIB = -L/opt/cuda/lib64 -lcublas -lcudart -lgomp
+GPU_ARCH = sm_35