diff --git a/example/job_stats_example.cc b/example/job_stats_example.cc
index e4de12df6d..78d01791f5 100644
--- a/example/job_stats_example.cc
+++ b/example/job_stats_example.cc
@@ -150,11 +150,11 @@ int main(int, char **) {
                 << "Max: " << job_info.summary.power_usage.max_value
                 << " Min: "<< job_info.summary.power_usage.min_value
                 << " Avg: "<< job_info.summary.power_usage.average << "\n";
-        std::cout << "| SM Clock (MHz)                   | "
+        std::cout << "| GPU Clock (MHz)                  | "
                 << "Max: " <<job_info.summary.gpu_clock.max_value
                 <<" Min: " << job_info.summary.gpu_clock.min_value
                 <<" Avg: "<< job_info.summary.gpu_clock.average << "\n";
-        std::cout << "| SM Utilization (%)               | "
+        std::cout << "| GPU Utilization (%)              | "
                 << "Max: " <<job_info.summary.gpu_utilization.max_value
                 <<" Min: "<< job_info.summary.gpu_utilization.min_value
                 <<" Avg: "<< job_info.summary.gpu_utilization.average << "\n";
diff --git a/include/rdc/rdc.h b/include/rdc/rdc.h
index add3ca7e39..5f128092e5 100755
--- a/include/rdc/rdc.h
+++ b/include/rdc/rdc.h
@@ -144,9 +144,9 @@ typedef enum {
 #define RDC_FI_POWER_USAGE                  155
 
 /**
- * SM clock for the GPU
+ * The current clock for the GPU
  */
-#define RDC_FI_GPU_SM_CLOCK                 100
+#define RDC_FI_GPU_CLOCK                 100
 
 /**
  * Clock for the memory
diff --git a/rdc_libs/bootstrap/src/RdcBootStrap.cc b/rdc_libs/bootstrap/src/RdcBootStrap.cc
index 392b3782de..d09bf8abf5 100644
--- a/rdc_libs/bootstrap/src/RdcBootStrap.cc
+++ b/rdc_libs/bootstrap/src/RdcBootStrap.cc
@@ -354,7 +354,7 @@ const char* field_id_string(uint32_t field_id) {
         {RDC_FI_GPU_MEMORY_USAGE, "GPU_MEMORY_USAGE"},
         {RDC_FI_GPU_MEMORY_TOTAL, "GPU_MEMORY_TOTAL"},
         {RDC_FI_POWER_USAGE, "POWER_USAGE"},
-        {RDC_FI_GPU_SM_CLOCK, "GPU_SM_CLOCK"},
+        {RDC_FI_GPU_CLOCK, "GPU_CLOCK"},
         {RDC_FI_GPU_UTIL, "GPU_UTIL"},
         {RDC_FI_GPU_TEMP, "GPU_TEMP"},
         {RDC_FI_GPU_COUNT, "GPU_COUNT"},
diff --git a/rdc_libs/rdc/src/RdcCacheManagerImpl.cc b/rdc_libs/rdc/src/RdcCacheManagerImpl.cc
index e86e0f435d..22cc2257fc 100644
--- a/rdc_libs/rdc/src/RdcCacheManagerImpl.cc
+++ b/rdc_libs/rdc/src/RdcCacheManagerImpl.cc
@@ -342,7 +342,7 @@ rdc_status_t RdcCacheManagerImpl::rdc_job_get_stats(char jobId[64],
                 summary_info.max_gpu_memory_used = std::max(
                     summary_info.max_gpu_memory_used,
                     gpu_info.max_gpu_memory_used);
-            } else if (ite->first == RDC_FI_GPU_SM_CLOCK) {
+            } else if (ite->first == RDC_FI_GPU_CLOCK) {
                 set_summary(ite->second, gpu_info.gpu_clock,
                     summary_info.gpu_clock, 1000000);
             } else if (ite->first == RDC_FI_GPU_UTIL) {
diff --git a/rdc_libs/rdc/src/RdcGroupSettingsImpl.cc b/rdc_libs/rdc/src/RdcGroupSettingsImpl.cc
index 9ba40b7130..0450ecab5e 100644
--- a/rdc_libs/rdc/src/RdcGroupSettingsImpl.cc
+++ b/rdc_libs/rdc/src/RdcGroupSettingsImpl.cc
@@ -30,7 +30,7 @@ namespace rdc {
 RdcGroupSettingsImpl::RdcGroupSettingsImpl() {
     // Add the default job stats fields
     uint32_t job_fields[] = {RDC_FI_GPU_MEMORY_USAGE,
-        RDC_FI_POWER_USAGE, RDC_FI_GPU_SM_CLOCK, RDC_FI_GPU_UTIL,
+        RDC_FI_POWER_USAGE, RDC_FI_GPU_CLOCK, RDC_FI_GPU_UTIL,
         RDC_FI_PCIE_TX, RDC_FI_PCIE_RX, RDC_FI_MEM_CLOCK,
         RDC_FI_GPU_TEMP};
     char job_field_group[] = "JobStatsFields";
diff --git a/rdc_libs/rdc/src/RdcMetricFetcherImpl.cc b/rdc_libs/rdc/src/RdcMetricFetcherImpl.cc
index 34200ced8a..ddd9476e20 100644
--- a/rdc_libs/rdc/src/RdcMetricFetcherImpl.cc
+++ b/rdc_libs/rdc/src/RdcMetricFetcherImpl.cc
@@ -35,7 +35,7 @@ namespace rdc {
 bool RdcMetricFetcherImpl::is_field_valid(uint32_t field_id) const {
      const std::vector<uint32_t> all_fields = {RDC_FI_GPU_MEMORY_USAGE,
      RDC_FI_GPU_MEMORY_TOTAL, RDC_FI_GPU_COUNT, RDC_FI_POWER_USAGE,
-     RDC_FI_GPU_SM_CLOCK, RDC_FI_GPU_UTIL, RDC_FI_DEV_NAME, RDC_FI_GPU_TEMP,
+     RDC_FI_GPU_CLOCK, RDC_FI_GPU_UTIL, RDC_FI_DEV_NAME, RDC_FI_GPU_TEMP,
      RDC_FI_MEM_CLOCK, RDC_FI_PCIE_TX, RDC_FI_PCIE_RX,
      RDC_FI_ECC_CORRECT_TOTAL, RDC_FI_ECC_UNCORRECT_TOTAL, RDC_FI_MEMORY_TEMP};
 
@@ -265,7 +265,7 @@ rdc_status_t RdcMetricFetcherImpl::fetch_smi_field(uint32_t gpu_index,
                  value->value.l_int = static_cast<int64_t>(i64);
              }
              break;
-        case RDC_FI_GPU_SM_CLOCK:
+        case RDC_FI_GPU_CLOCK:
         case RDC_FI_MEM_CLOCK:
              rsmi_frequencies_t f;
              clk_type = RSMI_CLK_TYPE_SYS;
diff --git a/rdci/src/RdciDmonSubSystem.cc b/rdci/src/RdciDmonSubSystem.cc
index 371eb23d0d..5d30fe5246 100644
--- a/rdci/src/RdciDmonSubSystem.cc
+++ b/rdci/src/RdciDmonSubSystem.cc
@@ -277,7 +277,7 @@ void RdciDmonSubSystem::create_temp_field_group() {
 
 void RdciDmonSubSystem::show_field_usage() const {
     std::cout << "Supported fields Ids:\n";
-    std::cout << "100 RDC_FI_GPU_SM_CLOCK: Current GPU clock frequencies.\n";
+    std::cout << "100 RDC_FI_GPU_CLOCK: Current GPU clock frequencies.\n";
     std::cout << "101 RDC_FI_MEM_CLOCK: Current Memory clock frequencies.\n";
     std::cout << "140 RDC_FI_MEMORY_TEMP: Memory "
               << "temperature in millidegrees Celsius.\n";
diff --git a/rdci/src/RdciStatsSubSystem.cc b/rdci/src/RdciStatsSubSystem.cc
index d8f905c7e7..5410160ad8 100644
--- a/rdci/src/RdciStatsSubSystem.cc
+++ b/rdci/src/RdciStatsSubSystem.cc
@@ -164,7 +164,7 @@ void RdciStatsSubSystem::show_job_stats(
         << gpu_info.power_usage.max_value<< " Min: "<<
         gpu_info.power_usage.min_value << " Avg: "
         << gpu_info.power_usage.average << "\n";
-    std::cout << "| SM Clock (MHz)                   | "  << "Max: "
+    std::cout << "| GPU Clock (MHz)                  | "  << "Max: "
         << gpu_info.gpu_clock.max_value << " Min: " <<
         gpu_info.gpu_clock.min_value << " Avg: "
         << gpu_info.gpu_clock.average << "\n";
@@ -172,7 +172,7 @@ void RdciStatsSubSystem::show_job_stats(
         << gpu_info.memory_clock.max_value << " Min: " <<
         gpu_info.memory_clock.min_value << " Avg: "
         << gpu_info.memory_clock.average << "\n";
-    std::cout << "| SM Utilization (%)               | "  << "Max: "
+    std::cout << "| GPU Utilization (%)              | "  << "Max: "
         << gpu_info.gpu_utilization.max_value <<" Min: " <<
         gpu_info.gpu_utilization.min_value << " Avg: " <<
         gpu_info.gpu_utilization.average << "\n";