diff --git a/plugins/kapt3/kapt3-compiler/src/org/jetbrains/kotlin/kapt3/stubs/parseParameters.kt b/plugins/kapt3/kapt3-compiler/src/org/jetbrains/kotlin/kapt3/stubs/parseParameters.kt
index 41962be534e..37133ae5479 100644
--- a/plugins/kapt3/kapt3-compiler/src/org/jetbrains/kotlin/kapt3/stubs/parseParameters.kt
+++ b/plugins/kapt3/kapt3-compiler/src/org/jetbrains/kotlin/kapt3/stubs/parseParameters.kt
@@ -25,7 +25,6 @@ import org.jetbrains.org.objectweb.asm.Type
 import org.jetbrains.org.objectweb.asm.tree.AnnotationNode
 import org.jetbrains.org.objectweb.asm.tree.ClassNode
 import org.jetbrains.org.objectweb.asm.tree.MethodNode
-import java.util.*
 
 internal class ParameterInfo(
     val flags: Long,
@@ -71,11 +70,8 @@ internal fun MethodNode.getParametersInfo(
 
         // @JvmOverloads constructors and ordinary methods don't have "this" local variable
         name = name ?: localVariables.getOrNull(index + localVariableIndexOffset)?.name
-                ?: originalDescriptor.valueParameters.getOrNull(index)?.name?.identifier
-                ?: "p${index - startParameterIndex}"
-
-        // Property setters has bad parameter names
-        if (name.startsWith("<") && name.endsWith(">")) {
+                ?: originalDescriptor.valueParameters.getOrNull(index)?.name?.identifierOrNullIfSpecial
+        if (name == null || name.startsWith("<") && name.endsWith(">")) {
             name = "p${index - startParameterIndex}"
         }
 
diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/annotations2_ir.txt b/plugins/kapt3/kapt3-compiler/testData/converter/annotations2_ir.txt
index 1a155e93137..aa1ef0e356c 100644
--- a/plugins/kapt3/kapt3-compiler/testData/converter/annotations2_ir.txt
+++ b/plugins/kapt3/kapt3-compiler/testData/converter/annotations2_ir.txt
@@ -27,19 +27,19 @@ public final class AnnotationsTest {
     @Anno(value = "top-level-fun")
     public static final void topLevelFun(@org.jetbrains.annotations.NotNull()
     @Anno(value = "top-level-fun-receiver")
-    java.lang.String $this$topLevelFun) {
+    java.lang.String p0) {
+    }
+
+    @org.jetbrains.annotations.NotNull()
+    public static final java.lang.String getTopLevelVal(@Anno(value = "top-level-val-receiver")
+    int p0) {
+        return null;
     }
 
     @Anno(value = "top-level-val")
     @java.lang.Deprecated()
     public static void getTopLevelVal$annotations(int p0) {
     }
-
-    @org.jetbrains.annotations.NotNull()
-    public static final java.lang.String getTopLevelVal(@Anno(value = "top-level-val-receiver")
-    int $this$topLevelVal) {
-        return null;
-    }
 }
 
 ////////////////////
diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/implicitReturnTypes.kt b/plugins/kapt3/kapt3-compiler/testData/converter/implicitReturnTypes.kt
index 9e1c3814635..90241371ca7 100644
--- a/plugins/kapt3/kapt3-compiler/testData/converter/implicitReturnTypes.kt
+++ b/plugins/kapt3/kapt3-compiler/testData/converter/implicitReturnTypes.kt
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND: JVM_IR
 // WITH_STDLIB
 
 // FILE: lib/Prop.java