diff --git a/rocclr/compiler/lib/backends/common/v0_8/if_acl.cpp b/rocclr/compiler/lib/backends/common/v0_8/if_acl.cpp
index ad666fe39a..c000b1cdf3 100644
--- a/rocclr/compiler/lib/backends/common/v0_8/if_acl.cpp
+++ b/rocclr/compiler/lib/backends/common/v0_8/if_acl.cpp
@@ -1644,7 +1644,7 @@ static std::string getSymbolName(aclType type, const char *name, aclSections &id
       assert(symbol && "symbol not found");
       break;
     case ACL_TYPE_HSAIL_BINARY:
-      symbol = findBIF30SymStruct(symHSABinary);
+      symbol = findBIF30SymStruct(symBRIG);
       assert(symbol && "symbol not found");
       break;
     case ACL_TYPE_LLVMIR_BINARY:
@@ -2273,9 +2273,7 @@ if_aclQueryInfo(aclCompiler *cl,
         *size = sizeof(bool);
         return ACL_SUCCESS;
       } else if (*size >= sizeof(bool)) {
-        bool contains = elfBin->isSection(aclBRIGcode) &&
-                  elfBin->isSection(aclBRIGoprs) &&
-                  elfBin->isSection(aclBRIGstrs);
+        bool contains = elfBin->isSection(aclBRIG);
         memcpy(ptr, &contains, sizeof(bool));
         return ACL_SUCCESS;
       }
diff --git a/rocclr/compiler/lib/include/v0_8/aclEnums.h b/rocclr/compiler/lib/include/v0_8/aclEnums.h
index 43ae7cd89e..70fdaf49c0 100644
--- a/rocclr/compiler/lib/include/v0_8/aclEnums.h
+++ b/rocclr/compiler/lib/include/v0_8/aclEnums.h
@@ -177,10 +177,10 @@ typedef enum _bif_sections_enum_0_8 {
   aclINTERNAL       = 27,
   aclSPIR           = 28,
   aclHEADER         = 29,
-  aclBRIGcode       = 30,
-  aclBRIGxxxx       = 31,
-  aclBRIGoprs       = 32,
-  aclBRIGstrs       = 33,
+  aclBRIG           = 30,
+  aclBRIGxxx1       = 31,
+  aclBRIGxxx2       = 32,
+  aclBRIGxxx3       = 33,
   aclHSADEBUG       = 34,
   aclKSTATS         = 35, // For storing kernel statistics
   aclLAST           = 36
diff --git a/rocclr/compiler/lib/utils/bif_section_labels.hpp b/rocclr/compiler/lib/utils/bif_section_labels.hpp
index 69d9bb4887..1af28f5f30 100644
--- a/rocclr/compiler/lib/utils/bif_section_labels.hpp
+++ b/rocclr/compiler/lib/utils/bif_section_labels.hpp
@@ -23,12 +23,12 @@ typedef enum {
   symAMDILText,
   symAMDILBinary,
   symHSAILText,
-  symHSABinary,
+  symBRIG,
   symAMDILFMeta,
   symISAText,
-  symBRIGOperands,
-  symBRIGxxxx,
-  symBRIGStrtab,
+  symBRIGxxx1,
+  symBRIGxxx2,
+  symBRIGxxx3,
   symX86Barrier,
   symAMDILHeader,
   symDebugInfo,
@@ -84,17 +84,17 @@ static const oclBIFSymbolStruct BIF30[28] =
   // 12: BIF 3.0 per kernel HSAIL source, .internal section via -fbin-hsail.
   {symHSAILText, { "__HSAIL_",  "_text" }, {aclCODEGEN, aclLAST}},
   // 13: BIF 3.0 per kernel HSAIL binary, .internal section via -fbin-hsail.
-  {symHSABinary, { "__BRIG__code",  "" }, {aclBRIGcode, aclLAST}},
+  {symBRIG, { "__BRIG__",  "" }, {aclBRIG, aclLAST}},
   // 14: BIF 3.0 per function metadata, .internal section via -fbin-amdil.
   {symAMDILFMeta, { "__AMDIL_",  "_fmetadata" }, {aclINTERNAL, aclLAST}},
   // 15: BIF 3.0 per kernel ISA text, .internal section via disassembly.
   {symISAText, { "__ISA_",    "_text" }, {aclINTERNAL, aclLAST}},
   // 16: BIF 3.0 BRIG operands declarations, .brig section via -fbin-brig.
-  {symBRIGOperands, { "__BRIG__operands","" }, {aclBRIGoprs, aclLAST}},
+  {symBRIGxxx1, { "","" }, {aclLAST, aclLAST}},
   // 17: Unused after changes in HSAIL PRM
-  {symBRIGxxxx, { "","" }, {aclLAST, aclLAST}},
+  {symBRIGxxx2, { "","" }, {aclLAST, aclLAST}},
   // 18: BIF 3.0 BRIG strtab declarations, .brig section via -fbin-brig.
-  {symBRIGStrtab, { "__BRIG__strtab","" }, {aclBRIGstrs, aclLAST}},
+  {symBRIGxxx3, { "","" }, {aclLAST, aclLAST}},
   // 19: BIF 3.0 per kernel barrier metadata, only valid for X86.
   {symX86Barrier, { "__X86_", "_barrier" }, {aclLAST, aclLAST}},
   // 20: BIF 3.0 per kernel header, .internal section via -fbin-amdil.(Legacy from bif2.x)