diff --git a/include/amd_smi/impl/amd_smi_device.h b/include/amd_smi/impl/amd_smi_device.h
index 10c2074a68..3db7b0f53c 100644
--- a/include/amd_smi/impl/amd_smi_device.h
+++ b/include/amd_smi/impl/amd_smi_device.h
@@ -51,7 +51,7 @@ namespace smi {
 
 class AMDSmiProcessor {
  public:
-    explicit AMDSmiProcessor(processor_type_t device) : processor_type_(device) {}
+    explicit AMDSmiProcessor(processor_type_t processor) : processor_type_(processor) {}
     virtual ~AMDSmiProcessor() {}
     processor_type_t get_processor_type() const { return processor_type_;}
  private:
diff --git a/include/amd_smi/impl/amd_smi_socket.h b/include/amd_smi/impl/amd_smi_socket.h
index a6d91e156e..9fb95be375 100644
--- a/include/amd_smi/impl/amd_smi_socket.h
+++ b/include/amd_smi/impl/amd_smi_socket.h
@@ -58,12 +58,12 @@ class AMDSmiSocket {
     explicit AMDSmiSocket(const std::string& id) : socket_identifier_(id) {}
     ~AMDSmiSocket();
     const std::string& get_socket_id() const { return socket_identifier_;}
-    void add_device(AMDSmiProcessor* device) { devices_.push_back(device); }
-    std::vector<AMDSmiProcessor*>& get_devices() { return devices_;}
-    amdsmi_status_t get_device_count(uint32_t* device_count) const;
+    void add_processor(AMDSmiProcessor* processor) { processors_.push_back(processor); }
+    std::vector<AMDSmiProcessor*>& get_processors() { return processors_;}
+    amdsmi_status_t get_processor_count(uint32_t* processor_count) const;
  private:
     std::string socket_identifier_;
-    std::vector<AMDSmiProcessor*> devices_;
+    std::vector<AMDSmiProcessor*> processors_;
 };
 
 }  // namespace smi
diff --git a/src/amd_smi/amd_smi.cc b/src/amd_smi/amd_smi.cc
index 0bf288a665..0546ce65e9 100644
--- a/src/amd_smi/amd_smi.cc
+++ b/src/amd_smi/amd_smi.cc
@@ -230,7 +230,7 @@ amdsmi_status_t amdsmi_get_processor_handles(amdsmi_socket_handle socket_handle,
     if (r != AMDSMI_STATUS_SUCCESS) return r;
 
 
-    std::vector<amd::smi::AMDSmiProcessor*>& devices = socket->get_devices();
+    std::vector<amd::smi::AMDSmiProcessor*>& devices = socket->get_processors();
     uint32_t device_size = static_cast<uint32_t>(devices.size());
     // Get the device count only
     if (processor_handles == nullptr) {
diff --git a/src/amd_smi/amd_smi_socket.cc b/src/amd_smi/amd_smi_socket.cc
index 0c824e513b..a563d72b93 100644
--- a/src/amd_smi/amd_smi_socket.cc
+++ b/src/amd_smi/amd_smi_socket.cc
@@ -49,14 +49,14 @@ namespace amd {
 namespace smi {
 
 AMDSmiSocket::~AMDSmiSocket() {
-    for (uint32_t i = 0; i < devices_.size(); i++) {
-        delete devices_[i];
+    for (uint32_t i = 0; i < processors_.size(); i++) {
+        delete processors_[i];
     }
-    devices_.clear();
+    processors_.clear();
 }
 
-amdsmi_status_t AMDSmiSocket::get_device_count(uint32_t* device_count) const {
-    *device_count = static_cast<uint32_t>(devices_.size());
+amdsmi_status_t AMDSmiSocket::get_processor_count(uint32_t* processor_count) const {
+    *processor_count = static_cast<uint32_t>(processors_.size());
     return AMDSMI_STATUS_SUCCESS;
 }
 
diff --git a/src/amd_smi/amd_smi_system.cc b/src/amd_smi/amd_smi_system.cc
index 5daee940ba..9557f8f021 100644
--- a/src/amd_smi/amd_smi_system.cc
+++ b/src/amd_smi/amd_smi_system.cc
@@ -105,7 +105,7 @@ amdsmi_status_t AMDSmiSystem::populate_amd_gpu_devices() {
         }
 
         AMDSmiProcessor* device = new AMDSmiGPUDevice(i, drm_);
-        socket->add_device(device);
+        socket->add_processor(device);
         devices_.insert(device);
     }
     return AMDSMI_STATUS_SUCCESS;