diff --git a/rocclr/runtime/device/rocm/rocmetadata.cpp b/rocclr/runtime/device/rocm/amdgpu_metadata.cpp
similarity index 99%
rename from rocclr/runtime/device/rocm/rocmetadata.cpp
rename to rocclr/runtime/device/rocm/amdgpu_metadata.cpp
index 576ed4a780..833a690712 100644
--- a/rocclr/runtime/device/rocm/rocmetadata.cpp
+++ b/rocclr/runtime/device/rocm/amdgpu_metadata.cpp
@@ -44,7 +44,7 @@
 #include <iostream>
 #include <cassert>
 
-#include "rocmetadata.hpp"
+#include "amdgpu_metadata.hpp"
 
 namespace roc {
 namespace RuntimeMD {
@@ -200,7 +200,7 @@ namespace RuntimeMD {
 
       out
         << "  Access: " << AccessQualToString(accQual)
-        << "  Address: " << (uint) addrQual
+        << "  Address: " << (unsigned) addrQual
         << "  Size: " << size
         << "  Align: " << align
         << "  Type Name: " << typeName;
diff --git a/rocclr/runtime/device/rocm/rocmetadata.hpp b/rocclr/runtime/device/rocm/amdgpu_metadata.hpp
similarity index 100%
rename from rocclr/runtime/device/rocm/rocmetadata.hpp
rename to rocclr/runtime/device/rocm/amdgpu_metadata.hpp
diff --git a/rocclr/runtime/device/rocm/rockernel.cpp b/rocclr/runtime/device/rocm/rockernel.cpp
index f15f68a445..87f6da4b6e 100644
--- a/rocclr/runtime/device/rocm/rockernel.cpp
+++ b/rocclr/runtime/device/rocm/rockernel.cpp
@@ -6,7 +6,7 @@
 #include "SCHSAInterface.h"
 #include "amd_hsa_kernel_code.h"
 #if defined(WITH_LIGHTNING_COMPILER)
-#include "rocmetadata.hpp"
+#include "amdgpu_metadata.hpp"
 #endif // defined(WITH_LIGHTNING_COMPILER)
 
 #include <algorithm>
diff --git a/rocclr/runtime/device/rocm/rocprogram.hpp b/rocclr/runtime/device/rocm/rocprogram.hpp
index 5f28fb85e3..9b7101ae29 100644
--- a/rocclr/runtime/device/rocm/rocprogram.hpp
+++ b/rocclr/runtime/device/rocm/rocprogram.hpp
@@ -18,7 +18,7 @@
 #include "HSAILItems.h"
 
 #if defined(WITH_LIGHTNING_COMPILER)
-#include "rocmetadata.hpp"
+#include "amdgpu_metadata.hpp"
 #include "driver/AmdCompiler.h"
 #endif // defined(WITH_LIGHTNING_COMPILER)