diff --git a/src/util/hsa_rsrc_factory.h b/src/util/hsa_rsrc_factory.h
index 9997a81c24..b3f3cf0dbe 100644
--- a/src/util/hsa_rsrc_factory.h
+++ b/src/util/hsa_rsrc_factory.h
@@ -135,7 +135,7 @@ class HsaTimer {
     sysclock_factor_ = (freq_t)1000000000 / (freq_t)sysclock_hz;
   }
 
-  // Methids for system-clock/ns conversion
+  // Methods for system-clock/ns conversion
   timestamp_t sysclock_to_ns(const timestamp_t& sysclock) const {
     return timestamp_t((freq_t)sysclock * sysclock_factor_);
   }
diff --git a/test/tool/gfx_metrics.xml b/test/tool/gfx_metrics.xml
index 9e4f24fc84..fecfe7b9ad 100644
--- a/test/tool/gfx_metrics.xml
+++ b/test/tool/gfx_metrics.xml
@@ -29,7 +29,7 @@
   <metric name="TCC_MC_WRREQ" block=TCC event=26 descr="Number of 32-byte transactions going over the TC_MC_wrreq interface. Atomics may travel over the same interface and are generally classified as write requests."></metric>
   <metric name="TCC_MC_WRREQ_STALL" block=TCC event=28 descr="Number of cycles a write request was stalled."></metric>
 
-  <metric name="TCP_TA_DATA_STALL_CYCLES" block=TCP event=3 descr="TCP stalls TA data interface. Now Windowed."></metric>
+  <metric name="TCP_TCP_TA_DATA_STALL_CYCLES" block=TCP event=3 descr="TCP stalls TA data interface. Now Windowed."></metric>
 </gfx8>
 
 <gfx9>
@@ -65,5 +65,5 @@
   <metric name="TCC_EA_RDREQ" block=TCC event=41 descr="Number of TCC/EA read requests (either 32-byte or 64-byte)"></metric>
   <metric name="TCC_EA_RDREQ_32B" block=TCC event=42 descr="Number of 32-byte TCC/EA read requests"></metric>
 
-  <metric name="TCP_TA_DATA_STALL_CYCLES" block=TCP event=6 descr="TCP stalls TA data interface. Now Windowed."></metric>
+  <metric name="TCP_TCP_TA_DATA_STALL_CYCLES" block=TCP event=6 descr="TCP stalls TA data interface. Now Windowed."></metric>
 </gfx9>
diff --git a/test/tool/metrics.xml b/test/tool/metrics.xml
index 4011c131f1..0b53b72ee4 100644
--- a/test/tool/metrics.xml
+++ b/test/tool/metrics.xml
@@ -167,7 +167,7 @@
   <metric
     name="MemUnitStalled"
     descr="The percentage of GPUTime the memory unit is stalled. Try reducing the number or size of fetches and writes if possible. Value range: 0% (optimal) to 100% (bad)."
-    expr=100*max(TCP_TA_DATA_STALL_CYCLES,16)/GRBM_GUI_ACTIVE/SE_NUM
+    expr=100*max(TCP_TCP_TA_DATA_STALL_CYCLES,16)/GRBM_GUI_ACTIVE/SE_NUM
   ></metric>
 
   # WriteUnitStalled The percentage of GPUTime the Write unit is stalled. Value range: 0% to 100% (bad).
@@ -177,7 +177,7 @@
     expr=100*TCC_WRREQ_STALL_max/GRBM_GUI_ACTIVE
   ></metric>
 
-  # The percentage of GPUTime ALU units are stalled by the LDS input queue being full or the output queue being not ready. If there are LDS bank conflicts, reduce them. Otherwise, try reducing the number of LDS accesses if possible. Value range: 0% (optimal) to 100% (bad).
+  # ALUStalledByLDS The percentage of GPUTime ALU units are stalled by the LDS input queue being full or the output queue being not ready. If there are LDS bank conflicts, reduce them. Otherwise, try reducing the number of LDS accesses if possible. Value range: 0% (optimal) to 100% (bad).
   <metric
     name="ALUStalledByLDS"
     descr="The percentage of GPUTime ALU units are stalled by the LDS input queue being full or the output queue being not ready. If there are LDS bank conflicts, reduce them. Otherwise, try reducing the number of LDS accesses if possible. Value range: 0% (optimal) to 100% (bad)."