diff --git a/renderdoc/android/android.cpp b/renderdoc/android/android.cpp
index 724acdfac..d73497165 100644
--- a/renderdoc/android/android.cpp
+++ b/renderdoc/android/android.cpp
@@ -39,8 +39,8 @@ RDOC_CONFIG(uint32_t, Android_MaxConnectTimeout, 30,
             "Maximum time in seconds to try connecting to the target app before giving up. "
             "Useful primarily for apps that take a very long time to start up.");
 
-RDOC_DEBUG_CONFIG(bool, Android_Debug_ProcessLaunch, false,
-                  "Output verbose debug logging messages when launching android apps.");
+RDOC_CONFIG(bool, Android_Debug_ProcessLaunch, false,
+            "Output verbose debug logging messages when launching android apps.");
 
 namespace Android
 {
diff --git a/renderdoc/core/remote_server.cpp b/renderdoc/core/remote_server.cpp
index 96b6f026c..64808dddc 100644
--- a/renderdoc/core/remote_server.cpp
+++ b/renderdoc/core/remote_server.cpp
@@ -41,9 +41,9 @@
 RDOC_CONFIG(uint32_t, RemoteServer_TimeoutMS, 5000,
             "Timeout in milliseconds for remote server operations.");
 
-RDOC_DEBUG_CONFIG(bool, RemoteServer_DebugLogging, false,
-                  "Output a verbose logging file in the system's temporary folder containing the "
-                  "traffic to and from the remote server.");
+RDOC_CONFIG(bool, RemoteServer_DebugLogging, false,
+            "Output a verbose logging file in the system's temporary folder containing the "
+            "traffic to and from the remote server.");
 
 static const uint32_t RemoteServerProtocolVersion =
     uint32_t(RENDERDOC_VERSION_MAJOR * 1000) + RENDERDOC_VERSION_MINOR;
diff --git a/renderdoc/driver/d3d12/d3d12_initstate.cpp b/renderdoc/driver/d3d12/d3d12_initstate.cpp
index a88ed2094..633190e24 100644
--- a/renderdoc/driver/d3d12/d3d12_initstate.cpp
+++ b/renderdoc/driver/d3d12/d3d12_initstate.cpp
@@ -31,10 +31,9 @@
 #include "d3d12_manager.h"
 #include "d3d12_resources.h"
 
-RDOC_DEBUG_CONFIG(
-    bool, D3D12_Debug_HideInitialDescriptors, false,
-    "Hide the initial contents of descriptor heaps. "
-    "For extremely large descriptor heaps this can drastically reduce memory consumption.");
+RDOC_CONFIG(bool, D3D12_Debug_HideInitialDescriptors, false,
+            "Hide the initial contents of descriptor heaps. "
+            "For extremely large descriptor heaps this can drastically reduce memory consumption.");
 
 bool D3D12ResourceManager::Prepare_InitialState(ID3D12DeviceChild *res)
 {
diff --git a/renderdoc/driver/vulkan/vk_bindless_feedback.cpp b/renderdoc/driver/vulkan/vk_bindless_feedback.cpp
index 741e0ef44..72e296794 100644
--- a/renderdoc/driver/vulkan/vk_bindless_feedback.cpp
+++ b/renderdoc/driver/vulkan/vk_bindless_feedback.cpp
@@ -31,8 +31,8 @@
 #include "vk_replay.h"
 #include "vk_shader_cache.h"
 
-RDOC_DEBUG_CONFIG(rdcstr, Vulkan_Debug_FeedbackDumpDirPath, "",
-                  "Path to dump bindless feedback annotation generated SPIR-V files.");
+RDOC_CONFIG(rdcstr, Vulkan_Debug_FeedbackDumpDirPath, "",
+            "Path to dump bindless feedback annotation generated SPIR-V files.");
 RDOC_CONFIG(
     bool, Vulkan_BindlessFeedback, true,
     "Enable fetching from GPU which descriptors were dynamically used in descriptor arrays.");
diff --git a/renderdoc/driver/vulkan/vk_initstate.cpp b/renderdoc/driver/vulkan/vk_initstate.cpp
index cefe13156..09d80578e 100644
--- a/renderdoc/driver/vulkan/vk_initstate.cpp
+++ b/renderdoc/driver/vulkan/vk_initstate.cpp
@@ -36,10 +36,9 @@
 // command buffer that stalls the GPU).
 // See INITSTATEBATCH
 
-RDOC_DEBUG_CONFIG(
-    bool, Vulkan_Debug_HideInitialDescriptors, false,
-    "Hide the initial contents of descriptor sets. "
-    "For extremely large descriptor sets this can drastically reduce memory consumption.");
+RDOC_CONFIG(bool, Vulkan_Debug_HideInitialDescriptors, false,
+            "Hide the initial contents of descriptor sets. "
+            "For extremely large descriptor sets this can drastically reduce memory consumption.");
 
 bool WrappedVulkan::Prepare_InitialState(WrappedVkRes *res)
 {
diff --git a/renderdoc/driver/vulkan/vk_memory.cpp b/renderdoc/driver/vulkan/vk_memory.cpp
index 2809d5abe..4c9819f47 100644
--- a/renderdoc/driver/vulkan/vk_memory.cpp
+++ b/renderdoc/driver/vulkan/vk_memory.cpp
@@ -25,8 +25,8 @@
 #include "core/settings.h"
 #include "vk_core.h"
 
-RDOC_DEBUG_CONFIG(bool, Vulkan_Debug_MemoryAllocationLogging, false,
-                  "Output verbose debug logging messages when allocating internal memory.");
+RDOC_CONFIG(bool, Vulkan_Debug_MemoryAllocationLogging, false,
+            "Output verbose debug logging messages when allocating internal memory.");
 
 void WrappedVulkan::ChooseMemoryIndices()
 {
diff --git a/renderdoc/driver/vulkan/vk_postvs.cpp b/renderdoc/driver/vulkan/vk_postvs.cpp
index f24840390..ac71716e2 100644
--- a/renderdoc/driver/vulkan/vk_postvs.cpp
+++ b/renderdoc/driver/vulkan/vk_postvs.cpp
@@ -33,8 +33,8 @@
 #include "vk_replay.h"
 #include "vk_shader_cache.h"
 
-RDOC_DEBUG_CONFIG(rdcstr, Vulkan_Debug_PostVSDumpDirPath, "",
-                  "Path to dump gnerated SPIR-V compute shaders for fetching post-vs.");
+RDOC_CONFIG(rdcstr, Vulkan_Debug_PostVSDumpDirPath, "",
+            "Path to dump gnerated SPIR-V compute shaders for fetching post-vs.");
 
 #undef None
 
diff --git a/renderdoc/driver/vulkan/vk_shaderdebug.cpp b/renderdoc/driver/vulkan/vk_shaderdebug.cpp
index 2e71aefc3..0ed450759 100644
--- a/renderdoc/driver/vulkan/vk_shaderdebug.cpp
+++ b/renderdoc/driver/vulkan/vk_shaderdebug.cpp
@@ -34,12 +34,12 @@
 
 #undef None
 
-RDOC_DEBUG_CONFIG(rdcstr, Vulkan_Debug_PSDebugDumpDirPath, "",
-                  "Path to dump pixel shader debugging generated SPIR-V files.");
-RDOC_DEBUG_CONFIG(bool, Vulkan_Debug_DisableBufferDeviceAddress, false,
-                  "Disable use of buffer device address for PS Input fetch.");
-RDOC_DEBUG_CONFIG(bool, Vulkan_Debug_ShaderDebugLogging, false,
-                  "Output verbose debug logging messages when debugging shaders.");
+RDOC_CONFIG(rdcstr, Vulkan_Debug_PSDebugDumpDirPath, "",
+            "Path to dump pixel shader debugging generated SPIR-V files.");
+RDOC_CONFIG(bool, Vulkan_Debug_DisableBufferDeviceAddress, false,
+            "Disable use of buffer device address for PS Input fetch.");
+RDOC_CONFIG(bool, Vulkan_Debug_ShaderDebugLogging, false,
+            "Output verbose debug logging messages when debugging shaders.");
 
 struct DescSetBindingSnapshot
 {
diff --git a/renderdoc/os/posix/linux/linux_process.cpp b/renderdoc/os/posix/linux/linux_process.cpp
index 7db273f5d..e36f54b16 100644
--- a/renderdoc/os/posix/linux/linux_process.cpp
+++ b/renderdoc/os/posix/linux/linux_process.cpp
@@ -40,8 +40,8 @@
 RDOC_CONFIG(bool, Linux_PtraceChildProcesses, true,
             "Use ptrace(2) to trace child processes at startup to ensure connection is made as "
             "early as possible.");
-RDOC_DEBUG_CONFIG(bool, Linux_Debug_PtraceLogging, false,
-                  "Enable verbose debug logging of ptrace usage.");
+RDOC_CONFIG(bool, Linux_Debug_PtraceLogging, false,
+            "Enable verbose debug logging of ptrace usage.");
 
 extern char **environ;