Update code to use COMPlus_ instead of COMPLUS_ when referencing knobs

59 files changed, 173 insertions, 173 deletions

diff --git a/src/debug/daccess/daccess.cpp b/src/debug/daccess/daccess.cpp
index 9e20926863..2465c62cef 100644
--- a/src/debug/daccess/daccess.cpp
+++ b/src/debug/daccess/daccess.cpp
@@ -3198,7 +3198,7 @@ ClrDataAccess::ClrDataAccess(ICorDebugDataTarget * pTarget, ICLRDataTarget * pLe
 
     // Verification asserts are disabled by default because some debuggers (cdb/windbg) probe likely locations
     // for DAC and having this assert pop up all the time can be annoying.  We let derived classes enable 
-    // this if they want.  It can also be overridden at run-time with COMPLUS_DbgDACAssertOnMismatch,
+    // this if they want.  It can also be overridden at run-time with COMPlus_DbgDACAssertOnMismatch,
     // see ClrDataAccess::VerifyDlls for details.
     m_fEnableDllVerificationAsserts = false;
 #endif
@@ -6974,7 +6974,7 @@ void ClrDataAccess::SetTargetConsistencyChecks(bool fEnableAsserts)
 // Notes:
 //     The implementation of ASSERT accesses this via code:DacTargetConsistencyAssertsEnabled
 //     
-//     By default, this is disabled, unless COMPLUS_DbgDACEnableAssert is set (see code:ClrDataAccess::ClrDataAccess).
+//     By default, this is disabled, unless COMPlus_DbgDACEnableAssert is set (see code:ClrDataAccess::ClrDataAccess).
 //     This is necessary for compatibility.  For example, SOS expects to be able to scan for
 //     valid MethodTables etc. (which may cause ASSERTs), and also doesn't want ASSERTs when working
 //     with targets with corrupted memory.
@@ -7073,7 +7073,7 @@ HRESULT ClrDataAccess::VerifyDlls()
 
 #ifdef _DEBUG
         // Check if verbose asserts are enabled.  The default is up to the specific instantiation of
-        // ClrDataAccess, but can be overridden (in either direction) by a COMPLUS knob.
+        // ClrDataAccess, but can be overridden (in either direction) by a COMPlus_ knob.
         // Note that we check this knob every time because it may be handy to turn it on in 
         // the environment mid-flight.
         DWORD dwAssertDefault = m_fEnableDllVerificationAsserts ? 1 : 0;
@@ -7105,7 +7105,7 @@ HRESULT ClrDataAccess::VerifyDlls()
                 "Actual %s timestamp: %s\n"\
                 "DAC will now fail to initialize with a CORDBG_E_MISMATCHED_CORWKS_AND_DACWKS_DLLS\n"\
                 "error.  If you really want to try and use the mimatched DLLs, you can disable this\n"\
-                "check by setting COMPLUS_DbgDACSkipVerifyDlls=1.  However, using a mismatched DAC\n"\
+                "check by setting COMPlus_DbgDACSkipVerifyDlls=1.  However, using a mismatched DAC\n"\
                 "DLL will usually result in arbitrary debugger failures.\n",
                 MAIN_CLR_DLL_NAME_A,
                 MAIN_CLR_DLL_NAME_A,
diff --git a/src/debug/di/process.cpp b/src/debug/di/process.cpp
index a6ff19a170..a2bf15d849 100644
--- a/src/debug/di/process.cpp
+++ b/src/debug/di/process.cpp
@@ -976,7 +976,7 @@ CordbProcess::CordbProcess(ULONG64 clrInstanceId,
     // On Debug builds, we'll ASSERT by default whenever the target appears to be corrupt or 
     // otherwise inconsistent (both in DAC and DBI).  But we also need the ability to 
     // explicitly test corrupt targets.
-    // Tests should set COMPLUS_DbgIgnoreInconsistentTarget=1 to suppress these asserts
+    // Tests should set COMPlus_DbgIgnoreInconsistentTarget=1 to suppress these asserts
     // Note that this controls two things:
     //     1) DAC behavior - see code:IDacDbiInterface::DacSetTargetConsistencyChecks
     //     2) RS-only consistency asserts - see code:CordbProcess::TargetConsistencyCheck
diff --git a/src/dlls/mscorrc/mscorrc.rc b/src/dlls/mscorrc/mscorrc.rc
index 610fb76ba9..a1d4de1c7d 100644
--- a/src/dlls/mscorrc/mscorrc.rc
+++ b/src/dlls/mscorrc/mscorrc.rc
@@ -2094,11 +2094,11 @@ BEGIN
         IDS_PROF_DETACH_COMPLETE                "The CLR has fully detached and unloaded the profiler."
         IDS_PROF_DETACH_THREAD_ERROR            "There was an internal failure in the profiling API detach infrastructure.  The profiler will not be able to be detached.  Error code: %d."
         IDS_PROF_CANCEL_ACTIVATION              "The profiler has requested that the CLR instance not load the profiler into this process.  Profiler CLSID: '%s'."
-        IDS_PROF_V2PROFILER_DISABLED            "Loading profiler failed.   The profiler that was configured to load was designed for an older version of the CLR.  You can use the COMPLUS_ProfAPI_ProfilerCompatibilitySetting environment variable to allow older profilers to be loaded by the current version of the CLR.  Please consult the documentation for information on how to use this environment variable, and the risks associated with it.  Profiler CLSID: '%s'."
+        IDS_PROF_V2PROFILER_DISABLED            "Loading profiler failed.   The profiler that was configured to load was designed for an older version of the CLR.  You can use the COMPlus_ProfAPI_ProfilerCompatibilitySetting environment variable to allow older profilers to be loaded by the current version of the CLR.  Please consult the documentation for information on how to use this environment variable, and the risks associated with it.  Profiler CLSID: '%s'."
         IDS_PROF_V2PROFILER_ENABLED             "A profiler designed for an older version of the CLR was loaded because of the environment variable setting below.  Older profilers will continue to work in many cases, but if you encounter problems, please consider upgrading the profiler or changing the setting of the environment variable.  Please consult the documentation for information on how to use this environment variable, and the risks associated with it.  Environment variable setting: %s=%s.  Profiler CLSID: '%s'."
         IDS_PROF_V2PROFILER_ALREADY_LOADED      "A profiler designed for an older version of the CLR was already loaded by an older version of the CLR in the process, and the profiler will therefore not be loaded into this process again.  Please consider upgrading your profiler in order to gain better support profiling processes that load multiple instances of the CLR. Profiler CLSID: '%s'."
         IDS_PROF_PROFILER_DISABLED              "Profilers will not be loaded by the current version of the CLR because of the environment variable setting below.  Please consult the documentation for information on how to use this environment variable, and the risks associated with it.  Environment variable setting: %s=%s. Profiler CLSID: '%s'."
-        IDS_E_PROF_TIMEOUT_WAITING_FOR_CONCURRENT_GC    "Profiler timed out on waiting for concurrent GC to finish after '%d' milliseconds. Please configure your profiler to increase its attaching time out value or consult the documentation for the COMPLUS_ProfAPI_AttachProfilerMinTimeoutInMs environment variable and try again. Profiler CLSID: '%s'."
+        IDS_E_PROF_TIMEOUT_WAITING_FOR_CONCURRENT_GC    "Profiler timed out on waiting for concurrent GC to finish after '%d' milliseconds. Please configure your profiler to increase its attaching time out value or consult the documentation for the COMPlus_ProfAPI_AttachProfilerMinTimeoutInMs environment variable and try again. Profiler CLSID: '%s'."
   END
 
 // Dialog box buttons
diff --git a/src/gc/gcpriv.h b/src/gc/gcpriv.h
index cf7d0666ba..5f41f5e9ce 100644
--- a/src/gc/gcpriv.h
+++ b/src/gc/gcpriv.h
@@ -604,12 +604,12 @@ public:
 
 // GC specific statistics, tracking counts and timings for GCs occuring in the system.
 // This writes the statistics to a file every 60 seconds, if a file is specified in
-// COMPLUS_GcMixLog
+// COMPlus_GcMixLog
 
 struct GCStatistics
     : public StatisticsBase
 {
-    // initialized to the contents of COMPLUS_GcMixLog, or NULL, if not present
+    // initialized to the contents of COMPlus_GcMixLog, or NULL, if not present
     static TCHAR* logFileName;
     static FILE*  logFile;
 
diff --git a/src/inc/clrconfig.h b/src/inc/clrconfig.h
index 634bc12427..2fbc2e1de8 100644
--- a/src/inc/clrconfig.h
+++ b/src/inc/clrconfig.h
@@ -33,7 +33,7 @@ public:
 
     // Setting each option results in some change to the config value lookup method. Default behavior is (in
     // the following order):
-    // * Look at environment variables (prepending COMPLUS_ to the name)
+    // * Look at environment variables (prepending COMPlus to the name)
     // * Look at the framework registry keys (HKCU\Software\Microsoft\.NETFramework then
     //     HKLM\Software\Microsoft\.NETFramework)
     // * Look at the available config files (system, application, host and user). For details see TODO:
@@ -41,8 +41,8 @@ public:
     enum LookupOptions {
         // If set, don't look in environment variables.
         IgnoreEnv = 0x1, 
-        // If set, do not prepend "COMPLUS_" when doing environment variable lookup.
-        DontPrependCOMPLUS_ = 0x2, 
+        // If set, do not prepend "COMPlus_" when doing environment variable lookup.
+        DontPrependCOMPlus_ = 0x2, 
         // If set, don't look in HKLM in the registry.
         IgnoreHKLM = 0x4, 
         // If set, don't look in HKCU in the registry.
@@ -183,9 +183,9 @@ public:
 
     //
     // Check whether an option is specified (e.g. explicitly listed) in any of the CLRConfig
-    // locations: environment or registry (with or without COMPLUS_) or any config file.
+    // locations: environment or registry (with or without COMPlus_) or any config file.
     // The result is therefore a conservative approximation (some settings do not actually
-    // take effect everywhere and no setting is valid both with and without COMPLUS_)
+    // take effect everywhere and no setting is valid both with and without COMPlus_)
     //
     static BOOL IsConfigOptionSpecified(LPCWSTR name);
 
diff --git a/src/inc/switches.h b/src/inc/switches.h
index 1e5dc6bbee..266dff0bc9 100644
--- a/src/inc/switches.h
+++ b/src/inc/switches.h
@@ -75,7 +75,7 @@
 #endif
 
 #if defined(_DEBUG) && !defined(DACCESS_COMPILE) && (defined(_TARGET_X86_) || defined(_TARGET_AMD64_))
-// On x86/x64 Windows debug builds, respect the COMPLUS_EnforceEEThreadNotRequiredContracts
+// On x86/x64 Windows debug builds, respect the COMPlus_EnforceEEThreadNotRequiredContracts
 // runtime switch. See code:InitThreadManager and code:GetThreadGenericFullCheck
 #define ENABLE_GET_THREAD_GENERIC_FULL_CHECK
 #endif
@@ -109,8 +109,8 @@
 #define JIT_IS_ALIGNED
 #endif
 
-// ALLOW_SXS_JIT enables AltJit support for JIT-ing, via COMPLUS_AltJit / COMPLUS_AltJitName.
-// ALLOW_SXS_JIT_NGEN enables AltJit support for NGEN, via COMPLUS_AltJitNgen / COMPLUS_AltJitName.
+// ALLOW_SXS_JIT enables AltJit support for JIT-ing, via COMPlus_AltJit / COMPlus_AltJitName.
+// ALLOW_SXS_JIT_NGEN enables AltJit support for NGEN, via COMPlus_AltJitNgen / COMPlus_AltJitName.
 // Note that if ALLOW_SXS_JIT_NGEN is defined, then ALLOW_SXS_JIT must be defined.
 #define ALLOW_SXS_JIT
 #if defined(ALLOW_SXS_JIT)
@@ -208,7 +208,7 @@
 #define FEATURE_JIT_TIMER
 
 // This feature in RyuJIT supersedes the FEATURE_JIT_TIMER. In addition to supporting the time log file, this
-// feature also supports using COMPLUS_JitTimeLogCsv=a.csv, which will dump method-level and phase-level timing
+// feature also supports using COMPlus_JitTimeLogCsv=a.csv, which will dump method-level and phase-level timing
 // statistics. Also see comments on FEATURE_JIT_TIMER.
 #define FEATURE_JIT_METHOD_PERF
 #endif // FEATURE_CORECLR
diff --git a/src/jit/codegenarm64.cpp b/src/jit/codegenarm64.cpp
index ee24891469..f3cf3cd69b 100644
--- a/src/jit/codegenarm64.cpp
+++ b/src/jit/codegenarm64.cpp
@@ -1819,7 +1819,7 @@ void                CodeGen::genCodeForBBlist()
         {
             // Unit testing of the ARM64 emitter: generate a bunch of instructions into the last block
             // (it's as good as any, but better than the prolog, which can only be a single instruction
-            // group) then use COMPLUS_JitLateDisasm=* to see if the late disassembler
+            // group) then use COMPlus_JitLateDisasm=* to see if the late disassembler
             // thinks the instructions are the same as we do.
             genArm64EmitterUnitTests();
         }
@@ -6860,7 +6860,7 @@ void        CodeGen::genSetScopeInfo  (unsigned             which,
 
 /*****************************************************************************
  * Unit testing of the ARM64 emitter: generate a bunch of instructions into the prolog
- * (it's as good a place as any), then use COMPLUS_JitLateDisasm=* to see if the late
+ * (it's as good a place as any), then use COMPlus_JitLateDisasm=* to see if the late
  * disassembler thinks the instructions as the same as we do.
  */
 
diff --git a/src/jit/codegencommon.cpp b/src/jit/codegencommon.cpp
index e3c1052e86..b81d81322e 100644
--- a/src/jit/codegencommon.cpp
+++ b/src/jit/codegencommon.cpp
@@ -3040,7 +3040,7 @@ void                CodeGen::genGenerateCode(void * * codePtr,
     // ugliness of having the failure here.
     if (!compiler->jitFallbackCompile)
     {
-        // Use COMPLUS_JitNoForceFallback=1 to prevent NOWAY assert testing from happening,
+        // Use COMPlus_JitNoForceFallback=1 to prevent NOWAY assert testing from happening,
         // especially that caused by enabling JIT stress.
         if (!JitConfig.JitNoForceFallback())
         {
diff --git a/src/jit/codegenxarch.cpp b/src/jit/codegenxarch.cpp
index c2781ff98d..e5962b106a 100644
--- a/src/jit/codegenxarch.cpp
+++ b/src/jit/codegenxarch.cpp
@@ -780,7 +780,7 @@ void                CodeGen::genCodeForBBlist()
         {
             // Unit testing of the AMD64 emitter: generate a bunch of instructions into the last block
             // (it's as good as any, but better than the prolog, which can only be a single instruction
-            // group) then use COMPLUS_JitLateDisasm=* to see if the late disassembler
+            // group) then use COMPlus_JitLateDisasm=* to see if the late disassembler
             // thinks the instructions are the same as we do.
             genAmd64EmitterUnitTests();
         }
@@ -8658,7 +8658,7 @@ void                CodeGen::genStoreLongLclVar(GenTree* treeNode)
 
 /*****************************************************************************
 * Unit testing of the XArch emitter: generate a bunch of instructions into the prolog
-* (it's as good a place as any), then use COMPLUS_JitLateDisasm=* to see if the late
+* (it's as good a place as any), then use COMPlus_JitLateDisasm=* to see if the late
 * disassembler thinks the instructions as the same as we do.
 */
 
diff --git a/src/jit/compiler.cpp b/src/jit/compiler.cpp
index d32bf28571..9024172546 100644
--- a/src/jit/compiler.cpp
+++ b/src/jit/compiler.cpp
@@ -27,7 +27,7 @@ XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
 #include "jittelemetry.h"
 
 #if defined(DEBUG)
-// Column settings for COMPLUS_JitDumpIR.  We could(should) make these programmable.
+// Column settings for COMPlus_JitDumpIR.  We could(should) make these programmable.
 #define COLUMN_OPCODE   30 
 #define COLUMN_OPERANDS (COLUMN_OPCODE + 25)
 #define COLUMN_KINDS    110
@@ -993,8 +993,8 @@ void                Compiler::compShutdown()
 #if MEASURE_MEM_ALLOC
 
 #ifdef DEBUG
-    // Under debug, we only dump memory stats when the COMPLUS_* variable is defined.
-    // Under non-debug, we don't have the COMPLUS_* variable, and we always dump it.
+    // Under debug, we only dump memory stats when the COMPlus_* variable is defined.
+    // Under non-debug, we don't have the COMPlus_* variable, and we always dump it.
     if (s_dspMemStats)
 #endif
     {
@@ -1828,7 +1828,7 @@ void Compiler::compSetProcessor()
     opts.compCanUseSSE2 = true;
 
 #ifdef FEATURE_AVX_SUPPORT
-    // COMPLUS_EnableAVX can be used to disable using AVX if available on a target machine.
+    // COMPlus_EnableAVX can be used to disable using AVX if available on a target machine.
     // Note that FEATURE_AVX_SUPPORT is not enabled for ctpjit
     opts.compCanUseAVX = false;
     if (((compileFlags & CORJIT_FLG_PREJIT) == 0) &&
@@ -2085,7 +2085,7 @@ void                Compiler::compInitOptions(CORJIT_FLAGS* jitFlags)
 #endif // !DEBUG
 
 #ifdef ALT_JIT
-    // Take care of COMPLUS_AltJitExcludeAssemblies.
+    // Take care of COMPlus_AltJitExcludeAssemblies.
     if (opts.altJit)
     {
         // First, initialize the AltJitExcludeAssemblies list, but only do it once.
@@ -2120,9 +2120,9 @@ void                Compiler::compInitOptions(CORJIT_FLAGS* jitFlags)
     bool altJitConfig   = !pfAltJit->isEmpty();
 
     //  If we have a non-empty AltJit config then we change all of these other 
-    //  config values to refer only to the AltJit. Otherwise, a lot of COMPLUS_* variables
+    //  config values to refer only to the AltJit. Otherwise, a lot of COMPlus_* variables
     //  would apply to both the altjit and the normal JIT, but we only care about
-    //  debugging the altjit if the COMPLUS_AltJit configuration is set.
+    //  debugging the altjit if the COMPlus_AltJit configuration is set.
     //  
     if (compIsForImportOnly() && (!altJitConfig || opts.altJit))
     {
@@ -2235,7 +2235,7 @@ void                Compiler::compInitOptions(CORJIT_FLAGS* jitFlags)
                     printf("\n");
                     printf("Available specifiers (comma separated):\n");
                     printf("\n");
-                    printf("?          dump out value of COMPLUS_JitDumpIRFormat and this list of values\n");
+                    printf("?          dump out value of COMPlus_JitDumpIRFormat and this list of values\n");
                     printf("\n");
                     printf("linear     linear IR dump (default)\n");
                     printf("tree       tree IR dump (traditional)\n");
@@ -2594,7 +2594,7 @@ void                Compiler::compInitOptions(CORJIT_FLAGS* jitFlags)
             opts.doLateDisasm = true;
 #endif // LATE_DISASM
 
-        // This one applies to both Ngen/Jit Disasm output: COMPLUS_JitDiffableDasm=1
+        // This one applies to both Ngen/Jit Disasm output: COMPlus_JitDiffableDasm=1
         if (JitConfig.DiffableDasm() != 0)
         {
             opts.disDiffable = true;
@@ -3338,7 +3338,7 @@ _SetMinOpts:
             codeGen->setFrameRequired(true);
 
 #if !defined(_TARGET_AMD64_)
-        // The VM sets CORJIT_FLG_FRAMED for two reasons: (1) the COMPLUS_JitFramed variable is set, or
+        // The VM sets CORJIT_FLG_FRAMED for two reasons: (1) the COMPlus_JitFramed variable is set, or
         // (2) the function is marked "noinline". The reason for #2 is that people mark functions
         // noinline to ensure the show up on in a stack walk. But for AMD64, we don't need a frame
         // pointer for the frame to show up in stack walk.
@@ -4668,7 +4668,7 @@ int           Compiler::compCompileHelper (CORINFO_MODULE_HANDLE            clas
 #ifdef ALT_JIT
         if (!compIsForInlining() && !opts.altJit)
         {
-            // We're an altjit, but the COMPLUS_AltJit configuration did not say to compile this method,
+            // We're an altjit, but the COMPlus_AltJit configuration did not say to compile this method,
             // so skip it.
             return CORJIT_SKIPPED;  
         }
@@ -4698,7 +4698,7 @@ int           Compiler::compCompileHelper (CORINFO_MODULE_HANDLE            clas
 
 #endif
 
-        // Check for COMPLUS_AgressiveInlining
+        // Check for COMPlus_AgressiveInlining
         if (JitConfig.JitAggressiveInlining())
         {
             compDoAggressiveInlining = true;
@@ -7241,7 +7241,7 @@ BasicBlock*    dFindBlock(unsigned bbNum)
 
 /*****************************************************************************
  *
- *  COMPLUS_JitDumpIR support - dump out function in linear IR form
+ *  COMPlus_JitDumpIR support - dump out function in linear IR form
  */
 
 void        cFuncIR(Compiler* comp)
@@ -7261,7 +7261,7 @@ void        cFuncIR(Compiler* comp)
 
 /*****************************************************************************
  *
- *  COMPLUS_JitDumpIR support - dump out the format specifiers from COMPLUS_JitDumpIRFormat
+ *  COMPlus_JitDumpIR support - dump out the format specifiers from COMPlus_JitDumpIRFormat
  */
 
 void        dFormatIR()
@@ -7270,13 +7270,13 @@ void        dFormatIR()
 
     if (comp->dumpIRFormat != NULL)
     {
-       printf("COMPLUS_JitDumpIRFormat=%ls", comp->dumpIRFormat);
+       printf("COMPlus_JitDumpIRFormat=%ls", comp->dumpIRFormat);
     }
 }
 
 /*****************************************************************************
  *
- *  COMPLUS_JitDumpIR support - dump out function in linear IR form
+ *  COMPlus_JitDumpIR support - dump out function in linear IR form
  */
 
 void        dFuncIR()
@@ -7286,7 +7286,7 @@ void        dFuncIR()
 
 /*****************************************************************************
  *
- *  COMPLUS_JitDumpIR support - dump out loop in linear IR form
+ *  COMPlus_JitDumpIR support - dump out loop in linear IR form
  */
 
 void        cLoopIR(Compiler* comp, Compiler::LoopDsc* loop)
@@ -7326,7 +7326,7 @@ void        cLoopIR(Compiler* comp, Compiler::LoopDsc* loop)
 
 /*****************************************************************************
  *
- *  COMPLUS_JitDumpIR support - dump out loop in linear IR form
+ *  COMPlus_JitDumpIR support - dump out loop in linear IR form
  */
 
 void        dLoopIR(Compiler::LoopDsc* loop)
@@ -7336,7 +7336,7 @@ void        dLoopIR(Compiler::LoopDsc* loop)
 
 /*****************************************************************************
  *
- *  COMPLUS_JitDumpIR support - dump out loop (given loop number) in linear IR form
+ *  COMPlus_JitDumpIR support - dump out loop (given loop number) in linear IR form
  */
 
 void        dLoopNumIR(unsigned loopNum)
@@ -7355,7 +7355,7 @@ void        dLoopNumIR(unsigned loopNum)
 
 /*****************************************************************************
  *
- *  COMPLUS_JitDumpIR support - dump spaces to specified tab stop
+ *  COMPlus_JitDumpIR support - dump spaces to specified tab stop
  */
 
 int        dTabStopIR(int curr, int tabstop)
@@ -7375,7 +7375,7 @@ void        cNodeIR(Compiler* comp, GenTree* tree);
 
 /*****************************************************************************
  *
- *  COMPLUS_JitDumpIR support - dump out block in linear IR form
+ *  COMPlus_JitDumpIR support - dump out block in linear IR form
  */
 
 void        cBlockIR(Compiler* comp, BasicBlock* block)
@@ -7528,7 +7528,7 @@ void        cBlockIR(Compiler* comp, BasicBlock* block)
 
 /*****************************************************************************
  *
- *  COMPLUS_JitDumpIR support - dump out block in linear IR form
+ *  COMPlus_JitDumpIR support - dump out block in linear IR form
  */
 
 void        dBlockIR(BasicBlock* block)
@@ -7538,7 +7538,7 @@ void        dBlockIR(BasicBlock* block)
 
 /*****************************************************************************
  *
- *  COMPLUS_JitDumpIR support - dump out tree node type for linear IR form
+ *  COMPlus_JitDumpIR support - dump out tree node type for linear IR form
  */
 
 int cTreeTypeIR(Compiler *comp, GenTree *tree)
@@ -7555,7 +7555,7 @@ int cTreeTypeIR(Compiler *comp, GenTree *tree)
 
 /*****************************************************************************
  *
- *  COMPLUS_JitDumpIR support - dump out tree node type for linear IR form
+ *  COMPlus_JitDumpIR support - dump out tree node type for linear IR form
  */
 
 int dTreeTypeIR(GenTree *tree)
@@ -7567,7 +7567,7 @@ int dTreeTypeIR(GenTree *tree)
 
 /*****************************************************************************
  *
- *  COMPLUS_JitDumpIR support - dump out tree node kind for linear IR form
+ *  COMPlus_JitDumpIR support - dump out tree node kind for linear IR form
  */
 
 int cTreeKindsIR(Compiler *comp, GenTree *tree)
@@ -7605,7 +7605,7 @@ int cTreeKindsIR(Compiler *comp, GenTree *tree)
 
 /*****************************************************************************
  *
- *  COMPLUS_JitDumpIR support - dump out tree node kind for linear IR form
+ *  COMPlus_JitDumpIR support - dump out tree node kind for linear IR form
  */
 
 int dTreeKindsIR(GenTree *tree)
@@ -7617,7 +7617,7 @@ int dTreeKindsIR(GenTree *tree)
 
 /*****************************************************************************
  *
- *  COMPLUS_JitDumpIR support - dump out tree node flags for linear IR form
+ *  COMPlus_JitDumpIR support - dump out tree node flags for linear IR form
  */
 
 int cTreeFlagsIR(Compiler *comp, GenTree *tree)
@@ -8290,7 +8290,7 @@ int cTreeFlagsIR(Compiler *comp, GenTree *tree)
 
 /*****************************************************************************
  *
- *  COMPLUS_JitDumpIR support - dump out tree node flags for linear IR form
+ *  COMPlus_JitDumpIR support - dump out tree node flags for linear IR form
  */
 
 int dTreeFlagsIR(GenTree *tree)
@@ -8302,7 +8302,7 @@ int dTreeFlagsIR(GenTree *tree)
 
 /*****************************************************************************
  *
- *  COMPLUS_JitDumpIR support - dump out SSA number on tree node for linear IR form
+ *  COMPlus_JitDumpIR support - dump out SSA number on tree node for linear IR form
  */
 
 int         cSsaNumIR(Compiler *comp, GenTree *tree)
@@ -8329,7 +8329,7 @@ int         cSsaNumIR(Compiler *comp, GenTree *tree)
 
 /*****************************************************************************
  *
- *  COMPLUS_JitDumpIR support - dump out SSA number on tree node for linear IR form
+ *  COMPlus_JitDumpIR support - dump out SSA number on tree node for linear IR form
  */
 
 int         dSsaNumIR(GenTree *tree)
@@ -8341,7 +8341,7 @@ int         dSsaNumIR(GenTree *tree)
 
 /*****************************************************************************
  *
- *  COMPLUS_JitDumpIR support - dump out Value Number on tree node for linear IR form
+ *  COMPlus_JitDumpIR support - dump out Value Number on tree node for linear IR form
  */
 
 int         cValNumIR(Compiler *comp, GenTree *tree)
@@ -8389,7 +8389,7 @@ int         cValNumIR(Compiler *comp, GenTree *tree)
 
 /*****************************************************************************
  *
- *  COMPLUS_JitDumpIR support - dump out Value Number on tree node for linear IR form
+ *  COMPlus_JitDumpIR support - dump out Value Number on tree node for linear IR form
  */
 
 int         dValNumIR(GenTree *tree)
@@ -8401,7 +8401,7 @@ int         dValNumIR(GenTree *tree)
 
 /*****************************************************************************
  *
- *  COMPLUS_JitDumpIR support - dump out tree leaf node for linear IR form
+ *  COMPlus_JitDumpIR support - dump out tree leaf node for linear IR form
  */
 
 int         cLeafIR(Compiler *comp, GenTree* tree)
@@ -8849,7 +8849,7 @@ int         cLeafIR(Compiler *comp, GenTree* tree)
 
 /*****************************************************************************
  *
- *  COMPLUS_JitDumpIR support - dump out tree leaf node for linear IR form
+ *  COMPlus_JitDumpIR support - dump out tree leaf node for linear IR form
  */
 
 int         dLeafIR(GenTree* tree)
@@ -8861,7 +8861,7 @@ int         dLeafIR(GenTree* tree)
 
 /*****************************************************************************
  *
- *  COMPLUS_JitDumpIR support - dump out tree indir node for linear IR form
+ *  COMPlus_JitDumpIR support - dump out tree indir node for linear IR form
  */
 
 int         cIndirIR(Compiler *comp, GenTree* tree)
@@ -8881,7 +8881,7 @@ int         cIndirIR(Compiler *comp, GenTree* tree)
 
 /*****************************************************************************
  *
- *  COMPLUS_JitDumpIR support - dump out tree indir node for linear IR form
+ *  COMPlus_JitDumpIR support - dump out tree indir node for linear IR form
  */
 
 int         dIndirIR(GenTree* tree)
@@ -8893,7 +8893,7 @@ int         dIndirIR(GenTree* tree)
 
 /*****************************************************************************
  *
- *  COMPLUS_JitDumpIR support - dump out tree operand node for linear IR form
+ *  COMPlus_JitDumpIR support - dump out tree operand node for linear IR form
  */
 
 int         cOperandIR(Compiler* comp, GenTree* operand)
@@ -9009,7 +9009,7 @@ int         cOperandIR(Compiler* comp, GenTree* operand)
 
 /*****************************************************************************
  *
- *  COMPLUS_JitDumpIR support - dump out tree operand node for linear IR form
+ *  COMPlus_JitDumpIR support - dump out tree operand node for linear IR form
  */
 
 int         dOperandIR(GenTree* operand)
@@ -9021,7 +9021,7 @@ int         dOperandIR(GenTree* operand)
 
 /*****************************************************************************
  *
- *  COMPLUS_JitDumpIR support - dump out tree list of nodes for linear IR form
+ *  COMPlus_JitDumpIR support - dump out tree list of nodes for linear IR form
  */
 
 int         cListIR(Compiler* comp, GenTree* list)
@@ -9053,7 +9053,7 @@ int         cListIR(Compiler* comp, GenTree* list)
 
 /*****************************************************************************
  *
- *  COMPLUS_JitDumpIR support - dump out tree list of nodes for linear IR form
+ *  COMPlus_JitDumpIR support - dump out tree list of nodes for linear IR form
  */
 
 int         dListIR(GenTree* list)
@@ -9065,7 +9065,7 @@ int         dListIR(GenTree* list)
 
 /*****************************************************************************
  *
- *  COMPLUS_JitDumpIR support - dump out tree dependencies based on comma nodes for linear IR form
+ *  COMPlus_JitDumpIR support - dump out tree dependencies based on comma nodes for linear IR form
  */
 
 int         cDependsIR(Compiler* comp, GenTree* comma, bool *first)
@@ -9100,7 +9100,7 @@ int         cDependsIR(Compiler* comp, GenTree* comma, bool *first)
 
 /*****************************************************************************
  *
- *  COMPLUS_JitDumpIR support - dump out tree dependencies based on comma nodes for linear IR form
+ *  COMPlus_JitDumpIR support - dump out tree dependencies based on comma nodes for linear IR form
  */
 
 int         dDependsIR(GenTree* comma)
@@ -9115,7 +9115,7 @@ int         dDependsIR(GenTree* comma)
 
 /*****************************************************************************
  *
- *  COMPLUS_JitDumpIR support - dump out tree node in linear IR form
+ *  COMPlus_JitDumpIR support - dump out tree node in linear IR form
  */
 
 void        cNodeIR(Compiler* comp, GenTree* tree)
@@ -9593,7 +9593,7 @@ void        cNodeIR(Compiler* comp, GenTree* tree)
 
 /*****************************************************************************
  *
- *  COMPLUS_JitDumpIR support - dump out tree in linear IR form
+ *  COMPlus_JitDumpIR support - dump out tree in linear IR form
  */
 
 void        cTreeIR(Compiler* comp, GenTree* tree)
@@ -9643,7 +9643,7 @@ void        cTreeIR(Compiler* comp, GenTree* tree)
 
 /*****************************************************************************
  *
- *  COMPLUS_JitDumpIR support - dump out tree in linear IR form
+ *  COMPlus_JitDumpIR support - dump out tree in linear IR form
  */
 
 void        dTreeIR(GenTree* tree)
diff --git a/src/jit/compiler.h b/src/jit/compiler.h
index c7b97b0441..1cacb4adbd 100644
--- a/src/jit/compiler.h
+++ b/src/jit/compiler.h
@@ -7518,7 +7518,7 @@ public :
         bool                disAsm2;        // Display native code after it is generated using external disassembler
         bool                dspOrder;       // Display names of each of the methods that we ngen/jit
         bool                dspUnwind;      // Display the unwind info output
-        bool                dspDiffable;    // Makes the Jit Dump 'diff-able' (currently uses same COMPLUS_* flag as disDiffable)
+        bool                dspDiffable;    // Makes the Jit Dump 'diff-able' (currently uses same COMPlus_* flag as disDiffable)
         bool                compLargeBranches; // Force using large conditional branches
         bool                dspGCtbls;      // Display the GC tables
 #endif
@@ -7944,7 +7944,7 @@ public :
 #ifdef DEBUG
     // Components used by the compiler may write unit test suites, and
     // have them run within this method.  They will be run only once per process, and only
-    // in debug.  (Perhaps should be under the control of a COMPLUS flag.)
+    // in debug.  (Perhaps should be under the control of a COMPlus_ flag.)
     // These should fail by asserting.
     void                compDoComponentUnitTestsOnce();
 #endif // DEBUG
diff --git a/src/jit/compiler.hpp b/src/jit/compiler.hpp
index 8657223514..21c9176617 100644
--- a/src/jit/compiler.hpp
+++ b/src/jit/compiler.hpp
@@ -4332,7 +4332,7 @@ Compiler::lvaPromotionType   Compiler::lvaGetPromotionType (const LclVarDsc *
         return PROMOTION_TYPE_INDEPENDENT;
     }
 
-    // Has struct promotion for arguments been disabled using COMPLUS_JitNoStructPromotion=2 
+    // Has struct promotion for arguments been disabled using COMPlus_JitNoStructPromotion=2 
     if (fgNoStructParamPromotion)
     {
         // The struct parameter is not enregistered
diff --git a/src/jit/error.cpp b/src/jit/error.cpp
index b853b9f8ef..6518e16d7d 100644
--- a/src/jit/error.cpp
+++ b/src/jit/error.cpp
@@ -32,7 +32,7 @@ unsigned fatal_NYI;
 void DECLSPEC_NORETURN fatal(int errCode)
 {
 #ifdef DEBUG
-    if (errCode != CORJIT_SKIPPED) // Don't stop on NYI: use COMPLUS_AltJitAssertOnNYI for that.
+    if (errCode != CORJIT_SKIPPED) // Don't stop on NYI: use COMPlus_AltJitAssertOnNYI for that.
     {
         if (JitConfig.DebugBreakOnVerificationFailure())
         {
@@ -310,13 +310,13 @@ void  __cdecl   assertAbort(const char *why, const char *file, unsigned line)
 
 #ifdef ALT_JIT
     // If we hit an assert, and we got here, it's either because the user hit "ignore" on the
-    // dialog pop-up, or they set COMPLUS_ContinueOnAssert=1 to not emit a pop-up, but just continue.
+    // dialog pop-up, or they set COMPlus_ContinueOnAssert=1 to not emit a pop-up, but just continue.
     // If we're an altjit, we have two options: (1) silently continue, as a normal JIT would, probably
     // leading to additional asserts, or (2) tell the VM that the AltJit wants to skip this function,
-    // thus falling back to the fallback JIT. Setting COMPLUS_AltJitSkipOnAssert=1 chooses this "skip"
+    // thus falling back to the fallback JIT. Setting COMPlus_AltJitSkipOnAssert=1 chooses this "skip"
     // to the fallback JIT behavior. This is useful when doing ASM diffs, where we only want to see
     // the first assert for any function, but we don't want to kill the whole ngen process on the
-    // first assert (which would happen if you used COMPLUS_NoGuiOnAssert=1 for example).
+    // first assert (which would happen if you used COMPlus_NoGuiOnAssert=1 for example).
     if (JitConfig.AltJitSkipOnAssert() != 0)
     {
         fatal(CORJIT_SKIPPED);
@@ -324,7 +324,7 @@ void  __cdecl   assertAbort(const char *why, const char *file, unsigned line)
 #elif defined(_TARGET_ARM64_)
     // TODO-ARM64-NYI: remove this after the JIT no longer asserts during startup
     //
-    // When we are bringing up the new Arm64 JIT we set COMPLUS_ContinueOnAssert=1 
+    // When we are bringing up the new Arm64 JIT we set COMPlus_ContinueOnAssert=1 
     // We only want to hit one assert then we will fall back to the interpreter.
     //
     bool interpreterFallback = (JitConfig.InterpreterFallback() != 0);
diff --git a/src/jit/flowgraph.cpp b/src/jit/flowgraph.cpp
index 32686dd811..b6912adc63 100644
--- a/src/jit/flowgraph.cpp
+++ b/src/jit/flowgraph.cpp
@@ -19112,14 +19112,14 @@ ONE_FILE_PER_METHOD:;
 //    MSAGL has also been open-sourced to https://github.com/Microsoft/automatic-graph-layout.git.
 //
 //    Here are the config values that control it:
-//      COMPLUS_JitDumpFg       A string (ala the COMPLUS_JitDump string) indicating what methods to dump flowgraphs for.
-//      COMPLUS_JitDumpFgDir    A path to a directory into which the flowgraphs will be dumped.
-//      COMPLUS_JitDumpFgFile   The filename to use. The default is "default.[xml|dot]".
+//      COMPlus_JitDumpFg       A string (ala the COMPlus_JitDump string) indicating what methods to dump flowgraphs for.
+//      COMPlus_JitDumpFgDir    A path to a directory into which the flowgraphs will be dumped.
+//      COMPlus_JitDumpFgFile   The filename to use. The default is "default.[xml|dot]".
 //                              Note that the new graphs will be appended to this file if it already exists.
-//      COMPLUS_JitDumpFgPhase  Phase(s) after which to dump the flowgraph.
+//      COMPlus_JitDumpFgPhase  Phase(s) after which to dump the flowgraph.
 //                              Set to the short name of a phase to see the flowgraph after that phase.
 //                              Leave unset to dump after COLD-BLK (determine first cold block) or set to * for all phases.
-//      COMPLUS_JitDumpFgDot    Set to non-zero to emit Dot instead of Xml Flowgraph dump. (Default is xml format.)
+//      COMPlus_JitDumpFgDot    Set to non-zero to emit Dot instead of Xml Flowgraph dump. (Default is xml format.)
 
 bool               Compiler::fgDumpFlowGraph(Phases phase)
 {
diff --git a/src/jit/importer.cpp b/src/jit/importer.cpp
index 10d783f6f4..514c7f1083 100644
--- a/src/jit/importer.cpp
+++ b/src/jit/importer.cpp
@@ -13622,7 +13622,7 @@ bool Compiler::impReturnInstruction(BasicBlock *block, int prefixFlags, OPCODE &
             if (opts.compGcChecks && info.compRetType == TYP_REF)
             {
                 // DDB 3483  : JIT Stress: early termination of GC ref's life time in exception code path
-                // VSW 440513: Incorrect gcinfo on the return value under COMPLUS_JitGCChecks=1 for methods with one-return BB.
+                // VSW 440513: Incorrect gcinfo on the return value under COMPlus_JitGCChecks=1 for methods with one-return BB.
                         
                 assert(op2->gtType == TYP_REF);
                                       
@@ -16633,7 +16633,7 @@ void          Compiler::impMarkInlineCandidate(GenTreePtr callNode, CORINFO_CONT
     }
 #endif
 
-    // Check for COMPLUS_AggressiveInlining
+    // Check for COMPlus_AggressiveInlining
     if (compDoAggressiveInlining)
     {
         methAttr |= CORINFO_FLG_FORCEINLINE;
diff --git a/src/jit/instr.cpp b/src/jit/instr.cpp
index 1ed705321b..85b8a44769 100644
--- a/src/jit/instr.cpp
+++ b/src/jit/instr.cpp
@@ -3907,7 +3907,7 @@ void                CodeGen::instGen_Return(unsigned stkArgSize)
  *  Emit a MemoryBarrier instruction
  *
  *     Note: all MemoryBarriers instructions can be removed by
- *           SET COMPLUS_JitNoMemoryBarriers=1
+ *           SET COMPlus_JitNoMemoryBarriers=1
  */
 void                CodeGen::instGen_MemoryBarrier()
 {
diff --git a/src/jit/jitconfigvalues.h b/src/jit/jitconfigvalues.h
index 8136517078..740984fa4e 100644
--- a/src/jit/jitconfigvalues.h
+++ b/src/jit/jitconfigvalues.h
@@ -8,7 +8,7 @@
 
 #if defined(DEBUG)
 CONFIG_INTEGER(AltJitLimit, W("AltJitLimit"), 0) // Max number of functions to use altjit for (decimal)
-CONFIG_INTEGER(AltJitSkipOnAssert, W("AltJitSkipOnAssert"), 0) // If AltJit hits an assert, fall back to the fallback JIT. Useful in conjunction with COMPLUS_ContinueOnAssert=1
+CONFIG_INTEGER(AltJitSkipOnAssert, W("AltJitSkipOnAssert"), 0) // If AltJit hits an assert, fall back to the fallback JIT. Useful in conjunction with COMPlus_ContinueOnAssert=1
 CONFIG_INTEGER(BreakOnDumpToken, W("BreakOnDumpToken"), 0xffffffff) // Breaks when using internal logging on a particular token value.
 CONFIG_INTEGER(DebugBreakOnVerificationFailure, W("DebugBreakOnVerificationFailure"), 0) // Halts the jit on verification failure
 CONFIG_INTEGER(DiffableDasm, W("JitDiffableDasm"), 0) // Make the disassembly diff-able
@@ -69,7 +69,7 @@ CONFIG_INTEGER(JitMinOptsLvRefCount, W("JITMinOptsLvRefcount"), DEFAULT_MIN_OPTS
 CONFIG_INTEGER(JitNoCMOV, W("JitNoCMOV"), 0)
 CONFIG_INTEGER(JitNoCSE, W("JitNoCSE"), 0)
 CONFIG_INTEGER(JitNoCSE2, W("JitNoCSE2"), 0)
-CONFIG_INTEGER(JitNoForceFallback, W("JitNoForceFallback"), 0) // Set to non-zero to prevent NOWAY assert testing. Overrides COMPLUS_JitForceFallback and JIT stress flags.
+CONFIG_INTEGER(JitNoForceFallback, W("JitNoForceFallback"), 0) // Set to non-zero to prevent NOWAY assert testing. Overrides COMPlus_JitForceFallback and JIT stress flags.
 CONFIG_INTEGER(JitNoHoist, W("JitNoHoist"), 0)
 CONFIG_INTEGER(JitNoInline, W("JitNoInline"), 0) // Disables inlining of all methods
 CONFIG_INTEGER(JitNoMemoryBarriers, W("JitNoMemoryBarriers"), 0) // If 1, don't generate memory barriers
diff --git a/src/jit/jittelemetry.h b/src/jit/jittelemetry.h
index 396d91d5fd..92f7acbec6 100644
--- a/src/jit/jittelemetry.h
+++ b/src/jit/jittelemetry.h
@@ -32,7 +32,7 @@ public:
     // Notification of noway_assert.
     void NotifyNowayAssert(const char* filename, unsigned line);
 
-    // Is telemetry enabled through COMPLUS_JitTelemetry?
+    // Is telemetry enabled through COMPlus_JitTelemetry?
     static bool IsTelemetryEnabled();
 
 private:
diff --git a/src/jit/lsra.cpp b/src/jit/lsra.cpp
index 5bf10ddc0c..127b720594 100644
--- a/src/jit/lsra.cpp
+++ b/src/jit/lsra.cpp
@@ -263,7 +263,7 @@ LinearScan::getRegisterRecord(regNumber regNum)
 //    mask      - The current mask of register candidates for a node
 //
 // Return Value:
-//    A possibly-modified mask, based on the value of COMPLUS_JitStressRegs.
+//    A possibly-modified mask, based on the value of COMPlus_JitStressRegs.
 //
 // Notes:
 //    This is the method used to implement the stress options that limit
@@ -8698,7 +8698,7 @@ LinearScan::resolveEdge(BasicBlock*      fromBlock,
                     {
                         // Spill "targetReg" to the stack and add its eventual target (otherTargetReg)
                         // to "targetRegsFromStack", which will be handled below.
-                        // NOTE: This condition is very rare.  Setting COMPLUS_JitStressRegs=0x203
+                        // NOTE: This condition is very rare.  Setting COMPlus_JitStressRegs=0x203
                         // has been known to trigger it in JIT SH.
 
                         // First, spill "otherInterval" from targetReg to the stack.
diff --git a/src/jit/lsra.h b/src/jit/lsra.h
index 19843a3c5f..4e53369535 100644
--- a/src/jit/lsra.h
+++ b/src/jit/lsra.h
@@ -427,7 +427,7 @@ public:
 private:
     //------------------------------------------------------------------------
     // Should we stress lsra?
-    // This uses the same COMPLUS variable as rsStressRegs (COMPLUS_JitStressRegs)
+    // This uses the same COMPLUS variable as rsStressRegs (COMPlus_JitStressRegs)
     // However, the possible values and their interpretation are entirely different.
     //
     // The mask bits are currently divided into fields in which each non-zero value
diff --git a/src/jit/optcse.cpp b/src/jit/optcse.cpp
index 61f99047af..9635cde966 100644
--- a/src/jit/optcse.cpp
+++ b/src/jit/optcse.cpp
@@ -2283,7 +2283,7 @@ bool                Compiler::optConfigDisableCSE(bool lexicalCSE)
         return true;        // valnum CSE phase is disabled
 #endif
 
-    // Next check if COMPLUS_JitNoCSE is set and applies to this method
+    // Next check if COMPlus_JitNoCSE is set and applies to this method
     //
     unsigned jitNoCSE = JitConfig.JitNoCSE();
 
diff --git a/src/jit/optimizer.cpp b/src/jit/optimizer.cpp
index 881761382f..d1bce8a994 100644
--- a/src/jit/optimizer.cpp
+++ b/src/jit/optimizer.cpp
@@ -4153,7 +4153,7 @@ void                Compiler::optPerformStaticOptimizations(unsigned loopNum, Lo
 //      cloning is allowed to be performed.
 //
 //  Return Value:
-//      Returns true in debug builds if COMPLUS_JitCloneLoops flag is set.
+//      Returns true in debug builds if COMPlus_JitCloneLoops flag is set.
 //      Disabled for retail for now.
 //
 bool                Compiler::optCanCloneLoops()
diff --git a/src/jit/regalloc.cpp b/src/jit/regalloc.cpp
index 4e33dd9722..739478c3f7 100644
--- a/src/jit/regalloc.cpp
+++ b/src/jit/regalloc.cpp
@@ -1243,7 +1243,7 @@ regMaskTP            Compiler::rpPredictRegPick(var_types    type,
                     }
                 }
 #endif
-                // See if COMPLUS_JitRegisterFP is restricting this FP register
+                // See if COMPlus_JitRegisterFP is restricting this FP register
                 //
                 if ((restrictMask & regBits) != regBits)
                     continue;
diff --git a/src/jit/regset.h b/src/jit/regset.h
index 7276b50258..e1b8d45c5b 100644
--- a/src/jit/regset.h
+++ b/src/jit/regset.h
@@ -314,10 +314,10 @@ public:
 #ifdef DEBUG
     /*****************************************************************************
         *  Should we stress register tracking logic ?
-        *  This is set via COMPLUS_JitStressRegs.
+        *  This is set via COMPlus_JitStressRegs.
         *  The following values are ordered, such that any value greater than RS_xx
         *  implies RS_xx.
-        *  LSRA defines a different set of values, but uses the same COMPLUS_JitStressRegs
+        *  LSRA defines a different set of values, but uses the same COMPlus_JitStressRegs
         *  value, with the same notion of relative ordering.
         *  1 = rsPickReg() picks 'bad' registers.
         *  2 = codegen spills at safe points. This is still flaky
diff --git a/src/jit/unwind.h b/src/jit/unwind.h
index 95b96d2ca1..68a06fc15c 100644
--- a/src/jit/unwind.h
+++ b/src/jit/unwind.h
@@ -556,7 +556,7 @@ private:
 
 // UnwindFragmentInfo: represents all the unwind information for a single fragment of a function or funclet.
 // A fragment is a section with a code size less than the maximum unwind code size: either 512K bytes, or
-// that specified by COMPLUS_JitSplitFunctionSize. In most cases, there will be exactly one fragment.
+// that specified by COMPlus_JitSplitFunctionSize. In most cases, there will be exactly one fragment.
 
 class UnwindFragmentInfo : public UnwindBase
 {
diff --git a/src/jit/unwindarm.cpp b/src/jit/unwindarm.cpp
index 0852924aad..745c3ac57a 100644
--- a/src/jit/unwindarm.cpp
+++ b/src/jit/unwindarm.cpp
@@ -1575,7 +1575,7 @@ void            UnwindInfo::HotColdSplitCodes(UnwindInfo* puwi)
 // so the fragment size will fit in the unwind data "Function Length" field.
 // The ARM Exception Data specification "Function Fragments" section describes this.
 // We split the function so that it is no larger than 512K bytes, or the value of
-// the COMPLUS_JitSplitFunctionSize value, if defined (and smaller). We must determine
+// the COMPlus_JitSplitFunctionSize value, if defined (and smaller). We must determine
 // how to split the function/funclet before we issue the instructions, so we can
 // reserve the unwind space with the VM. The instructions issued may shrink (but not
 // expand!) during issuing (although this is extremely rare in any case, and may not
@@ -1594,7 +1594,7 @@ void            UnwindInfo::Split()
     maxFragmentSize = UW_MAX_FRAGMENT_SIZE_BYTES;
 
 #ifdef DEBUG
-    // Consider COMPLUS_JitSplitFunctionSize
+    // Consider COMPlus_JitSplitFunctionSize
     unsigned splitFunctionSize = (unsigned) JitConfig.JitSplitFunctionSize();
 
     if (splitFunctionSize != 0)
@@ -1676,7 +1676,7 @@ void            UnwindInfo::Split()
 
 #ifdef DEBUG
     // Did the emitter split the function/funclet into as many fragments as we asked for?
-    // It might be fewer if the COMPLUS_JitSplitFunctionSize was used, but it better not
+    // It might be fewer if the COMPlus_JitSplitFunctionSize was used, but it better not
     // be fewer if we're splitting into 512K blocks!
 
     unsigned fragCount = 0;
@@ -1695,7 +1695,7 @@ void            UnwindInfo::Split()
 
         // If this fires, then we split into fewer fragments than we asked for, and we are using
         // the default, unwind-data-defined 512K maximum fragment size. We won't be able to fit
-        // this fragment into the unwind data! If you set COMPLUS_JitSplitFunctionSize to something
+        // this fragment into the unwind data! If you set COMPlus_JitSplitFunctionSize to something
         // small, we might not be able to split into as many fragments as asked for, because we
         // can't split prologs or epilogs.
         assert(maxFragmentSize != UW_MAX_FRAGMENT_SIZE_BYTES);
diff --git a/src/jit/valuenum.h b/src/jit/valuenum.h
index ab1bef4347..1a581d52ad 100644
--- a/src/jit/valuenum.h
+++ b/src/jit/valuenum.h
@@ -214,7 +214,7 @@ private:
 #ifdef DEBUG
     // This helps test some performance pathologies related to "evaluation" of VNF_MapSelect terms,
     // especially relating to the heap.  We count the number of applications of such terms we consider,
-    // and if this exceeds a limit, indicated by a COMPLUS_ variable, we assert.
+    // and if this exceeds a limit, indicated by a COMPlus_ variable, we assert.
     unsigned m_numMapSels;
 #endif
 
diff --git a/src/mscorlib/src/System/Globalization/DateTimeParse.cs b/src/mscorlib/src/System/Globalization/DateTimeParse.cs
index 8f332e446c..8de3242f30 100644
--- a/src/mscorlib/src/System/Globalization/DateTimeParse.cs
+++ b/src/mscorlib/src/System/Globalization/DateTimeParse.cs
@@ -609,10 +609,10 @@ new DS[] { DS.ERROR, DS.TX_NNN,  DS.TX_NNN,  DS.TX_NNN,  DS.ERROR,   DS.ERROR,
             // Builds with _LOGGING defined (x86dbg, amd64chk, etc) support tracing
             // Set the following internal-only/unsupported environment variables to enable DateTime tracing to the console:
             //
-            // COMPLUS_LogEnable=1
-            // COMPLUS_LogToConsole=1
-            // COMPLUS_LogLevel=9
-            // COMPLUS_ManagedLogFacility=0x00001000
+            // COMPlus_LogEnable=1
+            // COMPlus_LogToConsole=1
+            // COMPlus_LogLevel=9
+            // COMPlus_ManagedLogFacility=0x00001000
             if (_tracingEnabled) {
                 BCLDebug.Trace("DATETIME", "[DATETIME] Lex({0})\tpos:{1}({2}), {3}, DS.{4}", Hex(str.Value),
                                str.Index, Hex(str.m_current), tokenType, dps);
@@ -4160,10 +4160,10 @@ new DS[] { DS.ERROR, DS.TX_NNN,  DS.TX_NNN,  DS.TX_NNN,  DS.ERROR,   DS.ERROR,
         // Builds with _LOGGING defined (x86dbg, amd64chk, etc) support tracing
         // Set the following internal-only/unsupported environment variables to enable DateTime tracing to the console:
         //
-        // COMPLUS_LogEnable=1
-        // COMPLUS_LogToConsole=1
-        // COMPLUS_LogLevel=9
-        // COMPLUS_ManagedLogFacility=0x00001000
+        // COMPlus_LogEnable=1
+        // COMPlus_LogToConsole=1
+        // COMPlus_LogLevel=9
+        // COMPlus_ManagedLogFacility=0x00001000
         [Pure]
         [Conditional("_LOGGING")]
         internal static void LexTraceExit(string message, DS dps) {
diff --git a/src/mscorlib/src/System/TimeSpan.cs b/src/mscorlib/src/System/TimeSpan.cs
index c492f9746a..332721a47c 100644
--- a/src/mscorlib/src/System/TimeSpan.cs
+++ b/src/mscorlib/src/System/TimeSpan.cs
@@ -401,7 +401,7 @@ namespace System {
         //         </runtime>
         //        </configuration>
         // 2) Environment variable
-        //        set COMPLUS_TimeSpan_LegacyFormatMode=1
+        //        set COMPlus_TimeSpan_LegacyFormatMode=1
         // 3) RegistryKey
         //        [HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\.NETFramework]
         //        "TimeSpan_LegacyFormatMode"=dword:00000001
@@ -420,7 +420,7 @@ namespace System {
 #endif
         private static bool GetLegacyFormatMode() {
 #if !FEATURE_CORECLR
-            if (LegacyFormatMode()) // FCALL to check COMPLUS_TimeSpan_LegacyFormatMode
+            if (LegacyFormatMode()) // FCALL to check COMPlus_TimeSpan_LegacyFormatMode
                 return true;
             return CompatibilitySwitches.IsNetFx40TimeSpanLegacyFormatMode;
 #else
diff --git a/src/tools/crossgen/compare.bat b/src/tools/crossgen/compare.bat
index fcb506433b..290cc06fc0 100644
--- a/src/tools/crossgen/compare.bat
+++ b/src/tools/crossgen/compare.bat
@@ -106,10 +106,10 @@ SETLOCAL ENABLEDELAYEDEXPANSION
 
 set BITNESS=
 IF /I "%_BuildArch%" == "amd64" set BITNESS=64
-set FRAMEWORKDIR=%SYSTEMROOT%\Microsoft.NET\Framework%BITNESS%\%COMPLUS_Version%
+set FRAMEWORKDIR=%SYSTEMROOT%\Microsoft.NET\Framework%BITNESS%\%COMPlus_Version%
 IF "%BITNESS%" == "" set BITNESS=32
 
-set NATIVEIMAGEPATH=%FRAMEWORKDIR%\assembly\NativeImages_%COMPLUS_Version%_%BITNESS%
+set NATIVEIMAGEPATH=%FRAMEWORKDIR%\assembly\NativeImages_%COMPlus_Version%_%BITNESS%
 
 rem rmdir /S /Q %NATIVEIMAGEPATH%
 rem %FRAMEWORKDIR%\ngen install mscorlib
diff --git a/src/utilcode/clrconfig.cpp b/src/utilcode/clrconfig.cpp
index ba0a9715d4..c8a82060e9 100644
--- a/src/utilcode/clrconfig.cpp
+++ b/src/utilcode/clrconfig.cpp
@@ -210,17 +210,17 @@ BOOL CLRConfig::IsConfigEnabled(const ConfigDWORDInfo & info)
     // Set up REGUTIL options.
     // 
     REGUTIL::CORConfigLevel level = GetConfigLevel(info.options);
-    BOOL prependCOMPLUS = !CheckLookupOption(info, DontPrependCOMPLUS_);
+    BOOL prependCOMPlus = !CheckLookupOption(info, DontPrependCOMPlus_);
     
     // 
     // If we aren't favoring config files, we check REGUTIL here.
     // 
     if(CheckLookupOption(info, FavorConfigFile) == FALSE)
     {
-        REGUTIL::GetConfigDWORD_DontUse_(info.name, info.defaultValue, &result, level, prependCOMPLUS);
+        REGUTIL::GetConfigDWORD_DontUse_(info.name, info.defaultValue, &result, level, prependCOMPlus);
         if(result>0)
             return TRUE;
-        LPWSTR result = REGUTIL::GetConfigString_DontUse_(info.name, prependCOMPLUS, level);
+        LPWSTR result = REGUTIL::GetConfigString_DontUse_(info.name, prependCOMPlus, level);
         if(result != NULL && result[0] != 0)
         {
             return TRUE;
@@ -265,10 +265,10 @@ BOOL CLRConfig::IsConfigEnabled(const ConfigDWORDInfo & info)
     // 
     if(CheckLookupOption(info, FavorConfigFile) == TRUE)
     {
-        REGUTIL::GetConfigDWORD_DontUse_(info.name, info.defaultValue, &result, level, prependCOMPLUS);
+        REGUTIL::GetConfigDWORD_DontUse_(info.name, info.defaultValue, &result, level, prependCOMPlus);
         if(result>0)
             return TRUE;
-        LPWSTR result = REGUTIL::GetConfigString_DontUse_(info.name, prependCOMPLUS, level);
+        LPWSTR result = REGUTIL::GetConfigString_DontUse_(info.name, prependCOMPlus, level);
         if(result != NULL && result[0] != 0)
         {
             return TRUE;
@@ -284,7 +284,7 @@ BOOL CLRConfig::IsConfigEnabled(const ConfigDWORDInfo & info)
         s_GetPerformanceDefaultValueCallback != NULL &&
         s_GetPerformanceDefaultValueCallback(info.name, &performanceDefaultValue))
     {
-        if (!SUCCEEDED(REGUTIL::GetConfigDWORD_DontUse_(info.name, info.defaultValue, &result, level, prependCOMPLUS)))
+        if (!SUCCEEDED(REGUTIL::GetConfigDWORD_DontUse_(info.name, info.defaultValue, &result, level, prependCOMPlus)))
         {
             if(performanceDefaultValue>0)
                 return TRUE;
@@ -357,14 +357,14 @@ DWORD CLRConfig::GetConfigValue(const ConfigDWORDInfo & info)
     // Set up REGUTIL options.
     // 
     REGUTIL::CORConfigLevel level = GetConfigLevel(info.options);
-    BOOL prependCOMPLUS = !CheckLookupOption(info, DontPrependCOMPLUS_);
+    BOOL prependCOMPlus = !CheckLookupOption(info, DontPrependCOMPlus_);
     
     // 
     // If we aren't favoring config files, we check REGUTIL here.
     // 
     if(CheckLookupOption(info, FavorConfigFile) == FALSE)
     {
-        REGUTIL::GetConfigDWORD_DontUse_(info.name, info.defaultValue, &result, level, prependCOMPLUS);
+        REGUTIL::GetConfigDWORD_DontUse_(info.name, info.defaultValue, &result, level, prependCOMPlus);
         // TODO: We are ignoring explicitly defined default values to avoid change in behavior. 
         // TODO: Ideally, the following should check the hresult for success.
         if(result != info.defaultValue)
@@ -411,7 +411,7 @@ DWORD CLRConfig::GetConfigValue(const ConfigDWORDInfo & info)
     // 
     if(CheckLookupOption(info, FavorConfigFile) == TRUE)
     {
-        REGUTIL::GetConfigDWORD_DontUse_(info.name, info.defaultValue, &result, level, prependCOMPLUS);
+        REGUTIL::GetConfigDWORD_DontUse_(info.name, info.defaultValue, &result, level, prependCOMPlus);
         // TODO: We are ignoring explicitly defined default values to avoid change in behavior. 
         // TODO: Ideally, the following should check the hresult for success.
         if(result != info.defaultValue)
@@ -431,7 +431,7 @@ DWORD CLRConfig::GetConfigValue(const ConfigDWORDInfo & info)
     {
         // TODO: We ignore explicitly defined default values above, but we do not want to let performance defaults override these.
         // TODO: Ideally, the above would use hresult for success and this check would be removed.
-        if (!SUCCEEDED(REGUTIL::GetConfigDWORD_DontUse_(info.name, info.defaultValue, &result, level, prependCOMPLUS)))
+        if (!SUCCEEDED(REGUTIL::GetConfigDWORD_DontUse_(info.name, info.defaultValue, &result, level, prependCOMPlus)))
             return performanceDefaultValue;
     }
 
@@ -522,14 +522,14 @@ HRESULT CLRConfig::GetConfigValue(const ConfigStringInfo & info, __deref_out_z L
     // Set up REGUTIL options.
     // 
     REGUTIL::CORConfigLevel level = GetConfigLevel(info.options);
-    BOOL prependCOMPLUS = !CheckLookupOption(info, DontPrependCOMPLUS_);
+    BOOL prependCOMPlus = !CheckLookupOption(info, DontPrependCOMPlus_);
 
     // 
     // If we aren't favoring config files, we check REGUTIL here.
     // 
     if(result == NULL && CheckLookupOption(info, FavorConfigFile) == FALSE)
     {        
-        result = REGUTIL::GetConfigString_DontUse_(info.name, prependCOMPLUS, level);
+        result = REGUTIL::GetConfigString_DontUse_(info.name, prependCOMPlus, level);
     }
 
     // 
@@ -563,7 +563,7 @@ HRESULT CLRConfig::GetConfigValue(const ConfigStringInfo & info, __deref_out_z L
     if(result==NULL && 
         CheckLookupOption(info, FavorConfigFile) == TRUE)
     {
-        result = REGUTIL::GetConfigString_DontUse_(info.name, prependCOMPLUS, level);
+        result = REGUTIL::GetConfigString_DontUse_(info.name, prependCOMPlus, level);
     }
 
     if ((result != NULL) && CheckLookupOption(info, TrimWhiteSpaceFromStringValue))
@@ -617,7 +617,7 @@ BOOL CLRConfig::IsConfigOptionSpecified(LPCWSTR name)
         }
     }
 
-    // Check REGUTIL, both with and without the COMPLUS_ prefix
+    // Check REGUTIL, both with and without the COMPlus_ prefix
     {
         LPWSTR result = NULL;
     
diff --git a/src/utilcode/regutil.cpp b/src/utilcode/regutil.cpp
index 1cb8990f0c..fbc55708c7 100644
--- a/src/utilcode/regutil.cpp
+++ b/src/utilcode/regutil.cpp
@@ -1355,7 +1355,7 @@ void REGUTIL::InitOptionalConfigCache()
     LONG l = ERROR_SUCCESS; // general Win32 API error return code
     HKEY hkey = NULL;
 
-    // No caching if the environment variable COMPLUS_DisableConfigCache is set
+    // No caching if the environment variable COMPlus_DisableConfigCache is set
     //
     if (CLRConfig::GetConfigValue(CLRConfig::EXTERNAL_DisableConfigCache) != 0)
         goto failure;
diff --git a/src/utilcode/sortversioning.cpp b/src/utilcode/sortversioning.cpp
index c401086faf..5420947842 100644
--- a/src/utilcode/sortversioning.cpp
+++ b/src/utilcode/sortversioning.cpp
@@ -655,7 +655,7 @@ namespace SortVersioning
     //         </runtime>
     //        </configuration>
     // 2) Environment variable
-    //        set COMPLUS_CompatSortNLSVersion=4096
+    //        set COMPlus_CompatSortNLSVersion=4096
     // 3) RegistryKey
     //        [HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\.NETFramework]
     //        "CompatSortNLSVersion"=dword:00001000
diff --git a/src/utilcode/util.cpp b/src/utilcode/util.cpp
index dcc6b83e21..f801f94b60 100644
--- a/src/utilcode/util.cpp
+++ b/src/utilcode/util.cpp
@@ -2892,7 +2892,7 @@ void SOTolerantViolation(const char *szFunction, const char *szFile, int lineNum
 
 //
 // SONotMainlineViolation is used to report any code with SO_NOT_MAINLINE being run in a test environment
-// with COMPLUS_NO_SO_NOT_MAINLINE enabled
+// with COMPlus_NO_SO_NOT_MAINLINE enabled
 //
 void SONotMainlineViolation(const char *szFunction, const char *szFile, int lineNum) 
 {
@@ -2901,7 +2901,7 @@ void SONotMainlineViolation(const char *szFunction, const char *szFile, int line
 
 //
 // SONotMainlineViolation is used to report any code with SO_NOT_MAINLINE being run in a test environment
-// with COMPLUS_NO_SO_NOT_MAINLINE enabled
+// with COMPlus_NO_SO_NOT_MAINLINE enabled
 //
 void SOBackoutViolation(const char *szFunction, const char *szFile, int lineNum) 
 {
@@ -2968,8 +2968,8 @@ void SOViolation(const char *szFunction, const char *szFile, int lineNum, SOViol
                         "CONTRACT VIOLATION by %s at \"%s\" @ %d\n\n" 
                         "SO-not-mainline function being called with not-mainline checking enabled.\n"
                         "\nPlease open a bug against the feature owner.\n"
-                        "\nNOTE: You can disable this ASSERT by setting COMPLUS_SOEnableDefaultRWValidation=0.\n"
-                        "      or by turning of not-mainline checking by by setting COMPLUS_NO_SO_NOT_MAINLINE=0.\n"
+                        "\nNOTE: You can disable this ASSERT by setting COMPlus_SOEnableDefaultRWValidation=0.\n"
+                        "      or by turning of not-mainline checking by by setting COMPlus_NO_SO_NOT_MAINLINE=0.\n"
                         "\nFor details about this feature, see, in a CLR enlistment,\n"
                         "src\\ndp\\clr\\doc\\OtherDevDocs\\untriaged\\clrdev_web\\SO Guide for CLR Developers.doc\n",
                             szFunction, szFile, lineNum);
@@ -2981,7 +2981,7 @@ void SOViolation(const char *szFunction, const char *szFile, int lineNum, SOViol
                         "SO Backout Marker overrun.\n\n" 
                         "A dtor or handler path exceeded the backout code stack consumption limit.\n"
                         "\nPlease open a bug against the feature owner.\n"
-                        "\nNOTE: You can disable this ASSERT by setting COMPLUS_SOEnableBackoutStackValidation=0.\n"
+                        "\nNOTE: You can disable this ASSERT by setting COMPlus_SOEnableBackoutStackValidation=0.\n"
                         "\nFor details about this feature, see, in a CLR enlistment,\n"
                         "src\\ndp\\clr\\doc\\OtherDevDocs\\untriaged\\clrdev_web\\SO Guide for CLR Developers.doc\n");
     }
@@ -2992,7 +2992,7 @@ void SOViolation(const char *szFunction, const char *szFile, int lineNum, SOViol
                         "CONTRACT VIOLATION by %s at \"%s\" @ %d\n\n" 
                         "SO-intolerant function called outside an SO probe.\n"
                         "\nPlease open a bug against the feature owner.\n"
-                        "\nNOTE: You can disable this ASSERT by setting COMPLUS_SOEnableDefaultRWValidation=0.\n"
+                        "\nNOTE: You can disable this ASSERT by setting COMPlus_SOEnableDefaultRWValidation=0.\n"
                         "\nFor details about this feature, see, in a CLR enlistment,\n"
                         "src\\ndp\\clr\\doc\\OtherDevDocs\\untriaged\\clrdev_web\\SO Guide for CLR Developers.doc\n",
                             szFunction, szFile, lineNum);
diff --git a/src/vm/ceeload.cpp b/src/vm/ceeload.cpp
index 359948937e..3d64ebc8bc 100644
--- a/src/vm/ceeload.cpp
+++ b/src/vm/ceeload.cpp
@@ -13889,7 +13889,7 @@ static void ProfileDataAllocateTokenDefinitions(ProfileEmitter * pEmitter, Modul
     mdProfileData->size = sizeof(CORBBTPROF_BLOB_ENTRY);
 }
 
-// Responsible for writing out the profile data if the COMPLUS_BBInstr 
+// Responsible for writing out the profile data if the COMPlus_BBInstr 
 // environment variable is set.  This is called when the module is unloaded
 // (usually at shutdown).
 HRESULT Module::WriteMethodProfileDataLogFile(bool cleanup)
diff --git a/src/vm/clrex.cpp b/src/vm/clrex.cpp
index de6c2176f3..c8fc2f3886 100644
--- a/src/vm/clrex.cpp
+++ b/src/vm/clrex.cpp
@@ -2669,7 +2669,7 @@ CLRLastThrownObjectException* CLRLastThrownObjectException::Validate()
                     "  Please get a good stack trace of the exception that was thrown first\n"
                     "  (by re-running the app & catching first chance exceptions), find\n"
                     "  the caller of Validate, and file a bug against the owner.\n\n"
-                    "To suppress this assert 'set COMPLUS_SuppressLostExceptionTypeAssert=1'");
+                    "To suppress this assert 'set COMPlus_SuppressLostExceptionTypeAssert=1'");
                 }
             }
         }
diff --git a/src/vm/codeman.cpp b/src/vm/codeman.cpp
index 72b5aae345..fec74bb6ae 100644
--- a/src/vm/codeman.cpp
+++ b/src/vm/codeman.cpp
@@ -1558,7 +1558,7 @@ BOOL EEJitManager::LoadJIT()
     s_ngenCompilerDll = m_JITCompiler;
     
 #if defined(_TARGET_AMD64_) && !defined(CROSSGEN_COMPILE)
-    // If COMPLUS_UseLegacyJit=1, then we fall back to compatjit.dll.
+    // If COMPlus_UseLegacyJit=1, then we fall back to compatjit.dll.
     //
     // This fallback mechanism was introduced for Visual Studio "14" Preview, when JIT64 (the legacy JIT) was replaced with
     // RyuJIT. It was desired to provide a fallback mechanism in case comptibility problems (or other bugs)
@@ -1567,7 +1567,7 @@ BOOL EEJitManager::LoadJIT()
     //
     // If this is a compilation process, then we don't allow specifying a fallback JIT. This is a case where, when NGEN'ing,
     // we sometimes need to JIT some things (such as when we are NGEN'ing mscorlib). In that case, we want to use exactly
-    // the same JIT as NGEN uses. And NGEN doesn't follow the COMPLUS_UseLegacyJit=1 switch -- it always uses clrjit.dll.
+    // the same JIT as NGEN uses. And NGEN doesn't follow the COMPlus_UseLegacyJit=1 switch -- it always uses clrjit.dll.
     //
     // Note that we always load and initialize the default JIT. This is to handle cases where obfuscators rely on
     // LoadLibrary("clrjit.dll") returning the module handle of the JIT, and then they call GetProcAddress("getJit") to get
@@ -1644,7 +1644,7 @@ BOOL EEJitManager::LoadJIT()
 
 #ifdef ALLOW_SXS_JIT
 
-    // Do not load altjit.dll unless COMPLUS_AltJit is set.
+    // Do not load altjit.dll unless COMPlus_AltJit is set.
     // Even if the main JIT fails to load, if the user asks for an altjit we try to load it.
     // This allows us to display load error messages for loading altjit.
 
diff --git a/src/vm/domainfile.cpp b/src/vm/domainfile.cpp
index 5d2a95ffb2..5c77d608a8 100644
--- a/src/vm/domainfile.cpp
+++ b/src/vm/domainfile.cpp
@@ -2352,7 +2352,7 @@ void DomainAssembly::FindNativeImage()
         {
             SString sbuf;
             StackScratchBuffer scratch;
-            sbuf.Printf("COMPLUS_NgenBind_ZapForbid violation: %s.", GetSimpleName());
+            sbuf.Printf("COMPlus_NgenBind_ZapForbid violation: %s.", GetSimpleName());
             DbgAssertDialog(__FILE__, __LINE__, sbuf.GetUTF8(scratch));
         }
 #endif
diff --git a/src/vm/eeconfig.h b/src/vm/eeconfig.h
index 7270dce2a4..002396d8e0 100644
--- a/src/vm/eeconfig.h
+++ b/src/vm/eeconfig.h
@@ -1126,10 +1126,10 @@ private: //----------------------------------------------------------------
 #endif
 
 #ifdef _TARGET_AMD64_
-    // Assemblies for which we will not load a native image. This is from the COMPLUS_DisableNativeImageLoadList
+    // Assemblies for which we will not load a native image. This is from the COMPlus_DisableNativeImageLoadList
     // variable / reg key. It performs the same function as the config file key "<disableNativeImageLoad>" (except
     // that is it just a list of assembly names, which the config file key can specify full assembly identities).
-    // This was added to support COMPLUS_UseLegacyJit, to support the rollout of RyuJIT to replace JIT64, where
+    // This was added to support COMPlus_UseLegacyJit, to support the rollout of RyuJIT to replace JIT64, where
     // the user can cause the CLR to fall back to JIT64 for JITting but not for NGEN. This allows the user to
     // force JITting for a specified list of NGEN assemblies.
     AssemblyNamesList * pDisableNativeImageLoadList;
diff --git a/src/vm/eetoprofinterfaceimpl.cpp b/src/vm/eetoprofinterfaceimpl.cpp
index 0dbd697207..2ec3812159 100644
--- a/src/vm/eetoprofinterfaceimpl.cpp
+++ b/src/vm/eetoprofinterfaceimpl.cpp
@@ -2159,7 +2159,7 @@ HRESULT EEToProfInterfaceImpl::SetEventMask(DWORD dwEventMask, DWORD dwEventMask
     if (dwTestOnlyAllowedEventMask != 0)
     {
         // Remove from the immutable flag list those flags that a test-only profiler may
-        // need to set post-startup (specified via COMPLUS_TestOnlyAllowedEventMask)
+        // need to set post-startup (specified via COMPlus_TestOnlyAllowedEventMask)
         dwImmutableEventFlags &= ~dwTestOnlyAllowedEventMask;  
 
         // And add to the "allowable after attach" list the same test-only flags.
diff --git a/src/vm/gccover.cpp b/src/vm/gccover.cpp
index 18bc091c50..0b5bf34f21 100644
--- a/src/vm/gccover.cpp
+++ b/src/vm/gccover.cpp
@@ -741,7 +741,7 @@ void replaceSafePointInstructionWithGcStressInstr(UINT32 safePointOffset, LPVOID
                 //
                 // Given all of this, skip the MethodDesc::ReturnsObject() call by default to avoid
                 // unexpected AVs.  This implies leaving out the GC coverage breakpoints for direct calls
-                // unless COMPLUS_GcStressOnDirectCalls=1 is explicitly set in the environment.
+                // unless COMPlus_GcStressOnDirectCalls=1 is explicitly set in the environment.
                 //
 
                 static ConfigDWORD fGcStressOnDirectCalls;
diff --git a/src/vm/ibclogger.h b/src/vm/ibclogger.h
index 2fc5534e63..9f31151e64 100644
--- a/src/vm/ibclogger.h
+++ b/src/vm/ibclogger.h
@@ -389,7 +389,7 @@ public:
 
 
 // IBCLogger is responsible for collecting profile data.  Logging is turned on by the
-// COMPLUS_ZapBBInstr environment variable, and the actual writing to the file 
+// COMPlus_ZapBBInstr environment variable, and the actual writing to the file 
 // occurs in code:Module.WriteMethodProfileDataLogFile
 class IBCLogger
 {
diff --git a/src/vm/jithelpers.cpp b/src/vm/jithelpers.cpp
index 11c229721f..07f263cd55 100644
--- a/src/vm/jithelpers.cpp
+++ b/src/vm/jithelpers.cpp
@@ -6892,17 +6892,17 @@ void F_CALL_VA_CONV JIT_TailCall(PCODE copyArgs, PCODE target, ...)
 // *****************************************************************************
 //  JitHelperLogging usage:
 //      1) Ngen using:
-//              COMPLUS_HardPrejitEnabled=0 
+//              COMPlus_HardPrejitEnabled=0 
 //
 //         This allows us to instrument even ngen'd image calls to JIT helpers. 
 //         Remember to clear the key after ngen-ing and before actually running 
 //         the app you want to log.
 //
 //      2) Then set:
-//              COMPLUS_JitHelperLogging=1
-//              COMPLUS_LogEnable=1
-//              COMPLUS_LogLevel=1
-//              COMPLUS_LogToFile=1
+//              COMPlus_JitHelperLogging=1
+//              COMPlus_LogEnable=1
+//              COMPlus_LogLevel=1
+//              COMPlus_LogToFile=1
 //
 //      3) Run the app that you want to log; Results will be in COMPLUS.LOG(.X)
 //
diff --git a/src/vm/jitinterface.cpp b/src/vm/jitinterface.cpp
index 54c9043a8b..9c47f6d944 100644
--- a/src/vm/jitinterface.cpp
+++ b/src/vm/jitinterface.cpp
@@ -10455,7 +10455,7 @@ void CEEJitInfo::reserveUnwindInfo(BOOL isFunclet, BOOL isColdCode, ULONG unwind
     _ASSERTE_MSG(m_theUnwindBlock == NULL,
         "reserveUnwindInfo() can only be called before allocMem(), but allocMem() has already been called. "
         "This may indicate the JIT has hit a NO_WAY assert after calling allocMem(), and is re-JITting. "
-        "Set COMPLUS_JitBreakOnBadCode=1 and rerun to get the real error.");
+        "Set COMPlus_JitBreakOnBadCode=1 and rerun to get the real error.");
 
     ULONG currentSize  = unwindSize;
 
diff --git a/src/vm/profattach.h b/src/vm/profattach.h
index 282c85a7af..0a06fae73f 100644
--- a/src/vm/profattach.h
+++ b/src/vm/profattach.h
@@ -275,7 +275,7 @@ public:
     // available on demand (when finalizer thread detects the attach event has been
     // signaled).  The mode used by default is determined by the gc mode (server vs.
     // workstation).  But this can be overridden in either case by setting
-    // COMPLUS_AttachThreadAlwaysOn: 0=kOnDemand, nonzero=kAlwaysOn.
+    // COMPlus_AttachThreadAlwaysOn: 0=kOnDemand, nonzero=kAlwaysOn.
     enum AttachThreadingMode
     {
         // Too early in startup to know the mode yet
diff --git a/src/vm/profattachclient.cpp b/src/vm/profattachclient.cpp
index bab903607e..22e16fb207 100644
--- a/src/vm/profattachclient.cpp
+++ b/src/vm/profattachclient.cpp
@@ -226,7 +226,7 @@ HRESULT ProfilingAPIAttachClient::AttachProfiler(
         return CORPROF_E_PROFILEE_PROCESS_NOT_FOUND;
     }
 
-    // Adjust time out value according to env var COMPLUS_ProfAPI_AttachProfilerTimeoutInMs
+    // Adjust time out value according to env var COMPlus_ProfAPI_AttachProfilerTimeoutInMs
     // The default is 10 seconds as we want to avoid client (trigger process) time out too early 
     // due to wait operation for concurrent GC in the server (profilee side)
     DWORD dwMillisecondsMinFromEnv = CLRConfig::GetConfigValue(CLRConfig::EXTERNAL_ProfAPI_AttachProfilerMinTimeoutInMs);
diff --git a/src/vm/profilinghelper.cpp b/src/vm/profilinghelper.cpp
index 13d1c5d3fe..139ba89ec0 100644
--- a/src/vm/profilinghelper.cpp
+++ b/src/vm/profilinghelper.cpp
@@ -968,7 +968,7 @@ HRESULT ProfilingAPIUtility::LoadProfiler(
 
         if (profilerCompatibilityFlag == kPreventLoad)
         {
-            LOG((LF_CORPROF, LL_INFO10, "**PROF: COMPLUS_ProfAPI_ProfilerCompatibilitySetting is set to PreventLoad. "
+            LOG((LF_CORPROF, LL_INFO10, "**PROF: COMPlus_ProfAPI_ProfilerCompatibilitySetting is set to PreventLoad. "
                  "Profiler will not be loaded.\n"));
 
             LogProfInfo(IDS_PROF_PROFILER_DISABLED, 
@@ -1083,7 +1083,7 @@ HRESULT ProfilingAPIUtility::LoadProfiler(
     {
         if (profilerCompatibilityFlag == kDisableV2Profiler)
         {
-            LOG((LF_CORPROF, LL_INFO10, "**PROF: COMPLUS_ProfAPI_ProfilerCompatibilitySetting is set to DisableV2Profiler (the default). "
+            LOG((LF_CORPROF, LL_INFO10, "**PROF: COMPlus_ProfAPI_ProfilerCompatibilitySetting is set to DisableV2Profiler (the default). "
                  "V2 profilers are not allowed, so that the configured V2 profiler is going to be unloaded.\n"));
 
             LogProfInfo(IDS_PROF_V2PROFILER_DISABLED, wszClsid);
@@ -1100,7 +1100,7 @@ HRESULT ProfilingAPIUtility::LoadProfiler(
             return S_OK;
         }
 
-        LOG((LF_CORPROF, LL_INFO10, "**PROF: COMPLUS_ProfAPI_ProfilerCompatibilitySetting is set to EnableV2Profiler. "
+        LOG((LF_CORPROF, LL_INFO10, "**PROF: COMPlus_ProfAPI_ProfilerCompatibilitySetting is set to EnableV2Profiler. "
              "The configured V2 profiler is going to be initialized.\n"));
 
         LogProfInfo(IDS_PROF_V2PROFILER_ENABLED,
diff --git a/src/vm/profilinghelper.h b/src/vm/profilinghelper.h
index 04199bd927..2682d8a6d1 100644
--- a/src/vm/profilinghelper.h
+++ b/src/vm/profilinghelper.h
@@ -27,7 +27,7 @@
 #define COM_METHOD HRESULT STDMETHODCALLTYPE
 
 #ifdef _DEBUG
-// On DEBUG builds, setting the COMPLUS_ProfAPIFault to a bitmask of the flags
+// On DEBUG builds, setting the COMPlus_ProfAPIFault to a bitmask of the flags
 // below forces the Profiling API to return failures at various points.
 // Useful for event log testing.  Also see code:ProfilingAPIUtility.ShouldInjectProfAPIFault
 enum ProfAPIFaultFlags
diff --git a/src/vm/profilinghelper.inl b/src/vm/profilinghelper.inl
index 7c6f78631f..b195a3165e 100644
--- a/src/vm/profilinghelper.inl
+++ b/src/vm/profilinghelper.inl
@@ -134,7 +134,7 @@ inline void ProfilingAPIUtility::LogNoInterfaceError(REFIID iidRequested, LPCWST
 // ProfilingAPIUtility::ShouldInjectProfAPIFault
 //
 // Description: 
-//    Determines whether COMPLUS_ProfAPIFault is set to a bitmask value
+//    Determines whether COMPlus_ProfAPIFault is set to a bitmask value
 //    with the specified flag set
 //
 // Return Value:
diff --git a/src/vm/proftoeeinterfaceimpl.cpp b/src/vm/proftoeeinterfaceimpl.cpp
index f4810b3f95..228c53b605 100644
--- a/src/vm/proftoeeinterfaceimpl.cpp
+++ b/src/vm/proftoeeinterfaceimpl.cpp
@@ -79,22 +79,22 @@
 //  The above restrictions are lifted for certain tests that run with these environment
 //  variables set. (These are only available on DEBUG builds--including chk--not retail
 //  builds.)
-//    * COMPLUS_TestOnlyEnableSlowELTHooks:
+//    * COMPlus_TestOnlyEnableSlowELTHooks:
 //         * If nonzero, then on startup the runtime will act as if a profiler was loaded
 //             on startup and requested ELT slow-path (even if no profiler is loaded on
 //             startup). This will also allow the SetEnterLeaveFunctionHooks(2) info
 //             functions to be called outside of Initialize(). If a profiler later
 //             attaches and calls these functions, then the slow-path wrapper will call
 //             into the profiler's ELT hooks.
-//    * COMPLUS_TestOnlyEnableObjectAllocatedHook:
+//    * COMPlus_TestOnlyEnableObjectAllocatedHook:
 //         * If nonzero, then on startup the runtime will act as if a profiler was loaded
 //             on startup and requested ObjectAllocated callback (even if no profiler is loaded
 //             on startup). If a profiler later attaches and calls these functions, then the 
 //             ObjectAllocated notifications will call into the profiler's ObjectAllocated callback.
-//    * COMPLUS_TestOnlyEnableICorProfilerInfo:
+//    * COMPlus_TestOnlyEnableICorProfilerInfo:
 //         * If nonzero, then attaching profilers allows to call ICorProfilerInfo inteface, 
 //             which would otherwise be disallowed for attaching profilers
-//    * COMPLUS_TestOnlyAllowedEventMask
+//    * COMPlus_TestOnlyAllowedEventMask
 //         * If a profiler needs to work around the restrictions of either
 //             COR_PRF_ALLOWABLE_AFTER_ATTACH or COR_PRF_MONITOR_IMMUTABLE it may set
 //             this environment variable. Its value should be a bitmask containing all
diff --git a/src/vm/rejit.cpp b/src/vm/rejit.cpp
index d82d178eb1..587c096f5b 100644
--- a/src/vm/rejit.cpp
+++ b/src/vm/rejit.cpp
@@ -3082,7 +3082,7 @@ void ReJitManager::AssertRestOfEntriesAreReverted(
 //---------------------------------------------------------------------------------------
 //
 // Debug-only helper to dump ReJitManager contents to stdout. Only used if
-// COMPLUS_ProfAPI_EnableRejitDiagnostics is set.
+// COMPlus_ProfAPI_EnableRejitDiagnostics is set.
 //
 // Arguments:
 //      * szIntroText - Intro text passed by caller to be output before this ReJitManager
diff --git a/src/vm/stackprobe.cpp b/src/vm/stackprobe.cpp
index 749ff494d0..695f355d10 100644
--- a/src/vm/stackprobe.cpp
+++ b/src/vm/stackprobe.cpp
@@ -708,7 +708,7 @@ void BaseStackGuard::HandleOverwrittenThisStackGuard(__in_z char *stackID)
               "STACK GUARD VIOLATION\n"
               "The%s stack guard installed in %s at \"%s\" @ %d requested %d pages of stack.\n"
               "\nIf this is easily reproduced, please rerun the test under the debugger with the\n"
-              "DWORD environment variable COMPLUS_SOEnableStackProtectionInDebugger\n"
+              "DWORD environment variable COMPlus_SOEnableStackProtectionInDebugger\n"
               "set to 1.  This will cause an AV at the point of overrun.\n"
               "Attach the stack trace at that point to the bug in addition to this assert."
               MORE_INFO_STRING, stackID ? stackID : "",
diff --git a/src/vm/stacksampler.cpp b/src/vm/stacksampler.cpp
index efde608564..270d278b66 100644
--- a/src/vm/stacksampler.cpp
+++ b/src/vm/stacksampler.cpp
@@ -60,7 +60,7 @@
 //   JITting happened. But if we fail to acquire (ngen'ed method) or enter (unloaded domain) the original domain,
 //   we then try to JIT it under the thread's app domain in which the method was last seen to be executing.
 //
-// o The JIT to use is configurable with COMPLUS_AltJitName when COMPLUS_StackSampling is enabled.
+// o The JIT to use is configurable with COMPlus_AltJitName when COMPlus_StackSampling is enabled.
 //
 // o One use case is to collect traces as an .mc file from SuperPMI Shim JIT.
 //
diff --git a/src/vm/threads.cpp b/src/vm/threads.cpp
index 4a98e5e08b..5389300c39 100644
--- a/src/vm/threads.cpp
+++ b/src/vm/threads.cpp
@@ -1407,7 +1407,7 @@ DWORD_PTR Thread::OBJREF_HASH = OBJREF_TABSIZE;
 //             GetThreadGenericFullCheck() to actually be called when GetThread() is
 //             called, given the optimizations around GetThread():
 //             * code:InitThreadManager ensures that non-PAL, debug, x86/x64 builds that
-//                 run with COMPLUS_EnforceEEThreadNotRequiredContracts set are forced to
+//                 run with COMPlus_EnforceEEThreadNotRequiredContracts set are forced to
 //                 use GetThreadGeneric instead of the dynamically generated optimized
 //                 TLS getter.
 //             * The non-PAL, debug, x86/x64 GetThreadGeneric() (implemented in the
diff --git a/src/vm/threads.h b/src/vm/threads.h
index ecd921ca8c..9cf309d70a 100644
--- a/src/vm/threads.h
+++ b/src/vm/threads.h
@@ -4099,7 +4099,7 @@ private:
 
 private:
     // Set once on initialization, single-threaded, inside friend code:InitThreadManager,
-    // based on whether the user has set COMPLUS_EnforceEEThreadNotRequiredContracts.
+    // based on whether the user has set COMPlus_EnforceEEThreadNotRequiredContracts.
     // This is then later accessed via public
     // code:Thread::ShouldEnforceEEThreadNotRequiredContracts. See
     // code:GetThreadGenericFullCheck for details.
diff --git a/src/vm/threadsuspend.cpp b/src/vm/threadsuspend.cpp
index 373b8a9fc6..b571504709 100644
--- a/src/vm/threadsuspend.cpp
+++ b/src/vm/threadsuspend.cpp
@@ -7911,7 +7911,7 @@ BOOL Thread::HandledJITCase(BOOL ForTaskSwitchIn)
 #ifdef FEATURE_ENABLE_GCPOLL
             // On platforms that support both hijacking and GC polling
             // decide whether to hijack based on a configuration value.  
-            // COMPLUS_GCPollType = 1 is the setting that enables hijacking
+            // COMPlus_GCPollType = 1 is the setting that enables hijacking
             // in GCPOLL enabled builds.
             EEConfig::GCPollType pollType = g_pConfig->GetGCPollType();
             if (EEConfig::GCPOLL_TYPE_HIJACK == pollType || EEConfig::GCPOLL_TYPE_DEFAULT == pollType)
diff --git a/src/zap/svcworker.cpp b/src/zap/svcworker.cpp
index 9701e915c5..001345ce1c 100644
--- a/src/zap/svcworker.cpp
+++ b/src/zap/svcworker.cpp
@@ -633,7 +633,7 @@ public:
 #ifdef ALLOW_LOCAL_WORKER
             if (OptimizeCount != 0)
             {
-                GetSvcLogger()->Printf(W("You cannot call OptimizeAssembly twice.  If you are using COMPLUS_NgenLocalWorker, make sure you are only optimizing one assembly.\r\n"));
+                GetSvcLogger()->Printf(W("You cannot call OptimizeAssembly twice.  If you are using COMPlus_NgenLocalWorker, make sure you are only optimizing one assembly.\r\n"));
                 ThrowHR(E_FAIL);
             }
 #else // _DEBUG
diff --git a/src/zap/zapinfo.cpp b/src/zap/zapinfo.cpp
index 028d37b09d..c8a08a3cc6 100644
--- a/src/zap/zapinfo.cpp
+++ b/src/zap/zapinfo.cpp
@@ -149,8 +149,8 @@ int ZapInfo::ComputeJitFlags(CORINFO_METHOD_HANDLE handle)
     IfFailThrow(m_pEECompileInfo->GetBaseJitFlags(handle, &flags));
     jitFlags |= flags;
 
-    // COMPLUS_JitFramed specifies the default fpo setting for jitted and NGened code.
-    // You can override the behavior for NGened code using COMPLUS_NGenFramed.
+    // COMPlus_JitFramed specifies the default fpo setting for jitted and NGened code.
+    // You can override the behavior for NGened code using COMPlus_NGenFramed.
     static ConfigDWORD g_NGenFramed;
     DWORD dwNGenFramed = g_NGenFramed.val(CLRConfig::UNSUPPORTED_NGenFramed);
     if (dwNGenFramed == 0) 
diff --git a/src/zap/zapper.cpp b/src/zap/zapper.cpp
index d6d03d65b1..888a149b1f 100644
--- a/src/zap/zapper.cpp
+++ b/src/zap/zapper.cpp
@@ -884,7 +884,7 @@ void Zapper::InitEE(BOOL fForceDebug, BOOL fForceProfile, BOOL fForceInstrument)
 
 #ifdef ALLOW_SXS_JIT_NGEN
 
-    // Do not load altjit unless COMPLUS_AltJitNgen is set.
+    // Do not load altjit unless COMPlus_AltJitNgen is set.
     LPWSTR altJit;
     HRESULT hr = CLRConfig::GetConfigValue(CLRConfig::INTERNAL_AltJitNgen, &altJit);
     if (FAILED(hr))