diff --git a/MobileGL/MG_Util/SelfTest/DriverBugProbes.cpp b/MobileGL/MG_Util/SelfTest/DriverBugProbes.cpp
index ca8baf27..d0279ce3 100644
--- a/MobileGL/MG_Util/SelfTest/DriverBugProbes.cpp
+++ b/MobileGL/MG_Util/SelfTest/DriverBugProbes.cpp
@@ -11,7 +11,7 @@
 
 #include <Config.h>
 #include <MG_Util/Debug/Log.h>
-#if MOBILEGL_BUILD_DISAGGREGATED
+#if MOBILEGL_BUILD_RECORD_ARM
 #include <MG_Backend/DirectVulkan/Renderer/WireDepthResolveProbe.h>
 #endif
 
@@ -2479,7 +2479,7 @@ namespace MobileGL::MG_Util::SelfTest {
         return findings;
     }
 
-#if MOBILEGL_BUILD_DISAGGREGATED
+#if MOBILEGL_BUILD_RECORD_ARM
     Optional<DriverBugFinding> DescribeDepthStencilResolvePassBug(
         const MG_Backend::DirectVulkan::WireDepthResolveProbeMeasurement& measurement, Bool shaderStencilExport) {
         using namespace MG_Backend::DirectVulkan;
diff --git a/MobileGL/MG_Util/SelfTest/DriverBugProbes.h b/MobileGL/MG_Util/SelfTest/DriverBugProbes.h
index c90ffd02..e96152fc 100644
--- a/MobileGL/MG_Util/SelfTest/DriverBugProbes.h
+++ b/MobileGL/MG_Util/SelfTest/DriverBugProbes.h
@@ -9,7 +9,7 @@
 #pragma once
 #include <Includes.h>
 #include <MG_Util/BackendLoaders/OpenGL/Loader.h>
-#if MOBILEGL_BUILD_DISAGGREGATED
+#if MOBILEGL_BUILD_RECORD_ARM
 #include <MG_Backend/DirectVulkan/Renderer/WireDepthResolveArm.h>
 #endif
 
@@ -347,7 +347,7 @@ namespace MobileGL::MG_Util::SelfTest {
     // so an unaffected device renders an empty section rather than a wall of "not affected".
     Vector<DriverBugFinding> CollectGlesKnownDriverBugs(const MG_External::GLESFunctionsTable& gl);
 
-#if MOBILEGL_BUILD_DISAGGREGATED
+#if MOBILEGL_BUILD_RECORD_ARM
     // ===================== KNOWN VULKAN DRIVER BUGS =====================
     //
     // The DirectVulkan (Magma) backend's table, under the rules above: a control per probe, an
diff --git a/MobileGL/MG_Util/SelfTest/DriverPost.cpp b/MobileGL/MG_Util/SelfTest/DriverPost.cpp
index 4b071b3a..24300009 100644
--- a/MobileGL/MG_Util/SelfTest/DriverPost.cpp
+++ b/MobileGL/MG_Util/SelfTest/DriverPost.cpp
@@ -3028,7 +3028,7 @@ namespace MobileGL::MG_Util::SelfTest {
                                             graphicsQueueFamilyIndex, deviceExtensions, features,
                                             vkGetPhysicalDeviceFeatures2Fn, vkGetPhysicalDeviceProperties2Fn);
 
-#if MOBILEGL_BUILD_DISAGGREGATED
+#if MOBILEGL_BUILD_RECORD_ARM
         // The "Known Driver Bugs" section's Vulkan table (DriverBugProbes.h): each probe makes its
         // own throwaway device on the physical device picked above.
         {