diff --git a/README.md b/README.md
index a8ca2343f1..edfcecde0f 100755
--- a/README.md
+++ b/README.md
@@ -126,7 +126,7 @@ int main() {
       }
  
       // Get device name
-      amdsmi_board_info board_info;      
+      amdsmi_board_info_t board_info;
       ret = amdsmi_get_board_info(device_handles[j], &board_info);
       std::cout << "\tdevice "
                   << j <<"\n\t\tName:" << board_info.product_name << std::endl;
diff --git a/tests/amd_smi_test/functional/frequencies_read_write.cc b/tests/amd_smi_test/functional/frequencies_read_write.cc
index 17185486f3..818662683c 100755
--- a/tests/amd_smi_test/functional/frequencies_read_write.cc
+++ b/tests/amd_smi_test/functional/frequencies_read_write.cc
@@ -93,7 +93,7 @@ void TestFrequenciesReadWrite::Run(void) {
   amdsmi_status_t ret;
   amdsmi_frequencies_t f;
   uint32_t freq_bitmask;
-  amdsmi_clk_type amdsmi_clk;
+  amdsmi_clk_type_t amdsmi_clk;
 
   TestBase::Run();
   if (setup_failed_) {
@@ -106,7 +106,7 @@ void TestFrequenciesReadWrite::Run(void) {
 
     for (uint32_t clk = (uint32_t)CLK_TYPE_FIRST;
                                            clk <= CLK_TYPE__MAX; ++clk) {
-      amdsmi_clk = (amdsmi_clk_type)clk;
+      amdsmi_clk = (amdsmi_clk_type_t)clk;
 
       auto freq_read = [&]() -> bool {
         // Skip CLK_TYPE_PCIE, which does not supported in rocm-smi.
diff --git a/tests/amd_smi_test/functional/volt_freq_curv_read.cc b/tests/amd_smi_test/functional/volt_freq_curv_read.cc
index e2da710dd9..a0c18ee7ba 100755
--- a/tests/amd_smi_test/functional/volt_freq_curv_read.cc
+++ b/tests/amd_smi_test/functional/volt_freq_curv_read.cc
@@ -84,7 +84,7 @@ void TestVoltCurvRead::Close() {
   TestBase::Close();
 }
 
-static void pt_rng_Mhz(std::string title, amdsmi_range *r) {
+static void pt_rng_Mhz(std::string title, amdsmi_range_t *r) {
   assert(r != nullptr);
 
   std::cout << title << std::endl;
@@ -92,7 +92,7 @@ static void pt_rng_Mhz(std::string title, amdsmi_range *r) {
                                 r->upper_bound/1000000 << " MHz" << std::endl;
 }
 
-static void pt_rng_mV(std::string title, amdsmi_range *r) {
+static void pt_rng_mV(std::string title, amdsmi_range_t *r) {
   assert(r != nullptr);
 
   std::cout << title << std::endl;
@@ -105,7 +105,7 @@ static void print_pnt(amdsmi_od_vddc_point_t *pt) {
                                                                     std::endl;
   std::cout << "\t\t** Voltage: " << pt->voltage << "mV" << std::endl;
 }
-static void pt_vddc_curve(amdsmi_od_volt_curve *c) {
+static void pt_vddc_curve(amdsmi_od_volt_curve_t *c) {
   assert(c != nullptr);
 
   for (uint32_t i = 0; i < AMDSMI_NUM_VOLTAGE_CURVE_POINTS; ++i) {
diff --git a/tests/amd_smi_test/test_base.cc b/tests/amd_smi_test/test_base.cc
index 4131aedb65..2ae7662076 100644
--- a/tests/amd_smi_test/test_base.cc
+++ b/tests/amd_smi_test/test_base.cc
@@ -173,7 +173,7 @@ void TestBase::PrintDeviceHeader(amdsmi_device_handle dv_ind) {
     std::cout << "\t**Device ID: 0x" << std::hex << val_ui16 << std::endl;
   }
 
-  amdsmi_board_info board_info;
+  amdsmi_board_info_t board_info;
   err = amdsmi_get_board_info(dv_ind, &board_info);
   CHK_ERR_ASRT(err)
   IF_VERB(STANDARD) {
diff --git a/tests/amd_smi_test/test_common.cc b/tests/amd_smi_test/test_common.cc
index 033694f3f0..2aec2708bc 100644
--- a/tests/amd_smi_test/test_common.cc
+++ b/tests/amd_smi_test/test_common.cc
@@ -214,7 +214,7 @@ const char *GetErrStateNameStr(amdsmi_ras_err_state_t st) {
 const std::string GetVoltSensorNameStr(amdsmi_voltage_type_t st) {
   return kVoltSensorNameMap.at(st);
 }
-const char *FreqEnumToStr(amdsmi_clk_type amdsmi_clk) {
+const char *FreqEnumToStr(amdsmi_clk_type_t amdsmi_clk) {
   static_assert(CLK_TYPE__MAX == CLK_TYPE_DCLK1,
                                        "FreqEnumToStr() needs to be updated");
   switch (amdsmi_clk) {
diff --git a/tests/amd_smi_test/test_common.h b/tests/amd_smi_test/test_common.h
index d8ab88fcda..51de1f4c04 100644
--- a/tests/amd_smi_test/test_common.h
+++ b/tests/amd_smi_test/test_common.h
@@ -66,7 +66,7 @@ void PrintTestHeader(uint32_t dv_ind);
 const char *GetPerfLevelStr(amdsmi_dev_perf_level_t lvl);
 const char *GetBlockNameStr(amdsmi_gpu_block_t id);
 const char *GetErrStateNameStr(amdsmi_ras_err_state_t st);
-const char *FreqEnumToStr(amdsmi_clk_type amdsmi_clk);
+const char *FreqEnumToStr(amdsmi_clk_type_t amdsmi_clk);
 const std::string GetVoltSensorNameStr(amdsmi_voltage_type_t st);
 
 #if ENABLE_SMI