diff --git a/projects/rocprofiler/src/core/counters/metrics/metrics.h b/projects/rocprofiler/src/core/counters/metrics/metrics.h
index 7a06f7efdb..f51171454f 100644
--- a/projects/rocprofiler/src/core/counters/metrics/metrics.h
+++ b/projects/rocprofiler/src/core/counters/metrics/metrics.h
@@ -126,7 +126,7 @@ class MetricsDict {
   static MetricsDict* Create(const rocprofiler::HSAAgentInfo* agent_info) {
     std::lock_guard<mutex_t> lck(mutex_);
     if (map_ == NULL) map_ = new map_t;
-    std::string name = agent_info->GetDeviceInfo().getGfxip();
+    std::string name = std::string(agent_info->GetDeviceInfo().getName());
     auto ret = map_->insert({name, NULL});
     if (ret.second) ret.first->second = new MetricsDict(agent_info);
     return ret.first->second;
diff --git a/projects/rocprofiler/src/core/metrics.h b/projects/rocprofiler/src/core/metrics.h
index 8c36533731..26bdeef807 100644
--- a/projects/rocprofiler/src/core/metrics.h
+++ b/projects/rocprofiler/src/core/metrics.h
@@ -120,7 +120,7 @@ class MetricsDict {
   static MetricsDict* Create(const util::AgentInfo* agent_info) {
     std::lock_guard<mutex_t> lck(mutex_);
     if (map_ == NULL) map_ = new map_t;
-    auto ret = map_->insert({agent_info->gfxip, NULL});
+    auto ret = map_->insert({agent_info->name, NULL});
     if (ret.second) ret.first->second = new MetricsDict(agent_info);
     return ret.first->second;
   }