diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/JvmCodegen.kt b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/JvmCodegen.kt
index 25e24cbbc71..08133bb1021 100644
--- a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/JvmCodegen.kt
+++ b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/JvmCodegen.kt
@@ -16,11 +16,11 @@
 
 package org.jetbrains.kotlin.backend.jvm
 
-import org.jetbrains.kotlin.backend.jvm.codegen.JvmClassCodegen
+import org.jetbrains.kotlin.backend.jvm.codegen.ClassCodegen
 import org.jetbrains.kotlin.ir.declarations.IrClass
 
 class JvmCodegen(val context: JvmBackendContext) {
     fun generateClass(irClass: IrClass) {
-        JvmClassCodegen.generate(irClass, context)
+        ClassCodegen.generate(irClass, context)
     }
 }
diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/JvmClassCodegen.kt b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/ClassCodegen.kt
similarity index 97%
rename from compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/JvmClassCodegen.kt
rename to compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/ClassCodegen.kt
index 3e25789848b..08166d27e59 100644
--- a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/JvmClassCodegen.kt
+++ b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/ClassCodegen.kt
@@ -34,7 +34,7 @@ import org.jetbrains.org.objectweb.asm.Opcodes
 import org.jetbrains.org.objectweb.asm.Type
 import java.lang.RuntimeException
 
-class JvmClassCodegen private constructor(val irClass: IrClass, val context: JvmBackendContext) {
+class ClassCodegen private constructor(val irClass: IrClass, val context: JvmBackendContext) {
 
     val state = context.state
 
@@ -111,7 +111,7 @@ class JvmClassCodegen private constructor(val irClass: IrClass, val context: Jvm
                 badDescriptor(descriptor, state.classBuilderMode)
             }
 
-            JvmClassCodegen(irClass, context).generate()
+            ClassCodegen(irClass, context).generate()
         }
     }
 
@@ -146,7 +146,7 @@ class JvmClassCodegen private constructor(val irClass: IrClass, val context: Jvm
     }
 
     fun generateMethod(method: IrFunction) {
-        JvmFunctionCodegen(method, this).generate()
+        FunctionCodegen(method, this).generate()
     }
 
 }
diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/ExpressionCodegen.kt b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/ExpressionCodegen.kt
index 92f36aaafc7..eed63ce6331 100644
--- a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/ExpressionCodegen.kt
+++ b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/ExpressionCodegen.kt
@@ -47,7 +47,7 @@ class ExpressionCodegen(
         val irFunction: IrFunction,
         val frame: FrameMap,
         val mv: InstructionAdapter,
-        val classCodegen: JvmClassCodegen
+        val classCodegen: ClassCodegen
 ) : IrElementVisitor<StackValue, BlockInfo> {
 
     /*TODO*/
diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/JvmFunctionCodegen.kt b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/FunctionCodegen.kt
similarity index 95%
rename from compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/JvmFunctionCodegen.kt
rename to compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/FunctionCodegen.kt
index ce8f5e150d8..61675293ee5 100644
--- a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/JvmFunctionCodegen.kt
+++ b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/codegen/FunctionCodegen.kt
@@ -23,7 +23,7 @@ import org.jetbrains.kotlin.ir.declarations.IrFunction
 import org.jetbrains.org.objectweb.asm.Opcodes.ACC_STATIC
 import org.jetbrains.org.objectweb.asm.commons.InstructionAdapter
 
-class JvmFunctionCodegen(val irFunction: IrFunction, val classCodegen: JvmClassCodegen) {
+class FunctionCodegen(val irFunction: IrFunction, val classCodegen: ClassCodegen) {
 
     fun generate() {
         val signature = classCodegen.typeMapper.mapSignatureWithGeneric(irFunction.descriptor, OwnerKind.IMPLEMENTATION)