diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/RemappingClassBuilder.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/RemappingClassBuilder.java
index 3cb378d6796..1a39e524cc8 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/RemappingClassBuilder.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/RemappingClassBuilder.java
@@ -27,6 +27,7 @@ import org.jetbrains.org.objectweb.asm.ClassVisitor;
 import org.jetbrains.org.objectweb.asm.FieldVisitor;
 import org.jetbrains.org.objectweb.asm.MethodVisitor;
 import org.jetbrains.org.objectweb.asm.commons.*;
+import org.jetbrains.org.objectweb.asm.commons.FieldRemapper;
 
 public class RemappingClassBuilder extends DelegatingClassBuilder {
     private final ClassBuilder builder;
@@ -66,9 +67,8 @@ public class RemappingClassBuilder extends DelegatingClassBuilder {
             @Nullable String signature,
             @Nullable Object value
     ) {
-        return new RemappingFieldAdapter(
-                builder.newField(origin, access, name, remapper.mapDesc(desc), remapper.mapSignature(signature, true), value),
-                remapper
+        return new FieldRemapper(
+                builder.newField(origin, access, name, remapper.mapDesc(desc), remapper.mapSignature(signature, true), value), remapper
         );
     }
 
@@ -82,8 +82,7 @@ public class RemappingClassBuilder extends DelegatingClassBuilder {
             @Nullable String signature,
             @Nullable String[] exceptions
     ) {
-        return new RemappingMethodAdapter(
-                access, desc,
+        return new MethodRemapper(
                 builder.newMethod(origin, access, name, remapper.mapMethodDesc(desc), remapper.mapSignature(signature, false), exceptions),
                 remapper
         );
@@ -92,12 +91,12 @@ public class RemappingClassBuilder extends DelegatingClassBuilder {
     @Override
     @NotNull
     public AnnotationVisitor newAnnotation(@NotNull String desc, boolean visible) {
-        return new RemappingAnnotationAdapter(builder.newAnnotation(remapper.mapDesc(desc), visible), remapper);
+        return new AnnotationRemapper(builder.newAnnotation(remapper.mapDesc(desc), visible), remapper);
     }
 
     @Override
     @NotNull
     public ClassVisitor getVisitor() {
-        return new RemappingClassAdapter(builder.getVisitor(), remapper);
+        return new ClassRemapper(builder.getVisitor(), remapper);
     }
 }