diff --git a/GPUs/Makefile b/GPUs/Makefile
index 66ca83207858a2cf7967523146599e0dca3a9a9b..6830281798a9c40ffe50dec8bebb907fadeb2618 100644
--- a/GPUs/Makefile
+++ b/GPUs/Makefile
@@ -1,5 +1,6 @@
 CC=g++
 ICC =icc
+NVCC = nvcc
 
 DEBUG ?= 0  # Set to 1 for debug
 
@@ -15,12 +16,12 @@ EXT_DIR = ../External_Functions/
 
 MPI_PREFIX = $(I_MPI_ROOT)
 CUDA_PREFIX = $(CUDAROOT)
-GPU_MPI_CXX = nvcc -L $(I_MPI_ROOT)/lib64 -lmpi -ccbin mpiicc
-GPU_CXX = nvcc
+GPU_MPI_CXX = $(NVCC) -L $(I_MPI_ROOT)/lib64 -lmpi -ccbin mpiicc
+GPU_CXX = $(NVCC)
 
 LDFLAGS ?=-L $(CUDA_PREFIX)/lib64 -lcudart -lcublas -lcusparse -lm -lrt 
 
-GPU_COMPILE = nvcc -I $(CUDA_PREFIX)/include  -arch sm_35 -I$(EXT_DIR) $(LDFLAGS)
+GPU_COMPILE = $(NVCC) -I $(CUDA_PREFIX)/include  -arch sm_35 -I$(EXT_DIR) $(LDFLAGS)
 GPU_MPI_COMPILE = $(GPU_MPI_CXX) -I $(CUDA_PREFIX)/include -I $(I_MPI_ROOT)/include -arch sm_35 -I$(EXT_DIR) $(LDFLAGS)
 CPU_COMPILE = $(CC) $(CFLAGS) -I$(EXT_DIR) $(LDFLAGS)
 
diff --git a/MPI/Makefile b/MPI/Makefile
index 45807e5ac7c94fc110390aecaa06a4569dd541dd..4b25531a8d1aa0be5614045f0c8eff13dff2983b 100644
--- a/MPI/Makefile
+++ b/MPI/Makefile
@@ -1,5 +1,5 @@
 #CC=gcc
-ICC=mpiicc
+MPICC=mpiicc
 
 DEBUG ?= 0  # Set to 1 for debug
 
@@ -13,7 +13,7 @@ EXT_DIR = ../External_Functions/
 
 ICFLAGS=-O3 -Wall -axCORE-AVX2,CORE-AVX-I
 
-MPI_COMPILE= $(ICC) $(ICFLAGS) -I$(EXT_DIR)
+MPI_COMPILE= $(MPICC) $(ICFLAGS) -I$(EXT_DIR)
 MPI_OMP_COMPILE= $(MPI_COMPILE) -mt_mpi -qopenmp
 
 ifeq ($(DEBUG), 1)