diff --git a/error-prone-contrib/src/main/java/tech/picnic/errorprone/refasterrules/AssertJMapRules.java b/error-prone-contrib/src/main/java/tech/picnic/errorprone/refasterrules/AssertJMapRules.java
index 53288f7611..7ce1551c3e 100644
--- a/error-prone-contrib/src/main/java/tech/picnic/errorprone/refasterrules/AssertJMapRules.java
+++ b/error-prone-contrib/src/main/java/tech/picnic/errorprone/refasterrules/AssertJMapRules.java
@@ -29,13 +29,13 @@ static final class AbstractMapAssertIsEmpty<K, V> {
     void before(
         AbstractMapAssert<?, ?, K, V> mapAssert,
         @Matches(IsEmpty.class) Map<? extends K, ? extends V> wellTypedMap,
-        @Matches(IsEmpty.class) Map<?, ?> arbitraryMap,
+        @Matches(IsEmpty.class) Map<?, ?> arbitrarilyTypedMap,
         @Matches(IsEmpty.class) Iterable<? extends K> keys) {
       Refaster.anyOf(
           mapAssert.containsExactlyEntriesOf(wellTypedMap),
           mapAssert.containsExactlyInAnyOrderEntriesOf(wellTypedMap),
-          mapAssert.hasSameSizeAs(arbitraryMap),
-          mapAssert.isEqualTo(arbitraryMap),
+          mapAssert.hasSameSizeAs(arbitrarilyTypedMap),
+          mapAssert.isEqualTo(arbitrarilyTypedMap),
           mapAssert.containsOnlyKeys(keys),
           mapAssert.containsExactly(),
           mapAssert.containsOnly(),
diff --git a/error-prone-contrib/src/main/java/tech/picnic/errorprone/refasterrules/AssertJRules.java b/error-prone-contrib/src/main/java/tech/picnic/errorprone/refasterrules/AssertJRules.java
index 51ddd80a88..84bac00845 100644
--- a/error-prone-contrib/src/main/java/tech/picnic/errorprone/refasterrules/AssertJRules.java
+++ b/error-prone-contrib/src/main/java/tech/picnic/errorprone/refasterrules/AssertJRules.java
@@ -180,12 +180,12 @@ static final class AssertThatObjectEnumerableIsEmpty<E> {
     void before(
         ObjectEnumerableAssert<?, E> enumAssert,
         @Matches(IsEmpty.class) Iterable<? extends E> wellTypedIterable,
-        @Matches(IsEmpty.class) Iterable<?> arbitraryIterable) {
+        @Matches(IsEmpty.class) Iterable<?> arbitrarilyTypedIterable) {
       Refaster.anyOf(
           enumAssert.containsExactlyElementsOf(wellTypedIterable),
           enumAssert.containsExactlyInAnyOrderElementsOf(wellTypedIterable),
           enumAssert.hasSameElementsAs(wellTypedIterable),
-          enumAssert.hasSameSizeAs(arbitraryIterable),
+          enumAssert.hasSameSizeAs(arbitrarilyTypedIterable),
           enumAssert.isSubsetOf(wellTypedIterable),
           enumAssert.containsExactly(),
           enumAssert.containsExactlyInAnyOrder(),