Index: /trunk/Config.kmk
===================================================================
--- /trunk/Config.kmk	(revision 26221)
+++ /trunk/Config.kmk	(revision 26222)
@@ -2131,44 +2131,44 @@
  # Template for building RC things.
  #
- TEMPLATE_VBOXGC = VBox Raw-Mode Context
- TEMPLATE_VBOXGC_ASTOOL              = $(VBOX_ASTOOL)
- TEMPLATE_VBOXGC_ASFLAGS             = $(VBOX_ASFLAGS32)
- TEMPLATE_VBOXGC_DEFS                = IN_RC IPRT_NO_CRT RT_WITH_NOCRT_ALIASES $(ARCH_BITS_DEFS)
- TEMPLATE_VBOXGC_INCS                = $(PATH_ROOT)/include/iprt/nocrt
- TEMPLATE_VBOXGC_SYSSUFF             = .gc
- TEMPLATE_VBOXGC_BLD_TRG_ARCH        = x86
+ TEMPLATE_VBoxRc = VBox Raw-Mode Context
+ TEMPLATE_VBoxRc_ASTOOL              = $(VBOX_ASTOOL)
+ TEMPLATE_VBoxRc_ASFLAGS             = $(VBOX_ASFLAGS32)
+ TEMPLATE_VBoxRc_DEFS                = IN_RC IPRT_NO_CRT RT_WITH_NOCRT_ALIASES $(ARCH_BITS_DEFS)
+ TEMPLATE_VBoxRc_INCS                = $(PATH_ROOT)/include/iprt/nocrt
+ TEMPLATE_VBoxRc_SYSSUFF             = .gc
+ TEMPLATE_VBoxRc_BLD_TRG_ARCH        = x86
 
  ifeq ($(VBOX_LDR_FMT32),pe)
   ifdef VBOX_USE_VCC80
-   TEMPLATE_VBOXGC_TOOL              = VCC80X86
-   TEMPLATE_VBOXGC_CXXFLAGS          = -Zi -Zl -GR- -EHs- -GF -W3 -wd4244 -GS- -wd4996 -Zc:wchar_t- -Gs8192 $(VBOX_VCC_GC_OPT) $(VBOX_VCC_GC_FP)
+   TEMPLATE_VBoxRc_TOOL              = VCC80X86
+   TEMPLATE_VBoxRc_CXXFLAGS          = -Zi -Zl -GR- -EHs- -GF -W3 -wd4244 -GS- -wd4996 -Zc:wchar_t- -Gs8192 $(VBOX_VCC_GC_OPT) $(VBOX_VCC_GC_FP) $(VBOX_VCC_WERR)
   else
-   TEMPLATE_VBOXGC_TOOL              = VCC70
-   TEMPLATE_VBOXGC_CXXFLAGS          = -Zi -Zl -GR- -EHs- -GF -W3 -wd4244 $(VBOX_VCC_GC_OPT) $(VBOX_VCC_GC_FP)
+   TEMPLATE_VBoxRc_TOOL              = VCC70
+   TEMPLATE_VBoxRc_CXXFLAGS          = -Zi -Zl -GR- -EHs- -GF -W3 -wd4244 $(VBOX_VCC_GC_OPT) $(VBOX_VCC_GC_FP) $(VBOX_VCC_WERR)
   endif
-  TEMPLATE_VBOXGC_CFLAGS             = $(TEMPLATE_VBOXGC_CXXFLAGS)
-  TEMPLATE_VBOXGC_LDFLAGS            = -Driver -Subsystem:NATIVE -Incremental:NO -Align:64 -MapInfo:Lines -MapInfo:Exports -NoD
+  TEMPLATE_VBoxRc_CFLAGS             = $(TEMPLATE_VBoxRc_CXXFLAGS)
+  TEMPLATE_VBoxRc_LDFLAGS            = -Driver -Subsystem:NATIVE -Incremental:NO -Align:64 -MapInfo:Lines -MapInfo:Exports -NoD $(VBOX_VCC_WERR)
   ifndef VBOX_NOINC_MISC
    include $(KBUILD_PATH)/sdks/W2K3DDKX86.kmk
   endif
-  TEMPLATE_VBOXGC_LIBS               = \
+  TEMPLATE_VBoxRc_LIBS               = \
   	$(PATH_SDK_W2K3DDKX86_LIB)/int64.lib
-  TEMPLATE_VBOXGC_POST_CMDS          = $(VBOX_SIGN_IMAGE_CMDS)
+  TEMPLATE_VBoxRc_POST_CMDS          = $(VBOX_SIGN_IMAGE_CMDS)
  endif # pe
 
  ifeq ($(VBOX_LDR_FMT32),elf)
- TEMPLATE_VBOXGC_TOOL                = $(VBOX_GCC32_TOOL)
- TEMPLATE_VBOXGC_CXXFLAGS            = -nostdinc -g -pipe $(VBOX_GCC_PEDANTIC_CXX) $(VBOX_GCC32_Wno-variadic-macros) -fno-exceptions $(VBOX_GCC_GC_OPT) $(VBOX_GCC_GC_FP) -fno-strict-aliasing $(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_fvisibility-hidden) $(VBOX_GCC_fvisibility-inlines-hidden) -fno-rtti
- TEMPLATE_VBOXGC_CFLAGS              = -nostdinc -g -pipe $(VBOX_GCC_PEDANTIC_C)   $(VBOX_GCC32_Wno-variadic-macros) -fno-exceptions $(VBOX_GCC_GC_OPT) $(VBOX_GCC_GC_FP) -fno-strict-aliasing $(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_fvisibility-hidden)
+ TEMPLATE_VBoxRc_TOOL                = $(VBOX_GCC32_TOOL)
+ TEMPLATE_VBoxRc_CXXFLAGS            = -nostdinc -g -pipe $(VBOX_GCC_WERR) $(VBOX_GCC_PEDANTIC_CXX) $(VBOX_GCC32_Wno-variadic-macros) -fno-exceptions $(VBOX_GCC_GC_OPT) $(VBOX_GCC_GC_FP) -fno-strict-aliasing $(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_fvisibility-hidden) $(VBOX_GCC_fvisibility-inlines-hidden) -fno-rtti
+ TEMPLATE_VBoxRc_CFLAGS              = -nostdinc -g -pipe $(VBOX_GCC_WERR) $(VBOX_GCC_PEDANTIC_C)   $(VBOX_GCC32_Wno-variadic-macros) -fno-exceptions $(VBOX_GCC_GC_OPT) $(VBOX_GCC_GC_FP) -fno-strict-aliasing $(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_fvisibility-hidden)
   ifeq ($(KBUILD_TARGET),solaris)
-   TEMPLATE_VBOXGC_LDFLAGS           = -r
+   TEMPLATE_VBoxRc_LDFLAGS           = -r
   else
-   TEMPLATE_VBOXGC_LDFLAGS           = -nostdlib -Bsymbolic
+   TEMPLATE_VBoxRc_LDFLAGS           = -nostdlib -Bsymbolic
    # "temporarily", must fix the loader.
-   TEMPLATE_VBOXGC_LDFLAGS          += $(if $(VBOX_DO_STRIP_MODULES),-S,)
-   TEMPLATE_VBOXGC_LDFLAGS.release   = $(if $(VBOX_DO_STRIP_MODULES),-S,)
+   TEMPLATE_VBoxRc_LDFLAGS          += $(if $(VBOX_DO_STRIP_MODULES),-S,)
+   TEMPLATE_VBoxRc_LDFLAGS.release   = $(if $(VBOX_DO_STRIP_MODULES),-S,)
   endif
   ifn1of ($(KBUILD_TARGET), solaris freebsd)
-   TEMPLATE_VBOXGC_LIBS               = \
+   TEMPLATE_VBoxRc_LIBS               = \
    	$(VBOX_GCC32_LIBGCC) # instricts
   endif
@@ -2176,18 +2176,18 @@
 
  ifeq ($(VBOX_LDR_FMT32),macho)
- TEMPLATE_VBOXGC_TOOL                = GXX4MACHO
- TEMPLATE_VBOXGC_DEFS               += $(VBOX_DARWIN_DEF_SDK_DEFS)
- TEMPLATE_VBOXGC_CXXFLAGS            = $(VBOX_DARWIN_DEF_SDK_CXXFLAGS) -m32 -nostdinc -g -pipe $(VBOX_GCC_PEDANTIC_CXX) $(VBOX_GCC32_Wno-variadic-macros) -fno-common -msoft-float -static $(VBOX_GCC_fno-stack-protector) -fno-exceptions $(VBOX_GCC_GC_OPT) $(VBOX_GCC_GC_FP) -fno-strict-aliasing -fno-rtti
- TEMPLATE_VBOXGC_CFLAGS              = $(VBOX_DARWIN_DEF_SDK_CFLAGS)   -m32 -nostdinc -g -pipe $(VBOX_GCC_PEDANTIC_C)   $(VBOX_GCC32_Wno-variadic-macros) -fno-common -msoft-float -static $(VBOX_GCC_fno-stack-protector) -fno-exceptions $(VBOX_GCC_GC_OPT) $(VBOX_GCC_GC_FP) -fno-strict-aliasing
- TEMPLATE_VBOXGC_LDFLAGS             = $(VBOX_DARWIN_DEF_SDK_LDFLAGS)  -m32 -nostdlib
- #TEMPLATE_VBOXGC_LDFLAGS.release     = -Wl,-S ???
+ TEMPLATE_VBoxRc_TOOL                = GXX4MACHO
+ TEMPLATE_VBoxRc_DEFS               += $(VBOX_DARWIN_DEF_SDK_DEFS)
+ TEMPLATE_VBoxRc_CXXFLAGS            = $(VBOX_DARWIN_DEF_SDK_CXXFLAGS) -m32 -nostdinc -g -pipe $(VBOX_GCC_WERR) $(VBOX_GCC_PEDANTIC_CXX) $(VBOX_GCC32_Wno-variadic-macros) -fno-common -msoft-float -static $(VBOX_GCC_fno-stack-protector) -fno-exceptions $(VBOX_GCC_GC_OPT) $(VBOX_GCC_GC_FP) -fno-strict-aliasing -fno-rtti
+ TEMPLATE_VBoxRc_CFLAGS              = $(VBOX_DARWIN_DEF_SDK_CFLAGS)   -m32 -nostdinc -g -pipe $(VBOX_GCC_WERR) $(VBOX_GCC_PEDANTIC_C)   $(VBOX_GCC32_Wno-variadic-macros) -fno-common -msoft-float -static $(VBOX_GCC_fno-stack-protector) -fno-exceptions $(VBOX_GCC_GC_OPT) $(VBOX_GCC_GC_FP) -fno-strict-aliasing
+ TEMPLATE_VBoxRc_LDFLAGS             = $(VBOX_DARWIN_DEF_SDK_LDFLAGS)  -m32 -nostdlib
+ #TEMPLATE_VBoxRc_LDFLAGS.release     = -Wl,-S ???
  endif
 
  ifeq ($(VBOX_LDR_FMT32),lx)
- TEMPLATE_VBOXGC_TOOL                = GXX3OMF
- TEMPLATE_VBOXGC_CXXFLAGS            = -nostdinc -g -pipe $(VBOX_GCC_PEDANTIC_CXX) $(VBOX_GCC32_Wno-variadic-macros) $(VBOX_GCC_GC_OPT) $(VBOX_GCC_GC_FP) -fno-strict-aliasing -fno-exceptions -fno-rtti
- TEMPLATE_VBOXGC_CFLAGS              = -nostdinc -g -pipe $(VBOX_GCC_PEDANTIC_C)   $(VBOX_GCC32_Wno-variadic-macros) $(VBOX_GCC_GC_OPT) $(VBOX_GCC_GC_FP) -fno-strict-aliasing -fno-exceptions
- TEMPLATE_VBOXGC_LDFLAGS             = -Zdll -nostdlib
- TEMPLATE_VBOXGC_LIBS                = \
+ TEMPLATE_VBoxRc_TOOL                = GXX3OMF
+ TEMPLATE_VBoxRc_CXXFLAGS            = -nostdinc -g -pipe $(VBOX_GCC_WERR) $(VBOX_GCC_PEDANTIC_CXX) $(VBOX_GCC32_Wno-variadic-macros) $(VBOX_GCC_GC_OPT) $(VBOX_GCC_GC_FP) -fno-strict-aliasing -fno-exceptions -fno-rtti
+ TEMPLATE_VBoxRc_CFLAGS              = -nostdinc -g -pipe $(VBOX_GCC_WERR) $(VBOX_GCC_PEDANTIC_C)   $(VBOX_GCC32_Wno-variadic-macros) $(VBOX_GCC_GC_OPT) $(VBOX_GCC_GC_FP) -fno-strict-aliasing -fno-exceptions
+ TEMPLATE_VBoxRc_LDFLAGS             = -Zdll -nostdlib
+ TEMPLATE_VBoxRc_LIBS                = \
  	$(VBOX_GCC32_LIBGCC) \
  	$(VBOX_OBJ_SYS0) \
@@ -2199,18 +2199,18 @@
  # Template for building a RC ring-3 testcase (tstVMStructGC, tstDevStructGC).
  #
- TEMPLATE_VBOXGCEXE = VBox Raw-Mode as ring-3 testcase
- TEMPLATE_VBOXGCEXE_EXTENDS = VBOXGC
- TEMPLATE_VBOXGCEXE_DEFS = $(filter-out IPRT_NO_CRT RT_WITH_NOCRT_ALIASES,$(TEMPLATE_VBOXGC_DEFS))
- TEMPLATE_VBOXGCEXE_INCS = $(NO_SUCH_VARIABLE)
+ TEMPLATE_VBoxRcExe = VBox Raw-Mode as ring-3 testcase
+ TEMPLATE_VBoxRcExe_EXTENDS = VBoxRc
+ TEMPLATE_VBoxRcExe_DEFS = $(filter-out IPRT_NO_CRT RT_WITH_NOCRT_ALIASES,$(TEMPLATE_VBoxRc_DEFS))
+ TEMPLATE_VBoxRcExe_INCS = $(NO_SUCH_VARIABLE)
 
  ifeq ($(VBOX_LDR_FMT32),pe)
-  TEMPLATE_VBOXGCEXE_LDFLAGS = -Incremental:NO -MapInfo:Exports -NoD -Debug
-  TEMPLATE_VBOXGCEXE_SDKS    = WIN32SDK
+  TEMPLATE_VBoxRcExe_LDFLAGS = -Incremental:NO -MapInfo:Exports -NoD -Debug
+  TEMPLATE_VBoxRcExe_SDKS    = WIN32SDK
   ifdef VBOX_USE_VCC80
-   TEMPLATE_VBOXGCEXE_LIBS   = \
+   TEMPLATE_VBoxRcExe_LIBS   = \
  	$(PATH_TOOL_VCC80X86_LIB)/libcmt.lib \
  	$(PATH_TOOL_VCC80X86_LIB)/oldnames.lib
   else
-   TEMPLATE_VBOXGCEXE_LIBS   = \
+   TEMPLATE_VBoxRcExe_LIBS   = \
  	$(PATH_TOOL_VCC70_LIB)/libcmt.lib \
  	$(PATH_TOOL_VCC70_LIB)/oldnames.lib
@@ -2219,33 +2219,33 @@
 
  ifeq ($(VBOX_LDR_FMT32),elf)
-  TEMPLATE_VBOXGCEXE_CFLAGS   = $(filter-out -nostdinc,$(TEMPLATE_VBOXGC_CFLAGS))
-  TEMPLATE_VBOXGCEXE_CXXFLAGS = $(filter-out -nostdinc,$(TEMPLATE_VBOXGC_CXXFLAGS))
-  TEMPLATE_VBOXGCEXE_LDFLAGS  = -g
-  TEMPLATE_VBOXGCEXE_LDFLAGS.dbgopt = -g
-  TEMPLATE_VBOXGCEXE_LDFLAGS.strict = -g
-  TEMPLATE_VBOXGCEXE_LDFLAGS.release = -g
+  TEMPLATE_VBoxRcExe_CFLAGS   = $(filter-out -nostdinc,$(TEMPLATE_VBoxRc_CFLAGS))
+  TEMPLATE_VBoxRcExe_CXXFLAGS = $(filter-out -nostdinc,$(TEMPLATE_VBoxRc_CXXFLAGS))
+  TEMPLATE_VBoxRcExe_LDFLAGS  = -g
+  TEMPLATE_VBoxRcExe_LDFLAGS.dbgopt = -g
+  TEMPLATE_VBoxRcExe_LDFLAGS.strict = -g
+  TEMPLATE_VBoxRcExe_LDFLAGS.release = -g
   if1of ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH), freebsd.amd64)
    # The FreeBSD port of gcc isn't picking up -m32 where it should. the .o order below isn't
    # quite right (target source comes first), if it stops working we'll have to write a linker tool.
-   TEMPLATE_VBOXGCEXE_DEFS.$(KBUILD_TARGET)    = $(TEMPLATE_VBOXGC_DEFS.$(KBUILD_TARGET))    IPRT_DONT_USE_SYSTEM_STDINT_H
-   TEMPLATE_VBOXGCEXE_LDFLAGS.$(KBUILD_TARGET) = $(TEMPLATE_VBOXGC_LDFLAGS.$(KBUILD_TARGET)) -nostdlib -v
-   TEMPLATE_VBOXGCEXE_SOURCES.$(KBUILD_TARGET) = /usr/lib32/crtend.o /usr/lib32/crtn.o
-   TEMPLATE_VBOXGCEXE_SOURCES                  =	/usr/lib32/crt1.o /usr/lib32/crti.o /usr/lib32/crtbegin.o
-   TEMPLATE_VBOXGCEXE_LIBPATH.$(KBUILD_TARGET) = /usr/lib32
-   TEMPLATE_VBOXGCEXE_LIBS.$(KBUILD_TARGET)    = /usr/lib32/libc.so
+   TEMPLATE_VBoxRcExe_DEFS.$(KBUILD_TARGET)    = $(TEMPLATE_VBoxRc_DEFS.$(KBUILD_TARGET))    IPRT_DONT_USE_SYSTEM_STDINT_H
+   TEMPLATE_VBoxRcExe_LDFLAGS.$(KBUILD_TARGET) = $(TEMPLATE_VBoxRc_LDFLAGS.$(KBUILD_TARGET)) -nostdlib -v
+   TEMPLATE_VBoxRcExe_SOURCES.$(KBUILD_TARGET) = /usr/lib32/crtend.o /usr/lib32/crtn.o
+   TEMPLATE_VBoxRcExe_SOURCES                  =	/usr/lib32/crt1.o /usr/lib32/crti.o /usr/lib32/crtbegin.o
+   TEMPLATE_VBoxRcExe_LIBPATH.$(KBUILD_TARGET) = /usr/lib32
+   TEMPLATE_VBoxRcExe_LIBS.$(KBUILD_TARGET)    = /usr/lib32/libc.so
   endif
  endif
 
  ifeq ($(VBOX_LDR_FMT32),macho)
-  TEMPLATE_VBOXGCEXE_CFLAGS   = $(filter-out -static -nostdinc,$(TEMPLATE_VBOXGC_CFLAGS))
-  TEMPLATE_VBOXGCEXE_CXXFLAGS = $(filter-out -static -nostdinc,$(TEMPLATE_VBOXGC_CXXFLAGS))
-  TEMPLATE_VBOXGCEXE_LDFLAGS  = -g -m32
+  TEMPLATE_VBoxRcExe_CFLAGS   = $(filter-out -static -nostdinc,$(TEMPLATE_VBoxRc_CFLAGS))
+  TEMPLATE_VBoxRcExe_CXXFLAGS = $(filter-out -static -nostdinc,$(TEMPLATE_VBoxRc_CXXFLAGS))
+  TEMPLATE_VBoxRcExe_LDFLAGS  = -g -m32
  endif
 
  ifeq ($(VBOX_LDR_FMT32),lx)
-  TEMPLATE_VBOXGCEXE_CFLAGS   = $(filter-out -nostdinc,$(TEMPLATE_VBOXGC_CFLAGS))
-  TEMPLATE_VBOXGCEXE_CXXFLAGS = $(filter-out -nostdinc,$(TEMPLATE_VBOXGC_CXXFLAGS))
-  TEMPLATE_VBOXGCEXE_LDFLAGS  = -g
-  TEMPLATE_VBOXGCEXE_LIBS     = $(NO_SUCH_VARIABLE)
+  TEMPLATE_VBoxRcExe_CFLAGS   = $(filter-out -nostdinc,$(TEMPLATE_VBoxRc_CFLAGS))
+  TEMPLATE_VBoxRcExe_CXXFLAGS = $(filter-out -nostdinc,$(TEMPLATE_VBoxRc_CXXFLAGS))
+  TEMPLATE_VBoxRcExe_LDFLAGS  = -g
+  TEMPLATE_VBoxRcExe_LIBS     = $(NO_SUCH_VARIABLE)
  endif
 endif # VBOX_WITH_RAW_MODE
Index: /trunk/include/Makefile.kmk
===================================================================
--- /trunk/include/Makefile.kmk	(revision 26221)
+++ /trunk/include/Makefile.kmk	(revision 26222)
@@ -73,5 +73,5 @@
 	$(addprefix $(PATH_TARGET)/,$(subst .h,-cpp.cpp, $(subst /,_,$(hdrs.r3))))
 
-SyntaxVBoxIncludeR0_TEMPLATE = VBOXR0
+SyntaxVBoxIncludeR0_TEMPLATE = VBoxR0
 SyntaxVBoxIncludeR0_DEFS = VBOX_WITH_HGCM
 SyntaxVBoxIncludeR0_SOURCES := \
@@ -79,5 +79,5 @@
 	$(addprefix $(PATH_TARGET)/,$(subst .h,-cpp.cpp, $(subst /,_,$(hdrs.r0))))
 
-SyntaxVBoxIncludeGC_TEMPLATE = VBOXGC
+SyntaxVBoxIncludeGC_TEMPLATE = VBoxGC
 SyntaxVBoxIncludeGC_DEFS = VBOX_WITH_HGCM
 SyntaxVBoxIncludeGC_SOURCES := \
Index: /trunk/src/VBox/Devices/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Devices/Makefile.kmk	(revision 26221)
+++ /trunk/src/VBox/Devices/Makefile.kmk	(revision 26222)
@@ -525,5 +525,5 @@
  # VBoxDDGC (sysmod)
  #
- VBoxDDGC_TEMPLATE       = VBOXGC
+ VBoxDDGC_TEMPLATE       = VBoxRc
  VBoxDDGC_SYSSUFF        = .gc
  ifeq ($(KBUILD_TARGET_ARCH),x86)
@@ -727,5 +727,5 @@
  # VBoxDD2GC (LGPL sysmod)
  #
- VBoxDD2GC_TEMPLATE       = VBOXGC
+ VBoxDD2GC_TEMPLATE       = VBoxRc
  VBoxDD2GC_DEFS           =
  VBoxDD2GC_SYSSUFF        = .gc
Index: /trunk/src/VBox/Devices/testcase/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Devices/testcase/Makefile.kmk	(revision 26221)
+++ /trunk/src/VBox/Devices/testcase/Makefile.kmk	(revision 26222)
@@ -51,5 +51,5 @@
  #
  PROGRAMS += tstDeviceStructSizeRC
- tstDeviceStructSizeRC_TEMPLATE  = VBOXGCEXE
+ tstDeviceStructSizeRC_TEMPLATE  = VBoxRcExe
  tstDeviceStructSizeRC_DEFS      = VBOX_WITH_RAW_MODE
  ifdef VBOX_WITH_USB
Index: /trunk/src/VBox/Devices/testcase/tstDeviceStructSizeRC.cpp
===================================================================
--- /trunk/src/VBox/Devices/testcase/tstDeviceStructSizeRC.cpp	(revision 26221)
+++ /trunk/src/VBox/Devices/testcase/tstDeviceStructSizeRC.cpp	(revision 26222)
@@ -3,5 +3,5 @@
  * tstDeviceStructSizeGC - Generate structure member and size checks from the GC perspective.
  *
- * This is built using the VBOXGC template but linked into a host
+ * This is built using the VBoxRc template but linked into a host
  * ring-3 executable, rather hacky.
  */
Index: /trunk/src/VBox/Disassembler/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Disassembler/Makefile.kmk	(revision 26221)
+++ /trunk/src/VBox/Disassembler/Makefile.kmk	(revision 26222)
@@ -52,5 +52,5 @@
 ifdef VBOX_WITH_RAW_MODE
  LIBRARIES              += DisasmGC
- DisasmGC_TEMPLATE       = VBOXGC
+ DisasmGC_TEMPLATE       = VBoxRc
  DisasmGC_DEFS           = IN_DIS IN_RT_GC IN_RT_RC DIS_CORE_ONLY
  DisasmGC_SOURCES        = \
Index: /trunk/src/VBox/Runtime/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Runtime/Makefile.kmk	(revision 26221)
+++ /trunk/src/VBox/Runtime/Makefile.kmk	(revision 26222)
@@ -1549,5 +1549,5 @@
  # RuntimeGC - Guest context library.
  #
- RuntimeGC_TEMPLATE      = VBOXGC
+ RuntimeGC_TEMPLATE      = VBoxRc
  RuntimeGC_DEFS          = IN_RT_GC RT_WITH_VBOX
  RuntimeGC_INCS          = include
Index: /trunk/src/VBox/Runtime/testcase/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Runtime/testcase/Makefile.kmk	(revision 26221)
+++ /trunk/src/VBox/Runtime/testcase/Makefile.kmk	(revision 26222)
@@ -229,5 +229,5 @@
 
 ifdef VBOX_WITH_RAW_MODE
- tstLdrObj_TEMPLATE = VBOXGC
+ tstLdrObj_TEMPLATE = VBoxRc
  tstLdrObj_INST = $(INST_TESTCASE)
  tstLdrObj_SYSSUFF = .gc
Index: /trunk/src/VBox/VMM/Makefile.kmk
===================================================================
--- /trunk/src/VBox/VMM/Makefile.kmk	(revision 26221)
+++ /trunk/src/VBox/VMM/Makefile.kmk	(revision 26222)
@@ -253,5 +253,5 @@
  #
  LIBRARIES += VMMGCBuiltin
- VMMGCBuiltin_TEMPLATE = VBOXGC
+ VMMGCBuiltin_TEMPLATE = VBoxRc
  ifeq ($(VBOX_LDR_FMT32),pe)
   VMMGCBuiltin_SOURCES = VMMGC/VMMGCBuiltin.def
@@ -268,5 +268,5 @@
  #
  LIBRARIES += VMMGCImp
- VMMGCImp_TEMPLATE = VBOXGC
+ VMMGCImp_TEMPLATE = VBoxRc
  VMMGCImp_SOURCES = $(PATH_VMMGCImp)/VMMGC.def
  VMMGCImp_CLEAN   = $(PATH_VMMGCImp)/VMMGC.def
@@ -325,5 +325,5 @@
  #
  SYSMODS += VMMGC
- VMMGC_TEMPLATE  = VBOXGC
+ VMMGC_TEMPLATE  = VBoxRc
  VMMGC_SYSSUFF   = .gc
 
Index: /trunk/src/VBox/VMM/testcase/Makefile.kmk
===================================================================
--- /trunk/src/VBox/VMM/testcase/Makefile.kmk	(revision 26221)
+++ /trunk/src/VBox/VMM/testcase/Makefile.kmk	(revision 26222)
@@ -101,5 +101,5 @@
 #
 ifdef VBOX_WITH_RAW_MODE
- tstVMStructRC_TEMPLATE  = VBOXGCEXE
+ tstVMStructRC_TEMPLATE  = VBoxRcExe
  tstVMStructRC_DEFS      = IN_VMM_RC IN_DIS IN_RT_RC IN_RT_GC VBOX_WITH_RAW_MODE
  ifeq ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH),darwin.x86)
@@ -151,5 +151,5 @@
 
 ifdef VBOX_WITH_RAW_MODE
- tstAsmStructsRC_TEMPLATE= VBOXGCEXE
+ tstAsmStructsRC_TEMPLATE= VBoxRcExe
  tstAsmStructsRC_DEFS    = IN_VMM_RC IN_DIS IN_RT_RC IN_RT_GC VBOX_WITH_RAW_MODE
  ifdef VBOX_WITH_R0_LOGGING
@@ -228,5 +228,5 @@
  tstMicro_LIBS           = $(LIB_VMM) $(LIB_REM) $(LIB_RUNTIME)
 
- tstMicroGC_TEMPLATE     = VBOXGC
+ tstMicroGC_TEMPLATE     = VBoxRc
  tstMicroGC_SOURCES      = tstMicroGC.cpp tstMicroGCA.asm
  tstMicroGC_DEFS         =