5 files changed, 25 insertions, 25 deletions

diff --git a/mps/code/check.h b/mps/code/check.h
index d338fb0fa5a..d5209cf7945 100644
--- a/mps/code/check.h
+++ b/mps/code/check.h
@@ -23,7 +23,7 @@
  * without realising it.  This has happened before.  Eyeball the preprocessor
  * output for each variety.  For example:
  *
- *   cc -E -DCONFIG_VAR_WE trace.c
+ *   cc -E -DCONFIG_VAR_RASH trace.c
  *   cc -E -DCONFIG_VAR_HOT trace.c
  *   cc -E -DCONFIG_VAR_COOL trace.c
  *
diff --git a/mps/code/comm.gmk b/mps/code/comm.gmk
index 5d9d9c32ae8..bdb37556c9c 100644
--- a/mps/code/comm.gmk
+++ b/mps/code/comm.gmk
@@ -97,22 +97,22 @@ CFLAGSCOMMON = $(PFMDEFS) $(CFLAGSCOMPILER)
 #            variety.
 
 # These flags are added to compilations for the indicated variety.
-CFWE   = -DCONFIG_VAR_WE  -DNDEBUG $(CFLAGSOPT)
-CFHOT  = -DCONFIG_VAR_HOT -DNDEBUG $(CFLAGSOPT)
-CFDI   = -DCONFIG_VAR_DI  -DNDEBUG $(CFLAGSOPT)
-CFCOOL = -DCONFIG_VAR_COOL         $(CFLAGSDEBUG)
-CFTI   = -DCONFIG_VAR_TI           $(CFLAGSDEBUG)
+CFRASH = -DCONFIG_VAR_RASH -DNDEBUG $(CFLAGSOPT)
+CFHOT  = -DCONFIG_VAR_HOT  -DNDEBUG $(CFLAGSOPT)
+CFDIAG = -DCONFIG_VAR_DIAG -DNDEBUG $(CFLAGSOPT)
+CFCOOL = -DCONFIG_VAR_COOL          $(CFLAGSDEBUG)
+CFTI   = -DCONFIG_VAR_TI            $(CFLAGSDEBUG)
 
 # Bind CFLAGS to the appropriate set of flags for the variety.
 # %%VARIETY: Add a test for the variety and set CFLAGS here.
-ifeq ($(VARIETY),we)
-CFLAGS=$(CFLAGSCOMMON) $(CFWE)
+ifeq ($(VARIETY),rash)
+CFLAGS=$(CFLAGSCOMMON) $(CFRASH)
 else
 ifeq ($(VARIETY),hot)
 CFLAGS=$(CFLAGSCOMMON) $(CFHOT)
 else
-ifeq ($(VARIETY),di)
-CFLAGS=$(CFLAGSCOMMON) $(CFDI)
+ifeq ($(VARIETY),diag)
+CFLAGS=$(CFLAGSCOMMON) $(CFDIAG)
 else
 ifeq ($(VARIETY),cool)
 CFLAGS=$(CFLAGSCOMMON) $(CFCOOL)
@@ -291,10 +291,10 @@ endif
 #
 # %%VARIETY: Add a rule for how to build the MPS library for the variety
 
-$(PFM)/we/mps.a: $(PFM)/we/mps.o
+$(PFM)/rash/mps.a: $(PFM)/rash/mps.o
 $(PFM)/hot/mps.a: $(PFM)/hot/mps.o
 
-$(PFM)/di/mps.a: \
+$(PFM)/diag/mps.a: \
   $(MPMOBJ) $(AMCOBJ) $(AMSOBJ) $(AWLOBJ) $(LOOBJ) $(SNCOBJ) \
   $(MVFFOBJ) $(PLINTHOBJ) $(POOLNOBJ)
 $(PFM)/cool/mps.a: \
diff --git a/mps/code/commpost.nmk b/mps/code/commpost.nmk
index 0308ada12ab..568b914b8fe 100644
--- a/mps/code/commpost.nmk
+++ b/mps/code/commpost.nmk
@@ -96,7 +96,7 @@ mpsicv.cov:
 #
 # %%VARIETY: Add a rule for how to build the MPS library for the variety
 
-$(PFM)\we\mps.lib: $(PFM)\we\mps.obj
+$(PFM)\rash\mps.lib: $(PFM)\rash\mps.obj
         $(ECHO) $@
         $(LIBMAN) $(LIBFLAGS) /OUT:$@ $**
 
diff --git a/mps/code/commpre.nmk b/mps/code/commpre.nmk
index 16a10445ccc..08a3d02587d 100644
--- a/mps/code/commpre.nmk
+++ b/mps/code/commpre.nmk
@@ -113,9 +113,9 @@ CFLAGSEXTERNAL =
 
 # The combinations of variety
 # %%VARIETY: Define a macro containing the set of flags for the new variety.
-CFWE   = /DCONFIG_VAR_WE   $(CRTFLAGSHOT)  $(CFLAGSHOT)  $(CFLAGSEXTERNAL)
+CFRASH = /DCONFIG_VAR_RASH $(CRTFLAGSHOT)  $(CFLAGSHOT)  $(CFLAGSEXTERNAL)
 CFHOT  = /DCONFIG_VAR_HOT  $(CRTFLAGSHOT)  $(CFLAGSHOT)  $(CFLAGSEXTERNAL)
-CFDI   = /DCONFIG_VAR_DI   $(CRTFLAGSHOT)  $(CFLAGSHOT)  $(CFLAGSINTERNAL)
+CFDIAG = /DCONFIG_VAR_DIAG $(CRTFLAGSHOT)  $(CFLAGSHOT)  $(CFLAGSINTERNAL)
 CFCOOL = /DCONFIG_VAR_COOL $(CRTFLAGSCOOL) $(CFLAGSCOOL) $(CFLAGSINTERNAL)
 CFTI   = /DCONFIG_VAR_TI   $(CRTFLAGSCOOL) $(CFLAGSCOOL) $(CFLAGSINTERNAL)
 
@@ -130,9 +130,9 @@ LINKFLAGSINTERNAL = /DEBUG
 # ( Internal flags used to be set to /DEBUG:full )
 LINKFLAGSEXTERNAL = /RELEASE
 
-LFWE   = $(LINKFLAGSHOT)    $(LINKFLAGSEXTERNAL)
+LFRASH = $(LINKFLAGSHOT)    $(LINKFLAGSEXTERNAL)
 LFHOT  = $(LINKFLAGSHOT)    $(LINKFLAGSEXTERNAL)
-LFDI   = $(LINKFLAGSHOT)    $(LINKFLAGSINTERNAL)
+LFDIAG = $(LINKFLAGSHOT)    $(LINKFLAGSINTERNAL)
 LFCOOL = $(LINKFLAGSCOOL)   $(LINKFLAGSINTERNAL)
 LFTI   = $(LINKFLAGSCOOL)   $(LINKFLAGSINTERNAL)
 
@@ -143,9 +143,9 @@ LFTI   = $(LINKFLAGSCOOL)   $(LINKFLAGSINTERNAL)
 LIBMAN = lib                  # can't call this LIB - it screws the environment
 LIBFLAGSCOMMON = /nologo
 
-LIBFLAGSWE =
+LIBFLAGSRASH =
 LIBFLAGSHOT =
-LIBFLAGSDI =
+LIBFLAGSDIAG =
 LIBFLAGSCOOL =
 LIBFLAGSTI =
 
diff --git a/mps/code/config.h b/mps/code/config.h
index 41c092fc070..8920274e83e 100644
--- a/mps/code/config.h
+++ b/mps/code/config.h
@@ -25,7 +25,7 @@
    the directives CONFIG_ASSERT, CONFIG_STATS, CONFIG_LOG, etc. which control
    actual compilation features. */
 
-/* CONFIG_VAR_WE -- the white-hot variety
+/* CONFIG_VAR_RASH -- the rash and reckless variety
  *
  * This variety switches off as many features as possible for maximum
  * performance, but is therefore unsafe and undebuggable.  It is not intended
@@ -33,7 +33,7 @@
  * logging, etc. have negligible overhead.
  */
 
-#if defined(CONFIG_VAR_WE)      /* White-hot variety */
+#if defined(CONFIG_VAR_RASH)
 /* no asserts */
 /* no statistic meters */
 /* no telemetry log events */
@@ -46,7 +46,7 @@
  * consistency checking and allowing some debugging and telemetry features.
  */
 
-#elif defined(CONFIG_VAR_HOT)    /* Hot variety */
+#elif defined(CONFIG_VAR_HOT)
 #define CONFIG_ASSERT
 #ifndef CHECKLEVEL
 #define CHECKLEVEL      CheckLevelMINIMAL
@@ -55,14 +55,14 @@
 /* no telemetry log events */
 
 
-/* CONFIG_VAR_DI -- diagnostic variety
+/* CONFIG_VAR_DIAG -- diagnostic variety
  *
  * Deprecated.  The diagnostic variety prints messages about the internals
  * of the MPS to an output stream.  This is being replaced by an extended
  * telemetry system.  RB 2012-08-31
  */
 
-#elif defined(CONFIG_VAR_DI) /* Diagnostic variety */
+#elif defined(CONFIG_VAR_DIAG) /* Diagnostic variety */
 #define CONFIG_ASSERT
 #ifndef CHECKLEVEL
 #define CHECKLEVEL      CheckLevelMINIMAL
@@ -85,7 +85,7 @@
  * and data collection and output, and full debugging information.
  */
 
-#elif defined(CONFIG_VAR_COOL)    /* Cool variety */
+#elif defined(CONFIG_VAR_COOL)
 #define CONFIG_ASSERT
 #define CONFIG_ASSERT_ALL
 #define CONFIG_STATS