diff --git a/rocclr/device/devprogram.cpp b/rocclr/device/devprogram.cpp
index bb76db5fcb..15142622d7 100644
--- a/rocclr/device/devprogram.cpp
+++ b/rocclr/device/devprogram.cpp
@@ -2536,7 +2536,7 @@ Program::file_type_t Program::getNextCompilationStageFromBinary(amd::option::Opt
 
 // ================================================================================================
 #if defined(USE_COMGR_LIBRARY)
-bool Comgr_Binary_Data::create(amd_comgr_data_kind_t kind, void* binary, size_t binSize) {
+bool ComgrBinaryData::create(amd_comgr_data_kind_t kind, void* binary, size_t binSize) {
   amd_comgr_status_t status = amd::Comgr::create_data(kind, &binaryData_);
   if (status != AMD_COMGR_STATUS_SUCCESS) {
     return false;
@@ -2551,12 +2551,12 @@ bool Comgr_Binary_Data::create(amd_comgr_data_kind_t kind, void* binary, size_t
   return true;
 }
 
-amd_comgr_data_t& Comgr_Binary_Data::data() {
+amd_comgr_data_t& ComgrBinaryData::data() {
   assert(created_);
   return binaryData_;
 }
 
-Comgr_Binary_Data::~Comgr_Binary_Data() {
+ComgrBinaryData::~ComgrBinaryData() {
   if (created_) {
     amd::Comgr::release_data(binaryData_);
   }
@@ -2564,7 +2564,7 @@ Comgr_Binary_Data::~Comgr_Binary_Data() {
 
 bool Program::createKernelMetadataMap(void* binary, size_t binSize) {
 
-  Comgr_Binary_Data binaryData;
+  ComgrBinaryData binaryData;
   if (!binaryData.create(AMD_COMGR_DATA_KIND_EXECUTABLE, binary, binSize)) {
     buildLog_ += "Error: COMGR failed to create code object data object.\n";
     return false;
diff --git a/rocclr/device/devprogram.hpp b/rocclr/device/devprogram.hpp
index f934a610e4..16b658a561 100644
--- a/rocclr/device/devprogram.hpp
+++ b/rocclr/device/devprogram.hpp
@@ -470,10 +470,10 @@ class Program : public amd::HeapObject {
 
 #if defined(USE_COMGR_LIBRARY)
 
-class Comgr_Binary_Data {
+class ComgrBinaryData {
  public:
-  Comgr_Binary_Data() : binaryData_({0}), created_(false) {}
-  ~Comgr_Binary_Data();
+  ComgrBinaryData() : binaryData_({0}), created_(false) {}
+  ~ComgrBinaryData();
   bool create(amd_comgr_data_kind_t kind, void* binary, size_t binSize);
   amd_comgr_data_t& data();