diff --git a/configure/CONFIG.msvcCommon b/configure/CONFIG.msvcCommon
index ce5730d79..7a60600bb 100644
--- a/configure/CONFIG.msvcCommon
+++ b/configure/CONFIG.msvcCommon
@@ -8,9 +8,9 @@ OPT_WHOLE_PROGRAM = YES
 
 WINLINK = link
 
-RCCMD = $(LLVM_PREFIX)rc$(LLVM_SUFFIX) -l 0x409 $(INCLUDES) -fo $@ $<
+RCCMD = $(MSVC_PREFIX)rc$(MSVC_SUFFIX) -l 0x409 $(INCLUDES) -fo $@ $<
 
-ARCMD = $(LLVM_PREFIX)lib$(LLVM_SUFFIX) -nologo -verbose -out:$@ $(LIB_OPT_LDFLAGS) $(LIBRARY_LD_OBJS)
+ARCMD = $(MSVC_PREFIX)lib$(MSVC_SUFFIX) -nologo -verbose -out:$@ $(LIB_OPT_LDFLAGS) $(LIBRARY_LD_OBJS)
 
 #
 # Configure OS vendor C compiler
@@ -271,7 +271,7 @@ LINK.cpp = $(WINLINK) -nologo $(STATIC_LDFLAGS) $(LDFLAGS) $(PROD_LDFLAGS) \
 # linker created .manifest file into a library or product target.
 # useManifestTool.pl returns 0(don't use) or 1(use).
 #
-MT.exe = $(LLVM_PREFIX)mt$(LLVM_SUFFIX) -nologo -manifest $@.manifest
+MT.exe = $(MSVC_PREFIX)mt$(MSVC_SUFFIX) -nologo -manifest $@.manifest
 MT_DLL_COMMAND1 = $(MT.exe) "-outputresource:$@;\#2"
 MT_EXE_COMMAND_YES =
 MT_EXE_COMMAND_NO = $(MT.exe) "-outputresource:$@;\#1"
diff --git a/configure/os/CONFIG.Common.win32-x86-clang b/configure/os/CONFIG.Common.win32-x86-clang
index ecde48366..c93478c90 100644
--- a/configure/os/CONFIG.Common.win32-x86-clang
+++ b/configure/os/CONFIG.Common.win32-x86-clang
@@ -10,9 +10,9 @@ include $(CONFIG)/CONFIG.msvcCommon
 VALID_BUILDS = Ioc Host Command
 
 # Override CONFIG.msvcCommon settings:
-LLVM_PREFIX = llvm-
-CC = clang-cl$(LLVM_SUFFIX) --target=i686-pc-windows-msvc
-WINLINK = lld-link$(LLVM_SUFFIX)
+MSVC_PREFIX = llvm-
+CC = clang-cl$(MSVC_SUFFIX) --target=i686-pc-windows-msvc
+WINLINK = lld-link$(MSVC_SUFFIX)
 
 # clang-cl does not support /GL option
 OPT_WHOLE_PROGRAM = NO
diff --git a/configure/os/CONFIG.Common.windows-x64-clang b/configure/os/CONFIG.Common.windows-x64-clang
index 428e13b34..e1b6bb6b6 100644
--- a/configure/os/CONFIG.Common.windows-x64-clang
+++ b/configure/os/CONFIG.Common.windows-x64-clang
@@ -10,9 +10,9 @@ include $(CONFIG)/CONFIG.msvcCommon
 VALID_BUILDS = Ioc Host Command
 
 # Override CONFIG.msvcCommon settings:
-LLVM_PREFIX = llvm-
-CC = clang-cl$(LLVM_SUFFIX) --target=x86_64-pc-windows-msvc
-WINLINK = lld-link$(LLVM_SUFFIX)
+MSVC_PREFIX = llvm-
+CC = clang-cl$(MSVC_SUFFIX) --target=x86_64-pc-windows-msvc
+WINLINK = lld-link$(MSVC_SUFFIX)
 
 # clang-cl does not support /GL option
 OPT_WHOLE_PROGRAM = NO