diff --git a/prism/Makefile b/prism/Makefile
index f1877073..e6acbf15 100644
--- a/prism/Makefile
+++ b/prism/Makefile
@@ -127,9 +127,9 @@ JAVA_DIR_BACKUP = $(shell \
 # Compilers etc. #
 ##################
 
-C = gcc
-CPP = g++
-LD = $(CPP)
+CC = gcc
+CXX = g++
+LD = $(CXX)
 JAVAC = javac
 JAVACC = javacc
 
@@ -160,7 +160,7 @@ ifeq ($(OSTYPE),linux)
 		# Position Independent Code required on AMD64/Itanium
 		CUDD_XCFLAGS = -m64 -fPIC -DPIC -DHAVE_IEEE_754 -DBSD -DSIZEOF_VOID_P=8 -DSIZEOF_LONG=8 $(DEBUG) $(WARNINGS)
 		CFLAGS = $(CUDD_XCFLAGS) $(OPTIMISE)
-		CPPFLAGS = --std=c++11 $(CUDD_XCFLAGS) $(OPTIMISE)
+		CXXFLAGS = --std=c++11 $(CUDD_XCFLAGS) $(OPTIMISE)
 		LDFLAGS = $(CUDD_XCFLAGS) $(OPTIMISE)
 		BINDISTSUFFIX = linux64
 	else
@@ -169,13 +169,13 @@ ifeq ($(OSTYPE),linux)
 		# Note: We omit the -m64 flag from here since it seems to be unsupported by gcc on IA64
 		CUDD_XCFLAGS = -fPIC -DPIC -DHAVE_IEEE_754 -DBSD -DSIZEOF_VOID_P=8 -DSIZEOF_LONG=8 $(DEBUG) $(WARNINGS)
 		CFLAGS = $(CUDD_XCFLAGS) $(OPTIMISE)
-		CPPFLAGS = --std=c++11 $(CUDD_XCFLAGS) $(OPTIMISE)
+		CXXFLAGS = --std=c++11 $(CUDD_XCFLAGS) $(OPTIMISE)
 		LDFLAGS = $(CUDD_XCFLAGS) $(OPTIMISE)
 		BINDISTSUFFIX = linux64
 	else
 		CUDD_XCFLAGS = -m32 -malign-double -DHAVE_IEEE_754 -DBSD $(DEBUG) $(WARNINGS)
 		CFLAGS = $(CUDD_XCFLAGS) $(OPTIMISE)
-		CPPFLAGS = --std=c++11 $(CUDD_XCFLAGS) $(OPTIMISE)
+		CXXFLAGS = --std=c++11 $(CUDD_XCFLAGS) $(OPTIMISE)
 		LDFLAGS = $(CUDD_XCFLAGS) $(OPTIMISE)
 		BINDISTSUFFIX = linux32
 	endif
@@ -194,7 +194,7 @@ endif
 ifeq ($(OSTYPE),solaris)
 	CUDD_XCFLAGS = -mcpu=ultrasparc -DHAVE_IEEE_754 -DUNIX100 -DEPD_BIG_ENDIAN $(DEBUG) $(WARNINGS)
 	CFLAGS = $(CUDD_XCFLAGS) $(OPTIMISE)
-	CPPFLAGS = --std=c++11 $(CUDD_XCFLAGS) $(OPTIMISE)
+	CXXFLAGS = --std=c++11 $(CUDD_XCFLAGS) $(OPTIMISE)
 	LDFLAGS = $(CUDD_XCFLAGS) $(OPTIMISE)
 	BINDISTSUFFIX = solaris
 	BIN_TARGETS=prism.linux xprism.linux
@@ -209,21 +209,21 @@ endif
 # Cygwin
 ifeq ($(OSTYPE),cygwin)
 	ifeq ($(ARCH),x86_64)
-		C = /usr/bin/x86_64-w64-mingw32-gcc
-		CPP = /usr/bin/x86_64-w64-mingw32-g++
+		CC = /usr/bin/x86_64-w64-mingw32-gcc
+		CXX = /usr/bin/x86_64-w64-mingw32-g++
 		CUDD_XCFLAGS = -malign-double -DHAVE_IEEE_754 -DHAVE_GETRLIMIT=0 -DRLIMIT_DATA_DEFAULT=268435456 -DHAVE_SYS_RESOURCE_H=0 -DHAVE_SYS_WAIT_H=0 -DSIZEOF_VOID_P=8 -DSIZEOF_LONG=4 $(DEBUG) $(WARNINGS) -static-libgcc -static-libstdc++
 		CFLAGS = $(CUDD_XCFLAGS) $(OPTIMISE)
 		# need -DWIN32 for lpsolve (WIN32 is only defined by mingw/gcc without --std=c++11)
-		CPPFLAGS = --std=c++11 -DWIN32 $(CUDD_XCFLAGS) $(OPTIMISE)
+		CXXFLAGS = --std=c++11 -DWIN32 $(CUDD_XCFLAGS) $(OPTIMISE)
 		LDFLAGS = $(CUDD_XCFLAGS) $(OPTIMISE) -Wl,--add-stdcall-alias -Wl,-Bstatic,--whole-archive -lpthread -Wl,-Bdynamic,--no-whole-archive
 		BINDISTSUFFIX = win64
 	else
-		C = /usr/bin/i686-w64-mingw32-gcc
-		CPP = /usr/bin/i686-w64-mingw32-g++
+		CC = /usr/bin/i686-w64-mingw32-gcc
+		CXX = /usr/bin/i686-w64-mingw32-g++
 		CUDD_XCFLAGS = -march=i686 -malign-double -DHAVE_IEEE_754 -DHAVE_GETRLIMIT=0 -DRLIMIT_DATA_DEFAULT=268435456 -DHAVE_SYS_RESOURCE_H=0 -DHAVE_SYS_WAIT_H=0 $(DEBUG) $(WARNINGS) -static-libgcc -static-libstdc++
 		CFLAGS = $(CUDD_XCFLAGS) $(OPTIMISE)
 		# need -DWIN32 for lpsolve (WIN32 is only defined by mingw/gcc without --std=c++11)
-		CPPFLAGS = --std=c++11 -DWIN32 $(CUDD_XCFLAGS) $(OPTIMISE)
+		CXXFLAGS = --std=c++11 -DWIN32 $(CUDD_XCFLAGS) $(OPTIMISE)
 		LDFLAGS = $(CUDD_XCFLAGS) $(OPTIMISE) -Wl,--add-stdcall-alias -Wl,-Bstatic,--whole-archive -lpthread -Wl,-Bdynamic,--no-whole-archive
 		BINDISTSUFFIX = win32
 	endif
@@ -243,14 +243,14 @@ ifeq ($(OSTYPE),darwin)
 	ifeq ($(ARCH),x86_64)
 		CUDD_XCFLAGS = -arch x86_64 -fPIC -DPIC -DHAVE_IEEE_754 -DBSD -DSIZEOF_VOID_P=8 -DSIZEOF_LONG=8 -fno-common $(DEBUG) $(WARNINGS)
 		CFLAGS = $(CUDD_XCFLAGS) $(OPTIMISE)
-		CPPFLAGS = --std=c++11 $(CUDD_XCFLAGS) $(OPTIMISE)
+		CXXFLAGS = --std=c++11 $(CUDD_XCFLAGS) $(OPTIMISE)
 		LDFLAGS = $(CUDD_XCFLAGS) $(OPTIMISE) -Wl,-search_paths_first
 		BINDISTSUFFIX = osx64
 		BIN_TARGETS=prism.darwin64 xprism.linux
 	else
 		CUDD_XCFLAGS = -arch i386 -DHAVE_IEEE_754 -DBSD -fno-common $(DEBUG) $(WARNINGS)
 		CFLAGS = $(CUDD_XCFLAGS) $(OPTIMISE)
-		CPPFLAGS = --std=c++11 $(CUDD_XCFLAGS) $(OPTIMISE)
+		CXXFLAGS = --std=c++11 $(CUDD_XCFLAGS) $(OPTIMISE)
 		LDFLAGS = $(CUDD_XCFLAGS) $(OPTIMISE) -Wl,-search_paths_first
 		BINDISTSUFFIX = osx32
 		BIN_TARGETS=prism.darwin32 xprism.linux
@@ -320,7 +320,7 @@ cuddpackage: checks
 	@(if [ ! -h $(CUDD_DIR) ]; then \
 	  echo Making cudd ...; \
 	  cd $(CUDD_DIR) && \
-	  $(MAKE) C="$(C)" CC="$(C)" CPP="$(CPP)" CXX="$(CPP)" \
+	  $(MAKE) CC="$(CC)" CXX="$(CXX)" \
 	  XCFLAGS="$(CUDD_XCFLAGS)"; \
 	else \
 	  echo Skipping cudd make since it is a symlink...; \
@@ -330,7 +330,7 @@ cuddpackage: checks
 cuddpackageforce: checks
 	  @echo Making cudd ...; \
 	  cd $(CUDD_DIR) && \
-	  $(MAKE) C="$(C)" CC="$(C)" CPP="$(CPP)" \
+	  $(MAKE) CC="$(CC)" CXX="$(CXX)" \
 	  XCFLAGS="$(CUDD_XCFLAGS)";
 
 # Use this to force a rebuild (with javacc) of the main parser
@@ -351,11 +351,11 @@ extpackages: checks
 	  $(MAKE) \
 	  OSTYPE="$(OSTYPE)" \
 	  ARCH="$(ARCH)" \
-	  C="$(C)" \
-	  CPP="$(CPP)" \
+	  CC="$(CC)" \
+	  CXX="$(CXX)" \
 	  LD="$(LD)" \
 	  CFLAGS="$(CFLAGS)" \
-	  CPPFLAGS="$(CPPFLAGS)" \
+	  CXXFLAGS="$(CXXFLAGS)" \
 	  LDFLAGS="$(LDFLAGS)" \
 	  SHARED="$(SHARED)" \
 	  LIBPREFIX="$(LIBPREFIX)" \
@@ -383,13 +383,13 @@ make_dirs:
 	  JAVA_INCLUDES="$(JAVA_INCLUDES)" \
 	  JAVA_JNI_H_DIR="$(JAVA_JNI_H_DIR)" \
 	  JAVA_JNI_MD_H_DIR="$(JAVA_JNI_MD_H_DIR)" \
-	  C="$(C)" \
-	  CPP="$(CPP)" \
+	  CC="$(CC)" \
+	  CXX="$(CXX)" \
 	  LD="$(LD)" \
 	  JAVAC="$(JAVAC) $(JFLAGS)" \
 	  JAVACC="$(JAVACC)" \
 	  CFLAGS="$(CFLAGS)" \
-	  CPPFLAGS="$(CPPFLAGS)" \
+	  CXXFLAGS="$(CXXFLAGS)" \
 	  LDFLAGS="$(LDFLAGS)" \
 	  SHARED="$(SHARED)" \
 	  EXE="$(EXE)" \
diff --git a/prism/ext/lpsolve55/Makefile b/prism/ext/lpsolve55/Makefile
index f50fade4..3bbcba05 100644
--- a/prism/ext/lpsolve55/Makefile
+++ b/prism/ext/lpsolve55/Makefile
@@ -38,7 +38,7 @@ checks:
 	  cp bin/$(BINDISTSUFFIX)/$(LIBPREFIX)lpsolve55$(LIBSUFFIX) ../../lib; \
 	else \
 	  (cd src/lp_solve_5.5/lpsolve55 && \
-	  ARCH=$(ARCH) c=$(C) sh -x $(LPSOLVE55_BUILD) \
+	  ARCH=$(ARCH) c=$(CC) sh -x $(LPSOLVE55_BUILD) \
 	  ) && mv lib/$(LIBPREFIX)lpsolve55$(LIBSUFFIX) ../../lib/; \
 	fi)
 
diff --git a/prism/src/dd/Makefile b/prism/src/dd/Makefile
index 130713ee..73b2e496 100644
--- a/prism/src/dd/Makefile
+++ b/prism/src/dd/Makefile
@@ -47,7 +47,7 @@ $(PRISM_DIR_REL)/$(PRISM_OBJ_DIR)/$(THIS_DIR)/dd_test$(EXE): $(PRISM_DIR_REL)/$(
 	$(LD) $(LDFLAGS) -o $@ $(PRISM_DIR_REL)/$(PRISM_OBJ_DIR)/$(THIS_DIR)/dd_test.o -L$(PRISM_DIR_REL)/$(PRISM_LIB_DIR) -ldd
 
 $(PRISM_DIR_REL)/$(PRISM_OBJ_DIR)/$(THIS_DIR)/%.o: %.cc
-	$(CPP) $(CPPFLAGS) -c $< -o $@ $(INCLUDES)
+	$(CXX) $(CXXFLAGS) -c $< -o $@ $(INCLUDES)
 
 clean: checks
 	@rm -f $(PRISM_DIR_REL)/$(PRISM_LIB_DIR)/$(LIBPREFIX)dd$(LIBSUFFIX) $(O_FILES) $(PRISM_DIR_REL)/$(PRISM_OBJ_DIR)/$(THIS_DIR)/dd_test$(EXE)
diff --git a/prism/src/dv/Makefile b/prism/src/dv/Makefile
index fe85bb96..3b1f9c73 100644
--- a/prism/src/dv/Makefile
+++ b/prism/src/dv/Makefile
@@ -55,7 +55,7 @@ $(PRISM_DIR_REL)/$(PRISM_LIB_DIR)/$(LIBPREFIX)dv$(LIBSUFFIX): $(O_FILES)
 	$(LD) $(SHARED) $(LDFLAGS) -o $@ $(O_FILES) $(LIBRARIES)
 
 $(PRISM_DIR_REL)/$(PRISM_OBJ_DIR)/$(THIS_DIR)/%.o: %.cc
-	$(CPP) $(CPPFLAGS) -c $< -o $@ $(INCLUDES)
+	$(CXX) $(CXXFLAGS) -c $< -o $@ $(INCLUDES)
 
 clean: checks
 	@rm -f $(CLASS_FILES) $(PRISM_DIR_REL)/$(PRISM_LIB_DIR)/$(LIBPREFIX)dv$(LIBSUFFIX) $(O_FILES)
diff --git a/prism/src/hybrid/Makefile b/prism/src/hybrid/Makefile
index 75f803b7..d63a9879 100644
--- a/prism/src/hybrid/Makefile
+++ b/prism/src/hybrid/Makefile
@@ -58,7 +58,7 @@ $(PRISM_DIR_REL)/$(PRISM_LIB_DIR)/$(LIBPREFIX)prismhybrid$(LIBSUFFIX): $(O_FILES
 	$(LD) $(SHARED) $(LDFLAGS) -o $@ $(O_FILES) $(LIBRARIES)
 
 $(PRISM_DIR_REL)/$(PRISM_OBJ_DIR)/$(THIS_DIR)/%.o: %.cc
-	$(CPP) $(CPPFLAGS) -c $< -o $@ $(INCLUDES)
+	$(CXX) $(CXXFLAGS) -c $< -o $@ $(INCLUDES)
 
 clean: checks
 	@rm -f $(CLASS_FILES) $(PRISM_DIR_REL)/$(PRISM_LIB_DIR)/$(LIBPREFIX)prismhybrid$(LIBSUFFIX) $(O_FILES)
diff --git a/prism/src/jdd/Makefile b/prism/src/jdd/Makefile
index 2f7fa4fe..e7050929 100644
--- a/prism/src/jdd/Makefile
+++ b/prism/src/jdd/Makefile
@@ -53,7 +53,7 @@ $(PRISM_DIR_REL)/$(PRISM_LIB_DIR)/$(LIBPREFIX)jdd$(LIBSUFFIX): $(O_FILES)
 	$(LD) $(SHARED) $(LDFLAGS) -o $@ $(O_FILES) $(LIBRARIES)
 
 $(PRISM_DIR_REL)/$(PRISM_OBJ_DIR)/$(THIS_DIR)/%.o: %.cc
-	$(CPP) $(CPPFLAGS) -c $< -o $@ $(INCLUDES)
+	$(CXX) $(CXXFLAGS) -c $< -o $@ $(INCLUDES)
 
 clean: checks
 	@rm -f $(CLASS_FILES) $(PRISM_DIR_REL)/$(PRISM_LIB_DIR)/$(LIBPREFIX)jdd$(LIBSUFFIX) $(O_FILES)
diff --git a/prism/src/mtbdd/Makefile b/prism/src/mtbdd/Makefile
index 2f975c34..ab6ee5ca 100644
--- a/prism/src/mtbdd/Makefile
+++ b/prism/src/mtbdd/Makefile
@@ -57,7 +57,7 @@ $(PRISM_DIR_REL)/$(PRISM_LIB_DIR)/$(LIBPREFIX)prismmtbdd$(LIBSUFFIX): $(O_FILES)
 	$(LD) $(SHARED) $(LDFLAGS) -o $@ $(O_FILES) $(LIBRARIES)
 
 $(PRISM_DIR_REL)/$(PRISM_OBJ_DIR)/$(THIS_DIR)/%.o: %.cc
-	$(CPP) $(CPPFLAGS) -c $< -o $@ $(INCLUDES)
+	$(CXX) $(CXXFLAGS) -c $< -o $@ $(INCLUDES)
 
 clean: checks
 	@rm -f $(CLASS_FILES) $(PRISM_DIR_REL)/$(PRISM_LIB_DIR)/$(LIBPREFIX)prismmtbdd$(LIBSUFFIX) $(O_FILES)
diff --git a/prism/src/odd/Makefile b/prism/src/odd/Makefile
index d0400733..85a503e0 100644
--- a/prism/src/odd/Makefile
+++ b/prism/src/odd/Makefile
@@ -53,7 +53,7 @@ $(PRISM_DIR_REL)/$(PRISM_LIB_DIR)/$(LIBPREFIX)odd$(LIBSUFFIX): $(O_FILES)
 	$(LD) $(SHARED) $(LDFLAGS) -o $@ $(O_FILES) $(LIBRARIES)
 
 $(PRISM_DIR_REL)/$(PRISM_OBJ_DIR)/$(THIS_DIR)/%.o: %.cc
-	$(CPP) $(CPPFLAGS) -c $< -o $@ $(INCLUDES)
+	$(CXX) $(CXXFLAGS) -c $< -o $@ $(INCLUDES)
 
 clean: checks
 	@rm -f $(CLASS_FILES) $(PRISM_DIR_REL)/$(PRISM_LIB_DIR)/$(LIBPREFIX)odd$(LIBSUFFIX) $(O_FILES)
diff --git a/prism/src/prism/Makefile b/prism/src/prism/Makefile
index 74cbf69b..bddd23f3 100644
--- a/prism/src/prism/Makefile
+++ b/prism/src/prism/Makefile
@@ -51,14 +51,14 @@ $(PRISM_DIR_REL)/$(PRISM_LIB_DIR)/$(LIBPREFIX)prism$(LIBSUFFIX): $(O_FILES)
 	$(LD) $(SHARED) $(LDFLAGS) -o $@ $(O_FILES) $(LIBRARIES)
 
 $(PRISM_DIR_REL)/$(PRISM_OBJ_DIR)/$(THIS_DIR)/%.o: %.cc
-	$(CPP) $(CPPFLAGS) -c $< -o $@ $(INCLUDES)
+	$(CXX) $(CXXFLAGS) -c $< -o $@ $(INCLUDES)
 
 $(PRISM_DIR_REL)/$(PRISM_OBJ_DIR)/$(THIS_DIR)/ngprism$(EXE): ngprism.c
 # For ngprism on Windows, link winsocket library (ws2_32)
 	@if [ "$(EXE)" = "" ]; then \
-	  $(C) $(LDFLAGS) $(CFLAGS) -o $@ $<; \
+	  $(CC) $(LDFLAGS) $(CFLAGS) -o $@ $<; \
 	else \
-	  $(C) $(LDFLAGS) $(CFLAGS) -o $@ $< -lws2_32; \
+	  $(CC) $(LDFLAGS) $(CFLAGS) -o $@ $< -lws2_32; \
 	fi;
 
 clean: checks
diff --git a/prism/src/sparse/Makefile b/prism/src/sparse/Makefile
index 2e3c11f4..ef26a51a 100644
--- a/prism/src/sparse/Makefile
+++ b/prism/src/sparse/Makefile
@@ -59,7 +59,7 @@ $(PRISM_DIR_REL)/$(PRISM_LIB_DIR)/$(LIBPREFIX)prismsparse$(LIBSUFFIX): $(O_FILES
 	$(LD) $(SHARED) $(LDFLAGS) -o $@ $(O_FILES) $(LIBRARIES)
 
 $(PRISM_DIR_REL)/$(PRISM_OBJ_DIR)/$(THIS_DIR)/%.o: %.cc
-	$(CPP) $(CPPFLAGS) -c $< -o $@ $(INCLUDES)
+	$(CXX) $(CXXFLAGS) -c $< -o $@ $(INCLUDES)
 
 clean: checks
 	@rm -f $(CLASS_FILES) $(PRISM_DIR_REL)/$(PRISM_LIB_DIR)/$(LIBPREFIX)prismsparse$(LIBSUFFIX) $(O_FILES)