Update code to use COMPlus_ instead of COMPLUS_ when referencing knobs

22 files changed, 34 insertions, 34 deletions

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)