diff --git a/rocclr/hip_device.cpp b/rocclr/hip_device.cpp
index e4a83f2b5b..1ecc88bfc8 100644
--- a/rocclr/hip_device.cpp
+++ b/rocclr/hip_device.cpp
@@ -82,9 +82,9 @@ hipError_t hipDeviceComputeCapability(int *major, int *minor, hipDevice_t device
   }
 
   auto* deviceHandle = g_devices[device]->devices()[0];
-  const auto& info = deviceHandle->info();
-  *major = info.gfxipMajor_;
-  *minor = info.gfxipMinor_;
+  const auto& isa = deviceHandle->isa();
+  *major = isa.versionMajor();
+  *minor = isa.versionMinor();
 
   HIP_RETURN(hipSuccess);
 }
diff --git a/rocclr/hip_platform.cpp b/rocclr/hip_platform.cpp
index 868804bc31..0dcfacdfe9 100755
--- a/rocclr/hip_platform.cpp
+++ b/rocclr/hip_platform.cpp
@@ -329,10 +329,10 @@ hipError_t ihipOccupancyMaxActiveBlocksPerMultiprocessor(
   size_t GprWaves = VgprWaves;
   if (wrkGrpInfo->usedSGPRs_ > 0) {
     size_t maxSGPRs;
-    if (device.info().gfxipMajor_ < 8) {
+    if (device.isa().versionMajor() < 8) {
       maxSGPRs = 512;
     }
-    else if (device.info().gfxipMajor_ < 10) {
+    else if (device.isa().versionMajor() < 10) {
       maxSGPRs = 800;
     }
     else {