diff --git a/opencl/test/unit_test/memory_manager/memory_manager_tests.cpp b/opencl/test/unit_test/memory_manager/memory_manager_tests.cpp
index cc3c5b348e..549dd3c0f7 100644
--- a/opencl/test/unit_test/memory_manager/memory_manager_tests.cpp
+++ b/opencl/test/unit_test/memory_manager/memory_manager_tests.cpp
@@ -600,7 +600,7 @@ TEST_F(MemoryAllocatorTest, given32BitDeviceWhenPrintfSurfaceIsCreatedThen32BitA
         DebugManager.flags.Force32bitAddressing.set(false);
     }
 }
-HWTEST_F(MemoryAllocatorTest, givenSupportFor1MbAligmentWhenAllocateGraphicsMemoryThenAligmentIsSetCorrect) {
+HWTEST_F(MemoryAllocatorTest, givenSupportFor1MbAlignmentWhenAllocateGraphicsMemoryThenAlignmentIsSetCorrect) {
     class MockHwHelperHw : public HwHelperHw<FamilyType> {
       public:
         using HwHelperHw<FamilyType>::HwHelperHw;
diff --git a/opencl/test/unit_test/os_interface/windows/wddm_memory_manager_allocate_in_device_pool_tests.cpp b/opencl/test/unit_test/os_interface/windows/wddm_memory_manager_allocate_in_device_pool_tests.cpp
index 6e517ea698..1dc181110f 100644
--- a/opencl/test/unit_test/os_interface/windows/wddm_memory_manager_allocate_in_device_pool_tests.cpp
+++ b/opencl/test/unit_test/os_interface/windows/wddm_memory_manager_allocate_in_device_pool_tests.cpp
@@ -173,7 +173,7 @@ TEST_F(WddmMemoryManagerDevicePoolAlignmentTests, givenAllocationLessThen2MbWhen
     testAlignment(size, expectedAlignment);
 }
 
-TEST_F(WddmMemoryManagerDevicePoolAlignmentTests, givenTooMuchMemoryWastedOn2MbAligmentWhenAllocationInDevicePoolIsCreatedThenUse64kbAlignment) {
+TEST_F(WddmMemoryManagerDevicePoolAlignmentTests, givenTooMuchMemoryWastedOn2MbAlignmentWhenAllocationInDevicePoolIsCreatedThenUse64kbAlignment) {
     const float threshold = 0.1f;
 
     {
diff --git a/shared/source/helpers/bindless_heaps_helper.h b/shared/source/helpers/bindless_heaps_helper.h
index 06c0500b51..2961ad92b5 100644
--- a/shared/source/helpers/bindless_heaps_helper.h
+++ b/shared/source/helpers/bindless_heaps_helper.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2021 Intel Corporation
+ * Copyright (C) 2020-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -17,8 +17,6 @@
 
 namespace NEO {
 
-constexpr size_t ssAligment = MemoryConstants::cacheLineSize;
-
 class IndirectHeap;
 class GraphicsAllocation;
 
diff --git a/shared/test/common/helpers/blit_commands_helper_tests.cpp b/shared/test/common/helpers/blit_commands_helper_tests.cpp
index 7bd33d4e7a..1b911e7670 100644
--- a/shared/test/common/helpers/blit_commands_helper_tests.cpp
+++ b/shared/test/common/helpers/blit_commands_helper_tests.cpp
@@ -528,26 +528,26 @@ using BlitTestsParams = BlitColorTests;
 
 HWTEST2_P(BlitTestsParams, givenCopySizeAlignedWithin1and16BytesWhenGettingBytesPerPixelThenCorrectPixelSizeIsReturned, BlitPlatforms) {
     size_t copySize = 33;
-    auto aligment = GetParam();
-    copySize = alignUp(copySize, aligment);
+    auto alignment = GetParam();
+    copySize = alignUp(copySize, alignment);
     uint32_t srcOrigin, dstOrigin, srcSize, dstSize;
     srcOrigin = dstOrigin = 0;
     srcSize = dstSize = static_cast<uint32_t>(BlitterConstants::maxBytesPerPixel);
     uint32_t bytesPerPixel = NEO::BlitCommandsHelper<FamilyType>::getAvailableBytesPerPixel(copySize, srcOrigin, dstOrigin, srcSize, dstSize);
 
-    EXPECT_EQ(bytesPerPixel, aligment);
+    EXPECT_EQ(bytesPerPixel, alignment);
 }
 
 HWTEST2_P(BlitTestsParams, givenSrcSizeAlignedWithin1and16BytesWhenGettingBytesPerPixelThenCorrectPixelSizeIsReturned, BlitPlatforms) {
     size_t copySize = BlitterConstants::maxBytesPerPixel;
-    auto aligment = GetParam();
+    auto alignment = GetParam();
     uint32_t srcOrigin, dstOrigin, srcSize, dstSize;
     srcSize = 33;
-    srcSize = alignUp(srcSize, aligment);
+    srcSize = alignUp(srcSize, alignment);
     srcOrigin = dstOrigin = dstSize = static_cast<uint32_t>(BlitterConstants::maxBytesPerPixel);
     uint32_t bytesPerPixel = NEO::BlitCommandsHelper<FamilyType>::getAvailableBytesPerPixel(copySize, srcOrigin, dstOrigin, srcSize, dstSize);
 
-    EXPECT_EQ(bytesPerPixel, aligment);
+    EXPECT_EQ(bytesPerPixel, alignment);
 }
 
 HWTEST2_P(BlitTestsParams, givenSrcSizeNotAlignedWithin1and16BytesWhenGettingBytesPerPixelThen1BytePixelSizeIsReturned, BlitPlatforms) {
@@ -562,14 +562,14 @@ HWTEST2_P(BlitTestsParams, givenSrcSizeNotAlignedWithin1and16BytesWhenGettingByt
 
 HWTEST2_P(BlitTestsParams, givenDstSizeAlignedWithin1and16BytesWhenGettingBytesPerPixelThenCorrectPixelSizeIsReturned, BlitPlatforms) {
     size_t copySize = BlitterConstants::maxBytesPerPixel;
-    auto aligment = GetParam();
+    auto alignment = GetParam();
     uint32_t srcOrigin, dstOrigin, srcSize, dstSize;
     dstSize = 33;
-    dstSize = alignUp(dstSize, aligment);
+    dstSize = alignUp(dstSize, alignment);
     srcOrigin = dstOrigin = srcSize = static_cast<uint32_t>(BlitterConstants::maxBytesPerPixel);
     uint32_t bytesPerPixel = NEO::BlitCommandsHelper<FamilyType>::getAvailableBytesPerPixel(copySize, srcOrigin, dstOrigin, srcSize, dstSize);
 
-    EXPECT_EQ(bytesPerPixel, aligment);
+    EXPECT_EQ(bytesPerPixel, alignment);
 }
 
 HWTEST2_P(BlitTestsParams, givenDstSizeNotAlignedWithin1and16BytesWhenGettingBytesPerPixelThen1BytePixelSizeIsReturned, BlitPlatforms) {
@@ -584,26 +584,26 @@ HWTEST2_P(BlitTestsParams, givenDstSizeNotAlignedWithin1and16BytesWhenGettingByt
 
 HWTEST2_P(BlitTestsParams, givenSrcOriginAlignedWithin1and16BytesWhenGettingBytesPerPixelThenCorrectPixelSizeIsReturned, BlitPlatforms) {
     size_t copySize = BlitterConstants::maxBytesPerPixel;
-    auto aligment = GetParam();
+    auto alignment = GetParam();
     uint32_t srcOrigin, dstOrigin, srcSize, dstSize;
     srcOrigin = 33;
-    srcOrigin = alignUp(srcOrigin, aligment);
+    srcOrigin = alignUp(srcOrigin, alignment);
     dstSize = dstOrigin = srcSize = static_cast<uint32_t>(BlitterConstants::maxBytesPerPixel);
     uint32_t bytesPerPixel = NEO::BlitCommandsHelper<FamilyType>::getAvailableBytesPerPixel(copySize, srcOrigin, dstOrigin, srcSize, dstSize);
 
-    EXPECT_EQ(bytesPerPixel, aligment);
+    EXPECT_EQ(bytesPerPixel, alignment);
 }
 
 HWTEST2_P(BlitTestsParams, givenDstOriginAlignedWithin1and16BytesWhenGettingBytesPerPixelThenCorrectPixelSizeIsReturned, BlitPlatforms) {
     size_t copySize = BlitterConstants::maxBytesPerPixel;
-    auto aligment = GetParam();
+    auto alignment = GetParam();
     uint32_t srcOrigin, dstOrigin, srcSize, dstSize;
     dstOrigin = 33;
-    dstOrigin = alignUp(dstOrigin, aligment);
+    dstOrigin = alignUp(dstOrigin, alignment);
     dstSize = srcOrigin = srcSize = static_cast<uint32_t>(BlitterConstants::maxBytesPerPixel);
     uint32_t bytesPerPixel = NEO::BlitCommandsHelper<FamilyType>::getAvailableBytesPerPixel(copySize, srcOrigin, dstOrigin, srcSize, dstSize);
 
-    EXPECT_EQ(bytesPerPixel, aligment);
+    EXPECT_EQ(bytesPerPixel, alignment);
 }
 
 HWTEST2_P(BlitTestsParams, givenDstOriginNotAlignedWithin1and16BytesWhenGettingBytesPerPixelThen1BytePixelSizeIsReturned, BlitPlatforms) {