diff --git a/level_zero/core/test/unit_tests/sources/cmdqueue/test_cmdqueue_enqueue_cmdlist.cpp b/level_zero/core/test/unit_tests/sources/cmdqueue/test_cmdqueue_enqueue_cmdlist.cpp
index c7308a1dee..fdd7195d2e 100644
--- a/level_zero/core/test/unit_tests/sources/cmdqueue/test_cmdqueue_enqueue_cmdlist.cpp
+++ b/level_zero/core/test/unit_tests/sources/cmdqueue/test_cmdqueue_enqueue_cmdlist.cpp
@@ -159,7 +159,7 @@ HWTEST_F(CommandQueueExecuteCommandLists, whenASecondLevelBatchBufferPerCommandL
                   bbs->getSecondLevelBatchBuffer());
         EXPECT_EQ(MI_BATCH_BUFFER_START::ADDRESS_SPACE_INDICATOR_PPGTT,
                   bbs->getAddressSpaceIndicator());
-        EXPECT_EQ(allocation->getGpuAddress(), bbs->getBatchBufferStartAddressGraphicsaddress472());
+        EXPECT_EQ(allocation->getGpuAddress(), bbs->getBatchBufferStartAddress());
     }
 
     auto itorBBE = find<MI_BATCH_BUFFER_END *>(itorCurrent, cmdList.end());
diff --git a/opencl/source/command_queue/gpgpu_walker_enabled_device_enqueue.inl b/opencl/source/command_queue/gpgpu_walker_enabled_device_enqueue.inl
index 33da17ef79..22a2faad87 100644
--- a/opencl/source/command_queue/gpgpu_walker_enabled_device_enqueue.inl
+++ b/opencl/source/command_queue/gpgpu_walker_enabled_device_enqueue.inl
@@ -108,7 +108,7 @@ void GpgpuWalkerHelper<GfxFamily>::dispatchScheduler(
         MI_BATCH_BUFFER_START cmdBbStart = GfxFamily::cmdInitBatchBufferStart;
         cmdBbStart.setSecondLevelBatchBuffer(MI_BATCH_BUFFER_START::SECOND_LEVEL_BATCH_BUFFER_FIRST_LEVEL_BATCH);
         uint64_t slbAddress = devQueueHw.getSlbBuffer()->getGpuAddress();
-        cmdBbStart.setBatchBufferStartAddressGraphicsaddress472(slbAddress);
+        cmdBbStart.setBatchBufferStartAddress(slbAddress);
         *bbStart = cmdBbStart;
     }
 }
diff --git a/opencl/source/device_queue/device_queue_hw_skl_and_later.inl b/opencl/source/device_queue/device_queue_hw_skl_and_later.inl
index 5e5780ab36..429f5119fe 100644
--- a/opencl/source/device_queue/device_queue_hw_skl_and_later.inl
+++ b/opencl/source/device_queue/device_queue_hw_skl_and_later.inl
@@ -113,7 +113,7 @@ void DeviceQueueHw<GfxFamily>::buildSlbDummyCommands() {
     auto bbStartSpace = slbCS.getSpaceForCmd<MI_BATCH_BUFFER_START>();
     auto bbStart = GfxFamily::cmdInitBatchBufferStart;
     auto slbPtr = reinterpret_cast<uintptr_t>(slbBuffer->getUnderlyingBuffer());
-    bbStart.setBatchBufferStartAddressGraphicsaddress472(slbPtr);
+    bbStart.setBatchBufferStartAddress(slbPtr);
     *bbStartSpace = bbStart;
 
     igilCmdQueue->m_controls.m_CleanupSectionSize = 0;
diff --git a/opencl/test/unit_test/aub_tests/gen11/batch_buffer/aub_batch_buffer_tests_gen11.h b/opencl/test/unit_test/aub_tests/gen11/batch_buffer/aub_batch_buffer_tests_gen11.h
index 1438a2dc1d..666c1e9935 100644
--- a/opencl/test/unit_test/aub_tests/gen11/batch_buffer/aub_batch_buffer_tests_gen11.h
+++ b/opencl/test/unit_test/aub_tests/gen11/batch_buffer/aub_batch_buffer_tests_gen11.h
@@ -96,7 +96,7 @@ void setupAUBWithBatchBuffer(const NEO::Device *pDevice, aub_stream::EngineType
 
     auto cur = (uint32_t *)pRing;
     auto bbs = FamilyType::cmdInitBatchBufferStart;
-    bbs.setBatchBufferStartAddressGraphicsaddress472(gpuBatchBuffer);
+    bbs.setBatchBufferStartAddress(gpuBatchBuffer);
     bbs.setAddressSpaceIndicator(MI_BATCH_BUFFER_START::ADDRESS_SPACE_INDICATOR_PPGTT);
     *(MI_BATCH_BUFFER_START *)cur = bbs;
     cur = ptrOffset(cur, sizeof(MI_BATCH_BUFFER_START));
diff --git a/opencl/test/unit_test/aub_tests/gen12lp/batch_buffer/aub_batch_buffer_tests_gen12lp.h b/opencl/test/unit_test/aub_tests/gen12lp/batch_buffer/aub_batch_buffer_tests_gen12lp.h
index 35e8e1c6a4..4f66060bee 100644
--- a/opencl/test/unit_test/aub_tests/gen12lp/batch_buffer/aub_batch_buffer_tests_gen12lp.h
+++ b/opencl/test/unit_test/aub_tests/gen12lp/batch_buffer/aub_batch_buffer_tests_gen12lp.h
@@ -102,7 +102,7 @@ void setupAUBWithBatchBuffer(const NEO::Device *pDevice, aub_stream::EngineType
 
     auto cur = (uint32_t *)pRing;
     auto bbs = FamilyType::cmdInitBatchBufferStart;
-    bbs.setBatchBufferStartAddressGraphicsaddress472(gpuBatchBuffer);
+    bbs.setBatchBufferStartAddress(gpuBatchBuffer);
     bbs.setAddressSpaceIndicator(MI_BATCH_BUFFER_START::ADDRESS_SPACE_INDICATOR_PPGTT);
     *(MI_BATCH_BUFFER_START *)cur = bbs;
     cur = ptrOffset(cur, sizeof(MI_BATCH_BUFFER_START));
diff --git a/opencl/test/unit_test/aub_tests/gen9/batch_buffer/aub_batch_buffer_tests.h b/opencl/test/unit_test/aub_tests/gen9/batch_buffer/aub_batch_buffer_tests.h
index fa7c426fb0..cd0cf176c5 100644
--- a/opencl/test/unit_test/aub_tests/gen9/batch_buffer/aub_batch_buffer_tests.h
+++ b/opencl/test/unit_test/aub_tests/gen9/batch_buffer/aub_batch_buffer_tests.h
@@ -98,7 +98,7 @@ void setupAUBWithBatchBuffer(const NEO::Device *pDevice, aub_stream::EngineType
 
     auto cur = (uint32_t *)pRing;
     auto bbs = FamilyType::cmdInitBatchBufferStart;
-    bbs.setBatchBufferStartAddressGraphicsaddress472(gpuBatchBuffer);
+    bbs.setBatchBufferStartAddress(gpuBatchBuffer);
     bbs.setAddressSpaceIndicator(MI_BATCH_BUFFER_START::ADDRESS_SPACE_INDICATOR_PPGTT);
     *(MI_BATCH_BUFFER_START *)cur = bbs;
     cur = ptrOffset(cur, sizeof(MI_BATCH_BUFFER_START));
diff --git a/opencl/test/unit_test/command_stream/command_stream_receiver_flush_task_1_tests.cpp b/opencl/test/unit_test/command_stream/command_stream_receiver_flush_task_1_tests.cpp
index a4b539df58..3c34f224d3 100644
--- a/opencl/test/unit_test/command_stream/command_stream_receiver_flush_task_1_tests.cpp
+++ b/opencl/test/unit_test/command_stream/command_stream_receiver_flush_task_1_tests.cpp
@@ -1090,7 +1090,7 @@ HWTEST_F(CommandStreamReceiverFlushTaskTests, GivenBothCsWhenFlushingTaskThenCha
 
     // Expect to see address based on startOffset of task
     auto expectedAddress = static_cast<uint64_t>(reinterpret_cast<uintptr_t>(ptrOffset(commandStream.getCpuBase(), startOffset)));
-    EXPECT_EQ(expectedAddress, bbs->getBatchBufferStartAddressGraphicsaddress472());
+    EXPECT_EQ(expectedAddress, bbs->getBatchBufferStartAddress());
 
     // MI_BATCH_BUFFER_START from UMD must be PPGTT for security reasons
     EXPECT_EQ(MI_BATCH_BUFFER_START::ADDRESS_SPACE_INDICATOR_PPGTT, bbs->getAddressSpaceIndicator());
diff --git a/opencl/test/unit_test/command_stream/command_stream_receiver_flush_task_3_tests.cpp b/opencl/test/unit_test/command_stream/command_stream_receiver_flush_task_3_tests.cpp
index c430f24531..58dcde2a3e 100644
--- a/opencl/test/unit_test/command_stream/command_stream_receiver_flush_task_3_tests.cpp
+++ b/opencl/test/unit_test/command_stream/command_stream_receiver_flush_task_3_tests.cpp
@@ -143,7 +143,7 @@ HWTEST_F(CommandStreamReceiverFlushTaskTests, givenCsrInBatchingModeAndTwoRecord
 
     auto batchBufferStart = genCmdCast<MI_BATCH_BUFFER_START *>(bbEndLocation);
     ASSERT_NE(nullptr, batchBufferStart);
-    EXPECT_EQ(secondBatchBufferAddress, batchBufferStart->getBatchBufferStartAddressGraphicsaddress472());
+    EXPECT_EQ(secondBatchBufferAddress, batchBufferStart->getBatchBufferStartAddress());
     EXPECT_EQ(mockCsr->recordedCommandBuffer->batchBuffer.endCmdPtr, lastbbEndPtr);
 }
 
@@ -208,7 +208,7 @@ HWTEST_F(CommandStreamReceiverFlushTaskTests, givenCsrInBatchingModeAndThreeReco
 
     auto batchBufferStart = genCmdCast<MI_BATCH_BUFFER_START *>(bbEndLocation);
     ASSERT_NE(nullptr, batchBufferStart);
-    EXPECT_EQ(lastBatchBufferAddress, batchBufferStart->getBatchBufferStartAddressGraphicsaddress472());
+    EXPECT_EQ(lastBatchBufferAddress, batchBufferStart->getBatchBufferStartAddress());
     EXPECT_EQ(1, mockCsr->flushCalledCount);
     EXPECT_EQ(mockCsr->recordedCommandBuffer->batchBuffer.endCmdPtr, lastbbEndPtr);
 }
@@ -1675,7 +1675,7 @@ HWCMDTEST_F(IGFX_GEN8_CORE, CommandStreamReceiverFlushTaskTests, givenEpilogueRe
     EXPECT_NE(itBatchBufferStart, cmdList.end());
 
     auto batchBufferStart = genCmdCast<typename FamilyType::MI_BATCH_BUFFER_START *>(*itBatchBufferStart);
-    EXPECT_EQ(batchBufferStart->getBatchBufferStartAddressGraphicsaddress472(), commandStreamReceiverStream.getGraphicsAllocation()->getGpuAddress());
+    EXPECT_EQ(batchBufferStart->getBatchBufferStartAddress(), commandStreamReceiverStream.getGraphicsAllocation()->getGpuAddress());
 
     parseCommands<FamilyType>(commandStreamReceiverStream, 0);
 
diff --git a/opencl/test/unit_test/command_stream/command_stream_receiver_flush_task_gmock_tests.cpp b/opencl/test/unit_test/command_stream/command_stream_receiver_flush_task_gmock_tests.cpp
index 7a4c20f25b..7918234fa1 100644
--- a/opencl/test/unit_test/command_stream/command_stream_receiver_flush_task_gmock_tests.cpp
+++ b/opencl/test/unit_test/command_stream/command_stream_receiver_flush_task_gmock_tests.cpp
@@ -124,7 +124,7 @@ HWTEST2_F(CommandStreamReceiverFlushTaskGmockTests,
 
     auto batchBufferStart = genCmdCast<MI_BATCH_BUFFER_START *>(bbEndLocation);
     ASSERT_NE(nullptr, batchBufferStart);
-    EXPECT_EQ(lastBatchBufferAddress, batchBufferStart->getBatchBufferStartAddressGraphicsaddress472());
+    EXPECT_EQ(lastBatchBufferAddress, batchBufferStart->getBatchBufferStartAddress());
     EXPECT_EQ(1, mockCsr->flushCalledCount);
     EXPECT_EQ(expectedCallsCount, mockHelper->setPatchInfoDataCalled);
     EXPECT_EQ(static_cast<unsigned int>(removePatchInfoDataCount), mockHelper->removePatchInfoDataCalled);
diff --git a/opencl/test/unit_test/command_stream/command_stream_receiver_flush_task_tests_xehp_and_later.cpp b/opencl/test/unit_test/command_stream/command_stream_receiver_flush_task_tests_xehp_and_later.cpp
index 381edcb0ab..239bc0e52b 100644
--- a/opencl/test/unit_test/command_stream/command_stream_receiver_flush_task_tests_xehp_and_later.cpp
+++ b/opencl/test/unit_test/command_stream/command_stream_receiver_flush_task_tests_xehp_and_later.cpp
@@ -804,7 +804,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, CommandStreamReceiverFlushTaskXeHPAndLaterTests, gi
     EXPECT_NE(itBatchBufferStart, cmdList.end());
 
     auto batchBufferStart = genCmdCast<typename FamilyType::MI_BATCH_BUFFER_START *>(*itBatchBufferStart);
-    EXPECT_EQ(batchBufferStart->getBatchBufferStartAddressGraphicsaddress472(), commandStreamReceiverStream.getGraphicsAllocation()->getGpuAddress());
+    EXPECT_EQ(batchBufferStart->getBatchBufferStartAddress(), commandStreamReceiverStream.getGraphicsAllocation()->getGpuAddress());
 
     parseCommands<FamilyType>(commandStreamReceiverStream, 0);
 
diff --git a/opencl/test/unit_test/command_stream/command_stream_receiver_hw_2_tests.cpp b/opencl/test/unit_test/command_stream/command_stream_receiver_hw_2_tests.cpp
index e4e01abde6..8f74c1e4eb 100644
--- a/opencl/test/unit_test/command_stream/command_stream_receiver_hw_2_tests.cpp
+++ b/opencl/test/unit_test/command_stream/command_stream_receiver_hw_2_tests.cpp
@@ -1403,7 +1403,7 @@ HWTEST_F(BcsTests, givenBlitterDirectSubmissionEnabledWhenProgrammingBlitterThen
     MI_BATCH_BUFFER_START *bbStart = hwParser.getCommand<MI_BATCH_BUFFER_START>();
     ASSERT_NE(nullptr, bbStart);
     EXPECT_EQ(csr.latestFlushedBatchBuffer.endCmdPtr, bbStart);
-    EXPECT_EQ(0ull, bbStart->getBatchBufferStartAddressGraphicsaddress472());
+    EXPECT_EQ(0ull, bbStart->getBatchBufferStartAddress());
 }
 
 HWTEST_F(BcsTests, givenBlitterDirectSubmissionEnabledWhenFlushTagUpdateThenBatchBufferStartIsProgrammed) {
diff --git a/opencl/test/unit_test/command_stream/experimental_command_buffer_tests.cpp b/opencl/test/unit_test/command_stream/experimental_command_buffer_tests.cpp
index 58ae0206a3..0548e2dc19 100644
--- a/opencl/test/unit_test/command_stream/experimental_command_buffer_tests.cpp
+++ b/opencl/test/unit_test/command_stream/experimental_command_buffer_tests.cpp
@@ -81,7 +81,7 @@ HWTEST_F(MockExperimentalCommandBufferTest, givenEnabledExperimentalCmdBufferWhe
     ASSERT_NE(bbList.end(), it);
     bbStart = reinterpret_cast<MI_BATCH_BUFFER_START *>(*it);
     ASSERT_NE(nullptr, bbStart);
-    EXPECT_EQ(exCmdBufferGpuAddr, bbStart->getBatchBufferStartAddressGraphicsaddress472());
+    EXPECT_EQ(exCmdBufferGpuAddr, bbStart->getBatchBufferStartAddress());
     EXPECT_EQ(MI_BATCH_BUFFER_START::SECOND_LEVEL_BATCH_BUFFER_SECOND_LEVEL_BATCH, bbStart->getSecondLevelBatchBuffer());
 
     MI_BATCH_BUFFER_END *bbEnd = nullptr;
@@ -220,7 +220,7 @@ HWTEST_F(MockExperimentalCommandBufferTest, givenEnabledExperimentalCmdBufferWhe
     ASSERT_NE(bbList.end(), it);
     bbStart = reinterpret_cast<MI_BATCH_BUFFER_START *>(*it);
     ASSERT_NE(nullptr, bbStart);
-    EXPECT_EQ(exCmdBufferGpuAddr, bbStart->getBatchBufferStartAddressGraphicsaddress472());
+    EXPECT_EQ(exCmdBufferGpuAddr, bbStart->getBatchBufferStartAddress());
     EXPECT_EQ(MI_BATCH_BUFFER_START::SECOND_LEVEL_BATCH_BUFFER_SECOND_LEVEL_BATCH, bbStart->getSecondLevelBatchBuffer());
 
     PIPE_CONTROL *pipeControl = nullptr;
@@ -317,7 +317,7 @@ HWTEST_F(MockExperimentalCommandBufferTest, givenEnabledExperimentalCmdBufferWhe
     ASSERT_NE(bbList.end(), it);
     bbStart = reinterpret_cast<MI_BATCH_BUFFER_START *>(*it);
     ASSERT_NE(nullptr, bbStart);
-    EXPECT_EQ(oldExCmdBufferGpuAddr, bbStart->getBatchBufferStartAddressGraphicsaddress472());
+    EXPECT_EQ(oldExCmdBufferGpuAddr, bbStart->getBatchBufferStartAddress());
     EXPECT_EQ(MI_BATCH_BUFFER_START::SECOND_LEVEL_BATCH_BUFFER_SECOND_LEVEL_BATCH, bbStart->getSecondLevelBatchBuffer());
 
     flushTask(commandStreamReceiver);
@@ -339,7 +339,7 @@ HWTEST_F(MockExperimentalCommandBufferTest, givenEnabledExperimentalCmdBufferWhe
     ASSERT_NE(bbList.end(), it);
     bbStart = reinterpret_cast<MI_BATCH_BUFFER_START *>(*it);
     ASSERT_NE(nullptr, bbStart);
-    EXPECT_EQ(newExCmdBufferGpuAddr, bbStart->getBatchBufferStartAddressGraphicsaddress472());
+    EXPECT_EQ(newExCmdBufferGpuAddr, bbStart->getBatchBufferStartAddress());
     EXPECT_EQ(MI_BATCH_BUFFER_START::SECOND_LEVEL_BATCH_BUFFER_SECOND_LEVEL_BATCH, bbStart->getSecondLevelBatchBuffer());
 }
 
diff --git a/opencl/test/unit_test/execution_model/scheduler_dispatch_tests.cpp b/opencl/test/unit_test/execution_model/scheduler_dispatch_tests.cpp
index f877e25c96..c8b4a6f045 100644
--- a/opencl/test/unit_test/execution_model/scheduler_dispatch_tests.cpp
+++ b/opencl/test/unit_test/execution_model/scheduler_dispatch_tests.cpp
@@ -155,7 +155,7 @@ HWTEST2_F(ExecutionModelSchedulerFixture, WhenDispatchingSchedulerThenProgrammin
     auto *bbStart = (MI_BATCH_BUFFER_START *)*hwParser.itorBBStartAfterWalker;
 
     uint64_t slbAddress = pDevQueueHw->getSlbBuffer()->getGpuAddress();
-    EXPECT_EQ(slbAddress, bbStart->getBatchBufferStartAddressGraphicsaddress472());
+    EXPECT_EQ(slbAddress, bbStart->getBatchBufferStartAddress());
 }
 
 HWTEST2_F(ExecutionModelSchedulerFixture, WhenDispatchingSchedulerThenStandardCmdqIohIsNotUsed, DeviceEnqueueSupport) {
diff --git a/opencl/test/unit_test/mocks/mock_device_queue.h b/opencl/test/unit_test/mocks/mock_device_queue.h
index 468eaf4c98..4d8210092f 100644
--- a/opencl/test/unit_test/mocks/mock_device_queue.h
+++ b/opencl/test/unit_test/mocks/mock_device_queue.h
@@ -168,7 +168,7 @@ class MockDeviceQueueHw : public DeviceQueueHw<GfxFamily> {
         memset(expectedCmds.prefetch, 0x0, DeviceQueueHw<GfxFamily>::getCSPrefetchSize());
         expectedCmds.bbStart = GfxFamily::cmdInitBatchBufferStart;
         auto slbPtr = reinterpret_cast<uintptr_t>(this->getSlbBuffer()->getUnderlyingBuffer());
-        expectedCmds.bbStart.setBatchBufferStartAddressGraphicsaddress472(slbPtr);
+        expectedCmds.bbStart.setBatchBufferStartAddress(slbPtr);
     }
 
     IGIL_CommandQueue *getIgilQueue() {
diff --git a/shared/source/command_container/command_encoder.inl b/shared/source/command_container/command_encoder.inl
index 0bface89d9..91e26f9138 100644
--- a/shared/source/command_container/command_encoder.inl
+++ b/shared/source/command_container/command_encoder.inl
@@ -771,7 +771,7 @@ void EncodeBatchBufferStartOrEnd<Family>::programBatchBufferStart(LinearStream *
         cmd.setSecondLevelBatchBuffer(MI_BATCH_BUFFER_START::SECOND_LEVEL_BATCH_BUFFER_SECOND_LEVEL_BATCH);
     }
     cmd.setAddressSpaceIndicator(MI_BATCH_BUFFER_START::ADDRESS_SPACE_INDICATOR_PPGTT);
-    cmd.setBatchBufferStartAddressGraphicsaddress472(address);
+    cmd.setBatchBufferStartAddress(address);
     auto buffer = commandStream->getSpaceForCmd<MI_BATCH_BUFFER_START>();
     *buffer = cmd;
 }
diff --git a/shared/source/command_stream/aub_command_stream_receiver_hw_base.inl b/shared/source/command_stream/aub_command_stream_receiver_hw_base.inl
index 0428bd374e..07fc51cded 100644
--- a/shared/source/command_stream/aub_command_stream_receiver_hw_base.inl
+++ b/shared/source/command_stream/aub_command_stream_receiver_hw_base.inl
@@ -492,7 +492,7 @@ void AUBCommandStreamReceiverHw<GfxFamily>::submitBatchBufferAub(uint64_t batchB
 
         // Add our BBS
         auto bbs = GfxFamily::cmdInitBatchBufferStart;
-        bbs.setBatchBufferStartAddressGraphicsaddress472(static_cast<uint64_t>(batchBufferGpuAddress));
+        bbs.setBatchBufferStartAddress(static_cast<uint64_t>(batchBufferGpuAddress));
         bbs.setAddressSpaceIndicator(MI_BATCH_BUFFER_START::ADDRESS_SPACE_INDICATOR_PPGTT);
         *(MI_BATCH_BUFFER_START *)pTail = bbs;
         pTail = ((MI_BATCH_BUFFER_START *)pTail) + 1;
@@ -840,7 +840,7 @@ void AUBCommandStreamReceiverHw<GfxFamily>::addGUCStartMessage(uint64_t batchBuf
     MI_BATCH_BUFFER_START *miBatchBufferStartSpace = linearStream.getSpaceForCmd<MI_BATCH_BUFFER_START>();
     DEBUG_BREAK_IF(bufferSize != linearStream.getUsed());
     auto miBatchBufferStart = GfxFamily::cmdInitBatchBufferStart;
-    miBatchBufferStart.setBatchBufferStartAddressGraphicsaddress472(AUB::ptrToPPGTT(buffer.get()));
+    miBatchBufferStart.setBatchBufferStartAddress(AUB::ptrToPPGTT(buffer.get()));
     miBatchBufferStart.setAddressSpaceIndicator(MI_BATCH_BUFFER_START::ADDRESS_SPACE_INDICATOR_PPGTT);
     *miBatchBufferStartSpace = miBatchBufferStart;
 
diff --git a/shared/source/command_stream/command_stream_receiver_hw_base.inl b/shared/source/command_stream/command_stream_receiver_hw_base.inl
index bb58d8e43f..e1aa01899d 100644
--- a/shared/source/command_stream/command_stream_receiver_hw_base.inl
+++ b/shared/source/command_stream/command_stream_receiver_hw_base.inl
@@ -108,7 +108,7 @@ template <typename GfxFamily>
 inline void CommandStreamReceiverHw<GfxFamily>::addBatchBufferStart(MI_BATCH_BUFFER_START *commandBufferMemory, uint64_t startAddress, bool secondary) {
     MI_BATCH_BUFFER_START cmd = GfxFamily::cmdInitBatchBufferStart;
 
-    cmd.setBatchBufferStartAddressGraphicsaddress472(startAddress);
+    cmd.setBatchBufferStartAddress(startAddress);
     cmd.setAddressSpaceIndicator(MI_BATCH_BUFFER_START::ADDRESS_SPACE_INDICATOR_PPGTT);
     if (secondary) {
         cmd.setSecondLevelBatchBuffer(MI_BATCH_BUFFER_START::SECOND_LEVEL_BATCH_BUFFER_SECOND_LEVEL_BATCH);
diff --git a/shared/source/command_stream/tbx_command_stream_receiver_hw.inl b/shared/source/command_stream/tbx_command_stream_receiver_hw.inl
index fdad957a92..bde21768aa 100644
--- a/shared/source/command_stream/tbx_command_stream_receiver_hw.inl
+++ b/shared/source/command_stream/tbx_command_stream_receiver_hw.inl
@@ -325,7 +325,7 @@ void TbxCommandStreamReceiverHw<GfxFamily>::submitBatchBufferTbx(uint64_t batchB
 
         // Add our BBS
         auto bbs = GfxFamily::cmdInitBatchBufferStart;
-        bbs.setBatchBufferStartAddressGraphicsaddress472(static_cast<uint64_t>(batchBufferGpuAddress));
+        bbs.setBatchBufferStartAddress(static_cast<uint64_t>(batchBufferGpuAddress));
         bbs.setAddressSpaceIndicator(MI_BATCH_BUFFER_START::ADDRESS_SPACE_INDICATOR_PPGTT);
         *(MI_BATCH_BUFFER_START *)pTail = bbs;
         pTail = ((MI_BATCH_BUFFER_START *)pTail) + 1;
diff --git a/shared/source/direct_submission/direct_submission_hw.inl b/shared/source/direct_submission/direct_submission_hw.inl
index 38fe3463c5..8972cd3ea2 100644
--- a/shared/source/direct_submission/direct_submission_hw.inl
+++ b/shared/source/direct_submission/direct_submission_hw.inl
@@ -425,7 +425,7 @@ inline void DirectSubmissionHw<GfxFamily, Dispatcher>::setReturnAddress(void *re
     using MI_BATCH_BUFFER_START = typename GfxFamily::MI_BATCH_BUFFER_START;
 
     MI_BATCH_BUFFER_START cmd = GfxFamily::cmdInitBatchBufferStart;
-    cmd.setBatchBufferStartAddressGraphicsaddress472(returnAddress);
+    cmd.setBatchBufferStartAddress(returnAddress);
     cmd.setAddressSpaceIndicator(MI_BATCH_BUFFER_START::ADDRESS_SPACE_INDICATOR_PPGTT);
 
     MI_BATCH_BUFFER_START *returnBBStart = static_cast<MI_BATCH_BUFFER_START *>(returnCmd);
diff --git a/shared/source/direct_submission/dispatchers/dispatcher.inl b/shared/source/direct_submission/dispatchers/dispatcher.inl
index 543a60fc05..923b993624 100644
--- a/shared/source/direct_submission/dispatchers/dispatcher.inl
+++ b/shared/source/direct_submission/dispatchers/dispatcher.inl
@@ -18,7 +18,7 @@ inline void Dispatcher<GfxFamily>::dispatchStartCommandBuffer(LinearStream &cmdB
     using MI_BATCH_BUFFER_START = typename GfxFamily::MI_BATCH_BUFFER_START;
 
     MI_BATCH_BUFFER_START cmd = GfxFamily::cmdInitBatchBufferStart;
-    cmd.setBatchBufferStartAddressGraphicsaddress472(gpuStartAddress);
+    cmd.setBatchBufferStartAddress(gpuStartAddress);
     cmd.setAddressSpaceIndicator(MI_BATCH_BUFFER_START::ADDRESS_SPACE_INDICATOR_PPGTT);
 
     auto bbufferStart = cmdBuffer.getSpaceForCmd<MI_BATCH_BUFFER_START>();
diff --git a/shared/source/generated/gen11/hw_cmds_generated_gen11.inl b/shared/source/generated/gen11/hw_cmds_generated_gen11.inl
index 4f7f0e4944..1b90c7d3bb 100644
--- a/shared/source/generated/gen11/hw_cmds_generated_gen11.inl
+++ b/shared/source/generated/gen11/hw_cmds_generated_gen11.inl
@@ -4666,18 +4666,12 @@ typedef struct tagMI_BATCH_BUFFER_START {
         BATCHBUFFERSTARTADDRESS_GRAPHICSADDRESS39_2_BIT_SHIFT = 0x2,
         BATCHBUFFERSTARTADDRESS_GRAPHICSADDRESS39_2_ALIGN_SIZE = 0x4,
     } BATCHBUFFERSTARTADDRESS_GRAPHICSADDRESS39_2;
-    inline void setBatchBufferStartAddressGraphicsaddress392(const uint64_t value) {
+    inline void setBatchBufferStartAddress(const uint64_t value) {
         TheStructure.Common.BatchBufferStartAddress_Graphicsaddress39_2 = value >> BATCHBUFFERSTARTADDRESS_GRAPHICSADDRESS39_2_BIT_SHIFT;
     }
-    inline uint64_t getBatchBufferStartAddressGraphicsaddress392() const {
+    inline uint64_t getBatchBufferStartAddress() const {
         return (TheStructure.Common.BatchBufferStartAddress_Graphicsaddress39_2 << BATCHBUFFERSTARTADDRESS_GRAPHICSADDRESS39_2_BIT_SHIFT);
     }
-    inline void setBatchBufferStartAddressGraphicsaddress472(const uint64_t value) {
-        setBatchBufferStartAddressGraphicsaddress392(value);
-    }
-    inline uint64_t getBatchBufferStartAddressGraphicsaddress472() const {
-        return getBatchBufferStartAddressGraphicsaddress392();
-    }
     typedef enum tagBATCHBUFFERSTARTADDRESS_RESERVED {
         BATCHBUFFERSTARTADDRESS_RESERVED_BIT_SHIFT = 0x2,
         BATCHBUFFERSTARTADDRESS_RESERVED_ALIGN_SIZE = 0x4,
diff --git a/shared/source/generated/gen12lp/hw_cmds_generated_gen12lp.inl b/shared/source/generated/gen12lp/hw_cmds_generated_gen12lp.inl
index ea17ec5198..f04444faac 100644
--- a/shared/source/generated/gen12lp/hw_cmds_generated_gen12lp.inl
+++ b/shared/source/generated/gen12lp/hw_cmds_generated_gen12lp.inl
@@ -1203,12 +1203,6 @@ typedef struct tagMI_BATCH_BUFFER_START {
     inline uint64_t getBatchBufferStartAddress() const {
         return TheStructure.Common.BatchBufferStartAddress << BATCHBUFFERSTARTADDRESS_BIT_SHIFT;
     }
-    inline void setBatchBufferStartAddressGraphicsaddress472(const uint64_t value) {
-        TheStructure.Common.BatchBufferStartAddress = value >> BATCHBUFFERSTARTADDRESS_BIT_SHIFT;
-    }
-    inline uint64_t getBatchBufferStartAddressGraphicsaddress472() const {
-        return TheStructure.Common.BatchBufferStartAddress << BATCHBUFFERSTARTADDRESS_BIT_SHIFT;
-    }
     inline void setSecondLevelBatchBuffer(const SECOND_LEVEL_BATCH_BUFFER value) {
         TheStructure.Mi_Mode_Nestedbatchbufferenableis0.SecondLevelBatchBuffer = value;
     }
diff --git a/shared/source/generated/gen8/hw_cmds_generated_gen8.inl b/shared/source/generated/gen8/hw_cmds_generated_gen8.inl
index 50842e0f65..20871f60ef 100644
--- a/shared/source/generated/gen8/hw_cmds_generated_gen8.inl
+++ b/shared/source/generated/gen8/hw_cmds_generated_gen8.inl
@@ -1258,10 +1258,10 @@ typedef struct tagMI_BATCH_BUFFER_START {
         BATCHBUFFERSTARTADDRESS_GRAPHICSADDRESS47_2_BIT_SHIFT = 0x2,
         BATCHBUFFERSTARTADDRESS_GRAPHICSADDRESS47_2_ALIGN_SIZE = 0x4,
     } BATCHBUFFERSTARTADDRESS_GRAPHICSADDRESS47_2;
-    inline void setBatchBufferStartAddressGraphicsaddress472(const uint64_t value) {
+    inline void setBatchBufferStartAddress(const uint64_t value) {
         TheStructure.Common.BatchBufferStartAddress_Graphicsaddress47_2 = value >> BATCHBUFFERSTARTADDRESS_GRAPHICSADDRESS47_2_BIT_SHIFT;
     }
-    inline uint64_t getBatchBufferStartAddressGraphicsaddress472() const {
+    inline uint64_t getBatchBufferStartAddress() const {
         return (TheStructure.Common.BatchBufferStartAddress_Graphicsaddress47_2 << BATCHBUFFERSTARTADDRESS_GRAPHICSADDRESS47_2_BIT_SHIFT);
     }
     typedef enum tagBATCHBUFFERSTARTADDRESS_RESERVED {
diff --git a/shared/source/generated/gen9/hw_cmds_generated_gen9.inl b/shared/source/generated/gen9/hw_cmds_generated_gen9.inl
index 39c1fde8e9..654e5edd3c 100644
--- a/shared/source/generated/gen9/hw_cmds_generated_gen9.inl
+++ b/shared/source/generated/gen9/hw_cmds_generated_gen9.inl
@@ -1262,10 +1262,10 @@ typedef struct tagMI_BATCH_BUFFER_START {
         BATCHBUFFERSTARTADDRESS_GRAPHICSADDRESS47_2_BIT_SHIFT = 0x2,
         BATCHBUFFERSTARTADDRESS_GRAPHICSADDRESS47_2_ALIGN_SIZE = 0x4,
     } BATCHBUFFERSTARTADDRESS_GRAPHICSADDRESS47_2;
-    inline void setBatchBufferStartAddressGraphicsaddress472(const uint64_t value) {
+    inline void setBatchBufferStartAddress(const uint64_t value) {
         TheStructure.Common.BatchBufferStartAddress_Graphicsaddress47_2 = value >> BATCHBUFFERSTARTADDRESS_GRAPHICSADDRESS47_2_BIT_SHIFT;
     }
-    inline uint64_t getBatchBufferStartAddressGraphicsaddress472() const {
+    inline uint64_t getBatchBufferStartAddress() const {
         return (TheStructure.Common.BatchBufferStartAddress_Graphicsaddress47_2 << BATCHBUFFERSTARTADDRESS_GRAPHICSADDRESS47_2_BIT_SHIFT);
     }
     typedef enum tagBATCHBUFFERSTARTADDRESS_RESERVED {
diff --git a/shared/source/generated/xe_hp_core/hw_cmds_generated_xe_hp_core.inl b/shared/source/generated/xe_hp_core/hw_cmds_generated_xe_hp_core.inl
index 51e2b582a5..93836d75d3 100644
--- a/shared/source/generated/xe_hp_core/hw_cmds_generated_xe_hp_core.inl
+++ b/shared/source/generated/xe_hp_core/hw_cmds_generated_xe_hp_core.inl
@@ -6032,15 +6032,9 @@ typedef struct tagMI_BATCH_BUFFER_START {
     inline void setBatchBufferStartAddress(const uint64_t value) {
         TheStructure.Common.BatchBufferStartAddress = value >> BATCHBUFFERSTARTADDRESS_BIT_SHIFT;
     }
-    inline void setBatchBufferStartAddressGraphicsaddress472(const uint64_t value) {
-        TheStructure.Common.BatchBufferStartAddress = value >> BATCHBUFFERSTARTADDRESS_BIT_SHIFT;
-    }
     inline uint64_t getBatchBufferStartAddress() const {
         return TheStructure.Common.BatchBufferStartAddress << BATCHBUFFERSTARTADDRESS_BIT_SHIFT;
     }
-    inline uint64_t getBatchBufferStartAddressGraphicsaddress472() const {
-        return TheStructure.Common.BatchBufferStartAddress << BATCHBUFFERSTARTADDRESS_BIT_SHIFT;
-    }
     inline void setNestedLevelBatchBuffer(const NESTED_LEVEL_BATCH_BUFFER value) {
         TheStructure.Mi_Mode_Nestedbatchbufferenableis1.NestedLevelBatchBuffer = value;
     }
diff --git a/shared/source/generated/xe_hpc_core/hw_cmds_generated_xe_hpc_core.inl b/shared/source/generated/xe_hpc_core/hw_cmds_generated_xe_hpc_core.inl
index 786421725a..c0b6505241 100644
--- a/shared/source/generated/xe_hpc_core/hw_cmds_generated_xe_hpc_core.inl
+++ b/shared/source/generated/xe_hpc_core/hw_cmds_generated_xe_hpc_core.inl
@@ -6174,12 +6174,6 @@ typedef struct tagMI_BATCH_BUFFER_START {
     inline uint64_t getBatchBufferStartAddress() const {
         return TheStructure.Common.BatchBufferStartAddress << BATCHBUFFERSTARTADDRESS_BIT_SHIFT;
     }
-    inline void setBatchBufferStartAddressGraphicsaddress472(const uint64_t value) {
-        TheStructure.Common.BatchBufferStartAddress = value >> BATCHBUFFERSTARTADDRESS_BIT_SHIFT;
-    }
-    inline uint64_t getBatchBufferStartAddressGraphicsaddress472() const {
-        return TheStructure.Common.BatchBufferStartAddress << BATCHBUFFERSTARTADDRESS_BIT_SHIFT;
-    }
     inline void setSecondLevelBatchBuffer(const SECOND_LEVEL_BATCH_BUFFER value) {
         TheStructure.Mi_Mode_Nestedbatchbufferenableis0.SecondLevelBatchBuffer = value;
     }
diff --git a/shared/source/generated/xe_hpg_core/hw_cmds_generated_xe_hpg_core.inl b/shared/source/generated/xe_hpg_core/hw_cmds_generated_xe_hpg_core.inl
index 338d6b9ac4..0d27a9370a 100644
--- a/shared/source/generated/xe_hpg_core/hw_cmds_generated_xe_hpg_core.inl
+++ b/shared/source/generated/xe_hpg_core/hw_cmds_generated_xe_hpg_core.inl
@@ -6133,15 +6133,9 @@ typedef struct tagMI_BATCH_BUFFER_START {
     inline void setBatchBufferStartAddress(const uint64_t value) {
         TheStructure.Common.BatchBufferStartAddress = value >> BATCHBUFFERSTARTADDRESS_BIT_SHIFT;
     }
-    inline void setBatchBufferStartAddressGraphicsaddress472(const uint64_t value) {
-        TheStructure.Common.BatchBufferStartAddress = value >> BATCHBUFFERSTARTADDRESS_BIT_SHIFT;
-    }
     inline uint64_t getBatchBufferStartAddress() const {
         return TheStructure.Common.BatchBufferStartAddress << BATCHBUFFERSTARTADDRESS_BIT_SHIFT;
     }
-    inline uint64_t getBatchBufferStartAddressGraphicsaddress472() const {
-        return TheStructure.Common.BatchBufferStartAddress << BATCHBUFFERSTARTADDRESS_BIT_SHIFT;
-    }
     inline void setNestedLevelBatchBuffer(const NESTED_LEVEL_BATCH_BUFFER value) {
         TheStructure.Mi_Mode_Nestedbatchbufferenableis1.NestedLevelBatchBuffer = value;
     }
diff --git a/shared/test/unit_test/direct_submission/direct_submission_tests_1.cpp b/shared/test/unit_test/direct_submission/direct_submission_tests_1.cpp
index 7c7dbfcba6..a5c8188f8c 100644
--- a/shared/test/unit_test/direct_submission/direct_submission_tests_1.cpp
+++ b/shared/test/unit_test/direct_submission/direct_submission_tests_1.cpp
@@ -524,7 +524,7 @@ HWTEST_F(DirectSubmissionTest, givenDirectSubmissionWhenSettingAddressInReturnCo
     void *space = directSubmission.ringCommandStream.getSpace(sizeof(MI_BATCH_BUFFER_START));
     directSubmission.setReturnAddress(space, returnAddress);
     MI_BATCH_BUFFER_START *bbStart = reinterpret_cast<MI_BATCH_BUFFER_START *>(space);
-    EXPECT_EQ(returnAddress, bbStart->getBatchBufferStartAddressGraphicsaddress472());
+    EXPECT_EQ(returnAddress, bbStart->getBatchBufferStartAddress());
 }
 
 HWTEST_F(DirectSubmissionTest, whenDirectSubmissionInitializedThenExpectCreatedAllocationsFreed) {
diff --git a/shared/test/unit_test/direct_submission/direct_submission_tests_xe_hp_core.cpp b/shared/test/unit_test/direct_submission/direct_submission_tests_xe_hp_core.cpp
index cd75e1badb..a1b64a9401 100644
--- a/shared/test/unit_test/direct_submission/direct_submission_tests_xe_hp_core.cpp
+++ b/shared/test/unit_test/direct_submission/direct_submission_tests_xe_hp_core.cpp
@@ -37,7 +37,7 @@ XE_HP_CORE_TEST_F(DirectSubmissionTestXE_HP_CORE, givenBlitterUsedWhenDispatchin
 
     uint64_t exptectedJumpAddress = directSubmission.ringCommandStream.getGraphicsAllocation()->getGpuAddress();
     exptectedJumpAddress += sizeof(MI_BATCH_BUFFER_START);
-    EXPECT_EQ(exptectedJumpAddress, bbStart->getBatchBufferStartAddressGraphicsaddress472());
+    EXPECT_EQ(exptectedJumpAddress, bbStart->getBatchBufferStartAddress());
 }
 
 XE_HP_CORE_TEST_F(DirectSubmissionTestXE_HP_CORE, givenBlitterUsedWhenDispatchingPrefetchDisableTrueThenExpectArbCheckCmd) {
diff --git a/shared/test/unit_test/direct_submission/dispatchers/dispatcher_tests.cpp b/shared/test/unit_test/direct_submission/dispatchers/dispatcher_tests.cpp
index eda2fe8f44..8324695553 100644
--- a/shared/test/unit_test/direct_submission/dispatchers/dispatcher_tests.cpp
+++ b/shared/test/unit_test/direct_submission/dispatchers/dispatcher_tests.cpp
@@ -29,7 +29,7 @@ HWTEST_F(DispatcherTest, givenBaseDispatcherWhenAddingStartCmdThenExpectBbStart)
     hwParse.parseCommands<FamilyType>(cmdBuffer);
     MI_BATCH_BUFFER_START *start = hwParse.getCommand<MI_BATCH_BUFFER_START>();
     ASSERT_NE(nullptr, start);
-    EXPECT_EQ(gpuVa, start->getBatchBufferStartAddressGraphicsaddress472());
+    EXPECT_EQ(gpuVa, start->getBatchBufferStartAddress());
 }
 
 HWTEST_F(DispatcherTest, givenBaseDispatcherWhenAskingForStopCmdSizeThenReturnBbStopCmdSize) {
diff --git a/shared/test/unit_test/direct_submission/windows/wddm_direct_submission_tests.cpp b/shared/test/unit_test/direct_submission/windows/wddm_direct_submission_tests.cpp
index 2f65cf58a0..d9f99effd3 100644
--- a/shared/test/unit_test/direct_submission/windows/wddm_direct_submission_tests.cpp
+++ b/shared/test/unit_test/direct_submission/windows/wddm_direct_submission_tests.cpp
@@ -248,7 +248,7 @@ HWTEST_F(WddmDirectSubmissionTest, givenWddmWhenSwitchingRingBufferStartedThenEx
     hwParse.parseCommands<FamilyType>(tmpCmdBuffer, usedSpace);
     MI_BATCH_BUFFER_START *bbStart = hwParse.getCommand<MI_BATCH_BUFFER_START>();
     ASSERT_NE(nullptr, bbStart);
-    uint64_t actualGpuVa = GmmHelper::canonize(bbStart->getBatchBufferStartAddressGraphicsaddress472());
+    uint64_t actualGpuVa = GmmHelper::canonize(bbStart->getBatchBufferStartAddress());
     EXPECT_EQ(wddmDirectSubmission.ringBuffer2->getGpuAddress(), actualGpuVa);
 }
 
@@ -303,7 +303,7 @@ HWTEST_F(WddmDirectSubmissionTest, givenWddmWhenSwitchingRingBufferStartedAndWai
     hwParse.parseCommands<FamilyType>(tmpCmdBuffer, usedSpace);
     MI_BATCH_BUFFER_START *bbStart = hwParse.getCommand<MI_BATCH_BUFFER_START>();
     ASSERT_NE(nullptr, bbStart);
-    uint64_t actualGpuVa = GmmHelper::canonize(bbStart->getBatchBufferStartAddressGraphicsaddress472());
+    uint64_t actualGpuVa = GmmHelper::canonize(bbStart->getBatchBufferStartAddress());
     EXPECT_EQ(wddmDirectSubmission.ringBuffer2->getGpuAddress(), actualGpuVa);
 
     EXPECT_EQ(1u, wddm->waitFromCpuResult.called);
diff --git a/shared/test/unit_test/encoders/test_encode_command_buffer.cpp b/shared/test/unit_test/encoders/test_encode_command_buffer.cpp
index 563534de12..c51eec2167 100644
--- a/shared/test/unit_test/encoders/test_encode_command_buffer.cpp
+++ b/shared/test/unit_test/encoders/test_encode_command_buffer.cpp
@@ -90,7 +90,7 @@ HWTEST_F(EncodeBatchBufferStartOrEndTest, givenGpuAddressWhenEncodeBBStartThenAd
     ASSERT_NE(itor, commands.end());
     {
         auto cmd = genCmdCast<MI_BATCH_BUFFER_START *>(*itor);
-        EXPECT_EQ(gpuAddress, cmd->getBatchBufferStartAddressGraphicsaddress472());
+        EXPECT_EQ(gpuAddress, cmd->getBatchBufferStartAddress());
     }
 }