diff --git a/imagepipeline-base/src/main/java/com/facebook/cache/disk/DiskStorageCache.kt b/imagepipeline-base/src/main/java/com/facebook/cache/disk/DiskStorageCache.kt
index e017e16f20..32bc3003d9 100644
--- a/imagepipeline-base/src/main/java/com/facebook/cache/disk/DiskStorageCache.kt
+++ b/imagepipeline-base/src/main/java/com/facebook/cache/disk/DiskStorageCache.kt
@@ -295,7 +295,7 @@ class DiskStorageCache(
   }
 
   @Throws(IOException::class)
-  override fun insert(key: CacheKey, callback: WriterCallback): BinaryResource {
+  override fun insert(key: CacheKey, writer: WriterCallback): BinaryResource {
     // Write to a temp file, then move it into place. This allows more parallelism
     // when writing files.
     val cacheEvent = SettableCacheEvent.obtain().setCacheKey(key)
@@ -312,7 +312,7 @@ class DiskStorageCache(
       // getting the file is synchronized
       val inserter = startInsert(resourceId, key)
       try {
-        inserter.writeData(callback, key)
+        inserter.writeData(writer, key)
         // Committing the file is synchronized
         val resource = endInsert(inserter, key, resourceId)
         cacheEvent.setItemSize(resource.size()).setCacheSize(cacheStats.size)
diff --git a/imagepipeline/src/main/java/com/facebook/imagepipeline/memory/BitmapPoolBackend.kt b/imagepipeline/src/main/java/com/facebook/imagepipeline/memory/BitmapPoolBackend.kt
index a12eb1cae8..97bce158e8 100644
--- a/imagepipeline/src/main/java/com/facebook/imagepipeline/memory/BitmapPoolBackend.kt
+++ b/imagepipeline/src/main/java/com/facebook/imagepipeline/memory/BitmapPoolBackend.kt
@@ -29,6 +29,7 @@ open class BitmapPoolBackend : LruBucketsPoolBackend<Bitmap>() {
     return null
   }
 
+  @Suppress("PARAMETER_NAME_CHANGED_ON_OVERRIDE")
   override fun getSize(bitmap: Bitmap): Int = BitmapUtil.getSizeInBytes(bitmap)
 
   protected fun isReusable(bitmap: Bitmap?): Boolean {
diff --git a/imagepipeline/src/main/java/com/facebook/imagepipeline/memory/BucketsBitmapPool.kt b/imagepipeline/src/main/java/com/facebook/imagepipeline/memory/BucketsBitmapPool.kt
index d3a59a6853..ff6c5badbf 100644
--- a/imagepipeline/src/main/java/com/facebook/imagepipeline/memory/BucketsBitmapPool.kt
+++ b/imagepipeline/src/main/java/com/facebook/imagepipeline/memory/BucketsBitmapPool.kt
@@ -42,13 +42,13 @@ class BucketsBitmapPool(
    * Allocate a bitmap that has a backing memory allocation of 'size' bytes. This is configuration
    * agnostic so the size is the actual size in bytes of the bitmap.
    *
-   * @param size the 'size' in bytes of the bitmap
+   * @param bucketedSize the 'size' in bytes of the bitmap
    * @return a new bitmap with the specified size in memory
    */
-  public override fun alloc(size: Int): Bitmap {
+  public override fun alloc(bucketedSize: Int): Bitmap {
     return Bitmap.createBitmap(
         1,
-        ceil(size / BitmapUtil.RGB_565_BYTES_PER_PIXEL.toDouble()).toInt(),
+        ceil(bucketedSize / BitmapUtil.RGB_565_BYTES_PER_PIXEL.toDouble()).toInt(),
         Bitmap.Config.RGB_565,
     )
   }
diff --git a/imagepipeline/src/main/java/com/facebook/imagepipeline/producers/DiskCacheWriteProducer.kt b/imagepipeline/src/main/java/com/facebook/imagepipeline/producers/DiskCacheWriteProducer.kt
index 37fe574c1e..9d429766d8 100644
--- a/imagepipeline/src/main/java/com/facebook/imagepipeline/producers/DiskCacheWriteProducer.kt
+++ b/imagepipeline/src/main/java/com/facebook/imagepipeline/producers/DiskCacheWriteProducer.kt
@@ -37,8 +37,8 @@ class DiskCacheWriteProducer(
     private val cacheKeyFactory: CacheKeyFactory,
     private val inputProducer: Producer<EncodedImage>,
 ) : Producer<EncodedImage> {
-  override fun produceResults(consumer: Consumer<EncodedImage>, producerContext: ProducerContext) {
-    maybeStartInputProducer(consumer, producerContext)
+  override fun produceResults(consumer: Consumer<EncodedImage>, context: ProducerContext) {
+    maybeStartInputProducer(consumer, context)
   }
 
   private fun maybeStartInputProducer(
diff --git a/imagepipeline/src/main/java/com/facebook/imagepipeline/producers/ThreadHandoffProducer.kt b/imagepipeline/src/main/java/com/facebook/imagepipeline/producers/ThreadHandoffProducer.kt
index c776743a81..94286b3467 100644
--- a/imagepipeline/src/main/java/com/facebook/imagepipeline/producers/ThreadHandoffProducer.kt
+++ b/imagepipeline/src/main/java/com/facebook/imagepipeline/producers/ThreadHandoffProducer.kt
@@ -29,12 +29,12 @@ class ThreadHandoffProducer<T>(
 
       val statefulRunnable: StatefulProducerRunnable<T> =
           object : StatefulProducerRunnable<T>(consumer, producerListener, context, PRODUCER_NAME) {
-            override fun onSuccess(ignored: T?) {
+            override fun onSuccess(result: T?) {
               producerListener.onProducerFinishWithSuccess(context, PRODUCER_NAME, null)
               inputProducer.produceResults(consumer, context)
             }
 
-            override fun disposeResult(ignored: T?) = Unit
+            override fun disposeResult(result: T?) = Unit
 
             @Throws(Exception::class)
             override fun getResult(): T? {