diff --git a/projects/clr/rocclr/device/device.hpp b/projects/clr/rocclr/device/device.hpp
index 4380665731..f36ef43ec5 100644
--- a/projects/clr/rocclr/device/device.hpp
+++ b/projects/clr/rocclr/device/device.hpp
@@ -248,7 +248,7 @@ struct Info : public amd::EmbeddedObject {
   uint32_t maxComputeUnits_;
 
   //! The max number of parallel compute cores on the compute device.
-  uint32_t maxBoostComputeUnits_;
+  uint32_t maxPhysicalComputeUnits_;
 
   //! Maximum dimensions that specify the global and local work-item IDs
   //  used by the data-parallel execution model.
diff --git a/projects/clr/rocclr/device/pal/paldevice.cpp b/projects/clr/rocclr/device/pal/paldevice.cpp
index 4052047a1f..53f4367d52 100644
--- a/projects/clr/rocclr/device/pal/paldevice.cpp
+++ b/projects/clr/rocclr/device/pal/paldevice.cpp
@@ -320,7 +320,7 @@ void NullDevice::fillDeviceInfo(const Pal::DeviceProperties& palProp,
   info_.maxComputeUnits_ = settings().enableWgpMode_
       ? palProp.gfxipProperties.shaderCore.numAvailableCus / 2
       : palProp.gfxipProperties.shaderCore.numAvailableCus;
-  info_.maxBoostComputeUnits_ = info_.maxComputeUnits_;
+  info_.maxPhysicalComputeUnits_ = info_.maxComputeUnits_;
   info_.numberOfShaderEngines = palProp.gfxipProperties.shaderCore.numShaderEngines;
 
   // SI parts are scalar.  Also, reads don't need to be 128-bits to get peak rates.
diff --git a/projects/clr/rocclr/device/rocm/rocdevice.cpp b/projects/clr/rocclr/device/rocm/rocdevice.cpp
index 3b5b8b2982..da1c127b97 100644
--- a/projects/clr/rocclr/device/rocm/rocdevice.cpp
+++ b/projects/clr/rocclr/device/rocm/rocdevice.cpp
@@ -1101,14 +1101,14 @@ bool Device::populateOCLDeviceConstants() {
 
   if (HSA_STATUS_SUCCESS !=
       hsa_agent_get_info(_bkendDevice, (hsa_agent_info_t)HSA_AMD_AGENT_INFO_COMPUTE_UNIT_COUNT,
-                         &info_.maxBoostComputeUnits_)) {
+                         &info_.maxPhysicalComputeUnits_)) {
     return false;
   }
-  assert(info_.maxBoostComputeUnits_ > 0);
+  assert(info_.maxPhysicalComputeUnits_ > 0);
 
-  info_.maxBoostComputeUnits_ = settings().enableWgpMode_
-      ? info_.maxBoostComputeUnits_ / 2
-      : info_.maxBoostComputeUnits_;
+  info_.maxPhysicalComputeUnits_ = settings().enableWgpMode_
+      ? info_.maxPhysicalComputeUnits_ / 2
+      : info_.maxPhysicalComputeUnits_;
 
   if (HSA_STATUS_SUCCESS != hsa_agent_get_info(_bkendDevice,
                                                (hsa_agent_info_t)HSA_AMD_AGENT_INFO_CACHELINE_SIZE,