From 28c46b73f1d5af2b81870912566300416bf2b051 Mon Sep 17 00:00:00 2001
From: Denis Zharkov <denis.zharkov@jetbrains.com>
Date: Fri, 16 Oct 2015 15:58:27 +0300
Subject: [PATCH] Rename some of builtin parameters

---
 compiler/testData/builtin-classes.txt         | 84 +++++++++----------
 .../ValAndFunOverrideCompatibilityClash.txt   | 20 ++---
 .../diagnostics/tests/exposed/typeArgs.txt    |  8 +-
 .../tests/j+k/GenericsInSupertypes.txt        | 20 ++---
 .../tests/j+k/collectionOverrides/contains.kt |  2 +-
 .../j+k/collectionOverrides/contains.txt      | 76 ++++++++---------
 .../j+k/collectionOverrides/containsAll.kt    |  2 +-
 .../j+k/collectionOverrides/containsAll.txt   | 80 +++++++++---------
 .../containsAndOverload.txt                   | 26 +++---
 .../collectionOverrides/mapGetOverride.txt    |  2 +-
 .../overridesBuiltinNoMagic.txt               | 28 +++----
 .../tests/j+k/collectionOverrides/removeAt.kt |  2 +-
 .../j+k/collectionOverrides/removeAt.txt      | 40 ++++-----
 .../j+k/collectionOverrides/removeAtInt.kt    |  2 +-
 .../j+k/collectionOverrides/removeAtInt.txt   | 38 ++++-----
 .../tests/j+k/finalCollectionSize.txt         | 40 ++++-----
 .../diagnostics/tests/j+k/specialBridges.txt  | 20 ++---
 .../listSuperType.txt                         | 20 ++---
 .../multipleExactBoundsNullable.txt           |  2 +-
 .../nullabilityWarnings/delegation.txt        | 24 +++---
 .../platformTypes/supertypeTypeArguments.txt  |  2 +-
 .../diagnostics/tests/scopes/visibility2.txt  | 20 ++---
 .../diagnostics/tests/subtyping/kt-1457.txt   | 20 ++---
 .../customClassMutableCollection.txt          | 14 ++--
 .../customClassMutableList.txt                | 20 ++---
 .../invalidFqName.txt                         | 40 ++++-----
 .../wrongTypeParametersCount.txt              | 20 ++---
 .../return/HalfSubstitutedTypeParameters.txt  | 20 ++---
 .../return/SubclassOfCollection.txt           | 14 ++--
 .../propagation/return/SubclassOfMapEntry.txt |  2 +-
 .../modality/ModalityOfFakeOverrides.txt      | 20 ++---
 .../return/HalfSubstitutedTypeParameters.txt  | 20 ++---
 .../return/SubclassOfCollection.txt           | 14 ++--
 .../modality/ModalityOfFakeOverrides.txt      | 20 ++---
 .../platformTypes/notnullTypeArgument.txt     | 20 ++---
 .../platformTypes/nullableTypeArgument.txt    | 20 ++---
 core/builtins/native/kotlin/Collections.kt    | 56 ++++++-------
 core/builtins/native/kotlin/Iterator.kt       |  8 +-
 core/builtins/native/kotlin/Primitives.kt     | 12 +--
 .../kotlin/generators/builtins/primitives.kt  |  2 +-
 .../SubstitutedSignature1.kt                  |  2 +-
 41 files changed, 451 insertions(+), 451 deletions(-)

diff --git a/compiler/testData/builtin-classes.txt b/compiler/testData/builtin-classes.txt
index c5709214ef4..ff0bfaead86 100644
--- a/compiler/testData/builtin-classes.txt
+++ b/compiler/testData/builtin-classes.txt
@@ -279,8 +279,8 @@ public interface Cloneable {
 public interface Collection</*0*/ out E> : kotlin.Iterable<E> {
     public abstract val size: kotlin.Int
         public abstract fun <get-size>(): kotlin.Int
-    public abstract operator fun contains(/*0*/ o: @kotlin.UnsafeVariance() E): kotlin.Boolean
-    public abstract fun containsAll(/*0*/ c: kotlin.Collection<@kotlin.UnsafeVariance() E>): kotlin.Boolean
+    public abstract operator fun contains(/*0*/ element: @kotlin.UnsafeVariance() E): kotlin.Boolean
+    public abstract fun containsAll(/*0*/ elements: kotlin.Collection<@kotlin.UnsafeVariance() E>): kotlin.Boolean
     public abstract fun isEmpty(): kotlin.Boolean
     public abstract override /*1*/ fun iterator(): kotlin.Iterator<E>
 }
@@ -668,8 +668,8 @@ public final class Int : kotlin.Number, kotlin.Comparable<kotlin.Int> {
     public final operator fun rangeTo(/*0*/ other: kotlin.Int): kotlin.IntRange
     public final operator fun rangeTo(/*0*/ other: kotlin.Long): kotlin.LongRange
     public final operator fun rangeTo(/*0*/ other: kotlin.Short): kotlin.IntRange
-    public final infix fun shl(/*0*/ bits: kotlin.Int): kotlin.Int
-    public final infix fun shr(/*0*/ bits: kotlin.Int): kotlin.Int
+    public final infix fun shl(/*0*/ bitCount: kotlin.Int): kotlin.Int
+    public final infix fun shr(/*0*/ bitCount: kotlin.Int): kotlin.Int
     public final operator fun times(/*0*/ other: kotlin.Byte): kotlin.Int
     public final operator fun times(/*0*/ other: kotlin.Double): kotlin.Double
     public final operator fun times(/*0*/ other: kotlin.Float): kotlin.Float
@@ -685,7 +685,7 @@ public final class Int : kotlin.Number, kotlin.Comparable<kotlin.Int> {
     public open override /*1*/ fun toShort(): kotlin.Short
     public final operator fun unaryMinus(): kotlin.Int
     public final operator fun unaryPlus(): kotlin.Int
-    public final infix fun ushr(/*0*/ bits: kotlin.Int): kotlin.Int
+    public final infix fun ushr(/*0*/ bitCount: kotlin.Int): kotlin.Int
     public final infix fun xor(/*0*/ other: kotlin.Int): kotlin.Int
 
     public companion object Companion : kotlin.IntegerConstants<kotlin.Int> {
@@ -781,13 +781,13 @@ public interface Iterator</*0*/ out T> {
 public interface List</*0*/ out E> : kotlin.Collection<E> {
     public abstract override /*1*/ val size: kotlin.Int
         public abstract override /*1*/ fun <get-size>(): kotlin.Int
-    public abstract override /*1*/ fun contains(/*0*/ o: @kotlin.UnsafeVariance() E): kotlin.Boolean
-    public abstract override /*1*/ fun containsAll(/*0*/ c: kotlin.Collection<@kotlin.UnsafeVariance() E>): kotlin.Boolean
+    public abstract override /*1*/ fun contains(/*0*/ element: @kotlin.UnsafeVariance() E): kotlin.Boolean
+    public abstract override /*1*/ fun containsAll(/*0*/ elements: kotlin.Collection<@kotlin.UnsafeVariance() E>): kotlin.Boolean
     public abstract operator fun get(/*0*/ index: kotlin.Int): E
-    public abstract fun indexOf(/*0*/ o: @kotlin.UnsafeVariance() E): kotlin.Int
+    public abstract fun indexOf(/*0*/ element: @kotlin.UnsafeVariance() E): kotlin.Int
     public abstract override /*1*/ fun isEmpty(): kotlin.Boolean
     public abstract override /*1*/ fun iterator(): kotlin.Iterator<E>
-    public abstract fun lastIndexOf(/*0*/ o: @kotlin.UnsafeVariance() E): kotlin.Int
+    public abstract fun lastIndexOf(/*0*/ element: @kotlin.UnsafeVariance() E): kotlin.Int
     public abstract fun listIterator(): kotlin.ListIterator<E>
     public abstract fun listIterator(/*0*/ index: kotlin.Int): kotlin.ListIterator<E>
     public abstract fun subList(/*0*/ fromIndex: kotlin.Int, /*1*/ toIndex: kotlin.Int): kotlin.List<E>
@@ -845,8 +845,8 @@ public final class Long : kotlin.Number, kotlin.Comparable<kotlin.Long> {
     public final operator fun rangeTo(/*0*/ other: kotlin.Int): kotlin.LongRange
     public final operator fun rangeTo(/*0*/ other: kotlin.Long): kotlin.LongRange
     public final operator fun rangeTo(/*0*/ other: kotlin.Short): kotlin.LongRange
-    public final infix fun shl(/*0*/ bits: kotlin.Int): kotlin.Long
-    public final infix fun shr(/*0*/ bits: kotlin.Int): kotlin.Long
+    public final infix fun shl(/*0*/ bitCount: kotlin.Int): kotlin.Long
+    public final infix fun shr(/*0*/ bitCount: kotlin.Int): kotlin.Long
     public final operator fun times(/*0*/ other: kotlin.Byte): kotlin.Long
     public final operator fun times(/*0*/ other: kotlin.Double): kotlin.Double
     public final operator fun times(/*0*/ other: kotlin.Float): kotlin.Float
@@ -862,7 +862,7 @@ public final class Long : kotlin.Number, kotlin.Comparable<kotlin.Long> {
     public open override /*1*/ fun toShort(): kotlin.Short
     public final operator fun unaryMinus(): kotlin.Long
     public final operator fun unaryPlus(): kotlin.Long
-    public final infix fun ushr(/*0*/ bits: kotlin.Int): kotlin.Long
+    public final infix fun ushr(/*0*/ bitCount: kotlin.Int): kotlin.Long
     public final infix fun xor(/*0*/ other: kotlin.Long): kotlin.Long
 
     public companion object Companion : kotlin.IntegerConstants<kotlin.Long> {
@@ -964,16 +964,16 @@ public interface Map</*0*/ K, /*1*/ out V> {
 public interface MutableCollection</*0*/ E> : kotlin.Collection<E>, kotlin.MutableIterable<E> {
     public abstract override /*1*/ /*fake_override*/ val size: kotlin.Int
         public abstract override /*1*/ /*fake_override*/ fun <get-size>(): kotlin.Int
-    public abstract fun add(/*0*/ e: E): kotlin.Boolean
-    public abstract fun addAll(/*0*/ c: kotlin.Collection<E>): kotlin.Boolean
+    public abstract fun add(/*0*/ element: E): kotlin.Boolean
+    public abstract fun addAll(/*0*/ elements: kotlin.Collection<E>): kotlin.Boolean
     public abstract fun clear(): kotlin.Unit
-    public abstract override /*1*/ /*fake_override*/ fun contains(/*0*/ o: E): kotlin.Boolean
-    public abstract override /*1*/ /*fake_override*/ fun containsAll(/*0*/ c: kotlin.Collection<E>): kotlin.Boolean
+    public abstract override /*1*/ /*fake_override*/ fun contains(/*0*/ element: E): kotlin.Boolean
+    public abstract override /*1*/ /*fake_override*/ fun containsAll(/*0*/ elements: kotlin.Collection<E>): kotlin.Boolean
     public abstract override /*1*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean
     public abstract override /*2*/ fun iterator(): kotlin.MutableIterator<E>
-    public abstract fun remove(/*0*/ o: E): kotlin.Boolean
-    public abstract fun removeAll(/*0*/ c: kotlin.Collection<E>): kotlin.Boolean
-    public abstract fun retainAll(/*0*/ c: kotlin.Collection<E>): kotlin.Boolean
+    public abstract fun remove(/*0*/ element: E): kotlin.Boolean
+    public abstract fun removeAll(/*0*/ elements: kotlin.Collection<E>): kotlin.Boolean
+    public abstract fun retainAll(/*0*/ elements: kotlin.Collection<E>): kotlin.Boolean
 }
 
 public interface MutableIterable</*0*/ out T> : kotlin.Iterable<T> {
@@ -989,30 +989,30 @@ public interface MutableIterator</*0*/ out T> : kotlin.Iterator<T> {
 public interface MutableList</*0*/ E> : kotlin.List<E>, kotlin.MutableCollection<E> {
     public abstract override /*2*/ /*fake_override*/ val size: kotlin.Int
         public abstract override /*2*/ /*fake_override*/ fun <get-size>(): kotlin.Int
-    public abstract override /*1*/ fun add(/*0*/ e: E): kotlin.Boolean
+    public abstract override /*1*/ fun add(/*0*/ element: E): kotlin.Boolean
     public abstract fun add(/*0*/ index: kotlin.Int, /*1*/ element: E): kotlin.Unit
-    public abstract override /*1*/ fun addAll(/*0*/ c: kotlin.Collection<E>): kotlin.Boolean
-    public abstract fun addAll(/*0*/ index: kotlin.Int, /*1*/ c: kotlin.Collection<E>): kotlin.Boolean
+    public abstract override /*1*/ fun addAll(/*0*/ elements: kotlin.Collection<E>): kotlin.Boolean
+    public abstract fun addAll(/*0*/ index: kotlin.Int, /*1*/ elements: kotlin.Collection<E>): kotlin.Boolean
     public abstract override /*1*/ fun clear(): kotlin.Unit
-    public abstract override /*2*/ /*fake_override*/ fun contains(/*0*/ o: E): kotlin.Boolean
-    public abstract override /*2*/ /*fake_override*/ fun containsAll(/*0*/ c: kotlin.Collection<E>): kotlin.Boolean
+    public abstract override /*2*/ /*fake_override*/ fun contains(/*0*/ element: E): kotlin.Boolean
+    public abstract override /*2*/ /*fake_override*/ fun containsAll(/*0*/ elements: kotlin.Collection<E>): kotlin.Boolean
     public abstract override /*1*/ /*fake_override*/ fun get(/*0*/ index: kotlin.Int): E
-    public abstract override /*1*/ /*fake_override*/ fun indexOf(/*0*/ o: E): kotlin.Int
+    public abstract override /*1*/ /*fake_override*/ fun indexOf(/*0*/ element: E): kotlin.Int
     public abstract override /*2*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean
     public abstract override /*2*/ /*fake_override*/ fun iterator(): kotlin.MutableIterator<E>
-    public abstract override /*1*/ /*fake_override*/ fun lastIndexOf(/*0*/ o: E): kotlin.Int
+    public abstract override /*1*/ /*fake_override*/ fun lastIndexOf(/*0*/ element: E): kotlin.Int
     public abstract override /*1*/ fun listIterator(): kotlin.MutableListIterator<E>
     public abstract override /*1*/ fun listIterator(/*0*/ index: kotlin.Int): kotlin.MutableListIterator<E>
-    public abstract override /*1*/ fun remove(/*0*/ o: E): kotlin.Boolean
-    public abstract override /*1*/ fun removeAll(/*0*/ c: kotlin.Collection<E>): kotlin.Boolean
+    public abstract override /*1*/ fun remove(/*0*/ element: E): kotlin.Boolean
+    public abstract override /*1*/ fun removeAll(/*0*/ elements: kotlin.Collection<E>): kotlin.Boolean
     public abstract fun removeAt(/*0*/ index: kotlin.Int): E
-    public abstract override /*1*/ fun retainAll(/*0*/ c: kotlin.Collection<E>): kotlin.Boolean
+    public abstract override /*1*/ fun retainAll(/*0*/ elements: kotlin.Collection<E>): kotlin.Boolean
     public abstract operator fun set(/*0*/ index: kotlin.Int, /*1*/ element: E): E
     public abstract override /*1*/ fun subList(/*0*/ fromIndex: kotlin.Int, /*1*/ toIndex: kotlin.Int): kotlin.MutableList<E>
 }
 
 public interface MutableListIterator</*0*/ T> : kotlin.ListIterator<T>, kotlin.MutableIterator<T> {
-    public abstract fun add(/*0*/ e: T): kotlin.Unit
+    public abstract fun add(/*0*/ element: T): kotlin.Unit
     public abstract override /*2*/ fun hasNext(): kotlin.Boolean
     public abstract override /*1*/ /*fake_override*/ fun hasPrevious(): kotlin.Boolean
     public abstract override /*2*/ fun next(): T
@@ -1020,7 +1020,7 @@ public interface MutableListIterator</*0*/ T> : kotlin.ListIterator<T>, kotlin.M
     public abstract override /*1*/ /*fake_override*/ fun previous(): T
     public abstract override /*1*/ /*fake_override*/ fun previousIndex(): kotlin.Int
     public abstract override /*1*/ fun remove(): kotlin.Unit
-    public abstract fun set(/*0*/ e: T): kotlin.Unit
+    public abstract fun set(/*0*/ element: T): kotlin.Unit
 }
 
 public interface MutableMap</*0*/ K, /*1*/ V> : kotlin.Map<K, V> {
@@ -1038,7 +1038,7 @@ public interface MutableMap</*0*/ K, /*1*/ V> : kotlin.Map<K, V> {
     public abstract override /*1*/ /*fake_override*/ fun get(/*0*/ key: K): V?
     public abstract override /*1*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean
     public abstract fun put(/*0*/ key: K, /*1*/ value: V): V?
-    public abstract fun putAll(/*0*/ m: kotlin.Map<out K, V>): kotlin.Unit
+    public abstract fun putAll(/*0*/ from: kotlin.Map<out K, V>): kotlin.Unit
     public abstract fun remove(/*0*/ key: K): V?
 
     public interface MutableEntry</*0*/ K, /*1*/ V> : kotlin.Map.Entry<K, V> {
@@ -1046,23 +1046,23 @@ public interface MutableMap</*0*/ K, /*1*/ V> : kotlin.Map<K, V> {
             public abstract override /*1*/ /*fake_override*/ fun <get-key>(): K
         public abstract override /*1*/ /*fake_override*/ val value: V
             public abstract override /*1*/ /*fake_override*/ fun <get-value>(): V
-        public abstract fun setValue(/*0*/ value: V): V
+        public abstract fun setValue(/*0*/ newValue: V): V
     }
 }
 
 public interface MutableSet</*0*/ E> : kotlin.Set<E>, kotlin.MutableCollection<E> {
     public abstract override /*2*/ /*fake_override*/ val size: kotlin.Int
         public abstract override /*2*/ /*fake_override*/ fun <get-size>(): kotlin.Int
-    public abstract override /*1*/ fun add(/*0*/ e: E): kotlin.Boolean
-    public abstract override /*1*/ fun addAll(/*0*/ c: kotlin.Collection<E>): kotlin.Boolean
+    public abstract override /*1*/ fun add(/*0*/ element: E): kotlin.Boolean
+    public abstract override /*1*/ fun addAll(/*0*/ elements: kotlin.Collection<E>): kotlin.Boolean
     public abstract override /*1*/ fun clear(): kotlin.Unit
-    public abstract override /*2*/ /*fake_override*/ fun contains(/*0*/ o: E): kotlin.Boolean
-    public abstract override /*2*/ /*fake_override*/ fun containsAll(/*0*/ c: kotlin.Collection<E>): kotlin.Boolean
+    public abstract override /*2*/ /*fake_override*/ fun contains(/*0*/ element: E): kotlin.Boolean
+    public abstract override /*2*/ /*fake_override*/ fun containsAll(/*0*/ elements: kotlin.Collection<E>): kotlin.Boolean
     public abstract override /*2*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean
     public abstract override /*2*/ fun iterator(): kotlin.MutableIterator<E>
-    public abstract override /*1*/ fun remove(/*0*/ o: E): kotlin.Boolean
-    public abstract override /*1*/ fun removeAll(/*0*/ c: kotlin.Collection<E>): kotlin.Boolean
-    public abstract override /*1*/ fun retainAll(/*0*/ c: kotlin.Collection<E>): kotlin.Boolean
+    public abstract override /*1*/ fun remove(/*0*/ element: E): kotlin.Boolean
+    public abstract override /*1*/ fun removeAll(/*0*/ elements: kotlin.Collection<E>): kotlin.Boolean
+    public abstract override /*1*/ fun retainAll(/*0*/ elements: kotlin.Collection<E>): kotlin.Boolean
 }
 
 public final class Nothing {
@@ -1115,8 +1115,8 @@ public interface Range</*0*/ T : kotlin.Comparable<T>> {
 public interface Set</*0*/ out E> : kotlin.Collection<E> {
     public abstract override /*1*/ val size: kotlin.Int
         public abstract override /*1*/ fun <get-size>(): kotlin.Int
-    public abstract override /*1*/ fun contains(/*0*/ o: @kotlin.UnsafeVariance() E): kotlin.Boolean
-    public abstract override /*1*/ fun containsAll(/*0*/ c: kotlin.Collection<@kotlin.UnsafeVariance() E>): kotlin.Boolean
+    public abstract override /*1*/ fun contains(/*0*/ element: @kotlin.UnsafeVariance() E): kotlin.Boolean
+    public abstract override /*1*/ fun containsAll(/*0*/ elements: kotlin.Collection<@kotlin.UnsafeVariance() E>): kotlin.Boolean
     public abstract override /*1*/ fun isEmpty(): kotlin.Boolean
     public abstract override /*1*/ fun iterator(): kotlin.Iterator<E>
 }
diff --git a/compiler/testData/diagnostics/tests/ValAndFunOverrideCompatibilityClash.txt b/compiler/testData/diagnostics/tests/ValAndFunOverrideCompatibilityClash.txt
index 1e9973334d0..805a5b84c57 100644
--- a/compiler/testData/diagnostics/tests/ValAndFunOverrideCompatibilityClash.txt
+++ b/compiler/testData/diagnostics/tests/ValAndFunOverrideCompatibilityClash.txt
@@ -24,15 +24,15 @@ public final class Foo1 : java.util.ArrayList<kotlin.Int> {
     protected/*protected and package*/ final override /*1*/ /*fake_override*/ var modCount: kotlin.Int
     invisible_fake final override /*1*/ /*fake_override*/ var size: kotlin.Int
     public open override /*1*/ /*fake_override*/ val size: kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun add(/*0*/ e: kotlin.Int): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun add(/*0*/ element: kotlin.Int): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun add(/*0*/ index: kotlin.Int, /*1*/ element: kotlin.Int): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ c: kotlin.Collection<kotlin.Int>): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ index: kotlin.Int, /*1*/ c: kotlin.Collection<kotlin.Int>): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ elements: kotlin.Collection<kotlin.Int>): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ index: kotlin.Int, /*1*/ elements: kotlin.Collection<kotlin.Int>): kotlin.Boolean
     invisible_fake open override /*1*/ /*fake_override*/ fun batchRemove(/*0*/ p0: kotlin.(Mutable)Collection<*>!, /*1*/ p1: kotlin.Boolean): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun clear(): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
-    public open override /*1*/ /*fake_override*/ fun contains(/*0*/ o: kotlin.Int): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun containsAll(/*0*/ c: kotlin.Collection<kotlin.Int>): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun contains(/*0*/ element: kotlin.Int): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun containsAll(/*0*/ elements: kotlin.Collection<kotlin.Int>): kotlin.Boolean
     invisible_fake open override /*1*/ /*fake_override*/ fun elementData(/*0*/ p0: kotlin.Int): kotlin.Int!
     public open override /*1*/ /*fake_override*/ fun ensureCapacity(/*0*/ p0: kotlin.Int): kotlin.Unit
     invisible_fake open override /*1*/ /*fake_override*/ fun ensureCapacityInternal(/*0*/ p0: kotlin.Int): kotlin.Unit
@@ -41,21 +41,21 @@ public final class Foo1 : java.util.ArrayList<kotlin.Int> {
     public open override /*1*/ /*fake_override*/ fun get(/*0*/ index: kotlin.Int): kotlin.Int
     invisible_fake open override /*1*/ /*fake_override*/ fun grow(/*0*/ p0: kotlin.Int): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun indexOf(/*0*/ o: kotlin.Int): kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun indexOf(/*0*/ element: kotlin.Int): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun iterator(): kotlin.MutableIterator<kotlin.Int>
-    public open override /*1*/ /*fake_override*/ fun lastIndexOf(/*0*/ o: kotlin.Int): kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun lastIndexOf(/*0*/ element: kotlin.Int): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun listIterator(): kotlin.MutableListIterator<kotlin.Int>
     public open override /*1*/ /*fake_override*/ fun listIterator(/*0*/ index: kotlin.Int): kotlin.MutableListIterator<kotlin.Int>
     invisible_fake open override /*1*/ /*fake_override*/ fun outOfBoundsMsg(/*0*/ p0: kotlin.Int): kotlin.String!
     invisible_fake open override /*1*/ /*fake_override*/ fun rangeCheck(/*0*/ p0: kotlin.Int): kotlin.Unit
     invisible_fake open override /*1*/ /*fake_override*/ fun rangeCheckForAdd(/*0*/ p0: kotlin.Int): kotlin.Unit
     invisible_fake open override /*1*/ /*fake_override*/ fun readObject(/*0*/ p0: java.io.ObjectInputStream!): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun remove(/*0*/ o: kotlin.Int): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun removeAll(/*0*/ c: kotlin.Collection<kotlin.Int>): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun remove(/*0*/ element: kotlin.Int): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun removeAll(/*0*/ elements: kotlin.Collection<kotlin.Int>): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun removeAt(/*0*/ p0: kotlin.Int): kotlin.Int
     protected/*protected and package*/ open override /*1*/ /*fake_override*/ fun removeRange(/*0*/ p0: kotlin.Int, /*1*/ p1: kotlin.Int): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun retainAll(/*0*/ c: kotlin.Collection<kotlin.Int>): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun retainAll(/*0*/ elements: kotlin.Collection<kotlin.Int>): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun set(/*0*/ index: kotlin.Int, /*1*/ element: kotlin.Int): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun subList(/*0*/ fromIndex: kotlin.Int, /*1*/ toIndex: kotlin.Int): kotlin.MutableList<kotlin.Int>
     public open override /*1*/ /*fake_override*/ fun toArray(): kotlin.Array<(out) kotlin.Any!>!
diff --git a/compiler/testData/diagnostics/tests/exposed/typeArgs.txt b/compiler/testData/diagnostics/tests/exposed/typeArgs.txt
index 8e04cab5ac2..454d557daf9 100644
--- a/compiler/testData/diagnostics/tests/exposed/typeArgs.txt
+++ b/compiler/testData/diagnostics/tests/exposed/typeArgs.txt
@@ -8,15 +8,15 @@ public interface Generic</*0*/ E : My> {
 
 public interface His : kotlin.List<My> {
     public abstract override /*1*/ /*fake_override*/ val size: kotlin.Int
-    public abstract override /*1*/ /*fake_override*/ fun contains(/*0*/ o: My): kotlin.Boolean
-    public abstract override /*1*/ /*fake_override*/ fun containsAll(/*0*/ c: kotlin.Collection<My>): kotlin.Boolean
+    public abstract override /*1*/ /*fake_override*/ fun contains(/*0*/ element: My): kotlin.Boolean
+    public abstract override /*1*/ /*fake_override*/ fun containsAll(/*0*/ elements: kotlin.Collection<My>): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public abstract override /*1*/ /*fake_override*/ fun get(/*0*/ index: kotlin.Int): My
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public abstract override /*1*/ /*fake_override*/ fun indexOf(/*0*/ o: My): kotlin.Int
+    public abstract override /*1*/ /*fake_override*/ fun indexOf(/*0*/ element: My): kotlin.Int
     public abstract override /*1*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean
     public abstract override /*1*/ /*fake_override*/ fun iterator(): kotlin.Iterator<My>
-    public abstract override /*1*/ /*fake_override*/ fun lastIndexOf(/*0*/ o: My): kotlin.Int
+    public abstract override /*1*/ /*fake_override*/ fun lastIndexOf(/*0*/ element: My): kotlin.Int
     public abstract override /*1*/ /*fake_override*/ fun listIterator(): kotlin.ListIterator<My>
     public abstract override /*1*/ /*fake_override*/ fun listIterator(/*0*/ index: kotlin.Int): kotlin.ListIterator<My>
     public abstract override /*1*/ /*fake_override*/ fun subList(/*0*/ fromIndex: kotlin.Int, /*1*/ toIndex: kotlin.Int): kotlin.List<My>
diff --git a/compiler/testData/diagnostics/tests/j+k/GenericsInSupertypes.txt b/compiler/testData/diagnostics/tests/j+k/GenericsInSupertypes.txt
index b076ace0e9d..ff0a8c84dd8 100644
--- a/compiler/testData/diagnostics/tests/j+k/GenericsInSupertypes.txt
+++ b/compiler/testData/diagnostics/tests/j+k/GenericsInSupertypes.txt
@@ -7,14 +7,14 @@ public abstract class AL : java.util.ArrayList<p.P> {
     invisible_fake final override /*1*/ /*fake_override*/ var size: kotlin.Int
     public open override /*1*/ /*fake_override*/ val size: kotlin.Int
     public open override /*1*/ /*fake_override*/ fun add(/*0*/ index: kotlin.Int, /*1*/ element: p.P): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun add(/*0*/ e: p.P): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ c: kotlin.Collection<p.P>): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ index: kotlin.Int, /*1*/ c: kotlin.Collection<p.P>): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun add(/*0*/ element: p.P): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ elements: kotlin.Collection<p.P>): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ index: kotlin.Int, /*1*/ elements: kotlin.Collection<p.P>): kotlin.Boolean
     invisible_fake open override /*1*/ /*fake_override*/ fun batchRemove(/*0*/ p0: kotlin.(Mutable)Collection<*>!, /*1*/ p1: kotlin.Boolean): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun clear(): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
-    public open override /*1*/ /*fake_override*/ fun contains(/*0*/ o: p.P): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun containsAll(/*0*/ c: kotlin.Collection<p.P>): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun contains(/*0*/ element: p.P): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun containsAll(/*0*/ elements: kotlin.Collection<p.P>): kotlin.Boolean
     invisible_fake open override /*1*/ /*fake_override*/ fun elementData(/*0*/ p0: kotlin.Int): p.P!
     public open override /*1*/ /*fake_override*/ fun ensureCapacity(/*0*/ p0: kotlin.Int): kotlin.Unit
     invisible_fake open override /*1*/ /*fake_override*/ fun ensureCapacityInternal(/*0*/ p0: kotlin.Int): kotlin.Unit
@@ -23,21 +23,21 @@ public abstract class AL : java.util.ArrayList<p.P> {
     public open override /*1*/ /*fake_override*/ fun get(/*0*/ index: kotlin.Int): p.P
     invisible_fake open override /*1*/ /*fake_override*/ fun grow(/*0*/ p0: kotlin.Int): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun indexOf(/*0*/ o: p.P): kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun indexOf(/*0*/ element: p.P): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun iterator(): kotlin.MutableIterator<p.P>
-    public open override /*1*/ /*fake_override*/ fun lastIndexOf(/*0*/ o: p.P): kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun lastIndexOf(/*0*/ element: p.P): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun listIterator(): kotlin.MutableListIterator<p.P>
     public open override /*1*/ /*fake_override*/ fun listIterator(/*0*/ index: kotlin.Int): kotlin.MutableListIterator<p.P>
     invisible_fake open override /*1*/ /*fake_override*/ fun outOfBoundsMsg(/*0*/ p0: kotlin.Int): kotlin.String!
     invisible_fake open override /*1*/ /*fake_override*/ fun rangeCheck(/*0*/ p0: kotlin.Int): kotlin.Unit
     invisible_fake open override /*1*/ /*fake_override*/ fun rangeCheckForAdd(/*0*/ p0: kotlin.Int): kotlin.Unit
     invisible_fake open override /*1*/ /*fake_override*/ fun readObject(/*0*/ p0: java.io.ObjectInputStream!): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun remove(/*0*/ o: p.P): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun removeAll(/*0*/ c: kotlin.Collection<p.P>): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun remove(/*0*/ element: p.P): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun removeAll(/*0*/ elements: kotlin.Collection<p.P>): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun removeAt(/*0*/ p0: kotlin.Int): p.P
     protected/*protected and package*/ open override /*1*/ /*fake_override*/ fun removeRange(/*0*/ p0: kotlin.Int, /*1*/ p1: kotlin.Int): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun retainAll(/*0*/ c: kotlin.Collection<p.P>): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun retainAll(/*0*/ elements: kotlin.Collection<p.P>): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun set(/*0*/ index: kotlin.Int, /*1*/ element: p.P): p.P
     public open override /*1*/ /*fake_override*/ fun subList(/*0*/ fromIndex: kotlin.Int, /*1*/ toIndex: kotlin.Int): kotlin.MutableList<p.P>
     public open override /*1*/ /*fake_override*/ fun toArray(): kotlin.Array<(out) kotlin.Any!>!
diff --git a/compiler/testData/diagnostics/tests/j+k/collectionOverrides/contains.kt b/compiler/testData/diagnostics/tests/j+k/collectionOverrides/contains.kt
index d0bc1bf423a..f6a6da135d8 100644
--- a/compiler/testData/diagnostics/tests/j+k/collectionOverrides/contains.kt
+++ b/compiler/testData/diagnostics/tests/j+k/collectionOverrides/contains.kt
@@ -22,7 +22,7 @@ abstract class KA<T> : java.util.AbstractList<T>() {
 }
 
 abstract class KB : java.util.AbstractList<String>(), IC {
-    override fun contains(x: String) = false
+    override fun contains(element: String) = false
 }
 
 
diff --git a/compiler/testData/diagnostics/tests/j+k/collectionOverrides/contains.txt b/compiler/testData/diagnostics/tests/j+k/collectionOverrides/contains.txt
index 686b360181b..69fcec7f486 100644
--- a/compiler/testData/diagnostics/tests/j+k/collectionOverrides/contains.txt
+++ b/compiler/testData/diagnostics/tests/j+k/collectionOverrides/contains.txt
@@ -5,53 +5,53 @@ public fun foo(/*0*/ a: A<kotlin.String>, /*1*/ b: B, /*2*/ ic: IC, /*3*/ ka: KA
 public abstract class A</*0*/ T : kotlin.Any!> : kotlin.MutableCollection<T!> {
     public constructor A</*0*/ T : kotlin.Any!>()
     public abstract override /*1*/ /*fake_override*/ val size: kotlin.Int
-    public abstract override /*1*/ /*fake_override*/ fun add(/*0*/ e: T!): kotlin.Boolean
-    public abstract override /*1*/ /*fake_override*/ fun addAll(/*0*/ c: kotlin.Collection<T!>): kotlin.Boolean
+    public abstract override /*1*/ /*fake_override*/ fun add(/*0*/ element: T!): kotlin.Boolean
+    public abstract override /*1*/ /*fake_override*/ fun addAll(/*0*/ elements: kotlin.Collection<T!>): kotlin.Boolean
     public abstract override /*1*/ /*fake_override*/ fun clear(): kotlin.Unit
-    public open override /*1*/ fun contains(/*0*/ o: T!): kotlin.Boolean
-    public abstract override /*1*/ /*fake_override*/ fun containsAll(/*0*/ c: kotlin.Collection<T!>): kotlin.Boolean
+    public open override /*1*/ fun contains(/*0*/ element: T!): kotlin.Boolean
+    public abstract override /*1*/ /*fake_override*/ fun containsAll(/*0*/ elements: kotlin.Collection<T!>): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public abstract override /*1*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean
     public abstract override /*1*/ /*fake_override*/ fun iterator(): kotlin.MutableIterator<T!>
-    public abstract override /*1*/ /*fake_override*/ fun remove(/*0*/ o: T!): kotlin.Boolean
-    public abstract override /*1*/ /*fake_override*/ fun removeAll(/*0*/ c: kotlin.Collection<T!>): kotlin.Boolean
-    public abstract override /*1*/ /*fake_override*/ fun retainAll(/*0*/ c: kotlin.Collection<T!>): kotlin.Boolean
+    public abstract override /*1*/ /*fake_override*/ fun remove(/*0*/ element: T!): kotlin.Boolean
+    public abstract override /*1*/ /*fake_override*/ fun removeAll(/*0*/ elements: kotlin.Collection<T!>): kotlin.Boolean
+    public abstract override /*1*/ /*fake_override*/ fun retainAll(/*0*/ elements: kotlin.Collection<T!>): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
 public abstract class B : kotlin.MutableCollection<kotlin.String!> {
     public constructor B()
     public abstract override /*1*/ /*fake_override*/ val size: kotlin.Int
-    public abstract override /*1*/ /*fake_override*/ fun add(/*0*/ e: kotlin.String!): kotlin.Boolean
-    public abstract override /*1*/ /*fake_override*/ fun addAll(/*0*/ c: kotlin.Collection<kotlin.String!>): kotlin.Boolean
+    public abstract override /*1*/ /*fake_override*/ fun add(/*0*/ element: kotlin.String!): kotlin.Boolean
+    public abstract override /*1*/ /*fake_override*/ fun addAll(/*0*/ elements: kotlin.Collection<kotlin.String!>): kotlin.Boolean
     public abstract override /*1*/ /*fake_override*/ fun clear(): kotlin.Unit
     public open override /*1*/ fun contains(/*0*/ x: kotlin.String!): kotlin.Boolean
-    public abstract override /*1*/ /*fake_override*/ fun containsAll(/*0*/ c: kotlin.Collection<kotlin.String!>): kotlin.Boolean
+    public abstract override /*1*/ /*fake_override*/ fun containsAll(/*0*/ elements: kotlin.Collection<kotlin.String!>): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public abstract override /*1*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean
     public abstract override /*1*/ /*fake_override*/ fun iterator(): kotlin.MutableIterator<kotlin.String!>
-    public abstract override /*1*/ /*fake_override*/ fun remove(/*0*/ o: kotlin.String!): kotlin.Boolean
-    public abstract override /*1*/ /*fake_override*/ fun removeAll(/*0*/ c: kotlin.Collection<kotlin.String!>): kotlin.Boolean
-    public abstract override /*1*/ /*fake_override*/ fun retainAll(/*0*/ c: kotlin.Collection<kotlin.String!>): kotlin.Boolean
+    public abstract override /*1*/ /*fake_override*/ fun remove(/*0*/ element: kotlin.String!): kotlin.Boolean
+    public abstract override /*1*/ /*fake_override*/ fun removeAll(/*0*/ elements: kotlin.Collection<kotlin.String!>): kotlin.Boolean
+    public abstract override /*1*/ /*fake_override*/ fun retainAll(/*0*/ elements: kotlin.Collection<kotlin.String!>): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
 public interface IC : kotlin.MutableCollection<kotlin.String!> {
     public abstract override /*1*/ /*fake_override*/ val size: kotlin.Int
-    public abstract override /*1*/ /*fake_override*/ fun add(/*0*/ e: kotlin.String!): kotlin.Boolean
-    public abstract override /*1*/ /*fake_override*/ fun addAll(/*0*/ c: kotlin.Collection<kotlin.String!>): kotlin.Boolean
+    public abstract override /*1*/ /*fake_override*/ fun add(/*0*/ element: kotlin.String!): kotlin.Boolean
+    public abstract override /*1*/ /*fake_override*/ fun addAll(/*0*/ elements: kotlin.Collection<kotlin.String!>): kotlin.Boolean
     public abstract override /*1*/ /*fake_override*/ fun clear(): kotlin.Unit
     public abstract override /*1*/ fun contains(/*0*/ x: kotlin.String!): kotlin.Boolean
-    public abstract override /*1*/ /*fake_override*/ fun containsAll(/*0*/ c: kotlin.Collection<kotlin.String!>): kotlin.Boolean
+    public abstract override /*1*/ /*fake_override*/ fun containsAll(/*0*/ elements: kotlin.Collection<kotlin.String!>): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public abstract override /*1*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean
     public abstract override /*1*/ /*fake_override*/ fun iterator(): kotlin.MutableIterator<kotlin.String!>
-    public abstract override /*1*/ /*fake_override*/ fun remove(/*0*/ o: kotlin.String!): kotlin.Boolean
-    public abstract override /*1*/ /*fake_override*/ fun removeAll(/*0*/ c: kotlin.Collection<kotlin.String!>): kotlin.Boolean
-    public abstract override /*1*/ /*fake_override*/ fun retainAll(/*0*/ c: kotlin.Collection<kotlin.String!>): kotlin.Boolean
+    public abstract override /*1*/ /*fake_override*/ fun remove(/*0*/ element: kotlin.String!): kotlin.Boolean
+    public abstract override /*1*/ /*fake_override*/ fun removeAll(/*0*/ elements: kotlin.Collection<kotlin.String!>): kotlin.Boolean
+    public abstract override /*1*/ /*fake_override*/ fun retainAll(/*0*/ elements: kotlin.Collection<kotlin.String!>): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
@@ -59,29 +59,29 @@ public abstract class KA</*0*/ T> : java.util.AbstractList<T> {
     public constructor KA</*0*/ T>()
     protected/*protected and package*/ final override /*1*/ /*fake_override*/ var modCount: kotlin.Int
     public abstract override /*1*/ /*fake_override*/ val size: kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun add(/*0*/ e: T!): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun add(/*0*/ element: T!): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun add(/*0*/ index: kotlin.Int, /*1*/ element: T!): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ c: kotlin.Collection<T!>): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ index: kotlin.Int, /*1*/ c: kotlin.Collection<T!>): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ elements: kotlin.Collection<T!>): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ index: kotlin.Int, /*1*/ elements: kotlin.Collection<T!>): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun clear(): kotlin.Unit
     public open override /*1*/ fun contains(/*0*/ x: T): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun containsAll(/*0*/ c: kotlin.Collection<T!>): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun containsAll(/*0*/ elements: kotlin.Collection<T!>): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public abstract override /*1*/ /*fake_override*/ fun get(/*0*/ index: kotlin.Int): T!
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun indexOf(/*0*/ o: T!): kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun indexOf(/*0*/ element: T!): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun iterator(): kotlin.MutableIterator<T!>
-    public open override /*1*/ /*fake_override*/ fun lastIndexOf(/*0*/ o: T!): kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun lastIndexOf(/*0*/ element: T!): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun listIterator(): kotlin.MutableListIterator<T!>
     public open override /*1*/ /*fake_override*/ fun listIterator(/*0*/ index: kotlin.Int): kotlin.MutableListIterator<T!>
     invisible_fake open override /*1*/ /*fake_override*/ fun outOfBoundsMsg(/*0*/ p0: kotlin.Int): kotlin.String!
     invisible_fake open override /*1*/ /*fake_override*/ fun rangeCheckForAdd(/*0*/ p0: kotlin.Int): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun remove(/*0*/ o: T!): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun removeAll(/*0*/ c: kotlin.Collection<T!>): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun remove(/*0*/ element: T!): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun removeAll(/*0*/ elements: kotlin.Collection<T!>): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun removeAt(/*0*/ p0: kotlin.Int): T!
     protected/*protected and package*/ open override /*1*/ /*fake_override*/ fun removeRange(/*0*/ p0: kotlin.Int, /*1*/ p1: kotlin.Int): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun retainAll(/*0*/ c: kotlin.Collection<T!>): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun retainAll(/*0*/ elements: kotlin.Collection<T!>): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun set(/*0*/ index: kotlin.Int, /*1*/ element: T!): T!
     public open override /*1*/ /*fake_override*/ fun subList(/*0*/ fromIndex: kotlin.Int, /*1*/ toIndex: kotlin.Int): kotlin.MutableList<T!>
     public open override /*1*/ /*fake_override*/ fun toArray(): kotlin.Array<(out) kotlin.Any!>!
@@ -94,28 +94,28 @@ public abstract class KB : java.util.AbstractList<kotlin.String>, IC {
     protected/*protected and package*/ final override /*1*/ /*fake_override*/ var modCount: kotlin.Int
     public abstract override /*2*/ /*fake_override*/ val size: kotlin.Int
     public open override /*1*/ /*fake_override*/ fun add(/*0*/ index: kotlin.Int, /*1*/ element: kotlin.String!): kotlin.Unit
-    public open override /*2*/ /*fake_override*/ fun add(/*0*/ e: kotlin.String!): kotlin.Boolean
-    public open override /*2*/ /*fake_override*/ fun addAll(/*0*/ c: kotlin.Collection<kotlin.String!>): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ index: kotlin.Int, /*1*/ c: kotlin.Collection<kotlin.String!>): kotlin.Boolean
+    public open override /*2*/ /*fake_override*/ fun add(/*0*/ element: kotlin.String!): kotlin.Boolean
+    public open override /*2*/ /*fake_override*/ fun addAll(/*0*/ elements: kotlin.Collection<kotlin.String!>): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ index: kotlin.Int, /*1*/ elements: kotlin.Collection<kotlin.String!>): kotlin.Boolean
     public open override /*2*/ /*fake_override*/ fun clear(): kotlin.Unit
-    public open override /*2*/ fun contains(/*0*/ x: kotlin.String): kotlin.Boolean
-    public open override /*2*/ /*fake_override*/ fun containsAll(/*0*/ c: kotlin.Collection<kotlin.String!>): kotlin.Boolean
+    public open override /*2*/ fun contains(/*0*/ element: kotlin.String): kotlin.Boolean
+    public open override /*2*/ /*fake_override*/ fun containsAll(/*0*/ elements: kotlin.Collection<kotlin.String!>): kotlin.Boolean
     public open override /*2*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public abstract override /*1*/ /*fake_override*/ fun get(/*0*/ index: kotlin.Int): kotlin.String!
     public open override /*2*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun indexOf(/*0*/ o: kotlin.String!): kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun indexOf(/*0*/ element: kotlin.String!): kotlin.Int
     public open override /*2*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean
     public open override /*2*/ /*fake_override*/ fun iterator(): kotlin.MutableIterator<kotlin.String!>
-    public open override /*1*/ /*fake_override*/ fun lastIndexOf(/*0*/ o: kotlin.String!): kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun lastIndexOf(/*0*/ element: kotlin.String!): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun listIterator(): kotlin.MutableListIterator<kotlin.String!>
     public open override /*1*/ /*fake_override*/ fun listIterator(/*0*/ index: kotlin.Int): kotlin.MutableListIterator<kotlin.String!>
     invisible_fake open override /*1*/ /*fake_override*/ fun outOfBoundsMsg(/*0*/ p0: kotlin.Int): kotlin.String!
     invisible_fake open override /*1*/ /*fake_override*/ fun rangeCheckForAdd(/*0*/ p0: kotlin.Int): kotlin.Unit
-    public open override /*2*/ /*fake_override*/ fun remove(/*0*/ o: kotlin.String!): kotlin.Boolean
-    public open override /*2*/ /*fake_override*/ fun removeAll(/*0*/ c: kotlin.Collection<kotlin.String!>): kotlin.Boolean
+    public open override /*2*/ /*fake_override*/ fun remove(/*0*/ element: kotlin.String!): kotlin.Boolean
+    public open override /*2*/ /*fake_override*/ fun removeAll(/*0*/ elements: kotlin.Collection<kotlin.String!>): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun removeAt(/*0*/ p0: kotlin.Int): kotlin.String!
     protected/*protected and package*/ open override /*1*/ /*fake_override*/ fun removeRange(/*0*/ p0: kotlin.Int, /*1*/ p1: kotlin.Int): kotlin.Unit
-    public open override /*2*/ /*fake_override*/ fun retainAll(/*0*/ c: kotlin.Collection<kotlin.String!>): kotlin.Boolean
+    public open override /*2*/ /*fake_override*/ fun retainAll(/*0*/ elements: kotlin.Collection<kotlin.String!>): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun set(/*0*/ index: kotlin.Int, /*1*/ element: kotlin.String!): kotlin.String!
     public open override /*1*/ /*fake_override*/ fun subList(/*0*/ fromIndex: kotlin.Int, /*1*/ toIndex: kotlin.Int): kotlin.MutableList<kotlin.String!>
     public open override /*1*/ /*fake_override*/ fun toArray(): kotlin.Array<(out) kotlin.Any!>!
diff --git a/compiler/testData/diagnostics/tests/j+k/collectionOverrides/containsAll.kt b/compiler/testData/diagnostics/tests/j+k/collectionOverrides/containsAll.kt
index 61ce9d94991..b3da9f3a88d 100644
--- a/compiler/testData/diagnostics/tests/j+k/collectionOverrides/containsAll.kt
+++ b/compiler/testData/diagnostics/tests/j+k/collectionOverrides/containsAll.kt
@@ -26,7 +26,7 @@ abstract class KA<T> : java.util.AbstractList<T>() {
 }
 
 abstract class KB : java.util.AbstractList<String>(), IC {
-    override fun containsAll(x: Collection<String>) = false
+    override fun containsAll(elements: Collection<String>) = false
 }
 
 fun foo(
diff --git a/compiler/testData/diagnostics/tests/j+k/collectionOverrides/containsAll.txt b/compiler/testData/diagnostics/tests/j+k/collectionOverrides/containsAll.txt
index 795dbf47170..bcbd124b35e 100644
--- a/compiler/testData/diagnostics/tests/j+k/collectionOverrides/containsAll.txt
+++ b/compiler/testData/diagnostics/tests/j+k/collectionOverrides/containsAll.txt
@@ -5,53 +5,53 @@ public fun foo(/*0*/ a: A<kotlin.String>, /*1*/ b: B, /*2*/ ic: IC, /*3*/ ka: KA
 public abstract class A</*0*/ T : kotlin.Any!> : kotlin.MutableCollection<T!> {
     public constructor A</*0*/ T : kotlin.Any!>()
     public abstract override /*1*/ /*fake_override*/ val size: kotlin.Int
-    public abstract override /*1*/ /*fake_override*/ fun add(/*0*/ e: T!): kotlin.Boolean
-    public abstract override /*1*/ /*fake_override*/ fun addAll(/*0*/ c: kotlin.Collection<T!>): kotlin.Boolean
+    public abstract override /*1*/ /*fake_override*/ fun add(/*0*/ element: T!): kotlin.Boolean
+    public abstract override /*1*/ /*fake_override*/ fun addAll(/*0*/ elements: kotlin.Collection<T!>): kotlin.Boolean
     public abstract override /*1*/ /*fake_override*/ fun clear(): kotlin.Unit
-    public abstract override /*1*/ /*fake_override*/ fun contains(/*0*/ o: T!): kotlin.Boolean
-    public open override /*1*/ fun containsAll(/*0*/ c: kotlin.Collection<T!>): kotlin.Boolean
+    public abstract override /*1*/ /*fake_override*/ fun contains(/*0*/ element: T!): kotlin.Boolean
+    public open override /*1*/ fun containsAll(/*0*/ elements: kotlin.Collection<T!>): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public abstract override /*1*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean
     public abstract override /*1*/ /*fake_override*/ fun iterator(): kotlin.MutableIterator<T!>
-    public abstract override /*1*/ /*fake_override*/ fun remove(/*0*/ o: T!): kotlin.Boolean
-    public abstract override /*1*/ /*fake_override*/ fun removeAll(/*0*/ c: kotlin.Collection<T!>): kotlin.Boolean
-    public abstract override /*1*/ /*fake_override*/ fun retainAll(/*0*/ c: kotlin.Collection<T!>): kotlin.Boolean
+    public abstract override /*1*/ /*fake_override*/ fun remove(/*0*/ element: T!): kotlin.Boolean
+    public abstract override /*1*/ /*fake_override*/ fun removeAll(/*0*/ elements: kotlin.Collection<T!>): kotlin.Boolean
+    public abstract override /*1*/ /*fake_override*/ fun retainAll(/*0*/ elements: kotlin.Collection<T!>): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
 public abstract class B : kotlin.MutableCollection<kotlin.String!> {
     public constructor B()
     public abstract override /*1*/ /*fake_override*/ val size: kotlin.Int
-    public abstract override /*1*/ /*fake_override*/ fun add(/*0*/ e: kotlin.String!): kotlin.Boolean
-    public abstract override /*1*/ /*fake_override*/ fun addAll(/*0*/ c: kotlin.Collection<kotlin.String!>): kotlin.Boolean
+    public abstract override /*1*/ /*fake_override*/ fun add(/*0*/ element: kotlin.String!): kotlin.Boolean
+    public abstract override /*1*/ /*fake_override*/ fun addAll(/*0*/ elements: kotlin.Collection<kotlin.String!>): kotlin.Boolean
     public abstract override /*1*/ /*fake_override*/ fun clear(): kotlin.Unit
-    public abstract override /*1*/ /*fake_override*/ fun contains(/*0*/ o: kotlin.String!): kotlin.Boolean
-    public open override /*1*/ fun containsAll(/*0*/ c: kotlin.Collection<kotlin.String!>): kotlin.Boolean
+    public abstract override /*1*/ /*fake_override*/ fun contains(/*0*/ element: kotlin.String!): kotlin.Boolean
+    public open override /*1*/ fun containsAll(/*0*/ elements: kotlin.Collection<kotlin.String!>): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public abstract override /*1*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean
     public abstract override /*1*/ /*fake_override*/ fun iterator(): kotlin.MutableIterator<kotlin.String!>
-    public abstract override /*1*/ /*fake_override*/ fun remove(/*0*/ o: kotlin.String!): kotlin.Boolean
-    public abstract override /*1*/ /*fake_override*/ fun removeAll(/*0*/ c: kotlin.Collection<kotlin.String!>): kotlin.Boolean
-    public abstract override /*1*/ /*fake_override*/ fun retainAll(/*0*/ c: kotlin.Collection<kotlin.String!>): kotlin.Boolean
+    public abstract override /*1*/ /*fake_override*/ fun remove(/*0*/ element: kotlin.String!): kotlin.Boolean
+    public abstract override /*1*/ /*fake_override*/ fun removeAll(/*0*/ elements: kotlin.Collection<kotlin.String!>): kotlin.Boolean
+    public abstract override /*1*/ /*fake_override*/ fun retainAll(/*0*/ elements: kotlin.Collection<kotlin.String!>): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
 public interface IC : kotlin.MutableCollection<kotlin.String!> {
     public abstract override /*1*/ /*fake_override*/ val size: kotlin.Int
-    public abstract override /*1*/ /*fake_override*/ fun add(/*0*/ e: kotlin.String!): kotlin.Boolean
-    public abstract override /*1*/ /*fake_override*/ fun addAll(/*0*/ c: kotlin.Collection<kotlin.String!>): kotlin.Boolean
+    public abstract override /*1*/ /*fake_override*/ fun add(/*0*/ element: kotlin.String!): kotlin.Boolean
+    public abstract override /*1*/ /*fake_override*/ fun addAll(/*0*/ elements: kotlin.Collection<kotlin.String!>): kotlin.Boolean
     public abstract override /*1*/ /*fake_override*/ fun clear(): kotlin.Unit
-    public abstract override /*1*/ /*fake_override*/ fun contains(/*0*/ o: kotlin.String!): kotlin.Boolean
-    public abstract override /*1*/ fun containsAll(/*0*/ c: kotlin.Collection<kotlin.String!>): kotlin.Boolean
+    public abstract override /*1*/ /*fake_override*/ fun contains(/*0*/ element: kotlin.String!): kotlin.Boolean
+    public abstract override /*1*/ fun containsAll(/*0*/ elements: kotlin.Collection<kotlin.String!>): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public abstract override /*1*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean
     public abstract override /*1*/ /*fake_override*/ fun iterator(): kotlin.MutableIterator<kotlin.String!>
-    public abstract override /*1*/ /*fake_override*/ fun remove(/*0*/ o: kotlin.String!): kotlin.Boolean
-    public abstract override /*1*/ /*fake_override*/ fun removeAll(/*0*/ c: kotlin.Collection<kotlin.String!>): kotlin.Boolean
-    public abstract override /*1*/ /*fake_override*/ fun retainAll(/*0*/ c: kotlin.Collection<kotlin.String!>): kotlin.Boolean
+    public abstract override /*1*/ /*fake_override*/ fun remove(/*0*/ element: kotlin.String!): kotlin.Boolean
+    public abstract override /*1*/ /*fake_override*/ fun removeAll(/*0*/ elements: kotlin.Collection<kotlin.String!>): kotlin.Boolean
+    public abstract override /*1*/ /*fake_override*/ fun retainAll(/*0*/ elements: kotlin.Collection<kotlin.String!>): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
@@ -59,29 +59,29 @@ public abstract class KA</*0*/ T> : java.util.AbstractList<T> {
     public constructor KA</*0*/ T>()
     protected/*protected and package*/ final override /*1*/ /*fake_override*/ var modCount: kotlin.Int
     public abstract override /*1*/ /*fake_override*/ val size: kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun add(/*0*/ e: T!): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun add(/*0*/ element: T!): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun add(/*0*/ index: kotlin.Int, /*1*/ element: T!): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ c: kotlin.Collection<T!>): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ index: kotlin.Int, /*1*/ c: kotlin.Collection<T!>): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ elements: kotlin.Collection<T!>): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ index: kotlin.Int, /*1*/ elements: kotlin.Collection<T!>): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun clear(): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun contains(/*0*/ o: T!): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun contains(/*0*/ element: T!): kotlin.Boolean
     public open override /*1*/ fun containsAll(/*0*/ x: kotlin.Collection<T>): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public abstract override /*1*/ /*fake_override*/ fun get(/*0*/ index: kotlin.Int): T!
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun indexOf(/*0*/ o: T!): kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun indexOf(/*0*/ element: T!): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun iterator(): kotlin.MutableIterator<T!>
-    public open override /*1*/ /*fake_override*/ fun lastIndexOf(/*0*/ o: T!): kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun lastIndexOf(/*0*/ element: T!): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun listIterator(): kotlin.MutableListIterator<T!>
     public open override /*1*/ /*fake_override*/ fun listIterator(/*0*/ index: kotlin.Int): kotlin.MutableListIterator<T!>
     invisible_fake open override /*1*/ /*fake_override*/ fun outOfBoundsMsg(/*0*/ p0: kotlin.Int): kotlin.String!
     invisible_fake open override /*1*/ /*fake_override*/ fun rangeCheckForAdd(/*0*/ p0: kotlin.Int): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun remove(/*0*/ o: T!): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun removeAll(/*0*/ c: kotlin.Collection<T!>): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun remove(/*0*/ element: T!): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun removeAll(/*0*/ elements: kotlin.Collection<T!>): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun removeAt(/*0*/ p0: kotlin.Int): T!
     protected/*protected and package*/ open override /*1*/ /*fake_override*/ fun removeRange(/*0*/ p0: kotlin.Int, /*1*/ p1: kotlin.Int): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun retainAll(/*0*/ c: kotlin.Collection<T!>): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun retainAll(/*0*/ elements: kotlin.Collection<T!>): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun set(/*0*/ index: kotlin.Int, /*1*/ element: T!): T!
     public open override /*1*/ /*fake_override*/ fun subList(/*0*/ fromIndex: kotlin.Int, /*1*/ toIndex: kotlin.Int): kotlin.MutableList<T!>
     public open override /*1*/ /*fake_override*/ fun toArray(): kotlin.Array<(out) kotlin.Any!>!
@@ -94,28 +94,28 @@ public abstract class KB : java.util.AbstractList<kotlin.String>, IC {
     protected/*protected and package*/ final override /*1*/ /*fake_override*/ var modCount: kotlin.Int
     public abstract override /*2*/ /*fake_override*/ val size: kotlin.Int
     public open override /*1*/ /*fake_override*/ fun add(/*0*/ index: kotlin.Int, /*1*/ element: kotlin.String!): kotlin.Unit
-    public open override /*2*/ /*fake_override*/ fun add(/*0*/ e: kotlin.String!): kotlin.Boolean
-    public open override /*2*/ /*fake_override*/ fun addAll(/*0*/ c: kotlin.Collection<kotlin.String!>): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ index: kotlin.Int, /*1*/ c: kotlin.Collection<kotlin.String!>): kotlin.Boolean
+    public open override /*2*/ /*fake_override*/ fun add(/*0*/ element: kotlin.String!): kotlin.Boolean
+    public open override /*2*/ /*fake_override*/ fun addAll(/*0*/ elements: kotlin.Collection<kotlin.String!>): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ index: kotlin.Int, /*1*/ elements: kotlin.Collection<kotlin.String!>): kotlin.Boolean
     public open override /*2*/ /*fake_override*/ fun clear(): kotlin.Unit
-    public open override /*2*/ /*fake_override*/ fun contains(/*0*/ o: kotlin.String!): kotlin.Boolean
-    public open override /*2*/ fun containsAll(/*0*/ x: kotlin.Collection<kotlin.String>): kotlin.Boolean
+    public open override /*2*/ /*fake_override*/ fun contains(/*0*/ element: kotlin.String!): kotlin.Boolean
+    public open override /*2*/ fun containsAll(/*0*/ elements: kotlin.Collection<kotlin.String>): kotlin.Boolean
     public open override /*2*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public abstract override /*1*/ /*fake_override*/ fun get(/*0*/ index: kotlin.Int): kotlin.String!
     public open override /*2*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun indexOf(/*0*/ o: kotlin.String!): kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun indexOf(/*0*/ element: kotlin.String!): kotlin.Int
     public open override /*2*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean
     public open override /*2*/ /*fake_override*/ fun iterator(): kotlin.MutableIterator<kotlin.String!>
-    public open override /*1*/ /*fake_override*/ fun lastIndexOf(/*0*/ o: kotlin.String!): kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun lastIndexOf(/*0*/ element: kotlin.String!): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun listIterator(): kotlin.MutableListIterator<kotlin.String!>
     public open override /*1*/ /*fake_override*/ fun listIterator(/*0*/ index: kotlin.Int): kotlin.MutableListIterator<kotlin.String!>
     invisible_fake open override /*1*/ /*fake_override*/ fun outOfBoundsMsg(/*0*/ p0: kotlin.Int): kotlin.String!
     invisible_fake open override /*1*/ /*fake_override*/ fun rangeCheckForAdd(/*0*/ p0: kotlin.Int): kotlin.Unit
-    public open override /*2*/ /*fake_override*/ fun remove(/*0*/ o: kotlin.String!): kotlin.Boolean
-    public open override /*2*/ /*fake_override*/ fun removeAll(/*0*/ c: kotlin.Collection<kotlin.String!>): kotlin.Boolean
+    public open override /*2*/ /*fake_override*/ fun remove(/*0*/ element: kotlin.String!): kotlin.Boolean
+    public open override /*2*/ /*fake_override*/ fun removeAll(/*0*/ elements: kotlin.Collection<kotlin.String!>): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun removeAt(/*0*/ p0: kotlin.Int): kotlin.String!
     protected/*protected and package*/ open override /*1*/ /*fake_override*/ fun removeRange(/*0*/ p0: kotlin.Int, /*1*/ p1: kotlin.Int): kotlin.Unit
-    public open override /*2*/ /*fake_override*/ fun retainAll(/*0*/ c: kotlin.Collection<kotlin.String!>): kotlin.Boolean
+    public open override /*2*/ /*fake_override*/ fun retainAll(/*0*/ elements: kotlin.Collection<kotlin.String!>): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun set(/*0*/ index: kotlin.Int, /*1*/ element: kotlin.String!): kotlin.String!
     public open override /*1*/ /*fake_override*/ fun subList(/*0*/ fromIndex: kotlin.Int, /*1*/ toIndex: kotlin.Int): kotlin.MutableList<kotlin.String!>
     public open override /*1*/ /*fake_override*/ fun toArray(): kotlin.Array<(out) kotlin.Any!>!
diff --git a/compiler/testData/diagnostics/tests/j+k/collectionOverrides/containsAndOverload.txt b/compiler/testData/diagnostics/tests/j+k/collectionOverrides/containsAndOverload.txt
index f50dc8bd5fb..f3791ca8e31 100644
--- a/compiler/testData/diagnostics/tests/j+k/collectionOverrides/containsAndOverload.txt
+++ b/compiler/testData/diagnostics/tests/j+k/collectionOverrides/containsAndOverload.txt
@@ -5,35 +5,35 @@ public fun foo(/*0*/ a: A, /*1*/ ka: KA): kotlin.Unit
 public abstract class A : kotlin.MutableCollection<kotlin.String!> {
     public constructor A()
     public abstract override /*1*/ /*fake_override*/ val size: kotlin.Int
-    public abstract override /*1*/ /*fake_override*/ fun add(/*0*/ e: kotlin.String!): kotlin.Boolean
-    public abstract override /*1*/ /*fake_override*/ fun addAll(/*0*/ c: kotlin.Collection<kotlin.String!>): kotlin.Boolean
+    public abstract override /*1*/ /*fake_override*/ fun add(/*0*/ element: kotlin.String!): kotlin.Boolean
+    public abstract override /*1*/ /*fake_override*/ fun addAll(/*0*/ elements: kotlin.Collection<kotlin.String!>): kotlin.Boolean
     public abstract override /*1*/ /*fake_override*/ fun clear(): kotlin.Unit
-    public open override /*1*/ fun contains(/*0*/ o: kotlin.String!): kotlin.Boolean
-    public abstract override /*1*/ /*fake_override*/ fun containsAll(/*0*/ c: kotlin.Collection<kotlin.String!>): kotlin.Boolean
+    public open override /*1*/ fun contains(/*0*/ element: kotlin.String!): kotlin.Boolean
+    public abstract override /*1*/ /*fake_override*/ fun containsAll(/*0*/ elements: kotlin.Collection<kotlin.String!>): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public abstract override /*1*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean
     public abstract override /*1*/ /*fake_override*/ fun iterator(): kotlin.MutableIterator<kotlin.String!>
-    public abstract override /*1*/ /*fake_override*/ fun remove(/*0*/ o: kotlin.String!): kotlin.Boolean
-    public abstract override /*1*/ /*fake_override*/ fun removeAll(/*0*/ c: kotlin.Collection<kotlin.String!>): kotlin.Boolean
-    public abstract override /*1*/ /*fake_override*/ fun retainAll(/*0*/ c: kotlin.Collection<kotlin.String!>): kotlin.Boolean
+    public abstract override /*1*/ /*fake_override*/ fun remove(/*0*/ element: kotlin.String!): kotlin.Boolean
+    public abstract override /*1*/ /*fake_override*/ fun removeAll(/*0*/ elements: kotlin.Collection<kotlin.String!>): kotlin.Boolean
+    public abstract override /*1*/ /*fake_override*/ fun retainAll(/*0*/ elements: kotlin.Collection<kotlin.String!>): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
 public abstract class KA : A {
     public constructor KA()
     public abstract override /*1*/ /*fake_override*/ val size: kotlin.Int
-    public abstract override /*1*/ /*fake_override*/ fun add(/*0*/ e: kotlin.String!): kotlin.Boolean
-    public abstract override /*1*/ /*fake_override*/ fun addAll(/*0*/ c: kotlin.Collection<kotlin.String!>): kotlin.Boolean
+    public abstract override /*1*/ /*fake_override*/ fun add(/*0*/ element: kotlin.String!): kotlin.Boolean
+    public abstract override /*1*/ /*fake_override*/ fun addAll(/*0*/ elements: kotlin.Collection<kotlin.String!>): kotlin.Boolean
     public abstract override /*1*/ /*fake_override*/ fun clear(): kotlin.Unit
     public open override /*1*/ fun contains(/*0*/ x: kotlin.String): kotlin.Boolean
-    public abstract override /*1*/ /*fake_override*/ fun containsAll(/*0*/ c: kotlin.Collection<kotlin.String!>): kotlin.Boolean
+    public abstract override /*1*/ /*fake_override*/ fun containsAll(/*0*/ elements: kotlin.Collection<kotlin.String!>): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public abstract override /*1*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean
     public abstract override /*1*/ /*fake_override*/ fun iterator(): kotlin.MutableIterator<kotlin.String!>
-    public abstract override /*1*/ /*fake_override*/ fun remove(/*0*/ o: kotlin.String!): kotlin.Boolean
-    public abstract override /*1*/ /*fake_override*/ fun removeAll(/*0*/ c: kotlin.Collection<kotlin.String!>): kotlin.Boolean
-    public abstract override /*1*/ /*fake_override*/ fun retainAll(/*0*/ c: kotlin.Collection<kotlin.String!>): kotlin.Boolean
+    public abstract override /*1*/ /*fake_override*/ fun remove(/*0*/ element: kotlin.String!): kotlin.Boolean
+    public abstract override /*1*/ /*fake_override*/ fun removeAll(/*0*/ elements: kotlin.Collection<kotlin.String!>): kotlin.Boolean
+    public abstract override /*1*/ /*fake_override*/ fun retainAll(/*0*/ elements: kotlin.Collection<kotlin.String!>): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
diff --git a/compiler/testData/diagnostics/tests/j+k/collectionOverrides/mapGetOverride.txt b/compiler/testData/diagnostics/tests/j+k/collectionOverrides/mapGetOverride.txt
index 11de21c9fff..2dbd31c11eb 100644
--- a/compiler/testData/diagnostics/tests/j+k/collectionOverrides/mapGetOverride.txt
+++ b/compiler/testData/diagnostics/tests/j+k/collectionOverrides/mapGetOverride.txt
@@ -19,7 +19,7 @@ public abstract class MyMap : java.util.AbstractMap<kotlin.Double!, kotlin.CharS
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun put(/*0*/ key: kotlin.Double!, /*1*/ value: kotlin.CharSequence!): kotlin.CharSequence?
-    public open override /*1*/ /*fake_override*/ fun putAll(/*0*/ m: kotlin.Map<out kotlin.Double!, kotlin.CharSequence!>): kotlin.Unit
+    public open override /*1*/ /*fake_override*/ fun putAll(/*0*/ from: kotlin.Map<out kotlin.Double!, kotlin.CharSequence!>): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun remove(/*0*/ key: kotlin.Double!): kotlin.CharSequence?
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
diff --git a/compiler/testData/diagnostics/tests/j+k/collectionOverrides/overridesBuiltinNoMagic.txt b/compiler/testData/diagnostics/tests/j+k/collectionOverrides/overridesBuiltinNoMagic.txt
index 1488884b9b0..1832e9d6dc2 100644
--- a/compiler/testData/diagnostics/tests/j+k/collectionOverrides/overridesBuiltinNoMagic.txt
+++ b/compiler/testData/diagnostics/tests/j+k/collectionOverrides/overridesBuiltinNoMagic.txt
@@ -6,12 +6,12 @@ public open class X : kotlin.MutableList<kotlin.String!> {
     public constructor X()
     public open override /*1*/ val size: kotlin.Int
     @java.lang.Override() public open override /*1*/ fun add(/*0*/ index: kotlin.Int, /*1*/ element: kotlin.String!): kotlin.Unit
-    @java.lang.Override() public open override /*1*/ fun add(/*0*/ e: kotlin.String!): kotlin.Boolean
-    @java.lang.Override() public open override /*1*/ fun addAll(/*0*/ c: kotlin.Collection<kotlin.String!>): kotlin.Boolean
-    @java.lang.Override() public open override /*1*/ fun addAll(/*0*/ index: kotlin.Int, /*1*/ c: kotlin.Collection<kotlin.String!>): kotlin.Boolean
+    @java.lang.Override() public open override /*1*/ fun add(/*0*/ element: kotlin.String!): kotlin.Boolean
+    @java.lang.Override() public open override /*1*/ fun addAll(/*0*/ elements: kotlin.Collection<kotlin.String!>): kotlin.Boolean
+    @java.lang.Override() public open override /*1*/ fun addAll(/*0*/ index: kotlin.Int, /*1*/ elements: kotlin.Collection<kotlin.String!>): kotlin.Boolean
     @java.lang.Override() public open override /*1*/ fun clear(): kotlin.Unit
-    public open override /*1*/ fun contains(/*0*/ o: kotlin.String!): kotlin.Boolean
-    @java.lang.Override() public open override /*1*/ fun containsAll(/*0*/ c: kotlin.Collection<kotlin.String!>): kotlin.Boolean
+    public open override /*1*/ fun contains(/*0*/ element: kotlin.String!): kotlin.Boolean
+    @java.lang.Override() public open override /*1*/ fun containsAll(/*0*/ elements: kotlin.Collection<kotlin.String!>): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     @java.lang.Override() public open override /*1*/ fun get(/*0*/ index: kotlin.Int): kotlin.String!
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -22,9 +22,9 @@ public open class X : kotlin.MutableList<kotlin.String!> {
     @org.jetbrains.annotations.NotNull() @java.lang.Override() public open override /*1*/ fun listIterator(): kotlin.MutableListIterator<kotlin.String!>
     @org.jetbrains.annotations.NotNull() @java.lang.Override() public open override /*1*/ fun listIterator(/*0*/ index: kotlin.Int): kotlin.MutableListIterator<kotlin.String!>
     @java.lang.Override() public open override /*1*/ fun remove(/*0*/ o: kotlin.String!): kotlin.Boolean
-    @java.lang.Override() public open override /*1*/ fun removeAll(/*0*/ c: kotlin.Collection<kotlin.String!>): kotlin.Boolean
+    @java.lang.Override() public open override /*1*/ fun removeAll(/*0*/ elements: kotlin.Collection<kotlin.String!>): kotlin.Boolean
     public open override /*1*/ fun removeAt(/*0*/ index: kotlin.Int): kotlin.String!
-    @java.lang.Override() public open override /*1*/ fun retainAll(/*0*/ c: kotlin.Collection<kotlin.String!>): kotlin.Boolean
+    @java.lang.Override() public open override /*1*/ fun retainAll(/*0*/ elements: kotlin.Collection<kotlin.String!>): kotlin.Boolean
     @java.lang.Override() public open override /*1*/ fun set(/*0*/ index: kotlin.Int, /*1*/ element: kotlin.String!): kotlin.String!
     @org.jetbrains.annotations.NotNull() @java.lang.Override() public open override /*1*/ fun subList(/*0*/ fromIndex: kotlin.Int, /*1*/ toIndex: kotlin.Int): kotlin.MutableList<kotlin.String!>
     @org.jetbrains.annotations.NotNull() @java.lang.Override() public open fun toArray(): kotlin.Array<(out) kotlin.Any!>
@@ -36,12 +36,12 @@ public final class Y : X {
     public constructor Y()
     public open override /*1*/ /*fake_override*/ val size: kotlin.Int
     @java.lang.Override() public open override /*1*/ /*fake_override*/ fun add(/*0*/ index: kotlin.Int, /*1*/ element: kotlin.String!): kotlin.Unit
-    @java.lang.Override() public open override /*1*/ /*fake_override*/ fun add(/*0*/ e: kotlin.String!): kotlin.Boolean
-    @java.lang.Override() public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ c: kotlin.Collection<kotlin.String!>): kotlin.Boolean
-    @java.lang.Override() public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ index: kotlin.Int, /*1*/ c: kotlin.Collection<kotlin.String!>): kotlin.Boolean
+    @java.lang.Override() public open override /*1*/ /*fake_override*/ fun add(/*0*/ element: kotlin.String!): kotlin.Boolean
+    @java.lang.Override() public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ elements: kotlin.Collection<kotlin.String!>): kotlin.Boolean
+    @java.lang.Override() public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ index: kotlin.Int, /*1*/ elements: kotlin.Collection<kotlin.String!>): kotlin.Boolean
     @java.lang.Override() public open override /*1*/ /*fake_override*/ fun clear(): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun contains(/*0*/ o: kotlin.String!): kotlin.Boolean
-    @java.lang.Override() public open override /*1*/ /*fake_override*/ fun containsAll(/*0*/ c: kotlin.Collection<kotlin.String!>): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun contains(/*0*/ element: kotlin.String!): kotlin.Boolean
+    @java.lang.Override() public open override /*1*/ /*fake_override*/ fun containsAll(/*0*/ elements: kotlin.Collection<kotlin.String!>): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     @java.lang.Override() public open override /*1*/ /*fake_override*/ fun get(/*0*/ index: kotlin.Int): kotlin.String!
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@@ -52,9 +52,9 @@ public final class Y : X {
     @org.jetbrains.annotations.NotNull() @java.lang.Override() public open override /*1*/ /*fake_override*/ fun listIterator(): kotlin.MutableListIterator<kotlin.String!>
     @org.jetbrains.annotations.NotNull() @java.lang.Override() public open override /*1*/ /*fake_override*/ fun listIterator(/*0*/ index: kotlin.Int): kotlin.MutableListIterator<kotlin.String!>
     @java.lang.Override() public open override /*1*/ /*fake_override*/ fun remove(/*0*/ o: kotlin.String!): kotlin.Boolean
-    @java.lang.Override() public open override /*1*/ /*fake_override*/ fun removeAll(/*0*/ c: kotlin.Collection<kotlin.String!>): kotlin.Boolean
+    @java.lang.Override() public open override /*1*/ /*fake_override*/ fun removeAll(/*0*/ elements: kotlin.Collection<kotlin.String!>): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun removeAt(/*0*/ index: kotlin.Int): kotlin.String!
-    @java.lang.Override() public open override /*1*/ /*fake_override*/ fun retainAll(/*0*/ c: kotlin.Collection<kotlin.String!>): kotlin.Boolean
+    @java.lang.Override() public open override /*1*/ /*fake_override*/ fun retainAll(/*0*/ elements: kotlin.Collection<kotlin.String!>): kotlin.Boolean
     @java.lang.Override() public open override /*1*/ /*fake_override*/ fun set(/*0*/ index: kotlin.Int, /*1*/ element: kotlin.String!): kotlin.String!
     @org.jetbrains.annotations.NotNull() @java.lang.Override() public open override /*1*/ /*fake_override*/ fun subList(/*0*/ fromIndex: kotlin.Int, /*1*/ toIndex: kotlin.Int): kotlin.MutableList<kotlin.String!>
     @org.jetbrains.annotations.NotNull() @java.lang.Override() public open override /*1*/ /*fake_override*/ fun toArray(): kotlin.Array<(out) kotlin.Any!>
diff --git a/compiler/testData/diagnostics/tests/j+k/collectionOverrides/removeAt.kt b/compiler/testData/diagnostics/tests/j+k/collectionOverrides/removeAt.kt
index 5440046b5d8..171f9360072 100644
--- a/compiler/testData/diagnostics/tests/j+k/collectionOverrides/removeAt.kt
+++ b/compiler/testData/diagnostics/tests/j+k/collectionOverrides/removeAt.kt
@@ -9,7 +9,7 @@ import java.util.*;
 
 abstract class B<T> : MutableList<T>, AbstractList<T>() {
     override fun removeAt(index: Int): T = null!!
-    override fun remove(o: T): Boolean = null!!
+    override fun remove(element: T): Boolean = null!!
 }
 
 fun main(a: A<String>, b: B<String>, c: ArrayList<String>) {
diff --git a/compiler/testData/diagnostics/tests/j+k/collectionOverrides/removeAt.txt b/compiler/testData/diagnostics/tests/j+k/collectionOverrides/removeAt.txt
index 2992df3bca0..6fdc4198820 100644
--- a/compiler/testData/diagnostics/tests/j+k/collectionOverrides/removeAt.txt
+++ b/compiler/testData/diagnostics/tests/j+k/collectionOverrides/removeAt.txt
@@ -6,29 +6,29 @@ public abstract class A</*0*/ F : kotlin.Any!> : B<F!> {
     public constructor A</*0*/ F : kotlin.Any!>()
     protected/*protected and package*/ final override /*1*/ /*fake_override*/ var modCount: kotlin.Int
     public abstract override /*1*/ /*fake_override*/ val size: kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun add(/*0*/ e: F!): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun add(/*0*/ element: F!): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun add(/*0*/ index: kotlin.Int, /*1*/ element: F!): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ c: kotlin.Collection<F!>): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ index: kotlin.Int, /*1*/ c: kotlin.Collection<F!>): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ elements: kotlin.Collection<F!>): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ index: kotlin.Int, /*1*/ elements: kotlin.Collection<F!>): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun clear(): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun contains(/*0*/ o: F!): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun containsAll(/*0*/ c: kotlin.Collection<F!>): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun contains(/*0*/ element: F!): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun containsAll(/*0*/ elements: kotlin.Collection<F!>): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public abstract override /*1*/ /*fake_override*/ fun get(/*0*/ index: kotlin.Int): F!
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun indexOf(/*0*/ o: F!): kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun indexOf(/*0*/ element: F!): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun iterator(): kotlin.MutableIterator<F!>
-    public open override /*1*/ /*fake_override*/ fun lastIndexOf(/*0*/ o: F!): kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun lastIndexOf(/*0*/ element: F!): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun listIterator(): kotlin.MutableListIterator<F!>
     public open override /*1*/ /*fake_override*/ fun listIterator(/*0*/ index: kotlin.Int): kotlin.MutableListIterator<F!>
     invisible_fake open override /*1*/ /*fake_override*/ fun outOfBoundsMsg(/*0*/ p0: kotlin.Int): kotlin.String!
     invisible_fake open override /*1*/ /*fake_override*/ fun rangeCheckForAdd(/*0*/ p0: kotlin.Int): kotlin.Unit
-    public open override /*1*/ fun remove(/*0*/ o: F!): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun removeAll(/*0*/ c: kotlin.Collection<F!>): kotlin.Boolean
+    public open override /*1*/ fun remove(/*0*/ element: F!): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun removeAll(/*0*/ elements: kotlin.Collection<F!>): kotlin.Boolean
     public open override /*1*/ fun removeAt(/*0*/ x: kotlin.Int): F!
     protected/*protected and package*/ open override /*1*/ /*fake_override*/ fun removeRange(/*0*/ p0: kotlin.Int, /*1*/ p1: kotlin.Int): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun retainAll(/*0*/ c: kotlin.Collection<F!>): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun retainAll(/*0*/ elements: kotlin.Collection<F!>): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun set(/*0*/ index: kotlin.Int, /*1*/ element: F!): F!
     public open override /*1*/ /*fake_override*/ fun subList(/*0*/ fromIndex: kotlin.Int, /*1*/ toIndex: kotlin.Int): kotlin.MutableList<F!>
     public open override /*1*/ /*fake_override*/ fun toArray(): kotlin.Array<(out) kotlin.Any!>!
@@ -45,29 +45,29 @@ public abstract class B</*0*/ T> : kotlin.MutableList<T>, java.util.AbstractList
     public constructor B</*0*/ T>()
     protected/*protected and package*/ final override /*1*/ /*fake_override*/ var modCount: kotlin.Int
     public abstract override /*2*/ /*fake_override*/ val size: kotlin.Int
-    public open override /*2*/ /*fake_override*/ fun add(/*0*/ e: T!): kotlin.Boolean
+    public open override /*2*/ /*fake_override*/ fun add(/*0*/ element: T!): kotlin.Boolean
     public open override /*2*/ /*fake_override*/ fun add(/*0*/ index: kotlin.Int, /*1*/ element: T!): kotlin.Unit
-    public open override /*2*/ /*fake_override*/ fun addAll(/*0*/ c: kotlin.Collection<T!>): kotlin.Boolean
-    public open override /*2*/ /*fake_override*/ fun addAll(/*0*/ index: kotlin.Int, /*1*/ c: kotlin.Collection<T!>): kotlin.Boolean
+    public open override /*2*/ /*fake_override*/ fun addAll(/*0*/ elements: kotlin.Collection<T!>): kotlin.Boolean
+    public open override /*2*/ /*fake_override*/ fun addAll(/*0*/ index: kotlin.Int, /*1*/ elements: kotlin.Collection<T!>): kotlin.Boolean
     public open override /*2*/ /*fake_override*/ fun clear(): kotlin.Unit
-    public open override /*2*/ /*fake_override*/ fun contains(/*0*/ o: T!): kotlin.Boolean
-    public open override /*2*/ /*fake_override*/ fun containsAll(/*0*/ c: kotlin.Collection<T!>): kotlin.Boolean
+    public open override /*2*/ /*fake_override*/ fun contains(/*0*/ element: T!): kotlin.Boolean
+    public open override /*2*/ /*fake_override*/ fun containsAll(/*0*/ elements: kotlin.Collection<T!>): kotlin.Boolean
     public open override /*2*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public abstract override /*2*/ /*fake_override*/ fun get(/*0*/ index: kotlin.Int): T!
     public open override /*2*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*2*/ /*fake_override*/ fun indexOf(/*0*/ o: T!): kotlin.Int
+    public open override /*2*/ /*fake_override*/ fun indexOf(/*0*/ element: T!): kotlin.Int
     public open override /*2*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean
     public open override /*2*/ /*fake_override*/ fun iterator(): kotlin.MutableIterator<T!>
-    public open override /*2*/ /*fake_override*/ fun lastIndexOf(/*0*/ o: T!): kotlin.Int
+    public open override /*2*/ /*fake_override*/ fun lastIndexOf(/*0*/ element: T!): kotlin.Int
     public open override /*2*/ /*fake_override*/ fun listIterator(): kotlin.MutableListIterator<T!>
     public open override /*2*/ /*fake_override*/ fun listIterator(/*0*/ index: kotlin.Int): kotlin.MutableListIterator<T!>
     invisible_fake open override /*1*/ /*fake_override*/ fun outOfBoundsMsg(/*0*/ p0: kotlin.Int): kotlin.String!
     invisible_fake open override /*1*/ /*fake_override*/ fun rangeCheckForAdd(/*0*/ p0: kotlin.Int): kotlin.Unit
-    public open override /*2*/ fun remove(/*0*/ o: T): kotlin.Boolean
-    public open override /*2*/ /*fake_override*/ fun removeAll(/*0*/ c: kotlin.Collection<T!>): kotlin.Boolean
+    public open override /*2*/ fun remove(/*0*/ element: T): kotlin.Boolean
+    public open override /*2*/ /*fake_override*/ fun removeAll(/*0*/ elements: kotlin.Collection<T!>): kotlin.Boolean
     public open override /*2*/ fun removeAt(/*0*/ index: kotlin.Int): T
     protected/*protected and package*/ open override /*1*/ /*fake_override*/ fun removeRange(/*0*/ p0: kotlin.Int, /*1*/ p1: kotlin.Int): kotlin.Unit
-    public open override /*2*/ /*fake_override*/ fun retainAll(/*0*/ c: kotlin.Collection<T!>): kotlin.Boolean
+    public open override /*2*/ /*fake_override*/ fun retainAll(/*0*/ elements: kotlin.Collection<T!>): kotlin.Boolean
     public open override /*2*/ /*fake_override*/ fun set(/*0*/ index: kotlin.Int, /*1*/ element: T!): T!
     public open override /*2*/ /*fake_override*/ fun subList(/*0*/ fromIndex: kotlin.Int, /*1*/ toIndex: kotlin.Int): kotlin.MutableList<T!>
     public open override /*1*/ /*fake_override*/ fun toArray(): kotlin.Array<(out) kotlin.Any!>!
diff --git a/compiler/testData/diagnostics/tests/j+k/collectionOverrides/removeAtInt.kt b/compiler/testData/diagnostics/tests/j+k/collectionOverrides/removeAtInt.kt
index d0a956f3a4d..6a776a29a9a 100644
--- a/compiler/testData/diagnostics/tests/j+k/collectionOverrides/removeAtInt.kt
+++ b/compiler/testData/diagnostics/tests/j+k/collectionOverrides/removeAtInt.kt
@@ -9,7 +9,7 @@ import java.util.*;
 
 abstract class B : MutableList<Int>, AbstractList<Int>() {
     override fun removeAt(index: Int): Int = null!!
-    override fun remove(o: Int): Boolean = null!!
+    override fun remove(element: Int): Boolean = null!!
 }
 
 fun main(a: A, b: B, c: ArrayList<Int>) {
diff --git a/compiler/testData/diagnostics/tests/j+k/collectionOverrides/removeAtInt.txt b/compiler/testData/diagnostics/tests/j+k/collectionOverrides/removeAtInt.txt
index 0e2feffc347..347ef7cc998 100644
--- a/compiler/testData/diagnostics/tests/j+k/collectionOverrides/removeAtInt.txt
+++ b/compiler/testData/diagnostics/tests/j+k/collectionOverrides/removeAtInt.txt
@@ -7,28 +7,28 @@ public abstract class A : B {
     protected/*protected and package*/ final override /*1*/ /*fake_override*/ var modCount: kotlin.Int
     public abstract override /*1*/ /*fake_override*/ val size: kotlin.Int
     public open override /*1*/ /*fake_override*/ fun add(/*0*/ index: kotlin.Int, /*1*/ element: kotlin.Int!): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun add(/*0*/ e: kotlin.Int!): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ c: kotlin.Collection<kotlin.Int!>): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ index: kotlin.Int, /*1*/ c: kotlin.Collection<kotlin.Int!>): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun add(/*0*/ element: kotlin.Int!): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ elements: kotlin.Collection<kotlin.Int!>): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ index: kotlin.Int, /*1*/ elements: kotlin.Collection<kotlin.Int!>): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun clear(): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun contains(/*0*/ o: kotlin.Int!): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun containsAll(/*0*/ c: kotlin.Collection<kotlin.Int!>): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun contains(/*0*/ element: kotlin.Int!): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun containsAll(/*0*/ elements: kotlin.Collection<kotlin.Int!>): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public abstract override /*1*/ /*fake_override*/ fun get(/*0*/ index: kotlin.Int): kotlin.Int!
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun indexOf(/*0*/ o: kotlin.Int!): kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun indexOf(/*0*/ element: kotlin.Int!): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun iterator(): kotlin.MutableIterator<kotlin.Int!>
-    public open override /*1*/ /*fake_override*/ fun lastIndexOf(/*0*/ o: kotlin.Int!): kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun lastIndexOf(/*0*/ element: kotlin.Int!): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun listIterator(): kotlin.MutableListIterator<kotlin.Int!>
     public open override /*1*/ /*fake_override*/ fun listIterator(/*0*/ index: kotlin.Int): kotlin.MutableListIterator<kotlin.Int!>
     invisible_fake open override /*1*/ /*fake_override*/ fun outOfBoundsMsg(/*0*/ p0: kotlin.Int): kotlin.String!
     invisible_fake open override /*1*/ /*fake_override*/ fun rangeCheckForAdd(/*0*/ p0: kotlin.Int): kotlin.Unit
     public open override /*1*/ fun remove(/*0*/ x: kotlin.Int): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun removeAll(/*0*/ c: kotlin.Collection<kotlin.Int!>): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun removeAll(/*0*/ elements: kotlin.Collection<kotlin.Int!>): kotlin.Boolean
     public open override /*1*/ fun removeAt(/*0*/ x: kotlin.Int): kotlin.Int
     protected/*protected and package*/ open override /*1*/ /*fake_override*/ fun removeRange(/*0*/ p0: kotlin.Int, /*1*/ p1: kotlin.Int): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun retainAll(/*0*/ c: kotlin.Collection<kotlin.Int!>): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun retainAll(/*0*/ elements: kotlin.Collection<kotlin.Int!>): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun set(/*0*/ index: kotlin.Int, /*1*/ element: kotlin.Int!): kotlin.Int!
     public open override /*1*/ /*fake_override*/ fun subList(/*0*/ fromIndex: kotlin.Int, /*1*/ toIndex: kotlin.Int): kotlin.MutableList<kotlin.Int!>
     public open override /*1*/ /*fake_override*/ fun toArray(): kotlin.Array<(out) kotlin.Any!>!
@@ -46,28 +46,28 @@ public abstract class B : kotlin.MutableList<kotlin.Int>, java.util.AbstractList
     protected/*protected and package*/ final override /*1*/ /*fake_override*/ var modCount: kotlin.Int
     public abstract override /*2*/ /*fake_override*/ val size: kotlin.Int
     public open override /*2*/ /*fake_override*/ fun add(/*0*/ index: kotlin.Int, /*1*/ element: kotlin.Int!): kotlin.Unit
-    public open override /*2*/ /*fake_override*/ fun add(/*0*/ e: kotlin.Int!): kotlin.Boolean
-    public open override /*2*/ /*fake_override*/ fun addAll(/*0*/ c: kotlin.Collection<kotlin.Int!>): kotlin.Boolean
-    public open override /*2*/ /*fake_override*/ fun addAll(/*0*/ index: kotlin.Int, /*1*/ c: kotlin.Collection<kotlin.Int!>): kotlin.Boolean
+    public open override /*2*/ /*fake_override*/ fun add(/*0*/ element: kotlin.Int!): kotlin.Boolean
+    public open override /*2*/ /*fake_override*/ fun addAll(/*0*/ elements: kotlin.Collection<kotlin.Int!>): kotlin.Boolean
+    public open override /*2*/ /*fake_override*/ fun addAll(/*0*/ index: kotlin.Int, /*1*/ elements: kotlin.Collection<kotlin.Int!>): kotlin.Boolean
     public open override /*2*/ /*fake_override*/ fun clear(): kotlin.Unit
-    public open override /*2*/ /*fake_override*/ fun contains(/*0*/ o: kotlin.Int!): kotlin.Boolean
-    public open override /*2*/ /*fake_override*/ fun containsAll(/*0*/ c: kotlin.Collection<kotlin.Int!>): kotlin.Boolean
+    public open override /*2*/ /*fake_override*/ fun contains(/*0*/ element: kotlin.Int!): kotlin.Boolean
+    public open override /*2*/ /*fake_override*/ fun containsAll(/*0*/ elements: kotlin.Collection<kotlin.Int!>): kotlin.Boolean
     public open override /*2*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public abstract override /*2*/ /*fake_override*/ fun get(/*0*/ index: kotlin.Int): kotlin.Int!
     public open override /*2*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*2*/ /*fake_override*/ fun indexOf(/*0*/ o: kotlin.Int!): kotlin.Int
+    public open override /*2*/ /*fake_override*/ fun indexOf(/*0*/ element: kotlin.Int!): kotlin.Int
     public open override /*2*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean
     public open override /*2*/ /*fake_override*/ fun iterator(): kotlin.MutableIterator<kotlin.Int!>
-    public open override /*2*/ /*fake_override*/ fun lastIndexOf(/*0*/ o: kotlin.Int!): kotlin.Int
+    public open override /*2*/ /*fake_override*/ fun lastIndexOf(/*0*/ element: kotlin.Int!): kotlin.Int
     public open override /*2*/ /*fake_override*/ fun listIterator(): kotlin.MutableListIterator<kotlin.Int!>
     public open override /*2*/ /*fake_override*/ fun listIterator(/*0*/ index: kotlin.Int): kotlin.MutableListIterator<kotlin.Int!>
     invisible_fake open override /*1*/ /*fake_override*/ fun outOfBoundsMsg(/*0*/ p0: kotlin.Int): kotlin.String!
     invisible_fake open override /*1*/ /*fake_override*/ fun rangeCheckForAdd(/*0*/ p0: kotlin.Int): kotlin.Unit
-    public open override /*2*/ fun remove(/*0*/ o: kotlin.Int): kotlin.Boolean
-    public open override /*2*/ /*fake_override*/ fun removeAll(/*0*/ c: kotlin.Collection<kotlin.Int!>): kotlin.Boolean
+    public open override /*2*/ fun remove(/*0*/ element: kotlin.Int): kotlin.Boolean
+    public open override /*2*/ /*fake_override*/ fun removeAll(/*0*/ elements: kotlin.Collection<kotlin.Int!>): kotlin.Boolean
     public open override /*2*/ fun removeAt(/*0*/ index: kotlin.Int): kotlin.Int
     protected/*protected and package*/ open override /*1*/ /*fake_override*/ fun removeRange(/*0*/ p0: kotlin.Int, /*1*/ p1: kotlin.Int): kotlin.Unit
-    public open override /*2*/ /*fake_override*/ fun retainAll(/*0*/ c: kotlin.Collection<kotlin.Int!>): kotlin.Boolean
+    public open override /*2*/ /*fake_override*/ fun retainAll(/*0*/ elements: kotlin.Collection<kotlin.Int!>): kotlin.Boolean
     public open override /*2*/ /*fake_override*/ fun set(/*0*/ index: kotlin.Int, /*1*/ element: kotlin.Int!): kotlin.Int!
     public open override /*2*/ /*fake_override*/ fun subList(/*0*/ fromIndex: kotlin.Int, /*1*/ toIndex: kotlin.Int): kotlin.MutableList<kotlin.Int!>
     public open override /*1*/ /*fake_override*/ fun toArray(): kotlin.Array<(out) kotlin.Any!>!
diff --git a/compiler/testData/diagnostics/tests/j+k/finalCollectionSize.txt b/compiler/testData/diagnostics/tests/j+k/finalCollectionSize.txt
index 3516a5f5a99..0b6777ef10a 100644
--- a/compiler/testData/diagnostics/tests/j+k/finalCollectionSize.txt
+++ b/compiler/testData/diagnostics/tests/j+k/finalCollectionSize.txt
@@ -7,14 +7,14 @@ public abstract class A : java.util.ArrayList<kotlin.String!> {
     public final override /*1*/ val size: kotlin.Int
     invisible_fake final override /*1*/ /*fake_override*/ var size: kotlin.Int
     public open override /*1*/ /*fake_override*/ fun add(/*0*/ index: kotlin.Int, /*1*/ element: kotlin.String!): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun add(/*0*/ e: kotlin.String!): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ c: kotlin.Collection<kotlin.String!>): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ index: kotlin.Int, /*1*/ c: kotlin.Collection<kotlin.String!>): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun add(/*0*/ element: kotlin.String!): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ elements: kotlin.Collection<kotlin.String!>): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ index: kotlin.Int, /*1*/ elements: kotlin.Collection<kotlin.String!>): kotlin.Boolean
     invisible_fake open override /*1*/ /*fake_override*/ fun batchRemove(/*0*/ p0: kotlin.(Mutable)Collection<*>!, /*1*/ p1: kotlin.Boolean): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun clear(): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
-    public open override /*1*/ /*fake_override*/ fun contains(/*0*/ o: kotlin.String!): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun containsAll(/*0*/ c: kotlin.Collection<kotlin.String!>): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun contains(/*0*/ element: kotlin.String!): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun containsAll(/*0*/ elements: kotlin.Collection<kotlin.String!>): kotlin.Boolean
     invisible_fake open override /*1*/ /*fake_override*/ fun elementData(/*0*/ p0: kotlin.Int): kotlin.String!
     public open override /*1*/ /*fake_override*/ fun ensureCapacity(/*0*/ p0: kotlin.Int): kotlin.Unit
     invisible_fake open override /*1*/ /*fake_override*/ fun ensureCapacityInternal(/*0*/ p0: kotlin.Int): kotlin.Unit
@@ -23,21 +23,21 @@ public abstract class A : java.util.ArrayList<kotlin.String!> {
     public open override /*1*/ /*fake_override*/ fun get(/*0*/ index: kotlin.Int): kotlin.String!
     invisible_fake open override /*1*/ /*fake_override*/ fun grow(/*0*/ p0: kotlin.Int): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun indexOf(/*0*/ o: kotlin.String!): kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun indexOf(/*0*/ element: kotlin.String!): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun iterator(): kotlin.MutableIterator<kotlin.String!>
-    public open override /*1*/ /*fake_override*/ fun lastIndexOf(/*0*/ o: kotlin.String!): kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun lastIndexOf(/*0*/ element: kotlin.String!): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun listIterator(): kotlin.MutableListIterator<kotlin.String!>
     public open override /*1*/ /*fake_override*/ fun listIterator(/*0*/ index: kotlin.Int): kotlin.MutableListIterator<kotlin.String!>
     invisible_fake open override /*1*/ /*fake_override*/ fun outOfBoundsMsg(/*0*/ p0: kotlin.Int): kotlin.String!
     invisible_fake open override /*1*/ /*fake_override*/ fun rangeCheck(/*0*/ p0: kotlin.Int): kotlin.Unit
     invisible_fake open override /*1*/ /*fake_override*/ fun rangeCheckForAdd(/*0*/ p0: kotlin.Int): kotlin.Unit
     invisible_fake open override /*1*/ /*fake_override*/ fun readObject(/*0*/ p0: java.io.ObjectInputStream!): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun remove(/*0*/ o: kotlin.String!): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun removeAll(/*0*/ c: kotlin.Collection<kotlin.String!>): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun remove(/*0*/ element: kotlin.String!): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun removeAll(/*0*/ elements: kotlin.Collection<kotlin.String!>): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun removeAt(/*0*/ p0: kotlin.Int): kotlin.String!
     protected/*protected and package*/ open override /*1*/ /*fake_override*/ fun removeRange(/*0*/ p0: kotlin.Int, /*1*/ p1: kotlin.Int): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun retainAll(/*0*/ c: kotlin.Collection<kotlin.String!>): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun retainAll(/*0*/ elements: kotlin.Collection<kotlin.String!>): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun set(/*0*/ index: kotlin.Int, /*1*/ element: kotlin.String!): kotlin.String!
     public open override /*1*/ /*fake_override*/ fun subList(/*0*/ fromIndex: kotlin.Int, /*1*/ toIndex: kotlin.Int): kotlin.MutableList<kotlin.String!>
     public open override /*1*/ /*fake_override*/ fun toArray(): kotlin.Array<(out) kotlin.Any!>!
@@ -61,14 +61,14 @@ public final class B : A {
     public open override /*1*/ val size: kotlin.Int = 1
     invisible_fake final override /*1*/ /*fake_override*/ var size: kotlin.Int
     public open override /*1*/ /*fake_override*/ fun add(/*0*/ index: kotlin.Int, /*1*/ element: kotlin.String!): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun add(/*0*/ e: kotlin.String!): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ c: kotlin.Collection<kotlin.String!>): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ index: kotlin.Int, /*1*/ c: kotlin.Collection<kotlin.String!>): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun add(/*0*/ element: kotlin.String!): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ elements: kotlin.Collection<kotlin.String!>): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ index: kotlin.Int, /*1*/ elements: kotlin.Collection<kotlin.String!>): kotlin.Boolean
     invisible_fake open override /*1*/ /*fake_override*/ fun batchRemove(/*0*/ p0: kotlin.(Mutable)Collection<*>!, /*1*/ p1: kotlin.Boolean): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun clear(): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
-    public open override /*1*/ /*fake_override*/ fun contains(/*0*/ o: kotlin.String!): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun containsAll(/*0*/ c: kotlin.Collection<kotlin.String!>): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun contains(/*0*/ element: kotlin.String!): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun containsAll(/*0*/ elements: kotlin.Collection<kotlin.String!>): kotlin.Boolean
     invisible_fake open override /*1*/ /*fake_override*/ fun elementData(/*0*/ p0: kotlin.Int): kotlin.String!
     public open override /*1*/ /*fake_override*/ fun ensureCapacity(/*0*/ p0: kotlin.Int): kotlin.Unit
     invisible_fake open override /*1*/ /*fake_override*/ fun ensureCapacityInternal(/*0*/ p0: kotlin.Int): kotlin.Unit
@@ -77,21 +77,21 @@ public final class B : A {
     public open override /*1*/ /*fake_override*/ fun get(/*0*/ index: kotlin.Int): kotlin.String!
     invisible_fake open override /*1*/ /*fake_override*/ fun grow(/*0*/ p0: kotlin.Int): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun indexOf(/*0*/ o: kotlin.String!): kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun indexOf(/*0*/ element: kotlin.String!): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun iterator(): kotlin.MutableIterator<kotlin.String!>
-    public open override /*1*/ /*fake_override*/ fun lastIndexOf(/*0*/ o: kotlin.String!): kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun lastIndexOf(/*0*/ element: kotlin.String!): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun listIterator(): kotlin.MutableListIterator<kotlin.String!>
     public open override /*1*/ /*fake_override*/ fun listIterator(/*0*/ index: kotlin.Int): kotlin.MutableListIterator<kotlin.String!>
     invisible_fake open override /*1*/ /*fake_override*/ fun outOfBoundsMsg(/*0*/ p0: kotlin.Int): kotlin.String!
     invisible_fake open override /*1*/ /*fake_override*/ fun rangeCheck(/*0*/ p0: kotlin.Int): kotlin.Unit
     invisible_fake open override /*1*/ /*fake_override*/ fun rangeCheckForAdd(/*0*/ p0: kotlin.Int): kotlin.Unit
     invisible_fake open override /*1*/ /*fake_override*/ fun readObject(/*0*/ p0: java.io.ObjectInputStream!): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun remove(/*0*/ o: kotlin.String!): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun removeAll(/*0*/ c: kotlin.Collection<kotlin.String!>): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun remove(/*0*/ element: kotlin.String!): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun removeAll(/*0*/ elements: kotlin.Collection<kotlin.String!>): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun removeAt(/*0*/ p0: kotlin.Int): kotlin.String!
     protected/*protected and package*/ open override /*1*/ /*fake_override*/ fun removeRange(/*0*/ p0: kotlin.Int, /*1*/ p1: kotlin.Int): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun retainAll(/*0*/ c: kotlin.Collection<kotlin.String!>): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun retainAll(/*0*/ elements: kotlin.Collection<kotlin.String!>): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun set(/*0*/ index: kotlin.Int, /*1*/ element: kotlin.String!): kotlin.String!
     public open override /*1*/ /*fake_override*/ fun subList(/*0*/ fromIndex: kotlin.Int, /*1*/ toIndex: kotlin.Int): kotlin.MutableList<kotlin.String!>
     public open override /*1*/ /*fake_override*/ fun toArray(): kotlin.Array<(out) kotlin.Any!>!
diff --git a/compiler/testData/diagnostics/tests/j+k/specialBridges.txt b/compiler/testData/diagnostics/tests/j+k/specialBridges.txt
index 8ebf60e925d..ad86b0c2d9b 100644
--- a/compiler/testData/diagnostics/tests/j+k/specialBridges.txt
+++ b/compiler/testData/diagnostics/tests/j+k/specialBridges.txt
@@ -7,14 +7,14 @@ public final class B2 : java.util.ArrayList<kotlin.String>, I2 {
     invisible_fake final override /*1*/ /*fake_override*/ var size: kotlin.Int
     public open override /*2*/ /*fake_override*/ val size: kotlin.Int
     public open override /*1*/ /*fake_override*/ fun add(/*0*/ index: kotlin.Int, /*1*/ element: kotlin.String): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun add(/*0*/ e: kotlin.String): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ c: kotlin.Collection<kotlin.String>): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ index: kotlin.Int, /*1*/ c: kotlin.Collection<kotlin.String>): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun add(/*0*/ element: kotlin.String): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ elements: kotlin.Collection<kotlin.String>): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ index: kotlin.Int, /*1*/ elements: kotlin.Collection<kotlin.String>): kotlin.Boolean
     invisible_fake open override /*1*/ /*fake_override*/ fun batchRemove(/*0*/ p0: kotlin.(Mutable)Collection<*>!, /*1*/ p1: kotlin.Boolean): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun clear(): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
-    public open override /*1*/ /*fake_override*/ fun contains(/*0*/ o: kotlin.String): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun containsAll(/*0*/ c: kotlin.Collection<kotlin.String>): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun contains(/*0*/ element: kotlin.String): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun containsAll(/*0*/ elements: kotlin.Collection<kotlin.String>): kotlin.Boolean
     invisible_fake open override /*1*/ /*fake_override*/ fun elementData(/*0*/ p0: kotlin.Int): kotlin.String!
     public open override /*1*/ /*fake_override*/ fun ensureCapacity(/*0*/ p0: kotlin.Int): kotlin.Unit
     invisible_fake open override /*1*/ /*fake_override*/ fun ensureCapacityInternal(/*0*/ p0: kotlin.Int): kotlin.Unit
@@ -23,21 +23,21 @@ public final class B2 : java.util.ArrayList<kotlin.String>, I2 {
     public open override /*1*/ /*fake_override*/ fun get(/*0*/ index: kotlin.Int): kotlin.String
     invisible_fake open override /*1*/ /*fake_override*/ fun grow(/*0*/ p0: kotlin.Int): kotlin.Unit
     public open override /*2*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun indexOf(/*0*/ o: kotlin.String): kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun indexOf(/*0*/ element: kotlin.String): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun iterator(): kotlin.MutableIterator<kotlin.String>
-    public open override /*1*/ /*fake_override*/ fun lastIndexOf(/*0*/ o: kotlin.String): kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun lastIndexOf(/*0*/ element: kotlin.String): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun listIterator(): kotlin.MutableListIterator<kotlin.String>
     public open override /*1*/ /*fake_override*/ fun listIterator(/*0*/ index: kotlin.Int): kotlin.MutableListIterator<kotlin.String>
     invisible_fake open override /*1*/ /*fake_override*/ fun outOfBoundsMsg(/*0*/ p0: kotlin.Int): kotlin.String!
     invisible_fake open override /*1*/ /*fake_override*/ fun rangeCheck(/*0*/ p0: kotlin.Int): kotlin.Unit
     invisible_fake open override /*1*/ /*fake_override*/ fun rangeCheckForAdd(/*0*/ p0: kotlin.Int): kotlin.Unit
     invisible_fake open override /*1*/ /*fake_override*/ fun readObject(/*0*/ p0: java.io.ObjectInputStream!): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun remove(/*0*/ o: kotlin.String): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun removeAll(/*0*/ c: kotlin.Collection<kotlin.String>): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun remove(/*0*/ element: kotlin.String): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun removeAll(/*0*/ elements: kotlin.Collection<kotlin.String>): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun removeAt(/*0*/ p0: kotlin.Int): kotlin.String
     protected/*protected and package*/ open override /*1*/ /*fake_override*/ fun removeRange(/*0*/ p0: kotlin.Int, /*1*/ p1: kotlin.Int): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun retainAll(/*0*/ c: kotlin.Collection<kotlin.String>): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun retainAll(/*0*/ elements: kotlin.Collection<kotlin.String>): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun set(/*0*/ index: kotlin.Int, /*1*/ element: kotlin.String): kotlin.String
     public open override /*1*/ /*fake_override*/ fun subList(/*0*/ fromIndex: kotlin.Int, /*1*/ toIndex: kotlin.Int): kotlin.MutableList<kotlin.String>
     public open override /*1*/ /*fake_override*/ fun toArray(): kotlin.Array<(out) kotlin.Any!>!
diff --git a/compiler/testData/diagnostics/tests/platformTypes/genericVarianceViolation/listSuperType.txt b/compiler/testData/diagnostics/tests/platformTypes/genericVarianceViolation/listSuperType.txt
index c046dbf43a8..b6e301dc864 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/genericVarianceViolation/listSuperType.txt
+++ b/compiler/testData/diagnostics/tests/platformTypes/genericVarianceViolation/listSuperType.txt
@@ -14,25 +14,25 @@ public abstract class B : kotlin.MutableList<kotlin.String> {
     public constructor B()
     public abstract override /*1*/ /*fake_override*/ val size: kotlin.Int
     public abstract override /*1*/ /*fake_override*/ fun add(/*0*/ index: kotlin.Int, /*1*/ element: kotlin.String): kotlin.Unit
-    public abstract override /*1*/ /*fake_override*/ fun add(/*0*/ e: kotlin.String): kotlin.Boolean
-    public abstract override /*1*/ /*fake_override*/ fun addAll(/*0*/ c: kotlin.Collection<kotlin.String>): kotlin.Boolean
-    public abstract override /*1*/ /*fake_override*/ fun addAll(/*0*/ index: kotlin.Int, /*1*/ c: kotlin.Collection<kotlin.String>): kotlin.Boolean
+    public abstract override /*1*/ /*fake_override*/ fun add(/*0*/ element: kotlin.String): kotlin.Boolean
+    public abstract override /*1*/ /*fake_override*/ fun addAll(/*0*/ elements: kotlin.Collection<kotlin.String>): kotlin.Boolean
+    public abstract override /*1*/ /*fake_override*/ fun addAll(/*0*/ index: kotlin.Int, /*1*/ elements: kotlin.Collection<kotlin.String>): kotlin.Boolean
     public abstract override /*1*/ /*fake_override*/ fun clear(): kotlin.Unit
-    public abstract override /*1*/ /*fake_override*/ fun contains(/*0*/ o: kotlin.String): kotlin.Boolean
-    public abstract override /*1*/ /*fake_override*/ fun containsAll(/*0*/ c: kotlin.Collection<kotlin.String>): kotlin.Boolean
+    public abstract override /*1*/ /*fake_override*/ fun contains(/*0*/ element: kotlin.String): kotlin.Boolean
+    public abstract override /*1*/ /*fake_override*/ fun containsAll(/*0*/ elements: kotlin.Collection<kotlin.String>): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public abstract override /*1*/ /*fake_override*/ fun get(/*0*/ index: kotlin.Int): kotlin.String
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public abstract override /*1*/ /*fake_override*/ fun indexOf(/*0*/ o: kotlin.String): kotlin.Int
+    public abstract override /*1*/ /*fake_override*/ fun indexOf(/*0*/ element: kotlin.String): kotlin.Int
     public abstract override /*1*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean
     public abstract override /*1*/ /*fake_override*/ fun iterator(): kotlin.MutableIterator<kotlin.String>
-    public abstract override /*1*/ /*fake_override*/ fun lastIndexOf(/*0*/ o: kotlin.String): kotlin.Int
+    public abstract override /*1*/ /*fake_override*/ fun lastIndexOf(/*0*/ element: kotlin.String): kotlin.Int
     public abstract override /*1*/ /*fake_override*/ fun listIterator(): kotlin.MutableListIterator<kotlin.String>
     public abstract override /*1*/ /*fake_override*/ fun listIterator(/*0*/ index: kotlin.Int): kotlin.MutableListIterator<kotlin.String>
-    public abstract override /*1*/ /*fake_override*/ fun remove(/*0*/ o: kotlin.String): kotlin.Boolean
-    public abstract override /*1*/ /*fake_override*/ fun removeAll(/*0*/ c: kotlin.Collection<kotlin.String>): kotlin.Boolean
+    public abstract override /*1*/ /*fake_override*/ fun remove(/*0*/ element: kotlin.String): kotlin.Boolean
+    public abstract override /*1*/ /*fake_override*/ fun removeAll(/*0*/ elements: kotlin.Collection<kotlin.String>): kotlin.Boolean
     public abstract override /*1*/ /*fake_override*/ fun removeAt(/*0*/ index: kotlin.Int): kotlin.String
-    public abstract override /*1*/ /*fake_override*/ fun retainAll(/*0*/ c: kotlin.Collection<kotlin.String>): kotlin.Boolean
+    public abstract override /*1*/ /*fake_override*/ fun retainAll(/*0*/ elements: kotlin.Collection<kotlin.String>): kotlin.Boolean
     public abstract override /*1*/ /*fake_override*/ fun set(/*0*/ index: kotlin.Int, /*1*/ element: kotlin.String): kotlin.String
     public abstract override /*1*/ /*fake_override*/ fun subList(/*0*/ fromIndex: kotlin.Int, /*1*/ toIndex: kotlin.Int): kotlin.MutableList<kotlin.String>
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
diff --git a/compiler/testData/diagnostics/tests/platformTypes/methodCall/multipleExactBoundsNullable.txt b/compiler/testData/diagnostics/tests/platformTypes/methodCall/multipleExactBoundsNullable.txt
index facb5293d74..4783648ed97 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/methodCall/multipleExactBoundsNullable.txt
+++ b/compiler/testData/diagnostics/tests/platformTypes/methodCall/multipleExactBoundsNullable.txt
@@ -19,7 +19,7 @@ public/*package*/ open class MyMap</*0*/ K : kotlin.Any!, /*1*/ V : kotlin.Any!>
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun put(/*0*/ key: K!, /*1*/ value: V!): V?
-    public open override /*1*/ /*fake_override*/ fun putAll(/*0*/ m: kotlin.Map<out K!, V!>): kotlin.Unit
+    public open override /*1*/ /*fake_override*/ fun putAll(/*0*/ from: kotlin.Map<out K!, V!>): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun remove(/*0*/ key: K!): V?
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 
diff --git a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/delegation.txt b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/delegation.txt
index 5ca43e4abb1..af2767b3ef8 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/delegation.txt
+++ b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/delegation.txt
@@ -3,15 +3,15 @@ package
 public final class A : kotlin.List<kotlin.String> {
     public constructor A()
     public open override /*1*/ /*delegation*/ val size: kotlin.Int
-    public open override /*1*/ /*delegation*/ fun contains(/*0*/ o: kotlin.String): kotlin.Boolean
-    public open override /*1*/ /*delegation*/ fun containsAll(/*0*/ c: kotlin.Collection<kotlin.String>): kotlin.Boolean
+    public open override /*1*/ /*delegation*/ fun contains(/*0*/ element: kotlin.String): kotlin.Boolean
+    public open override /*1*/ /*delegation*/ fun containsAll(/*0*/ elements: kotlin.Collection<kotlin.String>): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*delegation*/ fun get(/*0*/ index: kotlin.Int): kotlin.String
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*1*/ /*delegation*/ fun indexOf(/*0*/ o: kotlin.String): kotlin.Int
+    public open override /*1*/ /*delegation*/ fun indexOf(/*0*/ element: kotlin.String): kotlin.Int
     public open override /*1*/ /*delegation*/ fun isEmpty(): kotlin.Boolean
     public open override /*1*/ /*delegation*/ fun iterator(): kotlin.Iterator<kotlin.String>
-    public open override /*1*/ /*delegation*/ fun lastIndexOf(/*0*/ o: kotlin.String): kotlin.Int
+    public open override /*1*/ /*delegation*/ fun lastIndexOf(/*0*/ element: kotlin.String): kotlin.Int
     public open override /*1*/ /*delegation*/ fun listIterator(): kotlin.ListIterator<kotlin.String>
     public open override /*1*/ /*delegation*/ fun listIterator(/*0*/ index: kotlin.Int): kotlin.ListIterator<kotlin.String>
     public open override /*1*/ /*delegation*/ fun subList(/*0*/ fromIndex: kotlin.Int, /*1*/ toIndex: kotlin.Int): kotlin.List<kotlin.String>
@@ -21,15 +21,15 @@ public final class A : kotlin.List<kotlin.String> {
 public final class B : kotlin.List<kotlin.String> {
     public constructor B()
     public open override /*1*/ /*delegation*/ val size: kotlin.Int
-    public open override /*1*/ /*delegation*/ fun contains(/*0*/ o: kotlin.String): kotlin.Boolean
-    public open override /*1*/ /*delegation*/ fun containsAll(/*0*/ c: kotlin.Collection<kotlin.String>): kotlin.Boolean
+    public open override /*1*/ /*delegation*/ fun contains(/*0*/ element: kotlin.String): kotlin.Boolean
+    public open override /*1*/ /*delegation*/ fun containsAll(/*0*/ elements: kotlin.Collection<kotlin.String>): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*delegation*/ fun get(/*0*/ index: kotlin.Int): kotlin.String
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*1*/ /*delegation*/ fun indexOf(/*0*/ o: kotlin.String): kotlin.Int
+    public open override /*1*/ /*delegation*/ fun indexOf(/*0*/ element: kotlin.String): kotlin.Int
     public open override /*1*/ /*delegation*/ fun isEmpty(): kotlin.Boolean
     public open override /*1*/ /*delegation*/ fun iterator(): kotlin.Iterator<kotlin.String>
-    public open override /*1*/ /*delegation*/ fun lastIndexOf(/*0*/ o: kotlin.String): kotlin.Int
+    public open override /*1*/ /*delegation*/ fun lastIndexOf(/*0*/ element: kotlin.String): kotlin.Int
     public open override /*1*/ /*delegation*/ fun listIterator(): kotlin.ListIterator<kotlin.String>
     public open override /*1*/ /*delegation*/ fun listIterator(/*0*/ index: kotlin.Int): kotlin.ListIterator<kotlin.String>
     public open override /*1*/ /*delegation*/ fun subList(/*0*/ fromIndex: kotlin.Int, /*1*/ toIndex: kotlin.Int): kotlin.List<kotlin.String>
@@ -39,15 +39,15 @@ public final class B : kotlin.List<kotlin.String> {
 public final class C : kotlin.List<kotlin.String> {
     public constructor C()
     public open override /*1*/ /*delegation*/ val size: kotlin.Int
-    public open override /*1*/ /*delegation*/ fun contains(/*0*/ o: kotlin.String): kotlin.Boolean
-    public open override /*1*/ /*delegation*/ fun containsAll(/*0*/ c: kotlin.Collection<kotlin.String>): kotlin.Boolean
+    public open override /*1*/ /*delegation*/ fun contains(/*0*/ element: kotlin.String): kotlin.Boolean
+    public open override /*1*/ /*delegation*/ fun containsAll(/*0*/ elements: kotlin.Collection<kotlin.String>): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*delegation*/ fun get(/*0*/ index: kotlin.Int): kotlin.String
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*1*/ /*delegation*/ fun indexOf(/*0*/ o: kotlin.String): kotlin.Int
+    public open override /*1*/ /*delegation*/ fun indexOf(/*0*/ element: kotlin.String): kotlin.Int
     public open override /*1*/ /*delegation*/ fun isEmpty(): kotlin.Boolean
     public open override /*1*/ /*delegation*/ fun iterator(): kotlin.Iterator<kotlin.String>
-    public open override /*1*/ /*delegation*/ fun lastIndexOf(/*0*/ o: kotlin.String): kotlin.Int
+    public open override /*1*/ /*delegation*/ fun lastIndexOf(/*0*/ element: kotlin.String): kotlin.Int
     public open override /*1*/ /*delegation*/ fun listIterator(): kotlin.ListIterator<kotlin.String>
     public open override /*1*/ /*delegation*/ fun listIterator(/*0*/ index: kotlin.Int): kotlin.ListIterator<kotlin.String>
     public open override /*1*/ /*delegation*/ fun subList(/*0*/ fromIndex: kotlin.Int, /*1*/ toIndex: kotlin.Int): kotlin.List<kotlin.String>
diff --git a/compiler/testData/diagnostics/tests/platformTypes/supertypeTypeArguments.txt b/compiler/testData/diagnostics/tests/platformTypes/supertypeTypeArguments.txt
index 223e45c0408..5d5179293d9 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/supertypeTypeArguments.txt
+++ b/compiler/testData/diagnostics/tests/platformTypes/supertypeTypeArguments.txt
@@ -52,7 +52,7 @@ public final class HashMapEx</*0*/ K, /*1*/ V> : java.util.HashMap<K, V>, ExtMap
     invisible_fake open override /*1*/ /*fake_override*/ fun newKeyIterator(): kotlin.(Mutable)Iterator<K!>!
     invisible_fake open override /*1*/ /*fake_override*/ fun newValueIterator(): kotlin.(Mutable)Iterator<V!>!
     public open override /*1*/ /*fake_override*/ fun put(/*0*/ key: K, /*1*/ value: V): V?
-    public open override /*1*/ /*fake_override*/ fun putAll(/*0*/ m: kotlin.Map<out K, V>): kotlin.Unit
+    public open override /*1*/ /*fake_override*/ fun putAll(/*0*/ from: kotlin.Map<out K, V>): kotlin.Unit
     invisible_fake open override /*1*/ /*fake_override*/ fun putAllForCreate(/*0*/ p0: (kotlin.MutableMap<out K!, out V!>..kotlin.Map<out K!, V!>?)): kotlin.Unit
     invisible_fake open override /*1*/ /*fake_override*/ fun putForCreate(/*0*/ p0: K!, /*1*/ p1: V!): kotlin.Unit
     invisible_fake open override /*1*/ /*fake_override*/ fun putForNullKey(/*0*/ p0: V!): V!
diff --git a/compiler/testData/diagnostics/tests/scopes/visibility2.txt b/compiler/testData/diagnostics/tests/scopes/visibility2.txt
index 9cbf2c343c8..a62da10822a 100644
--- a/compiler/testData/diagnostics/tests/scopes/visibility2.txt
+++ b/compiler/testData/diagnostics/tests/scopes/visibility2.txt
@@ -37,15 +37,15 @@ package b {
         protected/*protected and package*/ final override /*1*/ /*fake_override*/ var modCount: kotlin.Int
         invisible_fake final override /*1*/ /*fake_override*/ var size: kotlin.Int
         public open override /*1*/ /*fake_override*/ val size: kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun add(/*0*/ e: java.lang.Integer): kotlin.Boolean
+        public open override /*1*/ /*fake_override*/ fun add(/*0*/ element: java.lang.Integer): kotlin.Boolean
         public open override /*1*/ /*fake_override*/ fun add(/*0*/ index: kotlin.Int, /*1*/ element: java.lang.Integer): kotlin.Unit
-        public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ c: kotlin.Collection<java.lang.Integer>): kotlin.Boolean
-        public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ index: kotlin.Int, /*1*/ c: kotlin.Collection<java.lang.Integer>): kotlin.Boolean
+        public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ elements: kotlin.Collection<java.lang.Integer>): kotlin.Boolean
+        public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ index: kotlin.Int, /*1*/ elements: kotlin.Collection<java.lang.Integer>): kotlin.Boolean
         invisible_fake open override /*1*/ /*fake_override*/ fun batchRemove(/*0*/ p0: kotlin.(Mutable)Collection<*>!, /*1*/ p1: kotlin.Boolean): kotlin.Boolean
         public open override /*1*/ /*fake_override*/ fun clear(): kotlin.Unit
         public open override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
-        public open override /*1*/ /*fake_override*/ fun contains(/*0*/ o: java.lang.Integer): kotlin.Boolean
-        public open override /*1*/ /*fake_override*/ fun containsAll(/*0*/ c: kotlin.Collection<java.lang.Integer>): kotlin.Boolean
+        public open override /*1*/ /*fake_override*/ fun contains(/*0*/ element: java.lang.Integer): kotlin.Boolean
+        public open override /*1*/ /*fake_override*/ fun containsAll(/*0*/ elements: kotlin.Collection<java.lang.Integer>): kotlin.Boolean
         invisible_fake open override /*1*/ /*fake_override*/ fun elementData(/*0*/ p0: kotlin.Int): java.lang.Integer!
         public open override /*1*/ /*fake_override*/ fun ensureCapacity(/*0*/ p0: kotlin.Int): kotlin.Unit
         invisible_fake open override /*1*/ /*fake_override*/ fun ensureCapacityInternal(/*0*/ p0: kotlin.Int): kotlin.Unit
@@ -54,21 +54,21 @@ package b {
         public open override /*1*/ /*fake_override*/ fun get(/*0*/ index: kotlin.Int): java.lang.Integer
         invisible_fake open override /*1*/ /*fake_override*/ fun grow(/*0*/ p0: kotlin.Int): kotlin.Unit
         public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun indexOf(/*0*/ o: java.lang.Integer): kotlin.Int
+        public open override /*1*/ /*fake_override*/ fun indexOf(/*0*/ element: java.lang.Integer): kotlin.Int
         public open override /*1*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean
         public open override /*1*/ /*fake_override*/ fun iterator(): kotlin.MutableIterator<java.lang.Integer>
-        public open override /*1*/ /*fake_override*/ fun lastIndexOf(/*0*/ o: java.lang.Integer): kotlin.Int
+        public open override /*1*/ /*fake_override*/ fun lastIndexOf(/*0*/ element: java.lang.Integer): kotlin.Int
         public open override /*1*/ /*fake_override*/ fun listIterator(): kotlin.MutableListIterator<java.lang.Integer>
         public open override /*1*/ /*fake_override*/ fun listIterator(/*0*/ index: kotlin.Int): kotlin.MutableListIterator<java.lang.Integer>
         invisible_fake open override /*1*/ /*fake_override*/ fun outOfBoundsMsg(/*0*/ p0: kotlin.Int): kotlin.String!
         invisible_fake open override /*1*/ /*fake_override*/ fun rangeCheck(/*0*/ p0: kotlin.Int): kotlin.Unit
         invisible_fake open override /*1*/ /*fake_override*/ fun rangeCheckForAdd(/*0*/ p0: kotlin.Int): kotlin.Unit
         invisible_fake open override /*1*/ /*fake_override*/ fun readObject(/*0*/ p0: java.io.ObjectInputStream!): kotlin.Unit
-        public open override /*1*/ /*fake_override*/ fun remove(/*0*/ o: java.lang.Integer): kotlin.Boolean
-        public open override /*1*/ /*fake_override*/ fun removeAll(/*0*/ c: kotlin.Collection<java.lang.Integer>): kotlin.Boolean
+        public open override /*1*/ /*fake_override*/ fun remove(/*0*/ element: java.lang.Integer): kotlin.Boolean
+        public open override /*1*/ /*fake_override*/ fun removeAll(/*0*/ elements: kotlin.Collection<java.lang.Integer>): kotlin.Boolean
         public open override /*1*/ /*fake_override*/ fun removeAt(/*0*/ p0: kotlin.Int): java.lang.Integer
         protected/*protected and package*/ open override /*1*/ /*fake_override*/ fun removeRange(/*0*/ p0: kotlin.Int, /*1*/ p1: kotlin.Int): kotlin.Unit
-        public open override /*1*/ /*fake_override*/ fun retainAll(/*0*/ c: kotlin.Collection<java.lang.Integer>): kotlin.Boolean
+        public open override /*1*/ /*fake_override*/ fun retainAll(/*0*/ elements: kotlin.Collection<java.lang.Integer>): kotlin.Boolean
         public open override /*1*/ /*fake_override*/ fun set(/*0*/ index: kotlin.Int, /*1*/ element: java.lang.Integer): java.lang.Integer
         public open override /*1*/ /*fake_override*/ fun subList(/*0*/ fromIndex: kotlin.Int, /*1*/ toIndex: kotlin.Int): kotlin.MutableList<java.lang.Integer>
         public open override /*1*/ /*fake_override*/ fun toArray(): kotlin.Array<(out) kotlin.Any!>!
diff --git a/compiler/testData/diagnostics/tests/subtyping/kt-1457.txt b/compiler/testData/diagnostics/tests/subtyping/kt-1457.txt
index 0b66d52dd8a..22921dc72a6 100644
--- a/compiler/testData/diagnostics/tests/subtyping/kt-1457.txt
+++ b/compiler/testData/diagnostics/tests/subtyping/kt-1457.txt
@@ -8,15 +8,15 @@ public final class MyListOfPairs</*0*/ T> : java.util.ArrayList<Pair<T, T>> {
     protected/*protected and package*/ final override /*1*/ /*fake_override*/ var modCount: kotlin.Int
     invisible_fake final override /*1*/ /*fake_override*/ var size: kotlin.Int
     public open override /*1*/ /*fake_override*/ val size: kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun add(/*0*/ e: Pair<T, T>): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun add(/*0*/ element: Pair<T, T>): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun add(/*0*/ index: kotlin.Int, /*1*/ element: Pair<T, T>): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ c: kotlin.Collection<Pair<T, T>>): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ index: kotlin.Int, /*1*/ c: kotlin.Collection<Pair<T, T>>): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ elements: kotlin.Collection<Pair<T, T>>): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ index: kotlin.Int, /*1*/ elements: kotlin.Collection<Pair<T, T>>): kotlin.Boolean
     invisible_fake open override /*1*/ /*fake_override*/ fun batchRemove(/*0*/ p0: kotlin.(Mutable)Collection<*>!, /*1*/ p1: kotlin.Boolean): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun clear(): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
-    public open override /*1*/ /*fake_override*/ fun contains(/*0*/ o: Pair<T, T>): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun containsAll(/*0*/ c: kotlin.Collection<Pair<T, T>>): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun contains(/*0*/ element: Pair<T, T>): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun containsAll(/*0*/ elements: kotlin.Collection<Pair<T, T>>): kotlin.Boolean
     invisible_fake open override /*1*/ /*fake_override*/ fun elementData(/*0*/ p0: kotlin.Int): Pair<T, T>!
     public open override /*1*/ /*fake_override*/ fun ensureCapacity(/*0*/ p0: kotlin.Int): kotlin.Unit
     invisible_fake open override /*1*/ /*fake_override*/ fun ensureCapacityInternal(/*0*/ p0: kotlin.Int): kotlin.Unit
@@ -25,21 +25,21 @@ public final class MyListOfPairs</*0*/ T> : java.util.ArrayList<Pair<T, T>> {
     public open override /*1*/ /*fake_override*/ fun get(/*0*/ index: kotlin.Int): Pair<T, T>
     invisible_fake open override /*1*/ /*fake_override*/ fun grow(/*0*/ p0: kotlin.Int): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun indexOf(/*0*/ o: Pair<T, T>): kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun indexOf(/*0*/ element: Pair<T, T>): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun iterator(): kotlin.MutableIterator<Pair<T, T>>
-    public open override /*1*/ /*fake_override*/ fun lastIndexOf(/*0*/ o: Pair<T, T>): kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun lastIndexOf(/*0*/ element: Pair<T, T>): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun listIterator(): kotlin.MutableListIterator<Pair<T, T>>
     public open override /*1*/ /*fake_override*/ fun listIterator(/*0*/ index: kotlin.Int): kotlin.MutableListIterator<Pair<T, T>>
     invisible_fake open override /*1*/ /*fake_override*/ fun outOfBoundsMsg(/*0*/ p0: kotlin.Int): kotlin.String!
     invisible_fake open override /*1*/ /*fake_override*/ fun rangeCheck(/*0*/ p0: kotlin.Int): kotlin.Unit
     invisible_fake open override /*1*/ /*fake_override*/ fun rangeCheckForAdd(/*0*/ p0: kotlin.Int): kotlin.Unit
     invisible_fake open override /*1*/ /*fake_override*/ fun readObject(/*0*/ p0: java.io.ObjectInputStream!): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun remove(/*0*/ o: Pair<T, T>): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun removeAll(/*0*/ c: kotlin.Collection<Pair<T, T>>): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun remove(/*0*/ element: Pair<T, T>): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun removeAll(/*0*/ elements: kotlin.Collection<Pair<T, T>>): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun removeAt(/*0*/ p0: kotlin.Int): Pair<T, T>
     protected/*protected and package*/ open override /*1*/ /*fake_override*/ fun removeRange(/*0*/ p0: kotlin.Int, /*1*/ p1: kotlin.Int): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun retainAll(/*0*/ c: kotlin.Collection<Pair<T, T>>): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun retainAll(/*0*/ elements: kotlin.Collection<Pair<T, T>>): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun set(/*0*/ index: kotlin.Int, /*1*/ element: Pair<T, T>): Pair<T, T>
     public open override /*1*/ /*fake_override*/ fun subList(/*0*/ fromIndex: kotlin.Int, /*1*/ toIndex: kotlin.Int): kotlin.MutableList<Pair<T, T>>
     public open override /*1*/ /*fake_override*/ fun toArray(): kotlin.Array<(out) kotlin.Any!>!
diff --git a/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/customClassMutableCollection.txt b/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/customClassMutableCollection.txt
index a87809eb869..7099f354e74 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/customClassMutableCollection.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/customClassMutableCollection.txt
@@ -6,18 +6,18 @@ public fun foo(): kotlin.Unit
 @kotlin.jvm.PurelyImplements(value = "kotlin.MutableCollection") public/*package*/ open class A</*0*/ T : kotlin.Any!> : java.util.AbstractCollection<T!>, kotlin.MutableCollection<T> {
     public/*package*/ constructor A</*0*/ T : kotlin.Any!>()
     public open override /*2*/ val size: kotlin.Int
-    public open override /*2*/ /*fake_override*/ fun add(/*0*/ e: T): kotlin.Boolean
-    public open override /*2*/ /*fake_override*/ fun addAll(/*0*/ c: kotlin.Collection<T>): kotlin.Boolean
+    public open override /*2*/ /*fake_override*/ fun add(/*0*/ element: T): kotlin.Boolean
+    public open override /*2*/ /*fake_override*/ fun addAll(/*0*/ elements: kotlin.Collection<T>): kotlin.Boolean
     public open override /*2*/ /*fake_override*/ fun clear(): kotlin.Unit
-    public open override /*2*/ /*fake_override*/ fun contains(/*0*/ o: T): kotlin.Boolean
-    public open override /*2*/ /*fake_override*/ fun containsAll(/*0*/ c: kotlin.Collection<T>): kotlin.Boolean
+    public open override /*2*/ /*fake_override*/ fun contains(/*0*/ element: T): kotlin.Boolean
+    public open override /*2*/ /*fake_override*/ fun containsAll(/*0*/ elements: kotlin.Collection<T>): kotlin.Boolean
     public open override /*2*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*2*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*2*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean
     @java.lang.Override() public open override /*2*/ fun iterator(): kotlin.MutableIterator<T>
-    public open override /*2*/ /*fake_override*/ fun remove(/*0*/ o: T): kotlin.Boolean
-    public open override /*2*/ /*fake_override*/ fun removeAll(/*0*/ c: kotlin.Collection<T>): kotlin.Boolean
-    public open override /*2*/ /*fake_override*/ fun retainAll(/*0*/ c: kotlin.Collection<T>): kotlin.Boolean
+    public open override /*2*/ /*fake_override*/ fun remove(/*0*/ element: T): kotlin.Boolean
+    public open override /*2*/ /*fake_override*/ fun removeAll(/*0*/ elements: kotlin.Collection<T>): kotlin.Boolean
+    public open override /*2*/ /*fake_override*/ fun retainAll(/*0*/ elements: kotlin.Collection<T>): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun toArray(): kotlin.Array<(out) kotlin.Any!>!
     public open override /*1*/ /*fake_override*/ fun </*0*/ T : kotlin.Any!> toArray(/*0*/ p0: kotlin.Array<(out) T!>!): kotlin.Array<(out) T!>!
     public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String
diff --git a/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/customClassMutableList.txt b/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/customClassMutableList.txt
index 93134e17c80..c3c200d064a 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/customClassMutableList.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/customClassMutableList.txt
@@ -7,29 +7,29 @@ public fun foo(): kotlin.Unit
     public/*package*/ constructor A</*0*/ T : kotlin.Any!>()
     protected/*protected and package*/ final override /*1*/ /*fake_override*/ var modCount: kotlin.Int
     public open override /*2*/ val size: kotlin.Int
-    public open override /*2*/ /*fake_override*/ fun add(/*0*/ e: T): kotlin.Boolean
+    public open override /*2*/ /*fake_override*/ fun add(/*0*/ element: T): kotlin.Boolean
     public open override /*2*/ /*fake_override*/ fun add(/*0*/ index: kotlin.Int, /*1*/ element: T): kotlin.Unit
-    public open override /*2*/ /*fake_override*/ fun addAll(/*0*/ c: kotlin.Collection<T>): kotlin.Boolean
-    public open override /*2*/ /*fake_override*/ fun addAll(/*0*/ index: kotlin.Int, /*1*/ c: kotlin.Collection<T>): kotlin.Boolean
+    public open override /*2*/ /*fake_override*/ fun addAll(/*0*/ elements: kotlin.Collection<T>): kotlin.Boolean
+    public open override /*2*/ /*fake_override*/ fun addAll(/*0*/ index: kotlin.Int, /*1*/ elements: kotlin.Collection<T>): kotlin.Boolean
     public open override /*2*/ /*fake_override*/ fun clear(): kotlin.Unit
-    public open override /*2*/ /*fake_override*/ fun contains(/*0*/ o: T): kotlin.Boolean
-    public open override /*2*/ /*fake_override*/ fun containsAll(/*0*/ c: kotlin.Collection<T>): kotlin.Boolean
+    public open override /*2*/ /*fake_override*/ fun contains(/*0*/ element: T): kotlin.Boolean
+    public open override /*2*/ /*fake_override*/ fun containsAll(/*0*/ elements: kotlin.Collection<T>): kotlin.Boolean
     public open override /*2*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     @java.lang.Override() public open override /*2*/ fun get(/*0*/ index: kotlin.Int): T
     public open override /*2*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*2*/ /*fake_override*/ fun indexOf(/*0*/ o: T): kotlin.Int
+    public open override /*2*/ /*fake_override*/ fun indexOf(/*0*/ element: T): kotlin.Int
     public open override /*2*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean
     public open override /*2*/ /*fake_override*/ fun iterator(): kotlin.MutableIterator<T>
-    public open override /*2*/ /*fake_override*/ fun lastIndexOf(/*0*/ o: T): kotlin.Int
+    public open override /*2*/ /*fake_override*/ fun lastIndexOf(/*0*/ element: T): kotlin.Int
     public open override /*2*/ /*fake_override*/ fun listIterator(): kotlin.MutableListIterator<T>
     public open override /*2*/ /*fake_override*/ fun listIterator(/*0*/ index: kotlin.Int): kotlin.MutableListIterator<T>
     invisible_fake open override /*1*/ /*fake_override*/ fun outOfBoundsMsg(/*0*/ p0: kotlin.Int): kotlin.String!
     invisible_fake open override /*1*/ /*fake_override*/ fun rangeCheckForAdd(/*0*/ p0: kotlin.Int): kotlin.Unit
-    public open override /*2*/ /*fake_override*/ fun remove(/*0*/ o: T): kotlin.Boolean
-    public open override /*2*/ /*fake_override*/ fun removeAll(/*0*/ c: kotlin.Collection<T>): kotlin.Boolean
+    public open override /*2*/ /*fake_override*/ fun remove(/*0*/ element: T): kotlin.Boolean
+    public open override /*2*/ /*fake_override*/ fun removeAll(/*0*/ elements: kotlin.Collection<T>): kotlin.Boolean
     public open override /*2*/ /*fake_override*/ fun removeAt(/*0*/ index: kotlin.Int): T
     protected/*protected and package*/ open override /*1*/ /*fake_override*/ fun removeRange(/*0*/ p0: kotlin.Int, /*1*/ p1: kotlin.Int): kotlin.Unit
-    public open override /*2*/ /*fake_override*/ fun retainAll(/*0*/ c: kotlin.Collection<T>): kotlin.Boolean
+    public open override /*2*/ /*fake_override*/ fun retainAll(/*0*/ elements: kotlin.Collection<T>): kotlin.Boolean
     public open override /*2*/ /*fake_override*/ fun set(/*0*/ index: kotlin.Int, /*1*/ element: T): T
     public open override /*2*/ /*fake_override*/ fun subList(/*0*/ fromIndex: kotlin.Int, /*1*/ toIndex: kotlin.Int): kotlin.MutableList<T>
     public open override /*1*/ /*fake_override*/ fun toArray(): kotlin.Array<(out) kotlin.Any!>!
diff --git a/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/invalidFqName.txt b/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/invalidFqName.txt
index 2389faebb6b..905a85a6d56 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/invalidFqName.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/invalidFqName.txt
@@ -7,29 +7,29 @@ public val y: B<kotlin.String>
     public constructor A</*0*/ T : kotlin.Any!>()
     protected/*protected and package*/ final override /*1*/ /*fake_override*/ var modCount: kotlin.Int
     public open override /*1*/ val size: kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun add(/*0*/ e: T!): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun add(/*0*/ element: T!): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun add(/*0*/ index: kotlin.Int, /*1*/ element: T!): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ c: kotlin.Collection<T!>): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ index: kotlin.Int, /*1*/ c: kotlin.Collection<T!>): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ elements: kotlin.Collection<T!>): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ index: kotlin.Int, /*1*/ elements: kotlin.Collection<T!>): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun clear(): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun contains(/*0*/ o: T!): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun containsAll(/*0*/ c: kotlin.Collection<T!>): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun contains(/*0*/ element: T!): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun containsAll(/*0*/ elements: kotlin.Collection<T!>): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     @java.lang.Override() public open override /*1*/ fun get(/*0*/ index: kotlin.Int): T!
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun indexOf(/*0*/ o: T!): kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun indexOf(/*0*/ element: T!): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun iterator(): kotlin.MutableIterator<T!>
-    public open override /*1*/ /*fake_override*/ fun lastIndexOf(/*0*/ o: T!): kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun lastIndexOf(/*0*/ element: T!): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun listIterator(): kotlin.MutableListIterator<T!>
     public open override /*1*/ /*fake_override*/ fun listIterator(/*0*/ index: kotlin.Int): kotlin.MutableListIterator<T!>
     invisible_fake open override /*1*/ /*fake_override*/ fun outOfBoundsMsg(/*0*/ p0: kotlin.Int): kotlin.String!
     invisible_fake open override /*1*/ /*fake_override*/ fun rangeCheckForAdd(/*0*/ p0: kotlin.Int): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun remove(/*0*/ o: T!): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun removeAll(/*0*/ c: kotlin.Collection<T!>): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun remove(/*0*/ element: T!): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun removeAll(/*0*/ elements: kotlin.Collection<T!>): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun removeAt(/*0*/ p0: kotlin.Int): T!
     protected/*protected and package*/ open override /*1*/ /*fake_override*/ fun removeRange(/*0*/ p0: kotlin.Int, /*1*/ p1: kotlin.Int): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun retainAll(/*0*/ c: kotlin.Collection<T!>): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun retainAll(/*0*/ elements: kotlin.Collection<T!>): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun set(/*0*/ index: kotlin.Int, /*1*/ element: T!): T!
     public open override /*1*/ /*fake_override*/ fun subList(/*0*/ fromIndex: kotlin.Int, /*1*/ toIndex: kotlin.Int): kotlin.MutableList<T!>
     public open override /*1*/ /*fake_override*/ fun toArray(): kotlin.Array<(out) kotlin.Any!>!
@@ -46,29 +46,29 @@ public val y: B<kotlin.String>
     public constructor B</*0*/ T : kotlin.Any!>()
     protected/*protected and package*/ final override /*1*/ /*fake_override*/ var modCount: kotlin.Int
     public abstract override /*1*/ /*fake_override*/ val size: kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun add(/*0*/ e: T!): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun add(/*0*/ element: T!): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun add(/*0*/ index: kotlin.Int, /*1*/ element: T!): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ c: kotlin.Collection<T!>): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ index: kotlin.Int, /*1*/ c: kotlin.Collection<T!>): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ elements: kotlin.Collection<T!>): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ index: kotlin.Int, /*1*/ elements: kotlin.Collection<T!>): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun clear(): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun contains(/*0*/ o: T!): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun containsAll(/*0*/ c: kotlin.Collection<T!>): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun contains(/*0*/ element: T!): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun containsAll(/*0*/ elements: kotlin.Collection<T!>): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public abstract override /*1*/ /*fake_override*/ fun get(/*0*/ index: kotlin.Int): T!
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun indexOf(/*0*/ o: T!): kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun indexOf(/*0*/ element: T!): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun iterator(): kotlin.MutableIterator<T!>
-    public open override /*1*/ /*fake_override*/ fun lastIndexOf(/*0*/ o: T!): kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun lastIndexOf(/*0*/ element: T!): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun listIterator(): kotlin.MutableListIterator<T!>
     public open override /*1*/ /*fake_override*/ fun listIterator(/*0*/ index: kotlin.Int): kotlin.MutableListIterator<T!>
     invisible_fake open override /*1*/ /*fake_override*/ fun outOfBoundsMsg(/*0*/ p0: kotlin.Int): kotlin.String!
     invisible_fake open override /*1*/ /*fake_override*/ fun rangeCheckForAdd(/*0*/ p0: kotlin.Int): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun remove(/*0*/ o: T!): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun removeAll(/*0*/ c: kotlin.Collection<T!>): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun remove(/*0*/ element: T!): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun removeAll(/*0*/ elements: kotlin.Collection<T!>): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun removeAt(/*0*/ p0: kotlin.Int): T!
     protected/*protected and package*/ open override /*1*/ /*fake_override*/ fun removeRange(/*0*/ p0: kotlin.Int, /*1*/ p1: kotlin.Int): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun retainAll(/*0*/ c: kotlin.Collection<T!>): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun retainAll(/*0*/ elements: kotlin.Collection<T!>): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun set(/*0*/ index: kotlin.Int, /*1*/ element: T!): T!
     public open override /*1*/ /*fake_override*/ fun subList(/*0*/ fromIndex: kotlin.Int, /*1*/ toIndex: kotlin.Int): kotlin.MutableList<T!>
     public open override /*1*/ /*fake_override*/ fun toArray(): kotlin.Array<(out) kotlin.Any!>!
diff --git a/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/wrongTypeParametersCount.txt b/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/wrongTypeParametersCount.txt
index f8fa657d7ff..f316372a15d 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/wrongTypeParametersCount.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/wrongTypeParametersCount.txt
@@ -7,29 +7,29 @@ public fun foo(): kotlin.Unit
     public/*package*/ constructor A</*0*/ T : kotlin.Any!, /*1*/ V : kotlin.Any!>()
     protected/*protected and package*/ final override /*1*/ /*fake_override*/ var modCount: kotlin.Int
     public open override /*1*/ val size: kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun add(/*0*/ e: T!): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun add(/*0*/ element: T!): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun add(/*0*/ index: kotlin.Int, /*1*/ element: T!): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ c: kotlin.Collection<T!>): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ index: kotlin.Int, /*1*/ c: kotlin.Collection<T!>): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ elements: kotlin.Collection<T!>): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ index: kotlin.Int, /*1*/ elements: kotlin.Collection<T!>): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun clear(): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun contains(/*0*/ o: T!): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun containsAll(/*0*/ c: kotlin.Collection<T!>): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun contains(/*0*/ element: T!): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun containsAll(/*0*/ elements: kotlin.Collection<T!>): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     @java.lang.Override() public open override /*1*/ fun get(/*0*/ index: kotlin.Int): T!
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun indexOf(/*0*/ o: T!): kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun indexOf(/*0*/ element: T!): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun iterator(): kotlin.MutableIterator<T!>
-    public open override /*1*/ /*fake_override*/ fun lastIndexOf(/*0*/ o: T!): kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun lastIndexOf(/*0*/ element: T!): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun listIterator(): kotlin.MutableListIterator<T!>
     public open override /*1*/ /*fake_override*/ fun listIterator(/*0*/ index: kotlin.Int): kotlin.MutableListIterator<T!>
     invisible_fake open override /*1*/ /*fake_override*/ fun outOfBoundsMsg(/*0*/ p0: kotlin.Int): kotlin.String!
     invisible_fake open override /*1*/ /*fake_override*/ fun rangeCheckForAdd(/*0*/ p0: kotlin.Int): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun remove(/*0*/ o: T!): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun removeAll(/*0*/ c: kotlin.Collection<T!>): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun remove(/*0*/ element: T!): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun removeAll(/*0*/ elements: kotlin.Collection<T!>): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun removeAt(/*0*/ p0: kotlin.Int): T!
     protected/*protected and package*/ open override /*1*/ /*fake_override*/ fun removeRange(/*0*/ p0: kotlin.Int, /*1*/ p1: kotlin.Int): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun retainAll(/*0*/ c: kotlin.Collection<T!>): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun retainAll(/*0*/ elements: kotlin.Collection<T!>): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun set(/*0*/ index: kotlin.Int, /*1*/ element: T!): T!
     public open override /*1*/ /*fake_override*/ fun subList(/*0*/ fromIndex: kotlin.Int, /*1*/ toIndex: kotlin.Int): kotlin.MutableList<T!>
     public open override /*1*/ /*fake_override*/ fun toArray(): kotlin.Array<(out) kotlin.Any!>!
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/HalfSubstitutedTypeParameters.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/HalfSubstitutedTypeParameters.txt
index db534fb1350..83a13bd5447 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/HalfSubstitutedTypeParameters.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/HalfSubstitutedTypeParameters.txt
@@ -14,24 +14,24 @@ public interface HalfSubstitutedTypeParameters {
 
     public interface TrickyList</*0*/ X : kotlin.Any!, /*1*/ E : kotlin.Any!> : kotlin.MutableList<E!> {
         public abstract override /*1*/ /*fake_override*/ val size: kotlin.Int
-        public abstract override /*1*/ /*fake_override*/ fun add(/*0*/ e: E!): kotlin.Boolean
+        public abstract override /*1*/ /*fake_override*/ fun add(/*0*/ element: E!): kotlin.Boolean
         public abstract override /*1*/ /*fake_override*/ fun add(/*0*/ index: kotlin.Int, /*1*/ element: E!): kotlin.Unit
-        public abstract override /*1*/ /*fake_override*/ fun addAll(/*0*/ c: kotlin.Collection<E!>): kotlin.Boolean
-        public abstract override /*1*/ /*fake_override*/ fun addAll(/*0*/ index: kotlin.Int, /*1*/ c: kotlin.Collection<E!>): kotlin.Boolean
+        public abstract override /*1*/ /*fake_override*/ fun addAll(/*0*/ elements: kotlin.Collection<E!>): kotlin.Boolean
+        public abstract override /*1*/ /*fake_override*/ fun addAll(/*0*/ index: kotlin.Int, /*1*/ elements: kotlin.Collection<E!>): kotlin.Boolean
         public abstract override /*1*/ /*fake_override*/ fun clear(): kotlin.Unit
-        public abstract override /*1*/ /*fake_override*/ fun contains(/*0*/ o: E!): kotlin.Boolean
-        public abstract override /*1*/ /*fake_override*/ fun containsAll(/*0*/ c: kotlin.Collection<E!>): kotlin.Boolean
+        public abstract override /*1*/ /*fake_override*/ fun contains(/*0*/ element: E!): kotlin.Boolean
+        public abstract override /*1*/ /*fake_override*/ fun containsAll(/*0*/ elements: kotlin.Collection<E!>): kotlin.Boolean
         public abstract override /*1*/ /*fake_override*/ fun get(/*0*/ index: kotlin.Int): E!
-        public abstract override /*1*/ /*fake_override*/ fun indexOf(/*0*/ o: E!): kotlin.Int
+        public abstract override /*1*/ /*fake_override*/ fun indexOf(/*0*/ element: E!): kotlin.Int
         public abstract override /*1*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean
         public abstract override /*1*/ /*fake_override*/ fun iterator(): kotlin.MutableIterator<E!>
-        public abstract override /*1*/ /*fake_override*/ fun lastIndexOf(/*0*/ o: E!): kotlin.Int
+        public abstract override /*1*/ /*fake_override*/ fun lastIndexOf(/*0*/ element: E!): kotlin.Int
         public abstract override /*1*/ /*fake_override*/ fun listIterator(): kotlin.MutableListIterator<E!>
         public abstract override /*1*/ /*fake_override*/ fun listIterator(/*0*/ index: kotlin.Int): kotlin.MutableListIterator<E!>
-        public abstract override /*1*/ /*fake_override*/ fun remove(/*0*/ o: E!): kotlin.Boolean
-        public abstract override /*1*/ /*fake_override*/ fun removeAll(/*0*/ c: kotlin.Collection<E!>): kotlin.Boolean
+        public abstract override /*1*/ /*fake_override*/ fun remove(/*0*/ element: E!): kotlin.Boolean
+        public abstract override /*1*/ /*fake_override*/ fun removeAll(/*0*/ elements: kotlin.Collection<E!>): kotlin.Boolean
         public abstract override /*1*/ /*fake_override*/ fun removeAt(/*0*/ index: kotlin.Int): E!
-        public abstract override /*1*/ /*fake_override*/ fun retainAll(/*0*/ c: kotlin.Collection<E!>): kotlin.Boolean
+        public abstract override /*1*/ /*fake_override*/ fun retainAll(/*0*/ elements: kotlin.Collection<E!>): kotlin.Boolean
         public abstract override /*1*/ /*fake_override*/ fun set(/*0*/ index: kotlin.Int, /*1*/ element: E!): E!
         public abstract override /*1*/ /*fake_override*/ fun subList(/*0*/ fromIndex: kotlin.Int, /*1*/ toIndex: kotlin.Int): kotlin.MutableList<E!>
     }
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SubclassOfCollection.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SubclassOfCollection.txt
index 998011b6bcf..26757dddc3d 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SubclassOfCollection.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SubclassOfCollection.txt
@@ -2,14 +2,14 @@ package test
 
 public interface SubclassOfCollection</*0*/ E : kotlin.Any!> : kotlin.MutableCollection<E!> {
     public abstract override /*1*/ /*fake_override*/ val size: kotlin.Int
-    public abstract override /*1*/ /*fake_override*/ fun add(/*0*/ e: E!): kotlin.Boolean
-    public abstract override /*1*/ /*fake_override*/ fun addAll(/*0*/ c: kotlin.Collection<E!>): kotlin.Boolean
+    public abstract override /*1*/ /*fake_override*/ fun add(/*0*/ element: E!): kotlin.Boolean
+    public abstract override /*1*/ /*fake_override*/ fun addAll(/*0*/ elements: kotlin.Collection<E!>): kotlin.Boolean
     public abstract override /*1*/ /*fake_override*/ fun clear(): kotlin.Unit
-    public abstract override /*1*/ /*fake_override*/ fun contains(/*0*/ o: E!): kotlin.Boolean
-    public abstract override /*1*/ /*fake_override*/ fun containsAll(/*0*/ c: kotlin.Collection<E!>): kotlin.Boolean
+    public abstract override /*1*/ /*fake_override*/ fun contains(/*0*/ element: E!): kotlin.Boolean
+    public abstract override /*1*/ /*fake_override*/ fun containsAll(/*0*/ elements: kotlin.Collection<E!>): kotlin.Boolean
     public abstract override /*1*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean
     public abstract override /*1*/ fun iterator(): kotlin.MutableIterator<E!>
-    public abstract override /*1*/ /*fake_override*/ fun remove(/*0*/ o: E!): kotlin.Boolean
-    public abstract override /*1*/ /*fake_override*/ fun removeAll(/*0*/ c: kotlin.Collection<E!>): kotlin.Boolean
-    public abstract override /*1*/ /*fake_override*/ fun retainAll(/*0*/ c: kotlin.Collection<E!>): kotlin.Boolean
+    public abstract override /*1*/ /*fake_override*/ fun remove(/*0*/ element: E!): kotlin.Boolean
+    public abstract override /*1*/ /*fake_override*/ fun removeAll(/*0*/ elements: kotlin.Collection<E!>): kotlin.Boolean
+    public abstract override /*1*/ /*fake_override*/ fun retainAll(/*0*/ elements: kotlin.Collection<E!>): kotlin.Boolean
 }
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SubclassOfMapEntry.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SubclassOfMapEntry.txt
index 6f65cdfddcf..6392e3ec085 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SubclassOfMapEntry.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SubclassOfMapEntry.txt
@@ -3,5 +3,5 @@ package test
 public interface SubclassOfMapEntry</*0*/ K : kotlin.Any!, /*1*/ V : kotlin.Any!> : kotlin.MutableMap.MutableEntry<K!, V!> {
     public abstract override /*1*/ /*fake_override*/ val key: K!
     public abstract override /*1*/ /*fake_override*/ val value: V!
-    public abstract override /*1*/ fun setValue(/*0*/ value: V!): V!
+    public abstract override /*1*/ fun setValue(/*0*/ newValue: V!): V!
 }
diff --git a/compiler/testData/loadJava/compiledJava/modality/ModalityOfFakeOverrides.txt b/compiler/testData/loadJava/compiledJava/modality/ModalityOfFakeOverrides.txt
index 7724e6c5861..439285532a1 100644
--- a/compiler/testData/loadJava/compiledJava/modality/ModalityOfFakeOverrides.txt
+++ b/compiler/testData/loadJava/compiledJava/modality/ModalityOfFakeOverrides.txt
@@ -5,26 +5,26 @@ public open class ModalityOfFakeOverrides : java.util.AbstractList<kotlin.String
     protected/*protected and package*/ final override /*1*/ /*fake_override*/ var modCount: kotlin.Int
     public open override /*1*/ val size: kotlin.Int
     public open override /*1*/ /*fake_override*/ fun add(/*0*/ index: kotlin.Int, /*1*/ element: kotlin.String!): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun add(/*0*/ e: kotlin.String!): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ c: kotlin.Collection<kotlin.String!>): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ index: kotlin.Int, /*1*/ c: kotlin.Collection<kotlin.String!>): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun add(/*0*/ element: kotlin.String!): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ elements: kotlin.Collection<kotlin.String!>): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ index: kotlin.Int, /*1*/ elements: kotlin.Collection<kotlin.String!>): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun clear(): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun contains(/*0*/ o: kotlin.String!): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun containsAll(/*0*/ c: kotlin.Collection<kotlin.String!>): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun contains(/*0*/ element: kotlin.String!): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun containsAll(/*0*/ elements: kotlin.Collection<kotlin.String!>): kotlin.Boolean
     @org.jetbrains.annotations.NotNull() public open override /*1*/ fun get(/*0*/ index: kotlin.Int): kotlin.String
-    public open override /*1*/ /*fake_override*/ fun indexOf(/*0*/ o: kotlin.String!): kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun indexOf(/*0*/ element: kotlin.String!): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun iterator(): kotlin.MutableIterator<kotlin.String!>
-    public open override /*1*/ /*fake_override*/ fun lastIndexOf(/*0*/ o: kotlin.String!): kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun lastIndexOf(/*0*/ element: kotlin.String!): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun listIterator(): kotlin.MutableListIterator<kotlin.String!>
     public open override /*1*/ /*fake_override*/ fun listIterator(/*0*/ index: kotlin.Int): kotlin.MutableListIterator<kotlin.String!>
     invisible_fake open override /*1*/ /*fake_override*/ fun outOfBoundsMsg(/*0*/ p0: kotlin.Int): kotlin.String!
     invisible_fake open override /*1*/ /*fake_override*/ fun rangeCheckForAdd(/*0*/ p0: kotlin.Int): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun remove(/*0*/ o: kotlin.String!): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun removeAll(/*0*/ c: kotlin.Collection<kotlin.String!>): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun remove(/*0*/ element: kotlin.String!): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun removeAll(/*0*/ elements: kotlin.Collection<kotlin.String!>): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun removeAt(/*0*/ p0: kotlin.Int): kotlin.String!
     protected/*protected and package*/ open override /*1*/ /*fake_override*/ fun removeRange(/*0*/ p0: kotlin.Int, /*1*/ p1: kotlin.Int): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun retainAll(/*0*/ c: kotlin.Collection<kotlin.String!>): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun retainAll(/*0*/ elements: kotlin.Collection<kotlin.String!>): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun set(/*0*/ index: kotlin.Int, /*1*/ element: kotlin.String!): kotlin.String!
     public open override /*1*/ /*fake_override*/ fun subList(/*0*/ fromIndex: kotlin.Int, /*1*/ toIndex: kotlin.Int): kotlin.MutableList<kotlin.String!>
     public open override /*1*/ /*fake_override*/ fun toArray(): kotlin.Array<(out) kotlin.Any!>!
diff --git a/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/HalfSubstitutedTypeParameters.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/HalfSubstitutedTypeParameters.txt
index fc89faafa1a..8231c7bdceb 100644
--- a/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/HalfSubstitutedTypeParameters.txt
+++ b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/HalfSubstitutedTypeParameters.txt
@@ -15,24 +15,24 @@ public interface HalfSubstitutedTypeParameters {
     public interface TrickyList</*0*/ X, /*1*/ E> : kotlin.MutableList<E> {
         public abstract override /*1*/ /*fake_override*/ val size: kotlin.Int
             public abstract override /*1*/ /*fake_override*/ fun <get-size>(): kotlin.Int
-        public abstract override /*1*/ /*fake_override*/ fun add(/*0*/ e: E): kotlin.Boolean
+        public abstract override /*1*/ /*fake_override*/ fun add(/*0*/ element: E): kotlin.Boolean
         public abstract override /*1*/ /*fake_override*/ fun add(/*0*/ index: kotlin.Int, /*1*/ element: E): kotlin.Unit
-        public abstract override /*1*/ /*fake_override*/ fun addAll(/*0*/ c: kotlin.Collection<E>): kotlin.Boolean
-        public abstract override /*1*/ /*fake_override*/ fun addAll(/*0*/ index: kotlin.Int, /*1*/ c: kotlin.Collection<E>): kotlin.Boolean
+        public abstract override /*1*/ /*fake_override*/ fun addAll(/*0*/ elements: kotlin.Collection<E>): kotlin.Boolean
+        public abstract override /*1*/ /*fake_override*/ fun addAll(/*0*/ index: kotlin.Int, /*1*/ elements: kotlin.Collection<E>): kotlin.Boolean
         public abstract override /*1*/ /*fake_override*/ fun clear(): kotlin.Unit
-        public abstract override /*1*/ /*fake_override*/ fun contains(/*0*/ o: E): kotlin.Boolean
-        public abstract override /*1*/ /*fake_override*/ fun containsAll(/*0*/ c: kotlin.Collection<E>): kotlin.Boolean
+        public abstract override /*1*/ /*fake_override*/ fun contains(/*0*/ element: E): kotlin.Boolean
+        public abstract override /*1*/ /*fake_override*/ fun containsAll(/*0*/ elements: kotlin.Collection<E>): kotlin.Boolean
         public abstract override /*1*/ /*fake_override*/ fun get(/*0*/ index: kotlin.Int): E
-        public abstract override /*1*/ /*fake_override*/ fun indexOf(/*0*/ o: E): kotlin.Int
+        public abstract override /*1*/ /*fake_override*/ fun indexOf(/*0*/ element: E): kotlin.Int
         public abstract override /*1*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean
         public abstract override /*1*/ /*fake_override*/ fun iterator(): kotlin.MutableIterator<E>
-        public abstract override /*1*/ /*fake_override*/ fun lastIndexOf(/*0*/ o: E): kotlin.Int
+        public abstract override /*1*/ /*fake_override*/ fun lastIndexOf(/*0*/ element: E): kotlin.Int
         public abstract override /*1*/ /*fake_override*/ fun listIterator(): kotlin.MutableListIterator<E>
         public abstract override /*1*/ /*fake_override*/ fun listIterator(/*0*/ index: kotlin.Int): kotlin.MutableListIterator<E>
-        public abstract override /*1*/ /*fake_override*/ fun remove(/*0*/ o: E): kotlin.Boolean
-        public abstract override /*1*/ /*fake_override*/ fun removeAll(/*0*/ c: kotlin.Collection<E>): kotlin.Boolean
+        public abstract override /*1*/ /*fake_override*/ fun remove(/*0*/ element: E): kotlin.Boolean
+        public abstract override /*1*/ /*fake_override*/ fun removeAll(/*0*/ elements: kotlin.Collection<E>): kotlin.Boolean
         public abstract override /*1*/ /*fake_override*/ fun removeAt(/*0*/ index: kotlin.Int): E
-        public abstract override /*1*/ /*fake_override*/ fun retainAll(/*0*/ c: kotlin.Collection<E>): kotlin.Boolean
+        public abstract override /*1*/ /*fake_override*/ fun retainAll(/*0*/ elements: kotlin.Collection<E>): kotlin.Boolean
         public abstract override /*1*/ /*fake_override*/ fun set(/*0*/ index: kotlin.Int, /*1*/ element: E): E
         public abstract override /*1*/ /*fake_override*/ fun subList(/*0*/ fromIndex: kotlin.Int, /*1*/ toIndex: kotlin.Int): kotlin.MutableList<E>
     }
diff --git a/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/SubclassOfCollection.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/SubclassOfCollection.txt
index 75c315795dc..fa5a87d6b8f 100644
--- a/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/SubclassOfCollection.txt
+++ b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/SubclassOfCollection.txt
@@ -3,14 +3,14 @@ package test
 public interface SubclassOfCollection</*0*/ E> : kotlin.MutableCollection<E> {
     public abstract override /*1*/ /*fake_override*/ val size: kotlin.Int
         public abstract override /*1*/ /*fake_override*/ fun <get-size>(): kotlin.Int
-    public abstract override /*1*/ /*fake_override*/ fun add(/*0*/ e: E): kotlin.Boolean
-    public abstract override /*1*/ /*fake_override*/ fun addAll(/*0*/ c: kotlin.Collection<E>): kotlin.Boolean
+    public abstract override /*1*/ /*fake_override*/ fun add(/*0*/ element: E): kotlin.Boolean
+    public abstract override /*1*/ /*fake_override*/ fun addAll(/*0*/ elements: kotlin.Collection<E>): kotlin.Boolean
     public abstract override /*1*/ /*fake_override*/ fun clear(): kotlin.Unit
-    public abstract override /*1*/ /*fake_override*/ fun contains(/*0*/ o: E): kotlin.Boolean
-    public abstract override /*1*/ /*fake_override*/ fun containsAll(/*0*/ c: kotlin.Collection<E>): kotlin.Boolean
+    public abstract override /*1*/ /*fake_override*/ fun contains(/*0*/ element: E): kotlin.Boolean
+    public abstract override /*1*/ /*fake_override*/ fun containsAll(/*0*/ elements: kotlin.Collection<E>): kotlin.Boolean
     public abstract override /*1*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean
     public abstract override /*1*/ fun iterator(): kotlin.MutableIterator<E>
-    public abstract override /*1*/ /*fake_override*/ fun remove(/*0*/ o: E): kotlin.Boolean
-    public abstract override /*1*/ /*fake_override*/ fun removeAll(/*0*/ c: kotlin.Collection<E>): kotlin.Boolean
-    public abstract override /*1*/ /*fake_override*/ fun retainAll(/*0*/ c: kotlin.Collection<E>): kotlin.Boolean
+    public abstract override /*1*/ /*fake_override*/ fun remove(/*0*/ element: E): kotlin.Boolean
+    public abstract override /*1*/ /*fake_override*/ fun removeAll(/*0*/ elements: kotlin.Collection<E>): kotlin.Boolean
+    public abstract override /*1*/ /*fake_override*/ fun retainAll(/*0*/ elements: kotlin.Collection<E>): kotlin.Boolean
 }
diff --git a/compiler/testData/loadJava/compiledKotlin/fromLoadJava/modality/ModalityOfFakeOverrides.txt b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/modality/ModalityOfFakeOverrides.txt
index 2a0e0a9f9c7..296fa944b0d 100644
--- a/compiler/testData/loadJava/compiledKotlin/fromLoadJava/modality/ModalityOfFakeOverrides.txt
+++ b/compiler/testData/loadJava/compiledKotlin/fromLoadJava/modality/ModalityOfFakeOverrides.txt
@@ -6,26 +6,26 @@ public open class ModalityOfFakeOverrides : java.util.AbstractList<kotlin.String
     public open override /*1*/ val size: kotlin.Int
         public open override /*1*/ fun <get-size>(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun add(/*0*/ index: kotlin.Int, /*1*/ element: kotlin.String!): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun add(/*0*/ e: kotlin.String!): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ c: kotlin.Collection<kotlin.String!>): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ index: kotlin.Int, /*1*/ c: kotlin.Collection<kotlin.String!>): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun add(/*0*/ element: kotlin.String!): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ elements: kotlin.Collection<kotlin.String!>): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ index: kotlin.Int, /*1*/ elements: kotlin.Collection<kotlin.String!>): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun clear(): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun contains(/*0*/ o: kotlin.String!): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun containsAll(/*0*/ c: kotlin.Collection<kotlin.String!>): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun contains(/*0*/ element: kotlin.String!): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun containsAll(/*0*/ elements: kotlin.Collection<kotlin.String!>): kotlin.Boolean
     public open override /*1*/ fun get(/*0*/ index: kotlin.Int): kotlin.String
-    public open override /*1*/ /*fake_override*/ fun indexOf(/*0*/ o: kotlin.String!): kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun indexOf(/*0*/ element: kotlin.String!): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun iterator(): kotlin.MutableIterator<kotlin.String!>
-    public open override /*1*/ /*fake_override*/ fun lastIndexOf(/*0*/ o: kotlin.String!): kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun lastIndexOf(/*0*/ element: kotlin.String!): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun listIterator(): kotlin.MutableListIterator<kotlin.String!>
     public open override /*1*/ /*fake_override*/ fun listIterator(/*0*/ index: kotlin.Int): kotlin.MutableListIterator<kotlin.String!>
     invisible_fake open override /*1*/ /*fake_override*/ fun outOfBoundsMsg(/*0*/ p0: kotlin.Int): kotlin.String!
     invisible_fake open override /*1*/ /*fake_override*/ fun rangeCheckForAdd(/*0*/ p0: kotlin.Int): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun remove(/*0*/ o: kotlin.String!): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun removeAll(/*0*/ c: kotlin.Collection<kotlin.String!>): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun remove(/*0*/ element: kotlin.String!): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun removeAll(/*0*/ elements: kotlin.Collection<kotlin.String!>): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun removeAt(/*0*/ p0: kotlin.Int): kotlin.String!
     protected/*protected and package*/ open override /*1*/ /*fake_override*/ fun removeRange(/*0*/ p0: kotlin.Int, /*1*/ p1: kotlin.Int): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun retainAll(/*0*/ c: kotlin.Collection<kotlin.String!>): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun retainAll(/*0*/ elements: kotlin.Collection<kotlin.String!>): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun set(/*0*/ index: kotlin.Int, /*1*/ element: kotlin.String!): kotlin.String!
     public open override /*1*/ /*fake_override*/ fun subList(/*0*/ fromIndex: kotlin.Int, /*1*/ toIndex: kotlin.Int): kotlin.MutableList<kotlin.String!>
     public open override /*1*/ /*fake_override*/ fun toArray(): kotlin.Array<(out) kotlin.Any!>!
diff --git a/compiler/testData/loadJava/compiledKotlin/platformTypes/notnullTypeArgument.txt b/compiler/testData/loadJava/compiledKotlin/platformTypes/notnullTypeArgument.txt
index 95588165cf4..b43b334c850 100644
--- a/compiler/testData/loadJava/compiledKotlin/platformTypes/notnullTypeArgument.txt
+++ b/compiler/testData/loadJava/compiledKotlin/platformTypes/notnullTypeArgument.txt
@@ -8,35 +8,35 @@ public final class C : java.util.ArrayList<kotlin.String> {
     public open override /*1*/ /*fake_override*/ val size: kotlin.Int
         public open override /*1*/ /*fake_override*/ fun <get-size>(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun add(/*0*/ index: kotlin.Int, /*1*/ element: kotlin.String): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun add(/*0*/ e: kotlin.String): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ c: kotlin.Collection<kotlin.String>): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ index: kotlin.Int, /*1*/ c: kotlin.Collection<kotlin.String>): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun add(/*0*/ element: kotlin.String): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ elements: kotlin.Collection<kotlin.String>): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ index: kotlin.Int, /*1*/ elements: kotlin.Collection<kotlin.String>): kotlin.Boolean
     invisible_fake open override /*1*/ /*fake_override*/ fun batchRemove(/*0*/ p0: kotlin.(Mutable)Collection<*>!, /*1*/ p1: kotlin.Boolean): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun clear(): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
-    public open override /*1*/ /*fake_override*/ fun contains(/*0*/ o: kotlin.String): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun containsAll(/*0*/ c: kotlin.Collection<kotlin.String>): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun contains(/*0*/ element: kotlin.String): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun containsAll(/*0*/ elements: kotlin.Collection<kotlin.String>): kotlin.Boolean
     invisible_fake open override /*1*/ /*fake_override*/ fun elementData(/*0*/ p0: kotlin.Int): kotlin.String!
     public open override /*1*/ /*fake_override*/ fun ensureCapacity(/*0*/ p0: kotlin.Int): kotlin.Unit
     invisible_fake open override /*1*/ /*fake_override*/ fun ensureCapacityInternal(/*0*/ p0: kotlin.Int): kotlin.Unit
     invisible_fake open override /*1*/ /*fake_override*/ fun fastRemove(/*0*/ p0: kotlin.Int): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun get(/*0*/ index: kotlin.Int): kotlin.String
     invisible_fake open override /*1*/ /*fake_override*/ fun grow(/*0*/ p0: kotlin.Int): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun indexOf(/*0*/ o: kotlin.String): kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun indexOf(/*0*/ element: kotlin.String): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun iterator(): kotlin.MutableIterator<kotlin.String>
-    public open override /*1*/ /*fake_override*/ fun lastIndexOf(/*0*/ o: kotlin.String): kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun lastIndexOf(/*0*/ element: kotlin.String): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun listIterator(): kotlin.MutableListIterator<kotlin.String>
     public open override /*1*/ /*fake_override*/ fun listIterator(/*0*/ index: kotlin.Int): kotlin.MutableListIterator<kotlin.String>
     invisible_fake open override /*1*/ /*fake_override*/ fun outOfBoundsMsg(/*0*/ p0: kotlin.Int): kotlin.String!
     invisible_fake open override /*1*/ /*fake_override*/ fun rangeCheck(/*0*/ p0: kotlin.Int): kotlin.Unit
     invisible_fake open override /*1*/ /*fake_override*/ fun rangeCheckForAdd(/*0*/ p0: kotlin.Int): kotlin.Unit
     invisible_fake open override /*1*/ /*fake_override*/ fun readObject(/*0*/ p0: java.io.ObjectInputStream!): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun remove(/*0*/ o: kotlin.String): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun removeAll(/*0*/ c: kotlin.Collection<kotlin.String>): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun remove(/*0*/ element: kotlin.String): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun removeAll(/*0*/ elements: kotlin.Collection<kotlin.String>): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun removeAt(/*0*/ p0: kotlin.Int): kotlin.String
     protected/*protected and package*/ open override /*1*/ /*fake_override*/ fun removeRange(/*0*/ p0: kotlin.Int, /*1*/ p1: kotlin.Int): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun retainAll(/*0*/ c: kotlin.Collection<kotlin.String>): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun retainAll(/*0*/ elements: kotlin.Collection<kotlin.String>): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun set(/*0*/ index: kotlin.Int, /*1*/ element: kotlin.String): kotlin.String
     public open override /*1*/ /*fake_override*/ fun subList(/*0*/ fromIndex: kotlin.Int, /*1*/ toIndex: kotlin.Int): kotlin.MutableList<kotlin.String>
     public open override /*1*/ /*fake_override*/ fun toArray(): kotlin.Array<(out) kotlin.Any!>!
diff --git a/compiler/testData/loadJava/compiledKotlin/platformTypes/nullableTypeArgument.txt b/compiler/testData/loadJava/compiledKotlin/platformTypes/nullableTypeArgument.txt
index 04cdbf4fb7b..11bcdedc8d5 100644
--- a/compiler/testData/loadJava/compiledKotlin/platformTypes/nullableTypeArgument.txt
+++ b/compiler/testData/loadJava/compiledKotlin/platformTypes/nullableTypeArgument.txt
@@ -8,35 +8,35 @@ public final class C : java.util.ArrayList<kotlin.String?> {
     public open override /*1*/ /*fake_override*/ val size: kotlin.Int
         public open override /*1*/ /*fake_override*/ fun <get-size>(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun add(/*0*/ index: kotlin.Int, /*1*/ element: kotlin.String?): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun add(/*0*/ e: kotlin.String?): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ c: kotlin.Collection<kotlin.String?>): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ index: kotlin.Int, /*1*/ c: kotlin.Collection<kotlin.String?>): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun add(/*0*/ element: kotlin.String?): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ elements: kotlin.Collection<kotlin.String?>): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun addAll(/*0*/ index: kotlin.Int, /*1*/ elements: kotlin.Collection<kotlin.String?>): kotlin.Boolean
     invisible_fake open override /*1*/ /*fake_override*/ fun batchRemove(/*0*/ p0: kotlin.(Mutable)Collection<*>!, /*1*/ p1: kotlin.Boolean): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun clear(): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
-    public open override /*1*/ /*fake_override*/ fun contains(/*0*/ o: kotlin.String?): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun containsAll(/*0*/ c: kotlin.Collection<kotlin.String?>): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun contains(/*0*/ element: kotlin.String?): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun containsAll(/*0*/ elements: kotlin.Collection<kotlin.String?>): kotlin.Boolean
     invisible_fake open override /*1*/ /*fake_override*/ fun elementData(/*0*/ p0: kotlin.Int): kotlin.String?
     public open override /*1*/ /*fake_override*/ fun ensureCapacity(/*0*/ p0: kotlin.Int): kotlin.Unit
     invisible_fake open override /*1*/ /*fake_override*/ fun ensureCapacityInternal(/*0*/ p0: kotlin.Int): kotlin.Unit
     invisible_fake open override /*1*/ /*fake_override*/ fun fastRemove(/*0*/ p0: kotlin.Int): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun get(/*0*/ index: kotlin.Int): kotlin.String?
     invisible_fake open override /*1*/ /*fake_override*/ fun grow(/*0*/ p0: kotlin.Int): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun indexOf(/*0*/ o: kotlin.String?): kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun indexOf(/*0*/ element: kotlin.String?): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun isEmpty(): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun iterator(): kotlin.MutableIterator<kotlin.String?>
-    public open override /*1*/ /*fake_override*/ fun lastIndexOf(/*0*/ o: kotlin.String?): kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun lastIndexOf(/*0*/ element: kotlin.String?): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun listIterator(): kotlin.MutableListIterator<kotlin.String?>
     public open override /*1*/ /*fake_override*/ fun listIterator(/*0*/ index: kotlin.Int): kotlin.MutableListIterator<kotlin.String?>
     invisible_fake open override /*1*/ /*fake_override*/ fun outOfBoundsMsg(/*0*/ p0: kotlin.Int): kotlin.String!
     invisible_fake open override /*1*/ /*fake_override*/ fun rangeCheck(/*0*/ p0: kotlin.Int): kotlin.Unit
     invisible_fake open override /*1*/ /*fake_override*/ fun rangeCheckForAdd(/*0*/ p0: kotlin.Int): kotlin.Unit
     invisible_fake open override /*1*/ /*fake_override*/ fun readObject(/*0*/ p0: java.io.ObjectInputStream!): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun remove(/*0*/ o: kotlin.String?): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun removeAll(/*0*/ c: kotlin.Collection<kotlin.String?>): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun remove(/*0*/ element: kotlin.String?): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun removeAll(/*0*/ elements: kotlin.Collection<kotlin.String?>): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun removeAt(/*0*/ p0: kotlin.Int): kotlin.String?
     protected/*protected and package*/ open override /*1*/ /*fake_override*/ fun removeRange(/*0*/ p0: kotlin.Int, /*1*/ p1: kotlin.Int): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun retainAll(/*0*/ c: kotlin.Collection<kotlin.String?>): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun retainAll(/*0*/ elements: kotlin.Collection<kotlin.String?>): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun set(/*0*/ index: kotlin.Int, /*1*/ element: kotlin.String?): kotlin.String?
     public open override /*1*/ /*fake_override*/ fun subList(/*0*/ fromIndex: kotlin.Int, /*1*/ toIndex: kotlin.Int): kotlin.MutableList<kotlin.String?>
     public open override /*1*/ /*fake_override*/ fun toArray(): kotlin.Array<(out) kotlin.Any!>!
diff --git a/core/builtins/native/kotlin/Collections.kt b/core/builtins/native/kotlin/Collections.kt
index ff94edb23f5..639f0882b96 100644
--- a/core/builtins/native/kotlin/Collections.kt
+++ b/core/builtins/native/kotlin/Collections.kt
@@ -59,14 +59,14 @@ public interface Collection<out E> : Iterable<E> {
     /**
      * Checks if the specified element is contained in this collection.
      */
-    public operator fun contains(o: @UnsafeVariance E): Boolean
+    public operator fun contains(element: @UnsafeVariance E): Boolean
     override fun iterator(): Iterator<E>
 
     // Bulk Operations
     /**
      * Checks if all elements in the specified collection are contained in this collection.
      */
-    public fun containsAll(c: Collection<@UnsafeVariance E>): Boolean
+    public fun containsAll(elements: Collection<@UnsafeVariance E>): Boolean
 }
 
 /**
@@ -83,7 +83,7 @@ public interface MutableCollection<E> : Collection<E>, MutableIterable<E> {
      * @return `true` if the element has been added, `false` if the collection does not support duplicates
      * and the element is already contained in the collection.
      */
-    public fun add(e: E): Boolean
+    public fun add(element: E): Boolean
 
     /**
      * Removes a single instance of the specified element from this
@@ -91,7 +91,7 @@ public interface MutableCollection<E> : Collection<E>, MutableIterable<E> {
      *
      * @return `true` if the element has been successfully removed; `false` if it was not present in the collection.
      */
-    public fun remove(o: E): Boolean
+    public fun remove(element: E): Boolean
 
     // Bulk Modification Operations
     /**
@@ -99,21 +99,21 @@ public interface MutableCollection<E> : Collection<E>, MutableIterable<E> {
      *
      * @return `true` if any of the specified elements was added to the collection, `false` if the collection was not modified.
      */
-    public fun addAll(c: Collection<E>): Boolean
+    public fun addAll(elements: Collection<E>): Boolean
 
     /**
      * Removes all of this collection's elements that are also contained in the specified collection.
      *
      * @return `true` if any of the specified elements was removed from the collection, `false` if the collection was not modified.
      */
-    public fun removeAll(c: Collection<E>): Boolean
+    public fun removeAll(elements: Collection<E>): Boolean
 
     /**
      * Retains only the elements in this collection that are contained in the specified collection.
      *
      * @return `true` if any element was removed from the collection, `false` if the collection was not modified.
      */
-    public fun retainAll(c: Collection<E>): Boolean
+    public fun retainAll(elements: Collection<E>): Boolean
 
     /**
      * Removes all elements from this collection.
@@ -130,11 +130,11 @@ public interface List<out E> : Collection<E> {
     // Query Operations
     override val size: Int
     override fun isEmpty(): Boolean
-    override fun contains(o: @UnsafeVariance E): Boolean
+    override fun contains(element: @UnsafeVariance E): Boolean
     override fun iterator(): Iterator<E>
 
     // Bulk Operations
-    override fun containsAll(c: Collection<@UnsafeVariance E>): Boolean
+    override fun containsAll(elements: Collection<@UnsafeVariance E>): Boolean
 
     // Positional Access Operations
     /**
@@ -147,13 +147,13 @@ public interface List<out E> : Collection<E> {
      * Returns the index of the first occurrence of the specified element in the list, or -1 if the specified
      * element is not contained in the list.
      */
-    public fun indexOf(o: @UnsafeVariance E): Int
+    public fun indexOf(element: @UnsafeVariance E): Int
 
     /**
      * Returns the index of the last occurrence of the specified element in the list, or -1 if the specified
      * element is not contained in the list.
      */
-    public fun lastIndexOf(o: @UnsafeVariance E): Int
+    public fun lastIndexOf(element: @UnsafeVariance E): Int
 
     // List Iterators
     /**
@@ -180,20 +180,20 @@ public interface List<out E> : Collection<E> {
  */
 public interface MutableList<E> : List<E>, MutableCollection<E> {
     // Modification Operations
-    override fun add(e: E): Boolean
-    override fun remove(o: E): Boolean
+    override fun add(element: E): Boolean
+    override fun remove(element: E): Boolean
 
     // Bulk Modification Operations
-    override fun addAll(c: Collection<E>): Boolean
+    override fun addAll(elements: Collection<E>): Boolean
 
     /**
-     * Inserts all of the elements in the specified collection [c] into this list at the specified [index].
+     * Inserts all of the elements in the specified collection [elements] into this list at the specified [index].
      *
      * @return `true` if the list was changed as the result of the operation.
      */
-    public fun addAll(index: Int, c: Collection<E>): Boolean
-    override fun removeAll(c: Collection<E>): Boolean
-    override fun retainAll(c: Collection<E>): Boolean
+    public fun addAll(index: Int, elements: Collection<E>): Boolean
+    override fun removeAll(elements: Collection<E>): Boolean
+    override fun retainAll(elements: Collection<E>): Boolean
     override fun clear(): Unit
 
     // Positional Access Operations
@@ -234,11 +234,11 @@ public interface Set<out E> : Collection<E> {
     // Query Operations
     override val size: Int
     override fun isEmpty(): Boolean
-    override fun contains(o: @UnsafeVariance E): Boolean
+    override fun contains(element: @UnsafeVariance E): Boolean
     override fun iterator(): Iterator<E>
 
     // Bulk Operations
-    override fun containsAll(c: Collection<@UnsafeVariance E>): Boolean
+    override fun containsAll(elements: Collection<@UnsafeVariance E>): Boolean
 }
 
 /**
@@ -251,13 +251,13 @@ public interface MutableSet<E> : Set<E>, MutableCollection<E> {
     override fun iterator(): MutableIterator<E>
 
     // Modification Operations
-    override fun add(e: E): Boolean
-    override fun remove(o: E): Boolean
+    override fun add(element: E): Boolean
+    override fun remove(element: E): Boolean
 
     // Bulk Modification Operations
-    override fun addAll(c: Collection<E>): Boolean
-    override fun removeAll(c: Collection<E>): Boolean
-    override fun retainAll(c: Collection<E>): Boolean
+    override fun addAll(elements: Collection<E>): Boolean
+    override fun removeAll(elements: Collection<E>): Boolean
+    override fun retainAll(elements: Collection<E>): Boolean
     override fun clear(): Unit
 }
 
@@ -352,9 +352,9 @@ public interface MutableMap<K, V> : Map<K, V> {
 
     // Bulk Modification Operations
     /**
-     * Updates this map with key/value pairs from the specified map [m].
+     * Updates this map with key/value pairs from the specified map [from].
      */
-    public fun putAll(m: Map<out K, V>): Unit
+    public fun putAll(from: Map<out K, V>): Unit
 
     /**
      * Removes all elements from this map.
@@ -375,6 +375,6 @@ public interface MutableMap<K, V> : Map<K, V> {
          *
          * @return the previous value corresponding to the key.
          */
-         public fun setValue(value: V): V
+         public fun setValue(newValue: V): V
     }
 }
diff --git a/core/builtins/native/kotlin/Iterator.kt b/core/builtins/native/kotlin/Iterator.kt
index 0359d6c3967..0e4ea99ed4f 100644
--- a/core/builtins/native/kotlin/Iterator.kt
+++ b/core/builtins/native/kotlin/Iterator.kt
@@ -86,17 +86,17 @@ public interface MutableListIterator<T> : ListIterator<T>, MutableIterator<T> {
     override fun remove(): Unit
 
     /**
-     * Replaces the last element returned by [next] or [previous] with the specified element [e].
+     * Replaces the last element returned by [next] or [previous] with the specified element [element].
      */
-    public fun set(e: T): Unit
+    public fun set(element: T): Unit
 
     /**
-     * Adds the specified element [e] into the underlying collection immediately before the element that would be
+     * Adds the specified element [element] into the underlying collection immediately before the element that would be
      * returned by [next], if any, and after the element that would be returned by [previous], if any.
      * (If the collection contains no elements, the new element becomes the sole element in the collection.)
      * The new element is inserted before the implicit cursor: a subsequent call to [next] would be unaffected,
      * and a subsequent call to [previous] would return the new element. (This call increases by one the value \
      * that would be returned by a call to [nextIndex] or [previousIndex].)
      */
-    public fun add(e: T): Unit
+    public fun add(element: T): Unit
 }
diff --git a/core/builtins/native/kotlin/Primitives.kt b/core/builtins/native/kotlin/Primitives.kt
index f66db75e670..fc3fbe14281 100644
--- a/core/builtins/native/kotlin/Primitives.kt
+++ b/core/builtins/native/kotlin/Primitives.kt
@@ -430,11 +430,11 @@ public class Int private () : Number, Comparable<Int> {
     public operator fun rangeTo(other: Double): DoubleRange
 
     /** Shifts this value left by [bits]. */
-    public infix fun shl(bits: Int): Int
+    public infix fun shl(bitCount: Int): Int
     /** Shifts this value right by [bits], filling the leftmost bits with copies of the sign bit. */
-    public infix fun shr(bits: Int): Int
+    public infix fun shr(bitCount: Int): Int
     /** Shifts this value right by [bits], filling the leftmost bits with zeros. */
-    public infix fun ushr(bits: Int): Int
+    public infix fun ushr(bitCount: Int): Int
     /** Performs a bitwise AND operation between the two values. */
     public infix fun and(other: Int): Int
     /** Performs a bitwise OR operation between the two values. */
@@ -585,11 +585,11 @@ public class Long private () : Number, Comparable<Long> {
     public operator fun rangeTo(other: Double): DoubleRange
 
     /** Shifts this value left by [bits]. */
-    public infix fun shl(bits: Int): Long
+    public infix fun shl(bitCount: Int): Long
     /** Shifts this value right by [bits], filling the leftmost bits with copies of the sign bit. */
-    public infix fun shr(bits: Int): Long
+    public infix fun shr(bitCount: Int): Long
     /** Shifts this value right by [bits], filling the leftmost bits with zeros. */
-    public infix fun ushr(bits: Int): Long
+    public infix fun ushr(bitCount: Int): Long
     /** Performs a bitwise AND operation between the two values. */
     public infix fun and(other: Long): Long
     /** Performs a bitwise OR operation between the two values. */
diff --git a/generators/src/org/jetbrains/kotlin/generators/builtins/primitives.kt b/generators/src/org/jetbrains/kotlin/generators/builtins/primitives.kt
index 80eb6851cf1..b3ea30b3e72 100644
--- a/generators/src/org/jetbrains/kotlin/generators/builtins/primitives.kt
+++ b/generators/src/org/jetbrains/kotlin/generators/builtins/primitives.kt
@@ -141,7 +141,7 @@ class GeneratePrimitives(out: PrintWriter) : BuiltInsSourceGenerator(out) {
     private fun generateBitwiseOperators(className: String) {
         for ((name, doc) in shiftOperators) {
             out.println("    /** $doc */")
-            out.println("    public infix fun $name(bits: Int): $className")
+            out.println("    public infix fun $name(bitCount: Int): $className")
         }
         for ((name, doc) in bitwiseOperators) {
             out.println("    /** $doc */")
diff --git a/idea/idea-completion/testData/basic/common/substitutedSignature/SubstitutedSignature1.kt b/idea/idea-completion/testData/basic/common/substitutedSignature/SubstitutedSignature1.kt
index 3854f88f50c..7a646afc299 100644
--- a/idea/idea-completion/testData/basic/common/substitutedSignature/SubstitutedSignature1.kt
+++ b/idea/idea-completion/testData/basic/common/substitutedSignature/SubstitutedSignature1.kt
@@ -2,5 +2,5 @@ fun foo(list: MutableList<String>) {
     list.<caret>
 }
 
-// EXIST: { itemText: "add", tailText: "(e: String)", typeText: "Boolean" }
+// EXIST: { itemText: "add", tailText: "(element: String)", typeText: "Boolean" }
 // EXIST: { itemText: "iterator", tailText: "()", typeText: "Iterator<String>" }