diff --git a/fuzzer/hevc_dec_fuzzer.cpp b/fuzzer/hevc_dec_fuzzer.cpp
index 2a8e1cf..2e6da7c 100644
--- a/fuzzer/hevc_dec_fuzzer.cpp
+++ b/fuzzer/hevc_dec_fuzzer.cpp
@@ -216,37 +216,37 @@ void Codec::allocFrame() {
 
   size_t aligned_wd = (mWidth + 1) & ~1;
   size_t aligned_ht = (mHeight + 1) & ~1;
-  size_t elementSize = (mBitDepth > 8) ? 2 : 1;
+  size_t pixelSize = (mBitDepth > 8) ? 2 : 1;
   switch (mColorFormat) {
     case IV_YUV_420SP_UV:
       [[fallthrough]];
     case IV_YUV_420SP_VU:
-      sizes[0] = mWidth * mHeight * elementSize;
-      sizes[1] = ((aligned_wd * aligned_ht) >> 1) * elementSize;
+      sizes[0] = mWidth * mHeight * pixelSize;
+      sizes[1] = ((aligned_wd * aligned_ht) >> 1) * pixelSize;
       num_bufs = 2;
       break;
     case IV_GRAY:
-      sizes[0] = mWidth * mHeight * elementSize;
+      sizes[0] = mWidth * mHeight * pixelSize;
       num_bufs = 1;
       break;
     case IV_YUV_444P:
-      sizes[0] = (mWidth * mHeight) * elementSize;
-      sizes[1] = (mWidth * mHeight) * elementSize;
-      sizes[2] = (mWidth * mHeight) * elementSize;
+      sizes[0] = (mWidth * mHeight) * pixelSize;
+      sizes[1] = (mWidth * mHeight) * pixelSize;
+      sizes[2] = (mWidth * mHeight) * pixelSize;
       num_bufs = 3;
       break;
     case IV_YUV_422P:
-      sizes[0] = (mWidth * mHeight) * elementSize;
-      sizes[1] = ((aligned_wd * mHeight) >> 1) * elementSize;
-      sizes[2] = ((aligned_wd * mHeight) >> 1) * elementSize;
+      sizes[0] = (mWidth * mHeight) * pixelSize;
+      sizes[1] = ((aligned_wd * mHeight) >> 1) * pixelSize;
+      sizes[2] = ((aligned_wd * mHeight) >> 1) * pixelSize;
       num_bufs = 3;
       break;
     case IV_YUV_420P:
       [[fallthrough]];
     default:
-      sizes[0] = mWidth * mHeight * elementSize;
-      sizes[1] = ((aligned_wd * aligned_ht) >> 2) * elementSize;
-      sizes[2] = ((aligned_wd * aligned_ht) >> 2) * elementSize;
+      sizes[0] = mWidth * mHeight * pixelSize;
+      sizes[1] = ((aligned_wd * aligned_ht) >> 2) * pixelSize;
+      sizes[2] = ((aligned_wd * aligned_ht) >> 2) * pixelSize;
       num_bufs = 3;
       break;
   }
diff --git a/tests/common/RawBuf.cpp b/tests/common/RawBuf.cpp
index 9949d27..897c19d 100644
--- a/tests/common/RawBuf.cpp
+++ b/tests/common/RawBuf.cpp
@@ -93,7 +93,7 @@ bool RawBuf::allocBuffer(size_t width, size_t height, size_t bitDepth,
     mOffsets[i] = 0;
   }
 
-  size_t elementSize = (mBitDepth + 7) / 8;
+  size_t pixelSize = (mBitDepth + 7) / 8;
   for (size_t i = 0; i < planesCount; ++i) {
     size_t w = planeWidth(i);
     size_t h = planeHeight(i);
@@ -102,7 +102,7 @@ bool RawBuf::allocBuffer(size_t width, size_t height, size_t bitDepth,
     size_t alignedStride = (w + alignment - 1) & ~(alignment - 1);
     mStrides[i] = alignedStride;
     mOffsets[i] = totalSize;
-    totalSize += alignedStride * h * elementSize;
+    totalSize += alignedStride * h * pixelSize;
   }
 
   mStorage.resize(totalSize);