diff --git a/j2k/newSrc/org/jetbrains/kotlin/j2k/NewCodeBuilder.kt b/j2k/newSrc/org/jetbrains/kotlin/j2k/NewCodeBuilder.kt
index a8a8b7b1008..3a4119074fa 100644
--- a/j2k/newSrc/org/jetbrains/kotlin/j2k/NewCodeBuilder.kt
+++ b/j2k/newSrc/org/jetbrains/kotlin/j2k/NewCodeBuilder.kt
@@ -141,7 +141,8 @@ class NewCodeBuilder {
             printer.printWithNoIndent(
                 when (accessModifier.visibility) {
                     JKAccessModifier.Visibility.PUBLIC -> "public"
-                    JKAccessModifier.Visibility.PACKAGE_PRIVATE, JKAccessModifier.Visibility.INTERNAL -> "internal"
+                    JKAccessModifier.Visibility.INTERNAL -> "internal"
+                    JKAccessModifier.Visibility.PACKAGE_PRIVATE -> ""
 //                    JKAccessModifier.Visibility.PACKAGE_PRIVATE -> "internal /* package_local! */"
                     JKAccessModifier.Visibility.PROTECTED -> "protected"
                     JKAccessModifier.Visibility.PRIVATE -> "private"
@@ -174,7 +175,6 @@ class NewCodeBuilder {
         override fun visitKtModifier(ktModifier: JKKtModifier) {
             printer.printWithNoIndent(
                 when (ktModifier.type) {
-                    JKKtModifier.KtModifierType.INTERNAL -> "internal"
                     JKKtModifier.KtModifierType.ABSTRACT -> "abstract"
                     JKKtModifier.KtModifierType.INNER -> "inner"
                     JKKtModifier.KtModifierType.OPEN -> "open"
diff --git a/j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/ModifiersConversion.kt b/j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/ModifiersConversion.kt
index fac9d192a87..2b551eca3b1 100644
--- a/j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/ModifiersConversion.kt
+++ b/j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/ModifiersConversion.kt
@@ -8,10 +8,7 @@ package org.jetbrains.kotlin.j2k.conversions
 import org.jetbrains.kotlin.j2k.ConversionContext
 import org.jetbrains.kotlin.j2k.ast.Mutability
 import org.jetbrains.kotlin.j2k.tree.*
-import org.jetbrains.kotlin.j2k.tree.impl.JKKtConstructorImpl
-import org.jetbrains.kotlin.j2k.tree.impl.JKKtModifierImpl
-import org.jetbrains.kotlin.j2k.tree.impl.mutability
-import org.jetbrains.kotlin.j2k.tree.impl.visibility
+import org.jetbrains.kotlin.j2k.tree.impl.*
 
 class ModifiersConversion(private val context: ConversionContext) : RecursiveApplicableConversionBase() {
 
diff --git a/j2k/newSrc/org/jetbrains/kotlin/j2k/tree/k.kt b/j2k/newSrc/org/jetbrains/kotlin/j2k/tree/k.kt
index 10e4024572d..4b60bf4545d 100644
--- a/j2k/newSrc/org/jetbrains/kotlin/j2k/tree/k.kt
+++ b/j2k/newSrc/org/jetbrains/kotlin/j2k/tree/k.kt
@@ -42,6 +42,15 @@ interface JKKtAssignmentStatement : JKStatement {
 
 interface JKKtCall : JKMethodCallExpression
 
+interface JKKtModifier : JKModifier {
+    val type: KtModifierType
+
+    enum class KtModifierType {
+        ACTUAL, ABSTRACT, ANNOTATION, COMPANION, CONST, CROSSINLINE, DATA, ENUM, EXPECT, EXTERNAL, FINAL, INFIX, INLINE, INNER,
+        LATEINIT, NOINLINE, OPEN, OPERATOR, OUT, OVERRIDE, REIFIED, SEALED, SUSPEND, TAILREC, VARARG, PRIVATE, PROTECTED
+    }
+}
+
 interface JKKtMethodCallExpression : JKMethodCallExpression
 
 interface JKKtAlsoCallExpression : JKKtMethodCallExpression {