diff --git a/mps/code/w3i3mv.nmk b/mps/code/w3i3mv.nmk
index 3c4969309f6..604a16cb2bc 100644
--- a/mps/code/w3i3mv.nmk
+++ b/mps/code/w3i3mv.nmk
@@ -48,9 +48,9 @@ TESTLIB = <testlib>
 # libraries
 
 !IF "$(VARIETY)" == "hot"
-CFLAGS=$(CFLAGSCOMMONPRE) $(CFHE) $(CFLAGSCOMMONPOST)
-LINKFLAGS=$(LINKFLAGSCOMMON) $(LFHE)
-LIBFLAGS=$(LIBFLAGSCOMMON) $(LIBFLAGSHE)
+CFLAGS=$(CFLAGSCOMMONPRE) $(CFHOT) $(CFLAGSCOMMONPOST)
+LINKFLAGS=$(LINKFLAGSCOMMON) $(LFHOT)
+LIBFLAGS=$(LIBFLAGSCOMMON) $(LIBFLAGSHOT)
 MPMOBJ0 = $(MPM:<=w3i3mv\hot\)
 MPMOBJ = $(MPMOBJ0:>=.obj)
 PLINTHOBJ0 = $(PLINTH:<=w3i3mv\hot\)
@@ -106,9 +106,9 @@ TESTLIBOBJ0 = $(TESTLIB:<=w3i3mv\di\)
 TESTLIBOBJ = $(TESTLIBOBJ0:>=.obj)
 
 !ELSEIF "$(VARIETY)" == "cool"
-CFLAGS=$(CFLAGSCOMMONPRE) $(CFCI) $(CFLAGSCOMMONPOST)
-LINKFLAGS=$(LINKFLAGSCOMMON) $(LFCI)
-LIBFLAGS=$(LIBFLAGSCOMMON) $(LIBFLAGSCI)
+CFLAGS=$(CFLAGSCOMMONPRE) $(CFCOOL) $(CFLAGSCOMMONPOST)
+LINKFLAGS=$(LINKFLAGSCOMMON) $(LFCOOL)
+LIBFLAGS=$(LIBFLAGSCOMMON) $(LIBFLAGSCOOL)
 MPMOBJ0 = $(MPM:<=w3i3mv\cool\)
 MPMOBJ = $(MPMOBJ0:>=.obj)
 PLINTHOBJ0 = $(PLINTH:<=w3i3mv\cool\)
diff --git a/mps/code/w3i6mv.nmk b/mps/code/w3i6mv.nmk
index bf5b6efa68d..4bb3325f691 100644
--- a/mps/code/w3i6mv.nmk
+++ b/mps/code/w3i6mv.nmk
@@ -50,9 +50,9 @@ TESTLIB = <testlib>
 # libraries
 
 !IF "$(VARIETY)" == "hot"
-CFLAGS=$(CFLAGSCOMMONPRE) $(CFHE) $(CFLAGSCOMMONPOST)
-LINKFLAGS=$(LINKFLAGSCOMMON) $(LFHE)
-LIBFLAGS=$(LIBFLAGSCOMMON) $(LIBFLAGSHE)
+CFLAGS=$(CFLAGSCOMMONPRE) $(CFHOT) $(CFLAGSCOMMONPOST)
+LINKFLAGS=$(LINKFLAGSCOMMON) $(LFHOT)
+LIBFLAGS=$(LIBFLAGSCOMMON) $(LIBFLAGSHOT)
 MPMOBJ0 = $(MPM:<=w3i6mv\hot\)
 MPMOBJ = $(MPMOBJ0:>=.obj)
 PLINTHOBJ0 = $(PLINTH:<=w3i6mv\hot\)
@@ -108,9 +108,9 @@ TESTLIBOBJ0 = $(TESTLIB:<=w3i6mv\di\)
 TESTLIBOBJ = $(TESTLIBOBJ0:>=.obj)
 
 !ELSEIF "$(VARIETY)" == "cool"
-CFLAGS=$(CFLAGSCOMMONPRE) $(CFCI) $(CFLAGSCOMMONPOST)
-LINKFLAGS=$(LINKFLAGSCOMMON) $(LFCI)
-LIBFLAGS=$(LIBFLAGSCOMMON) $(LIBFLAGSCI)
+CFLAGS=$(CFLAGSCOMMONPRE) $(CFCOOL) $(CFLAGSCOMMONPOST)
+LINKFLAGS=$(LINKFLAGSCOMMON) $(LFCOOL)
+LIBFLAGS=$(LIBFLAGSCOMMON) $(LIBFLAGSCOOL)
 MPMOBJ0 = $(MPM:<=w3i6mv\cool\)
 MPMOBJ = $(MPMOBJ0:>=.obj)
 PLINTHOBJ0 = $(PLINTH:<=w3i6mv\cool\)