diff --git a/idea/testData/copyPaste/conversion/AddImports.expected.kt b/idea/testData/copyPaste/conversion/AddImports.expected.kt
index 68c97e9f991..216bd16c88e 100644
--- a/idea/testData/copyPaste/conversion/AddImports.expected.kt
+++ b/idea/testData/copyPaste/conversion/AddImports.expected.kt
@@ -1,5 +1,5 @@
 import java.io.File
 
-internal fun foo(file: File): List<String> {
+fun foo(file: File): List<String> {
     return emptyList()
 }
diff --git a/idea/testData/copyPaste/conversion/ConversionInCorrectContext.expected.kt b/idea/testData/copyPaste/conversion/ConversionInCorrectContext.expected.kt
index 9f33f3fd57f..d7026fe8098 100644
--- a/idea/testData/copyPaste/conversion/ConversionInCorrectContext.expected.kt
+++ b/idea/testData/copyPaste/conversion/ConversionInCorrectContext.expected.kt
@@ -1,3 +1,3 @@
-internal fun foo(p: Dependency): Double {
+fun foo(p: Dependency): Double {
     return p.getInt().toDouble() // explicit conversion to Double must be added on conversion (if type Dependency) is correctly resolved
 }
diff --git a/idea/testData/copyPaste/conversion/HalfTheWhiteSpace.expected.kt b/idea/testData/copyPaste/conversion/HalfTheWhiteSpace.expected.kt
index 55cda45cfb0..d92740a572c 100644
--- a/idea/testData/copyPaste/conversion/HalfTheWhiteSpace.expected.kt
+++ b/idea/testData/copyPaste/conversion/HalfTheWhiteSpace.expected.kt
@@ -1,10 +1,10 @@
 class A {
 
 
-    internal fun foo() {
+    fun foo() {
     }
 
-    internal fun bar() {
+    fun bar() {
     }
 
 
diff --git a/idea/testData/copyPaste/conversion/MethodDeclarationWithNoBody.expected.kt b/idea/testData/copyPaste/conversion/MethodDeclarationWithNoBody.expected.kt
index 6ea83f686a9..6ee0e06e614 100644
--- a/idea/testData/copyPaste/conversion/MethodDeclarationWithNoBody.expected.kt
+++ b/idea/testData/copyPaste/conversion/MethodDeclarationWithNoBody.expected.kt
@@ -1,3 +1,3 @@
 package to
 
-internal fun foo(p: Int)
\ No newline at end of file
+fun foo(p: Int)
\ No newline at end of file
diff --git a/j2k/src/org/jetbrains/kotlin/j2k/ClassBodyConverter.kt b/j2k/src/org/jetbrains/kotlin/j2k/ClassBodyConverter.kt
index b072bca22cd..7374697b9f8 100644
--- a/j2k/src/org/jetbrains/kotlin/j2k/ClassBodyConverter.kt
+++ b/j2k/src/org/jetbrains/kotlin/j2k/ClassBodyConverter.kt
@@ -19,16 +19,12 @@ package org.jetbrains.kotlin.j2k
 import com.intellij.openapi.util.text.StringUtil
 import com.intellij.psi.*
 import org.jetbrains.kotlin.j2k.ast.*
-import org.jetbrains.kotlin.j2k.ast.Class
 import org.jetbrains.kotlin.j2k.usageProcessing.AccessorToPropertyProcessing
 import org.jetbrains.kotlin.j2k.usageProcessing.MethodIntoObjectProcessing
 import org.jetbrains.kotlin.j2k.usageProcessing.ToObjectWithOnlyMethodsProcessing
 import org.jetbrains.kotlin.load.java.JvmAbi
 import org.jetbrains.kotlin.name.SpecialNames
-import java.util.ArrayList
-import java.util.HashMap
-import java.util.HashSet
-import java.util.LinkedHashMap
+import java.util.*
 
 class FieldCorrectionInfo(val name: String, val access: Modifier?, val setterAccess: Modifier?) {
     val identifier = Identifier(name).assignNoPrototype()
@@ -189,11 +185,11 @@ class ClassBodyConverter(private val psiClass: PsiClass,
                 membersToRemove.add(setterInfo.method)
             }
 
-            val getterAccess = converter.convertModifiers(getterInfo.method).accessModifier()
+            val getterAccess = converter.convertModifiers(getterInfo.method, isOpenClass).accessModifier()
             val setterAccess = if (setterInfo != null)
-                converter.convertModifiers(setterInfo.method).accessModifier()
+                converter.convertModifiers(setterInfo.method, isOpenClass).accessModifier()
             else
-                converter.convertModifiers(field).accessModifier()
+                converter.convertModifiers(field, false).accessModifier()
             //TODO: check that setter access is not bigger
             fieldCorrections[field] = FieldCorrectionInfo(propertyName, getterAccess, setterAccess)
 
diff --git a/j2k/src/org/jetbrains/kotlin/j2k/CodeConverter.kt b/j2k/src/org/jetbrains/kotlin/j2k/CodeConverter.kt
index 35b6fc24fc5..7e65fab0399 100644
--- a/j2k/src/org/jetbrains/kotlin/j2k/CodeConverter.kt
+++ b/j2k/src/org/jetbrains/kotlin/j2k/CodeConverter.kt
@@ -71,7 +71,7 @@ class CodeConverter(
                     !variable.hasWriteAccesses(converter.referenceSearcher, variable.getContainingMethod())
         return LocalVariable(variable.declarationIdentifier(),
                              converter.convertAnnotations(variable),
-                             converter.convertModifiers(variable),
+                             converter.convertModifiers(variable, false),
                              converter.variableTypeToDeclare(variable, settings.specifyLocalVariableTypeByDefault, isVal),
                              convertExpression(variable.getInitializer(), variable.getType()),
                              isVal).assignPrototype(variable)
diff --git a/j2k/src/org/jetbrains/kotlin/j2k/ConstructorConverter.kt b/j2k/src/org/jetbrains/kotlin/j2k/ConstructorConverter.kt
index 45e646f5eb8..0a98fbadf5d 100644
--- a/j2k/src/org/jetbrains/kotlin/j2k/ConstructorConverter.kt
+++ b/j2k/src/org/jetbrains/kotlin/j2k/ConstructorConverter.kt
@@ -19,10 +19,7 @@ package org.jetbrains.kotlin.j2k
 import com.intellij.psi.*
 import com.intellij.psi.util.PsiUtil
 import org.jetbrains.kotlin.j2k.ast.*
-import org.jetbrains.kotlin.j2k.ast.Annotation
-import java.util.ArrayList
-import java.util.HashMap
-import java.util.HashSet
+import java.util.*
 
 class ConstructorConverter(
         private val psiClass: PsiClass,
@@ -208,7 +205,7 @@ class ConstructorConverter(
                         val accessModifiers = if (fieldCorrection != null)
                             Modifiers(listOf()).with(fieldCorrection.access).assignNoPrototype()
                         else
-                            converter.convertModifiers(field).filter { it in ACCESS_MODIFIERS }
+                            converter.convertModifiers(field, false).filter { it in ACCESS_MODIFIERS }
                         FunctionParameter(name,
                                           type,
                                           if (field.isVal(converter.referenceSearcher)) FunctionParameter.VarValModifier.Val else FunctionParameter.VarValModifier.Var,
diff --git a/j2k/src/org/jetbrains/kotlin/j2k/Converter.kt b/j2k/src/org/jetbrains/kotlin/j2k/Converter.kt
index fca1a323b59..1222b169dd7 100644
--- a/j2k/src/org/jetbrains/kotlin/j2k/Converter.kt
+++ b/j2k/src/org/jetbrains/kotlin/j2k/Converter.kt
@@ -162,7 +162,7 @@ class Converter private constructor(
         }
 
         val annotations = convertAnnotations(psiClass)
-        var modifiers = convertModifiers(psiClass)
+        var modifiers = convertModifiers(psiClass, false)
         val typeParameters = convertTypeParameterList(psiClass.getTypeParameterList())
         val extendsTypes = convertToNotNullableTypes(psiClass.getExtendsListTypes())
         val implementsTypes = convertToNotNullableTypes(psiClass.getImplementsListTypes())
@@ -282,7 +282,7 @@ class Converter private constructor(
 
         return Class(psiClass.declarationIdentifier(),
                      convertAnnotations(psiClass),
-                     convertModifiers(psiClass).with(Modifier.ANNOTATION).without(Modifier.ABSTRACT),
+                     convertModifiers(psiClass, false).with(Modifier.ANNOTATION).without(Modifier.ABSTRACT),
                      TypeParameterList.Empty,
                      listOf(),
                      null,
@@ -292,13 +292,14 @@ class Converter private constructor(
 
     public fun convertInitializer(initializer: PsiClassInitializer): Initializer {
         return Initializer(deferredElement { codeConverter -> codeConverter.convertBlock(initializer.getBody()) },
-                           convertModifiers(initializer)).assignPrototype(initializer)
+                           convertModifiers(initializer, false)).assignPrototype(initializer)
     }
 
     public fun convertField(field: PsiField, correction: FieldCorrectionInfo?): Member {
         val annotations = convertAnnotations(field)
 
-        var modifiers = convertModifiers(field)
+        var modifiers = convertModifiers(field, false)
+
         if (correction != null) {
             modifiers = modifiers.without(modifiers.accessModifier()).with(correction.access)
         }
@@ -362,10 +363,7 @@ class Converter private constructor(
 
         val annotations = convertAnnotations(method) + convertThrows(method)
 
-        var modifiers = convertModifiers(method)
-        if (needOpenModifier(method, isInOpenClass, modifiers)) {
-            modifiers = modifiers.with(Modifier.OPEN)
-        }
+        var modifiers = convertModifiers(method, isInOpenClass)
 
         val statementsToInsert = ArrayList<Statement>()
         for (parameter in method.getParameterList().getParameters()) {
@@ -392,11 +390,6 @@ class Converter private constructor(
             constructorConverter.convertConstructor(method, annotations, modifiers, membersToRemove!!, postProcessBody)
         }
         else {
-            val isOverride = isOverride(method)
-            if (isOverride) {
-                modifiers = modifiers.with(Modifier.OVERRIDE)
-            }
-
             val containingClass = method.getContainingClass()
 
             if (settings.openByDefault) {
@@ -555,9 +548,34 @@ class Converter private constructor(
         return Identifier(identifier.getText()!!).assignPrototype(identifier)
     }
 
-    public fun convertModifiers(owner: PsiModifierListOwner): Modifiers {
-        return Modifiers(MODIFIERS_MAP.filter { owner.hasModifierProperty(it.first) }.map { it.second })
+    public fun convertModifiers(owner: PsiModifierListOwner, isMethodInOpenClass: Boolean): Modifiers {
+        var modifiers = Modifiers(MODIFIERS_MAP.filter { owner.hasModifierProperty(it.first) }.map { it.second })
                 .assignPrototype(owner.getModifierList(), CommentsAndSpacesInheritance.NO_SPACES)
+
+        if (owner is PsiMethod) {
+            val isOverride = isOverride(owner)
+            if (isOverride) {
+                modifiers = modifiers.with(Modifier.OVERRIDE)
+            }
+
+            if (needOpenModifier(owner, isMethodInOpenClass, modifiers)) {
+                modifiers = modifiers.with(Modifier.OPEN)
+            }
+
+            modifiers = modifiers.adaptForContainingClassVisibility(owner.containingClass)
+        }
+        else if (owner is PsiField) {
+            modifiers = modifiers.adaptForContainingClassVisibility(owner.containingClass)
+        }
+
+        return modifiers
+    }
+
+    // to convert package local members in package local class into public member (when it's not override, open or abstract)
+    private fun Modifiers.adaptForContainingClassVisibility(containingClass: PsiClass?): Modifiers {
+        if (containingClass == null || !containingClass.hasModifierProperty(PsiModifier.PACKAGE_LOCAL)) return this
+        if (!contains(Modifier.INTERNAL) || contains(Modifier.OVERRIDE) || contains(Modifier.OPEN) || contains(Modifier.ABSTRACT)) return this
+        return without(Modifier.INTERNAL).with(Modifier.PUBLIC)
     }
 
     public fun convertAnonymousClassBody(anonymousClass: PsiAnonymousClass): AnonymousClassBody {
diff --git a/j2k/testData/fileOrElement/annotations/annotationUsages.kt b/j2k/testData/fileOrElement/annotations/annotationUsages.kt
index b1b2c429ee6..ff24adb9bc1 100644
--- a/j2k/testData/fileOrElement/annotations/annotationUsages.kt
+++ b/j2k/testData/fileOrElement/annotations/annotationUsages.kt
@@ -17,16 +17,16 @@ internal class C {
     @Anon5(1)
     private val field2 = 0
 
-    @Anon5(1) internal var field3 = 0
+    @Anon5(1) var field3 = 0
 
     @Anon5(1)
-    internal var field4 = 0
+    var field4 = 0
 
     @Anon6
-    internal fun foo(@Deprecated("") p1: Int, @Deprecated("") @Anon5(2) p2: Char) {
+    fun foo(@Deprecated("") p1: Int, @Deprecated("") @Anon5(2) p2: Char) {
         @Deprecated("") @Anon5(3) val c = 'a'
     }
 
-    @Anon5(1) internal fun bar() {
+    @Anon5(1) fun bar() {
     }
 }
diff --git a/j2k/testData/fileOrElement/annotations/jetbrainsNotNullChainExpr.kt b/j2k/testData/fileOrElement/annotations/jetbrainsNotNullChainExpr.kt
index bde72df5289..56278e1d02c 100644
--- a/j2k/testData/fileOrElement/annotations/jetbrainsNotNullChainExpr.kt
+++ b/j2k/testData/fileOrElement/annotations/jetbrainsNotNullChainExpr.kt
@@ -3,13 +3,13 @@
 package test
 
 internal class Foo {
-    internal fun execute() {
+    fun execute() {
     }
 }
 
 internal class Bar {
-    internal var fooNotNull = Foo()
-    internal var fooNullable: Foo? = null
+    var fooNotNull = Foo()
+    var fooNullable: Foo? = null
 }
 
 internal class Test {
diff --git a/j2k/testData/fileOrElement/anonymousBlock/oneAnonBlock.kt b/j2k/testData/fileOrElement/anonymousBlock/oneAnonBlock.kt
index 69abb195232..899813170d8 100644
--- a/j2k/testData/fileOrElement/anonymousBlock/oneAnonBlock.kt
+++ b/j2k/testData/fileOrElement/anonymousBlock/oneAnonBlock.kt
@@ -1,5 +1,5 @@
 internal class Test {
-    internal var str: String
+    var str: String
 
     init {
         str = "Ola"
diff --git a/j2k/testData/fileOrElement/anonymousBlock/oneStaticAnonBlock.kt b/j2k/testData/fileOrElement/anonymousBlock/oneStaticAnonBlock.kt
index b2fb9d2b815..0feb5f165bc 100644
--- a/j2k/testData/fileOrElement/anonymousBlock/oneStaticAnonBlock.kt
+++ b/j2k/testData/fileOrElement/anonymousBlock/oneStaticAnonBlock.kt
@@ -1,5 +1,5 @@
 internal object Test {
-    internal var str: String
+    var str: String
 
     init {
         str = "Ola"
diff --git a/j2k/testData/fileOrElement/arrayType/methodArrayArgs.kt b/j2k/testData/fileOrElement/arrayType/methodArrayArgs.kt
index 100512358fb..5be1e8e5db5 100644
--- a/j2k/testData/fileOrElement/arrayType/methodArrayArgs.kt
+++ b/j2k/testData/fileOrElement/arrayType/methodArrayArgs.kt
@@ -1,2 +1,2 @@
-internal fun fromArrayToCollection(a: Array<Foo>) {
+fun fromArrayToCollection(a: Array<Foo>) {
 }
\ No newline at end of file
diff --git a/j2k/testData/fileOrElement/assignmentExpression/nullability-settings.kt b/j2k/testData/fileOrElement/assignmentExpression/nullability-settings.kt
index 31804eba374..5a6bb6d025f 100644
--- a/j2k/testData/fileOrElement/assignmentExpression/nullability-settings.kt
+++ b/j2k/testData/fileOrElement/assignmentExpression/nullability-settings.kt
@@ -3,7 +3,7 @@
 import java.util.HashSet
 
 internal class Foo {
-    internal fun foo(o: HashSet<Any?>?) {
+    fun foo(o: HashSet<Any?>?) {
         val o2: HashSet<Any?>? = o
         var foo: Int = 0
         foo = o2!!.size()
diff --git a/j2k/testData/fileOrElement/assignmentExpression/nullability.kt b/j2k/testData/fileOrElement/assignmentExpression/nullability.kt
index 6bc968ed732..0ca42340b06 100644
--- a/j2k/testData/fileOrElement/assignmentExpression/nullability.kt
+++ b/j2k/testData/fileOrElement/assignmentExpression/nullability.kt
@@ -1,7 +1,7 @@
 import java.util.HashSet
 
 internal class Foo {
-    internal fun foo(o: HashSet<Any>) {
+    fun foo(o: HashSet<Any>) {
         val o2 = o
         var foo = 0
         foo = o2.size()
diff --git a/j2k/testData/fileOrElement/blocks/Blocks.kt b/j2k/testData/fileOrElement/blocks/Blocks.kt
index 827ace24bc2..f1644d4da0e 100644
--- a/j2k/testData/fileOrElement/blocks/Blocks.kt
+++ b/j2k/testData/fileOrElement/blocks/Blocks.kt
@@ -1,4 +1,4 @@
-internal fun foo() {
+fun foo() {
     run {
         val a = 1
         bar(a)
diff --git a/j2k/testData/fileOrElement/boxedType/Boxing.kt b/j2k/testData/fileOrElement/boxedType/Boxing.kt
index 434a837cd28..48dc099c286 100644
--- a/j2k/testData/fileOrElement/boxedType/Boxing.kt
+++ b/j2k/testData/fileOrElement/boxedType/Boxing.kt
@@ -1,7 +1,7 @@
 import java.util.ArrayList
 
 internal class Boxing {
-    internal fun test() {
+    fun test() {
         var i: Int? = 0
         val n = 0.0f
         i = 1
diff --git a/j2k/testData/fileOrElement/boxedType/kt-671.kt b/j2k/testData/fileOrElement/boxedType/kt-671.kt
index 606d4433a97..3357145964a 100644
--- a/j2k/testData/fileOrElement/boxedType/kt-671.kt
+++ b/j2k/testData/fileOrElement/boxedType/kt-671.kt
@@ -2,7 +2,7 @@
 package demo
 
 internal class Test {
-    internal fun test() {
+    fun test() {
         val i = Integer.valueOf(100)
         val s = 3
         val ss = java.lang.Short.valueOf(s)
diff --git a/j2k/testData/fileOrElement/callChainExpression/libraryFieldCall.kt b/j2k/testData/fileOrElement/callChainExpression/libraryFieldCall.kt
index f8ec85e4c97..a9b7fff5a51 100644
--- a/j2k/testData/fileOrElement/callChainExpression/libraryFieldCall.kt
+++ b/j2k/testData/fileOrElement/callChainExpression/libraryFieldCall.kt
@@ -1,10 +1,10 @@
 // ERROR: Property must be initialized or be abstract
 internal object Library {
-    internal val ourOut: java.io.PrintStream
+    val ourOut: java.io.PrintStream
 }
 
 internal class User {
-    internal fun main() {
+    fun main() {
         Library.ourOut.print(1)
     }
 }
\ No newline at end of file
diff --git a/j2k/testData/fileOrElement/callChainExpression/libraryMethodCall.kt b/j2k/testData/fileOrElement/callChainExpression/libraryMethodCall.kt
index 341b00902d7..acbc341fb8f 100644
--- a/j2k/testData/fileOrElement/callChainExpression/libraryMethodCall.kt
+++ b/j2k/testData/fileOrElement/callChainExpression/libraryMethodCall.kt
@@ -1,14 +1,14 @@
 internal object Library {
-    internal fun call() {
+    fun call() {
     }
 
-    internal fun getString(): String {
+    fun getString(): String {
         return ""
     }
 }
 
 internal class User {
-    internal fun main() {
+    fun main() {
         Library.call()
         Library.getString().isEmpty()
     }
diff --git a/j2k/testData/fileOrElement/callChainExpression/libraryMethodCallFromInstance-settings.kt b/j2k/testData/fileOrElement/callChainExpression/libraryMethodCallFromInstance-settings.kt
index 4a31418ac07..0362fc28e3a 100644
--- a/j2k/testData/fileOrElement/callChainExpression/libraryMethodCallFromInstance-settings.kt
+++ b/j2k/testData/fileOrElement/callChainExpression/libraryMethodCallFromInstance-settings.kt
@@ -1,16 +1,16 @@
 // !forceNotNullTypes: false
 // !specifyLocalVariableTypeByDefault: true
 internal class Library {
-    internal fun call() {
+    fun call() {
     }
 
-    internal fun getString(): String? {
+    fun getString(): String? {
         return ""
     }
 }
 
 internal class User {
-    internal fun main() {
+    fun main() {
         val lib: Library = Library()
         lib.call()
         lib.getString()!!.isEmpty()
diff --git a/j2k/testData/fileOrElement/callChainExpression/libraryMethodCallFromInstance.kt b/j2k/testData/fileOrElement/callChainExpression/libraryMethodCallFromInstance.kt
index 8b51cfef8c9..f4e98f83358 100644
--- a/j2k/testData/fileOrElement/callChainExpression/libraryMethodCallFromInstance.kt
+++ b/j2k/testData/fileOrElement/callChainExpression/libraryMethodCallFromInstance.kt
@@ -1,14 +1,14 @@
 internal class Library {
-    internal fun call() {
+    fun call() {
     }
 
-    internal fun getString(): String {
+    fun getString(): String {
         return ""
     }
 }
 
 internal class User {
-    internal fun main() {
+    fun main() {
         val lib = Library()
         lib.call()
         lib.getString().isEmpty()
diff --git a/j2k/testData/fileOrElement/callChainExpression/libraryStringFieldCall.kt b/j2k/testData/fileOrElement/callChainExpression/libraryStringFieldCall.kt
index e3e6f49be3c..335f685b46e 100644
--- a/j2k/testData/fileOrElement/callChainExpression/libraryStringFieldCall.kt
+++ b/j2k/testData/fileOrElement/callChainExpression/libraryStringFieldCall.kt
@@ -4,7 +4,7 @@ internal class Library {
 }
 
 internal class User {
-    internal fun main() {
+    fun main() {
         Library().myString.isEmpty()
     }
 }
\ No newline at end of file
diff --git a/j2k/testData/fileOrElement/class/abstractClass.kt b/j2k/testData/fileOrElement/class/abstractClass.kt
index 555e7c97658..cb9ecf0ccde 100644
--- a/j2k/testData/fileOrElement/class/abstractClass.kt
+++ b/j2k/testData/fileOrElement/class/abstractClass.kt
@@ -1,7 +1,7 @@
 internal abstract class A {
     internal abstract fun callme()
 
-    internal fun callmetoo() {
+    fun callmetoo() {
         print("This is a concrete method.")
     }
 }
\ No newline at end of file
diff --git a/j2k/testData/fileOrElement/class/classWithEmptyMethods.kt b/j2k/testData/fileOrElement/class/classWithEmptyMethods.kt
index f58c67f6561..e1a4ff4fab5 100644
--- a/j2k/testData/fileOrElement/class/classWithEmptyMethods.kt
+++ b/j2k/testData/fileOrElement/class/classWithEmptyMethods.kt
@@ -1,10 +1,10 @@
 internal class T {
-    internal fun main() {
+    fun main() {
     }
 
-    internal fun i(): Int {
+    fun i(): Int {
     }
 
-    internal fun s(): String {
+    fun s(): String {
     }
 }
\ No newline at end of file
diff --git a/j2k/testData/fileOrElement/class/classWithFields.kt b/j2k/testData/fileOrElement/class/classWithFields.kt
index 21b0019262b..a6887313e13 100644
--- a/j2k/testData/fileOrElement/class/classWithFields.kt
+++ b/j2k/testData/fileOrElement/class/classWithFields.kt
@@ -1,4 +1,4 @@
 internal class T {
-    internal var a = "abc"
-    internal var b = 10
+    var a = "abc"
+    var b = 10
 }
\ No newline at end of file
diff --git a/j2k/testData/fileOrElement/class/classWithMultiplyFields.kt b/j2k/testData/fileOrElement/class/classWithMultiplyFields.kt
index 1dca8d30706..0bda7e0f9f8 100644
--- a/j2k/testData/fileOrElement/class/classWithMultiplyFields.kt
+++ b/j2k/testData/fileOrElement/class/classWithMultiplyFields.kt
@@ -1,5 +1,5 @@
 internal class T {
-    internal var a: String
-    internal var b: String
-    internal var c = "abc"
+    var a: String
+    var b: String
+    var c = "abc"
 }
\ No newline at end of file
diff --git a/j2k/testData/fileOrElement/class/kt-639.kt b/j2k/testData/fileOrElement/class/kt-639.kt
index cf4bef16bc3..7317697d3cd 100644
--- a/j2k/testData/fileOrElement/class/kt-639.kt
+++ b/j2k/testData/fileOrElement/class/kt-639.kt
@@ -5,15 +5,15 @@ package demo
 import java.util.HashMap
 
 internal class Test {
-    internal constructor() {
+    constructor() {
     }
 
-    internal constructor(s: String) {
+    constructor(s: String) {
     }
 }
 
 internal class User {
-    internal fun main() {
+    fun main() {
         val m = HashMap(1)
         val m2 = HashMap(10)
 
diff --git a/j2k/testData/fileOrElement/class/notUtilityClass.kt b/j2k/testData/fileOrElement/class/notUtilityClass.kt
index 364bd7f1de7..91f99d6cad1 100644
--- a/j2k/testData/fileOrElement/class/notUtilityClass.kt
+++ b/j2k/testData/fileOrElement/class/notUtilityClass.kt
@@ -5,6 +5,6 @@ internal open class Base {
 }
 
 internal class Derived : Base() {
-    internal fun foo() {
+    fun foo() {
     }
 }
diff --git a/j2k/testData/fileOrElement/class/oneStaticFieldOneNonStatic.kt b/j2k/testData/fileOrElement/class/oneStaticFieldOneNonStatic.kt
index 88228e93f01..8399743b108 100644
--- a/j2k/testData/fileOrElement/class/oneStaticFieldOneNonStatic.kt
+++ b/j2k/testData/fileOrElement/class/oneStaticFieldOneNonStatic.kt
@@ -1,9 +1,9 @@
 internal class S {
-    internal fun sB(): Boolean {
+    fun sB(): Boolean {
         return true
     }
 
     companion object {
-        internal var myI = 10
+        var myI = 10
     }
 }
\ No newline at end of file
diff --git a/j2k/testData/fileOrElement/class/oneStaticMethod.kt b/j2k/testData/fileOrElement/class/oneStaticMethod.kt
index 669db1aef11..c235ee8b824 100644
--- a/j2k/testData/fileOrElement/class/oneStaticMethod.kt
+++ b/j2k/testData/fileOrElement/class/oneStaticMethod.kt
@@ -1,5 +1,5 @@
 internal object S {
-    internal fun staticF(): Boolean {
+    fun staticF(): Boolean {
         return true
     }
 }
\ No newline at end of file
diff --git a/j2k/testData/fileOrElement/class/oneStaticMethodOneNonStatic.kt b/j2k/testData/fileOrElement/class/oneStaticMethodOneNonStatic.kt
index ca3a268a131..64d84154106 100644
--- a/j2k/testData/fileOrElement/class/oneStaticMethodOneNonStatic.kt
+++ b/j2k/testData/fileOrElement/class/oneStaticMethodOneNonStatic.kt
@@ -1,10 +1,10 @@
 internal class S {
-    internal fun sB(): Boolean {
+    fun sB(): Boolean {
         return true
     }
 
     companion object {
-        internal fun sI(): Int {
+        fun sI(): Int {
             return 1
         }
     }
diff --git a/j2k/testData/fileOrElement/class/twoStaticMethod.kt b/j2k/testData/fileOrElement/class/twoStaticMethod.kt
index 115e136cbcf..253ae13a75b 100644
--- a/j2k/testData/fileOrElement/class/twoStaticMethod.kt
+++ b/j2k/testData/fileOrElement/class/twoStaticMethod.kt
@@ -1,9 +1,9 @@
 internal object S {
-    internal fun sB(): Boolean {
+    fun sB(): Boolean {
         return true
     }
 
-    internal fun sI(): Int {
+    fun sI(): Int {
         return 1
     }
 }
\ No newline at end of file
diff --git a/j2k/testData/fileOrElement/codeSimplifications/IfNullReturnToElvis.kt b/j2k/testData/fileOrElement/codeSimplifications/IfNullReturnToElvis.kt
index f78c45c4b93..76ab9f406fb 100644
--- a/j2k/testData/fileOrElement/codeSimplifications/IfNullReturnToElvis.kt
+++ b/j2k/testData/fileOrElement/codeSimplifications/IfNullReturnToElvis.kt
@@ -1,7 +1,7 @@
 import java.io.File
 
 internal class C {
-    internal fun foo(file: File): String {
+    fun foo(file: File): String {
         val parent = file.parentFile ?: return ""
         return parent.name
     }
diff --git a/j2k/testData/fileOrElement/codeSimplifications/IfToElvis.kt b/j2k/testData/fileOrElement/codeSimplifications/IfToElvis.kt
index 81c38cf7b29..9b4da7382d5 100644
--- a/j2k/testData/fileOrElement/codeSimplifications/IfToElvis.kt
+++ b/j2k/testData/fileOrElement/codeSimplifications/IfToElvis.kt
@@ -1,5 +1,5 @@
 internal class C {
-    internal fun foo(s: String?): String {
+    fun foo(s: String?): String {
         return s ?: ""
     }
 }
diff --git a/j2k/testData/fileOrElement/codeSimplifications/IfToSafeCall.kt b/j2k/testData/fileOrElement/codeSimplifications/IfToSafeCall.kt
index d4c54952984..c099cc4e97b 100644
--- a/j2k/testData/fileOrElement/codeSimplifications/IfToSafeCall.kt
+++ b/j2k/testData/fileOrElement/codeSimplifications/IfToSafeCall.kt
@@ -1,7 +1,7 @@
 import java.io.File
 
 internal class C {
-    internal fun foo(file: File?) {
+    fun foo(file: File?) {
         file?.delete()
     }
 }
diff --git a/j2k/testData/fileOrElement/codeSimplifications/NotIs.kt b/j2k/testData/fileOrElement/codeSimplifications/NotIs.kt
index 014ca39e7fb..9d5bdd549f4 100644
--- a/j2k/testData/fileOrElement/codeSimplifications/NotIs.kt
+++ b/j2k/testData/fileOrElement/codeSimplifications/NotIs.kt
@@ -1,5 +1,5 @@
 internal class C {
-    internal fun foo(o: Any) {
+    fun foo(o: Any) {
         if (o !is String) return
         println("String")
     }
diff --git a/j2k/testData/fileOrElement/codeSimplifications/RedundantTypeCast.kt b/j2k/testData/fileOrElement/codeSimplifications/RedundantTypeCast.kt
index 03bb4b6c517..e909976dcef 100644
--- a/j2k/testData/fileOrElement/codeSimplifications/RedundantTypeCast.kt
+++ b/j2k/testData/fileOrElement/codeSimplifications/RedundantTypeCast.kt
@@ -1,5 +1,5 @@
 internal class C {
-    internal fun foo(o: Any) {
+    fun foo(o: Any) {
         if (o is String) {
             val l = o.length()
         }
diff --git a/j2k/testData/fileOrElement/codeSimplifications/RedundantTypeCastAndInline.kt b/j2k/testData/fileOrElement/codeSimplifications/RedundantTypeCastAndInline.kt
index 8db04db9969..380c2e05a24 100644
--- a/j2k/testData/fileOrElement/codeSimplifications/RedundantTypeCastAndInline.kt
+++ b/j2k/testData/fileOrElement/codeSimplifications/RedundantTypeCastAndInline.kt
@@ -1,5 +1,5 @@
 internal class C {
-    internal fun foo(o: Any) {
+    fun foo(o: Any) {
         if (o is String) {
             val l = o.length()
             val substring = o.substring(l - 2)
diff --git a/j2k/testData/fileOrElement/comments/comments.kt b/j2k/testData/fileOrElement/comments/comments.kt
index 17b8227846c..3d0d20cd3d8 100644
--- a/j2k/testData/fileOrElement/comments/comments.kt
+++ b/j2k/testData/fileOrElement/comments/comments.kt
@@ -8,7 +8,7 @@ import java.util.ArrayList // we need ArrayList
 
 // let's declare a class:
 internal class A /* just a sample name*/ : Runnable /* let's implement Runnable */ {
-    internal fun foo/* again a sample name */(p: Int /* parameter p */, c: Char /* parameter c */) {
+    fun foo/* again a sample name */(p: Int /* parameter p */, c: Char /* parameter c */) {
         // let's print something:
         println("1") // print 1
         println("2") // print 2
diff --git a/j2k/testData/fileOrElement/comments/comments2.kt b/j2k/testData/fileOrElement/comments/comments2.kt
index 6f7e7889e95..2a2c576497f 100644
--- a/j2k/testData/fileOrElement/comments/comments2.kt
+++ b/j2k/testData/fileOrElement/comments/comments2.kt
@@ -3,13 +3,13 @@
 package foo
 
 internal class A {
-    internal fun /* nothing to return */ foo(/* no parameters at all */) {
+    fun /* nothing to return */ foo(/* no parameters at all */) {
         // let declare a variable
         // with 2 comments before
         val /*int*/ a /* it's a */ = 2 /* it's 2 */ + 1 /* it's 1 */ // variable a declared
     } // end of foo
 
-    internal fun /* we return int*/ foo(/*int*/ p: Int/* parameter p */): Int {
+    fun /* we return int*/ foo(/*int*/ p: Int/* parameter p */): Int {
         /* body is empty */
     }
 
diff --git a/j2k/testData/fileOrElement/comments/commentsForConstructors.kt b/j2k/testData/fileOrElement/comments/commentsForConstructors.kt
index cac56b5d623..ee4a54d50c8 100644
--- a/j2k/testData/fileOrElement/comments/commentsForConstructors.kt
+++ b/j2k/testData/fileOrElement/comments/commentsForConstructors.kt
@@ -1,5 +1,5 @@
 internal class A// this is a primary constructor
-@JvmOverloads internal constructor(p: Int = 1) {
+@JvmOverloads constructor(p: Int = 1) {
     private val v: Int
 
     init {
@@ -7,7 +7,7 @@ internal class A// this is a primary constructor
     } // end of primary constructor body
 
     // this is a secondary constructor 2
-    internal constructor(s: String) : this(s.length()) {
+    constructor(s: String) : this(s.length()) {
     } // end of secondary constructor 2 body
 }// this is a secondary constructor 1
 // end of secondary constructor 1 body
@@ -16,6 +16,6 @@ internal class B// this constructor will disappear
 (private val x: Int) // end of constructor body
 {
 
-    internal fun foo() {
+    fun foo() {
     }
 }
\ No newline at end of file
diff --git a/j2k/testData/fileOrElement/conditionalExpression/multiline.kt b/j2k/testData/fileOrElement/conditionalExpression/multiline.kt
index b06f56af97d..2f5f828b244 100644
--- a/j2k/testData/fileOrElement/conditionalExpression/multiline.kt
+++ b/j2k/testData/fileOrElement/conditionalExpression/multiline.kt
@@ -1,4 +1,4 @@
-internal fun foo(b: Boolean) {
+fun foo(b: Boolean) {
     if (b)
         println("true")
     else
diff --git a/j2k/testData/fileOrElement/constructors/allCallsPrimary.kt b/j2k/testData/fileOrElement/constructors/allCallsPrimary.kt
index 9888a6926d0..c33ca4ae82b 100644
--- a/j2k/testData/fileOrElement/constructors/allCallsPrimary.kt
+++ b/j2k/testData/fileOrElement/constructors/allCallsPrimary.kt
@@ -1,6 +1,6 @@
 package pack
 
-internal class C @JvmOverloads internal constructor(arg1: Int, arg2: Int = 0, arg3: Int = 0)
+internal class C @JvmOverloads constructor(arg1: Int, arg2: Int = 0, arg3: Int = 0)
 
 object User {
     fun main() {
diff --git a/j2k/testData/fileOrElement/constructors/allCallsPrimary2.kt b/j2k/testData/fileOrElement/constructors/allCallsPrimary2.kt
index 68673b4f397..5c852575ea9 100644
--- a/j2k/testData/fileOrElement/constructors/allCallsPrimary2.kt
+++ b/j2k/testData/fileOrElement/constructors/allCallsPrimary2.kt
@@ -1,13 +1,13 @@
-internal class C internal constructor(internal val myArg1: Int) {
-    internal var myArg2: Int = 0
-    internal var myArg3: Int = 0
+internal class C(val myArg1: Int) {
+    var myArg2: Int = 0
+    var myArg3: Int = 0
 
-    internal constructor(arg1: Int, arg2: Int, arg3: Int) : this(arg1) {
+    constructor(arg1: Int, arg2: Int, arg3: Int) : this(arg1) {
         myArg2 = arg2
         myArg3 = arg3
     }
 
-    internal constructor(arg1: Int, arg2: Int) : this(arg1) {
+    constructor(arg1: Int, arg2: Int) : this(arg1) {
         myArg2 = arg2
         myArg3 = 0
     }
diff --git a/j2k/testData/fileOrElement/constructors/chain.kt b/j2k/testData/fileOrElement/constructors/chain.kt
index 47c66dcdb14..e6d2be69384 100644
--- a/j2k/testData/fileOrElement/constructors/chain.kt
+++ b/j2k/testData/fileOrElement/constructors/chain.kt
@@ -1,10 +1,10 @@
-internal class C internal constructor(arg1: Int, arg2: Int, arg3: Int) {
+internal class C(arg1: Int, arg2: Int, arg3: Int) {
 
-    internal constructor(arg1: Int, arg2: Int) : this(arg1, arg2, 0) {
+    constructor(arg1: Int, arg2: Int) : this(arg1, arg2, 0) {
         println()
     }
 
-    internal constructor(arg1: Int) : this(arg1, 0) {
+    constructor(arg1: Int) : this(arg1, 0) {
         println()
     }
 }
diff --git a/j2k/testData/fileOrElement/constructors/customerBuilder.kt b/j2k/testData/fileOrElement/constructors/customerBuilder.kt
index 7961c9da0c4..1dfd809cd75 100644
--- a/j2k/testData/fileOrElement/constructors/customerBuilder.kt
+++ b/j2k/testData/fileOrElement/constructors/customerBuilder.kt
@@ -1,6 +1,6 @@
 package org.test.customer
 
-internal class Customer internal constructor(val firstName: String, val lastName: String) {
+internal class Customer(val firstName: String, val lastName: String) {
 
     init {
         doSmthBefore()
diff --git a/j2k/testData/fileOrElement/constructors/fieldsInitializedFromParams8.kt b/j2k/testData/fileOrElement/constructors/fieldsInitializedFromParams8.kt
index fd179e70e28..0b43deb548e 100644
--- a/j2k/testData/fileOrElement/constructors/fieldsInitializedFromParams8.kt
+++ b/j2k/testData/fileOrElement/constructors/fieldsInitializedFromParams8.kt
@@ -1,3 +1,3 @@
-internal open class Base internal constructor(o: Any, l: Int)
+internal open class Base(o: Any, l: Int)
 
 internal class C(private val string: String) : Base(string, string.length())
diff --git a/j2k/testData/fileOrElement/constructors/lineBreaksBetweenParameters.kt b/j2k/testData/fileOrElement/constructors/lineBreaksBetweenParameters.kt
index 6cc0c952a08..0a6d3da32eb 100644
--- a/j2k/testData/fileOrElement/constructors/lineBreaksBetweenParameters.kt
+++ b/j2k/testData/fileOrElement/constructors/lineBreaksBetweenParameters.kt
@@ -1,12 +1,12 @@
-internal class C1 internal constructor(arg1: Int,
-                                       arg2: Int,
-                                       arg3: Int) {
+internal class C1(arg1: Int,
+                  arg2: Int,
+                  arg3: Int) {
 
-    internal constructor(x: Int,
-                         y: Int) : this(x, x + y, 0) {
+    constructor(x: Int,
+                y: Int) : this(x, x + y, 0) {
     }
 }
 
-internal class C2 internal constructor(private val arg1: Int,
-                                       private val arg2: Int,
-                                       arg3: Int)
+internal class C2(private val arg1: Int,
+                  private val arg2: Int,
+                  arg3: Int)
diff --git a/j2k/testData/fileOrElement/constructors/methodCallInFactoryFun.kt b/j2k/testData/fileOrElement/constructors/methodCallInFactoryFun.kt
index b974607b4eb..a5853ced827 100644
--- a/j2k/testData/fileOrElement/constructors/methodCallInFactoryFun.kt
+++ b/j2k/testData/fileOrElement/constructors/methodCallInFactoryFun.kt
@@ -1,10 +1,10 @@
-internal class C internal constructor(private val arg1: Int, private val arg2: Int, private val arg3: Int) {
+internal class C(private val arg1: Int, private val arg2: Int, private val arg3: Int) {
 
-    internal fun foo(p: Int): Int {
+    fun foo(p: Int): Int {
         return p
     }
 
-    internal constructor(arg1: Int, arg2: Int, other: C) : this(arg1, arg2, 0) {
+    constructor(arg1: Int, arg2: Int, other: C) : this(arg1, arg2, 0) {
         println(foo(1) + this.foo(2) + other.foo(3) + staticFoo(4) + C.staticFoo(5))
     }
 
diff --git a/j2k/testData/fileOrElement/constructors/nestedClassNameInParameterDefaults.kt b/j2k/testData/fileOrElement/constructors/nestedClassNameInParameterDefaults.kt
index 3d1d17f7b32..e291249cae1 100644
--- a/j2k/testData/fileOrElement/constructors/nestedClassNameInParameterDefaults.kt
+++ b/j2k/testData/fileOrElement/constructors/nestedClassNameInParameterDefaults.kt
@@ -1,6 +1,6 @@
-internal class A @JvmOverloads internal constructor(nested: A.Nested = A.Nested(A.Nested.FIELD)) {
+internal class A @JvmOverloads constructor(nested: A.Nested = A.Nested(A.Nested.FIELD)) {
 
-    internal class Nested internal constructor(p: Int) {
+    internal class Nested(p: Int) {
         companion object {
 
             val FIELD = 0
diff --git a/j2k/testData/fileOrElement/constructors/nestedClassNameInParameterDefaults2.kt b/j2k/testData/fileOrElement/constructors/nestedClassNameInParameterDefaults2.kt
index c9430ee5c43..185648bc6a4 100644
--- a/j2k/testData/fileOrElement/constructors/nestedClassNameInParameterDefaults2.kt
+++ b/j2k/testData/fileOrElement/constructors/nestedClassNameInParameterDefaults2.kt
@@ -1,9 +1,9 @@
 // ERROR: Property must be initialized or be abstract
 import A.Nested
 
-internal class A @JvmOverloads internal constructor(nested: Nested = Nested(Nested.FIELD)) {
+internal class A @JvmOverloads constructor(nested: Nested = Nested(Nested.FIELD)) {
 
-    internal class Nested internal constructor(p: Int) {
+    internal class Nested(p: Int) {
         companion object {
 
             val FIELD = 0
@@ -12,5 +12,5 @@ internal class A @JvmOverloads internal constructor(nested: Nested = Nested(Nest
 }
 
 internal class B {
-    internal var nested: Nested
+    var nested: Nested
 }
\ No newline at end of file
diff --git a/j2k/testData/fileOrElement/constructors/nestedClassNameInParameterDefaults3.kt b/j2k/testData/fileOrElement/constructors/nestedClassNameInParameterDefaults3.kt
index 79914add408..f2cfdfae66c 100644
--- a/j2k/testData/fileOrElement/constructors/nestedClassNameInParameterDefaults3.kt
+++ b/j2k/testData/fileOrElement/constructors/nestedClassNameInParameterDefaults3.kt
@@ -3,9 +3,9 @@ package pack
 
 import pack.A.Nested
 
-internal class A @JvmOverloads internal constructor(nested: Nested = Nested(Nested.FIELD)) {
+internal class A @JvmOverloads constructor(nested: Nested = Nested(Nested.FIELD)) {
 
-    internal class Nested internal constructor(p: Int) {
+    internal class Nested(p: Int) {
         companion object {
 
             val FIELD = 0
@@ -14,5 +14,5 @@ internal class A @JvmOverloads internal constructor(nested: Nested = Nested(Nest
 }
 
 internal class B {
-    internal var nested: Nested
+    var nested: Nested
 }
\ No newline at end of file
diff --git a/j2k/testData/fileOrElement/constructors/nestedClassNameInParameterDefaults4.kt b/j2k/testData/fileOrElement/constructors/nestedClassNameInParameterDefaults4.kt
index 768ca9ff3fc..5ea5b4fd7af 100644
--- a/j2k/testData/fileOrElement/constructors/nestedClassNameInParameterDefaults4.kt
+++ b/j2k/testData/fileOrElement/constructors/nestedClassNameInParameterDefaults4.kt
@@ -3,9 +3,9 @@ package pack
 
 import pack.A.*
 
-internal class A @JvmOverloads internal constructor(nested: Nested = Nested(Nested.FIELD)) {
+internal class A @JvmOverloads constructor(nested: Nested = Nested(Nested.FIELD)) {
 
-    internal class Nested internal constructor(p: Int) {
+    internal class Nested(p: Int) {
         companion object {
 
             val FIELD = 0
@@ -14,5 +14,5 @@ internal class A @JvmOverloads internal constructor(nested: Nested = Nested(Nest
 }
 
 internal class B {
-    internal var nested: Nested
+    var nested: Nested
 }
\ No newline at end of file
diff --git a/j2k/testData/fileOrElement/constructors/nestedClassNameInSuperParameters.kt b/j2k/testData/fileOrElement/constructors/nestedClassNameInSuperParameters.kt
index b62f4ef67af..0de1dc779ef 100644
--- a/j2k/testData/fileOrElement/constructors/nestedClassNameInSuperParameters.kt
+++ b/j2k/testData/fileOrElement/constructors/nestedClassNameInSuperParameters.kt
@@ -1,6 +1,6 @@
-internal open class Base internal constructor(nested: Base.Nested) {
+internal open class Base(nested: Base.Nested) {
 
-    internal class Nested internal constructor(p: Int) {
+    internal class Nested(p: Int) {
         companion object {
 
             val FIELD = 0
@@ -8,4 +8,4 @@ internal open class Base internal constructor(nested: Base.Nested) {
     }
 }
 
-internal class Derived internal constructor() : Base(Base.Nested(Base.Nested.FIELD))
\ No newline at end of file
+internal class Derived : Base(Base.Nested(Base.Nested.FIELD))
\ No newline at end of file
diff --git a/j2k/testData/fileOrElement/constructors/noPrimary.kt b/j2k/testData/fileOrElement/constructors/noPrimary.kt
index 73cdf3b354e..bc2c59cf6b1 100644
--- a/j2k/testData/fileOrElement/constructors/noPrimary.kt
+++ b/j2k/testData/fileOrElement/constructors/noPrimary.kt
@@ -1,14 +1,14 @@
 internal open class Base
 
 internal class C : Base {
-    internal constructor(arg1: Int, arg2: Int, arg3: Int) {
+    constructor(arg1: Int, arg2: Int, arg3: Int) {
     }
 
-    internal constructor(arg1: Int, arg2: Int) : this(arg1, arg2, 0) {
+    constructor(arg1: Int, arg2: Int) : this(arg1, arg2, 0) {
         println()
     }
 
-    internal constructor(arg: Int) {
+    constructor(arg: Int) {
         println(arg)
     }
 }
diff --git a/j2k/testData/fileOrElement/constructors/parameterDefaults1.kt b/j2k/testData/fileOrElement/constructors/parameterDefaults1.kt
index da1aa9a14c0..73e9f76f6f8 100644
--- a/j2k/testData/fileOrElement/constructors/parameterDefaults1.kt
+++ b/j2k/testData/fileOrElement/constructors/parameterDefaults1.kt
@@ -1,7 +1,7 @@
 package pack
 
-internal class C @JvmOverloads internal constructor(a: Int = 0, b: Int = 0, c: Int = 0, d: Int = 0, e: Int = 0) {
+internal class C @JvmOverloads constructor(a: Int = 0, b: Int = 0, c: Int = 0, d: Int = 0, e: Int = 0) {
 
-    internal constructor(a: Int) : this(a, 0, 0, 0, 1) {
+    constructor(a: Int) : this(a, 0, 0, 0, 1) {
     }
 }
diff --git a/j2k/testData/fileOrElement/constructors/parameterDefaults2.kt b/j2k/testData/fileOrElement/constructors/parameterDefaults2.kt
index c122fc20ce1..4c55f841f8b 100644
--- a/j2k/testData/fileOrElement/constructors/parameterDefaults2.kt
+++ b/j2k/testData/fileOrElement/constructors/parameterDefaults2.kt
@@ -1,10 +1,10 @@
 package pack
 
-internal class C @JvmOverloads internal constructor(a: Int = 0, b: Int = 0, c: Int = 0, d: Int = 0, e: Int = 0) {
+internal class C @JvmOverloads constructor(a: Int = 0, b: Int = 0, c: Int = 0, d: Int = 0, e: Int = 0) {
 
-    internal constructor(a1: Int, b1: Int, c1: Int) : this(a1, b1, c1, 0, 0) {
+    constructor(a1: Int, b1: Int, c1: Int) : this(a1, b1, c1, 0, 0) {
     }
 
-    internal constructor(b: Byte) : this(b.toInt(), 0, 0, 0, 0) {
+    constructor(b: Byte) : this(b.toInt(), 0, 0, 0, 0) {
     }
 }
diff --git a/j2k/testData/fileOrElement/constructors/parameterDefaults3.kt b/j2k/testData/fileOrElement/constructors/parameterDefaults3.kt
index 84c5d41a2c1..7d6115a5dfb 100644
--- a/j2k/testData/fileOrElement/constructors/parameterDefaults3.kt
+++ b/j2k/testData/fileOrElement/constructors/parameterDefaults3.kt
@@ -1,7 +1,7 @@
 package pack
 
-internal class C @JvmOverloads internal constructor(a: Int = 0, b: Int = 0, c: Int = 0, d: Int = 0, e: Int = 0) {
+internal class C @JvmOverloads constructor(a: Int = 0, b: Int = 0, c: Int = 0, d: Int = 0, e: Int = 0) {
 
-    internal constructor(a: Int, b: Int, c: Int) : this(b, a, c, 0, 0) {
+    constructor(a: Int, b: Int, c: Int) : this(b, a, c, 0, 0) {
     }
 }
diff --git a/j2k/testData/fileOrElement/constructors/parameterDefaults4.kt b/j2k/testData/fileOrElement/constructors/parameterDefaults4.kt
index 07e680b896f..b4f570e0d5d 100644
--- a/j2k/testData/fileOrElement/constructors/parameterDefaults4.kt
+++ b/j2k/testData/fileOrElement/constructors/parameterDefaults4.kt
@@ -1,3 +1,3 @@
 package pack
 
-internal class C @JvmOverloads internal constructor(a: Int = 1, b: Int = 2, c: Int = 3, d: Int = 4, e: Int = 5)
+internal class C @JvmOverloads constructor(a: Int = 1, b: Int = 2, c: Int = 3, d: Int = 4, e: Int = 5)
diff --git a/j2k/testData/fileOrElement/constructors/parameterDefaults5.kt b/j2k/testData/fileOrElement/constructors/parameterDefaults5.kt
index 07e680b896f..b4f570e0d5d 100644
--- a/j2k/testData/fileOrElement/constructors/parameterDefaults5.kt
+++ b/j2k/testData/fileOrElement/constructors/parameterDefaults5.kt
@@ -1,3 +1,3 @@
 package pack
 
-internal class C @JvmOverloads internal constructor(a: Int = 1, b: Int = 2, c: Int = 3, d: Int = 4, e: Int = 5)
+internal class C @JvmOverloads constructor(a: Int = 1, b: Int = 2, c: Int = 3, d: Int = 4, e: Int = 5)
diff --git a/j2k/testData/fileOrElement/constructors/parameterModification.kt b/j2k/testData/fileOrElement/constructors/parameterModification.kt
index 9885d0a9dd7..d96edf38fdc 100644
--- a/j2k/testData/fileOrElement/constructors/parameterModification.kt
+++ b/j2k/testData/fileOrElement/constructors/parameterModification.kt
@@ -1,4 +1,4 @@
-internal class C @JvmOverloads internal constructor(arg1: Int, arg2: Int = 0, arg3: Int = 0) {
+internal class C @JvmOverloads constructor(arg1: Int, arg2: Int = 0, arg3: Int = 0) {
     private val field: Int
 
     init {
@@ -10,7 +10,7 @@ internal class C @JvmOverloads internal constructor(arg1: Int, arg2: Int = 0, ar
         arg3++
     }
 
-    internal constructor(arg1: Int, arg2: Int) : this(arg1, arg2, 0) {
+    constructor(arg1: Int, arg2: Int) : this(arg1, arg2, 0) {
         var arg2 = arg2
         arg2++
     }
diff --git a/j2k/testData/fileOrElement/constructors/qualifiedRefInFactoryFun.kt b/j2k/testData/fileOrElement/constructors/qualifiedRefInFactoryFun.kt
index 28d86ddbfbb..daea028a06d 100644
--- a/j2k/testData/fileOrElement/constructors/qualifiedRefInFactoryFun.kt
+++ b/j2k/testData/fileOrElement/constructors/qualifiedRefInFactoryFun.kt
@@ -1,12 +1,12 @@
-internal class C internal constructor(private val arg1: Int, private val arg2: Int, private val arg3: Int) {
+internal class C(private val arg1: Int, private val arg2: Int, private val arg3: Int) {
 
-    internal constructor(arg1: Int, arg2: Int, other: C) : this(arg1, arg2, 0) {
+    constructor(arg1: Int, arg2: Int, other: C) : this(arg1, arg2, 0) {
         println(this.arg1 + other.arg2)
     }
 }
 
 internal class User {
-    internal fun foo() {
+    fun foo() {
         val c1 = C(100, 100, 100)
         val c2 = C(100, 100, c1)
     }
diff --git a/j2k/testData/fileOrElement/constructors/secondaryConstructorsInInnerClass.kt b/j2k/testData/fileOrElement/constructors/secondaryConstructorsInInnerClass.kt
index 7e332358d4b..da24f657ddc 100644
--- a/j2k/testData/fileOrElement/constructors/secondaryConstructorsInInnerClass.kt
+++ b/j2k/testData/fileOrElement/constructors/secondaryConstructorsInInnerClass.kt
@@ -48,7 +48,7 @@ internal class Outer {
         }
     }
 
-    internal fun foo() {
+    fun foo() {
         val inner1 = Inner1(1)
         val inner2 = Inner2(2)
         val inner3 = Inner3(3)
diff --git a/j2k/testData/fileOrElement/constructors/secondaryConstructorsInNestedClass.kt b/j2k/testData/fileOrElement/constructors/secondaryConstructorsInNestedClass.kt
index 74c9e1ce7b1..bbfa626a7e9 100644
--- a/j2k/testData/fileOrElement/constructors/secondaryConstructorsInNestedClass.kt
+++ b/j2k/testData/fileOrElement/constructors/secondaryConstructorsInNestedClass.kt
@@ -48,7 +48,7 @@ internal object Outer {
         }
     }
 
-    internal fun foo() {
+    fun foo() {
         val nested1 = Nested1(1)
         val nested2 = Nested2(2)
         val nested3 = Nested3(3)
diff --git a/j2k/testData/fileOrElement/constructors/secondaryConstructorsVisibility.kt b/j2k/testData/fileOrElement/constructors/secondaryConstructorsVisibility.kt
index 091ae10a14f..975a77c3e82 100644
--- a/j2k/testData/fileOrElement/constructors/secondaryConstructorsVisibility.kt
+++ b/j2k/testData/fileOrElement/constructors/secondaryConstructorsVisibility.kt
@@ -6,7 +6,7 @@ internal class A() {
     protected constructor(c: Char) : this() {
     }
 
-    internal constructor(f: Float) : this() {
+    constructor(f: Float) : this() {
     }
 
     private constructor(d: Double) : this() {
diff --git a/j2k/testData/fileOrElement/constructors/staticFieldRefInFactoryFun.kt b/j2k/testData/fileOrElement/constructors/staticFieldRefInFactoryFun.kt
index 31a0e03fbcf..08bc109ea8d 100644
--- a/j2k/testData/fileOrElement/constructors/staticFieldRefInFactoryFun.kt
+++ b/j2k/testData/fileOrElement/constructors/staticFieldRefInFactoryFun.kt
@@ -1,6 +1,6 @@
-internal class C internal constructor() {
+internal class C() {
 
-    internal constructor(p: Int) : this() {
+    constructor(p: Int) : this() {
         println(staticField1 + C.staticField2)
     }
 
diff --git a/j2k/testData/fileOrElement/docComments/linkTag.kt b/j2k/testData/fileOrElement/docComments/linkTag.kt
index f54881f4eee..e8337e07ac8 100644
--- a/j2k/testData/fileOrElement/docComments/linkTag.kt
+++ b/j2k/testData/fileOrElement/docComments/linkTag.kt
@@ -2,6 +2,6 @@
  * [C.foo]
  */
 internal class C {
-    internal fun foo(i: Int) {
+    fun foo(i: Int) {
     }
 }
diff --git a/j2k/testData/fileOrElement/docComments/linkTagWithLabel.kt b/j2k/testData/fileOrElement/docComments/linkTagWithLabel.kt
index 86b4b7ea116..2073328f9c6 100644
--- a/j2k/testData/fileOrElement/docComments/linkTagWithLabel.kt
+++ b/j2k/testData/fileOrElement/docComments/linkTagWithLabel.kt
@@ -2,6 +2,6 @@
  * [the best foo method ever][C.foo]
  */
 internal class C {
-    internal fun foo(i: Int) {
+    fun foo(i: Int) {
     }
 }
diff --git a/j2k/testData/fileOrElement/docComments/seeTag.kt b/j2k/testData/fileOrElement/docComments/seeTag.kt
index f1f97425bec..30df04108cb 100644
--- a/j2k/testData/fileOrElement/docComments/seeTag.kt
+++ b/j2k/testData/fileOrElement/docComments/seeTag.kt
@@ -2,6 +2,6 @@
  * @see C.foo
  */
 internal class C {
-    internal fun foo(i: Int) {
+    fun foo(i: Int) {
     }
 }
diff --git a/j2k/testData/fileOrElement/dropAccessors/DifferentFieldNameAndSuperClass.kt b/j2k/testData/fileOrElement/dropAccessors/DifferentFieldNameAndSuperClass.kt
index f108ff27f51..ff0baf94ce3 100644
--- a/j2k/testData/fileOrElement/dropAccessors/DifferentFieldNameAndSuperClass.kt
+++ b/j2k/testData/fileOrElement/dropAccessors/DifferentFieldNameAndSuperClass.kt
@@ -7,4 +7,4 @@ open class Base internal constructor(x: Int) {
     }
 }
 
-internal class Derived internal constructor(b: Base) : Base(b.x)
+internal class Derived(b: Base) : Base(b.x)
diff --git a/j2k/testData/fileOrElement/dropAccessors/DifferentProtectedFieldName.kt b/j2k/testData/fileOrElement/dropAccessors/DifferentProtectedFieldName.kt
index 5de970a19e4..d9c8c629a68 100644
--- a/j2k/testData/fileOrElement/dropAccessors/DifferentProtectedFieldName.kt
+++ b/j2k/testData/fileOrElement/dropAccessors/DifferentProtectedFieldName.kt
@@ -10,7 +10,7 @@ open class AAA {
 }
 
 internal class BBB : AAA() {
-    internal fun bar() {
+    fun bar() {
         println(x)
         x = 10
     }
diff --git a/j2k/testData/fileOrElement/dropAccessors/FieldUsagesInFactoryMethods.kt b/j2k/testData/fileOrElement/dropAccessors/FieldUsagesInFactoryMethods.kt
index 141b935cf2f..fbb92ccb42a 100644
--- a/j2k/testData/fileOrElement/dropAccessors/FieldUsagesInFactoryMethods.kt
+++ b/j2k/testData/fileOrElement/dropAccessors/FieldUsagesInFactoryMethods.kt
@@ -1,13 +1,13 @@
-internal class C internal constructor(internal val arg1: Int) {
-    internal var arg2: Int = 0
-    internal var arg3: Int = 0
+internal class C(val arg1: Int) {
+    var arg2: Int = 0
+    var arg3: Int = 0
 
-    internal constructor(arg1: Int, arg2: Int, arg3: Int) : this(arg1) {
+    constructor(arg1: Int, arg2: Int, arg3: Int) : this(arg1) {
         this.arg2 = arg2
         this.arg3 = arg3
     }
 
-    internal constructor(arg1: Int, arg2: Int) : this(arg1) {
+    constructor(arg1: Int, arg2: Int) : this(arg1) {
         this.arg2 = arg2
         arg3 = 0
     }
diff --git a/j2k/testData/fileOrElement/dropAccessors/GetterSetterUsages.kt b/j2k/testData/fileOrElement/dropAccessors/GetterSetterUsages.kt
index 1553c6985fd..0a04edf97ff 100644
--- a/j2k/testData/fileOrElement/dropAccessors/GetterSetterUsages.kt
+++ b/j2k/testData/fileOrElement/dropAccessors/GetterSetterUsages.kt
@@ -11,7 +11,7 @@ class AAA {
 }
 
 internal class B {
-    internal fun foo(a: AAA) {
+    fun foo(a: AAA) {
         a.x = a.x + 1
     }
 }
diff --git a/j2k/testData/fileOrElement/dropAccessors/JavaKeywordPropertyName.kt b/j2k/testData/fileOrElement/dropAccessors/JavaKeywordPropertyName.kt
index 3be000e1c02..ee1b690720f 100644
--- a/j2k/testData/fileOrElement/dropAccessors/JavaKeywordPropertyName.kt
+++ b/j2k/testData/fileOrElement/dropAccessors/JavaKeywordPropertyName.kt
@@ -1,7 +1,7 @@
 internal class C {
     val default = 0
 
-    internal fun foo() {
+    fun foo() {
         println(default)
     }
 }
diff --git a/j2k/testData/fileOrElement/dropAccessors/KeywordPropertyName.kt b/j2k/testData/fileOrElement/dropAccessors/KeywordPropertyName.kt
index 80ad58a074a..eface5562ed 100644
--- a/j2k/testData/fileOrElement/dropAccessors/KeywordPropertyName.kt
+++ b/j2k/testData/fileOrElement/dropAccessors/KeywordPropertyName.kt
@@ -1,7 +1,7 @@
 internal class C {
     val `this` = 0
 
-    internal fun foo() {
+    fun foo() {
         println(`this`)
     }
 }
\ No newline at end of file
diff --git a/j2k/testData/fileOrElement/enum/companionObject.kt b/j2k/testData/fileOrElement/enum/companionObject.kt
index 63a79baaa70..38f09359dc6 100644
--- a/j2k/testData/fileOrElement/enum/companionObject.kt
+++ b/j2k/testData/fileOrElement/enum/companionObject.kt
@@ -12,7 +12,7 @@ enum class TestEnum {
 }
 
 internal class Go {
-    internal fun fn() {
+    fun fn() {
         val x = TestEnum.parse()
     }
 }
diff --git a/j2k/testData/fileOrElement/enum/enumConstantIsNotNull.kt b/j2k/testData/fileOrElement/enum/enumConstantIsNotNull.kt
index a9c2b78f9fa..57ecffac83f 100644
--- a/j2k/testData/fileOrElement/enum/enumConstantIsNotNull.kt
+++ b/j2k/testData/fileOrElement/enum/enumConstantIsNotNull.kt
@@ -1,7 +1,7 @@
 internal enum class E {
     FOO;
 
-    internal fun foo() {
+    fun foo() {
         FOO.toString()
     }
 }
\ No newline at end of file
diff --git a/j2k/testData/fileOrElement/equals/EqOperator.kt b/j2k/testData/fileOrElement/equals/EqOperator.kt
index 142127612c8..d51fcd408ac 100644
--- a/j2k/testData/fileOrElement/equals/EqOperator.kt
+++ b/j2k/testData/fileOrElement/equals/EqOperator.kt
@@ -23,7 +23,7 @@ internal enum class EE {
 }
 
 internal class X {
-    internal fun foo(i1: I?, i2: I?, s1: String, s2: String, c1: C, c2: C, i: Int, o1: O, o2: O, e1: E, e2: E, bb1: BB, bb2: BB, arr1: IntArray, arr2: IntArray, ee1: EE?, ee2: EE) {
+    fun foo(i1: I?, i2: I?, s1: String, s2: String, c1: C, c2: C, i: Int, o1: O, o2: O, e1: E, e2: E, bb1: BB, bb2: BB, arr1: IntArray, arr2: IntArray, ee1: EE?, ee2: EE) {
         if (i1 === i2) return
         if (s1 === s2) return
         if (c1 == c2) return
diff --git a/j2k/testData/fileOrElement/equals/Equals1.kt b/j2k/testData/fileOrElement/equals/Equals1.kt
index 0f854fa62df..28173f0a78a 100644
--- a/j2k/testData/fileOrElement/equals/Equals1.kt
+++ b/j2k/testData/fileOrElement/equals/Equals1.kt
@@ -1,11 +1,11 @@
 internal interface I
 
 internal class C {
-    internal fun foo1(i1: I, i2: I): Boolean {
+    fun foo1(i1: I, i2: I): Boolean {
         return i1 == i2
     }
 
-    internal fun foo2(i1: I, i2: I): Boolean {
+    fun foo2(i1: I, i2: I): Boolean {
         return i1 != i2
     }
 }
\ No newline at end of file
diff --git a/j2k/testData/fileOrElement/equals/Equals2.kt b/j2k/testData/fileOrElement/equals/Equals2.kt
index 332f40cc475..ef3d4162657 100644
--- a/j2k/testData/fileOrElement/equals/Equals2.kt
+++ b/j2k/testData/fileOrElement/equals/Equals2.kt
@@ -1,9 +1,9 @@
 internal class C {
-    internal fun foo1(s1: String, s2: String): Boolean {
+    fun foo1(s1: String, s2: String): Boolean {
         return s1 == s2
     }
 
-    internal fun foo2(s1: String, s2: String): Boolean {
+    fun foo2(s1: String, s2: String): Boolean {
         return s1 != s2
     }
 }
\ No newline at end of file
diff --git a/j2k/testData/fileOrElement/equals/Equals3.kt b/j2k/testData/fileOrElement/equals/Equals3.kt
index 2ac99c8b9bb..dcf03ae53a1 100644
--- a/j2k/testData/fileOrElement/equals/Equals3.kt
+++ b/j2k/testData/fileOrElement/equals/Equals3.kt
@@ -3,7 +3,7 @@ internal class C {
         return false
     }
 
-    internal fun foo(c1: C, c2: C): Boolean {
+    fun foo(c1: C, c2: C): Boolean {
         return c1.equals(c2)
     }
 }
\ No newline at end of file
diff --git a/j2k/testData/fileOrElement/equals/Equals4.kt b/j2k/testData/fileOrElement/equals/Equals4.kt
index a6699e157a8..683e4c88c09 100644
--- a/j2k/testData/fileOrElement/equals/Equals4.kt
+++ b/j2k/testData/fileOrElement/equals/Equals4.kt
@@ -1,5 +1,5 @@
 internal class C {
-    internal fun foo(s1: String, s2: String, s3: String, s4: String): Boolean {
+    fun foo(s1: String, s2: String, s3: String, s4: String): Boolean {
         return s1 == s2 == (s3 != s4)
     }
 }
\ No newline at end of file
diff --git a/j2k/testData/fileOrElement/equals/ObjectsEquals.kt b/j2k/testData/fileOrElement/equals/ObjectsEquals.kt
index 4b692fc8327..884e8122f03 100644
--- a/j2k/testData/fileOrElement/equals/ObjectsEquals.kt
+++ b/j2k/testData/fileOrElement/equals/ObjectsEquals.kt
@@ -3,11 +3,11 @@ import java.util.Objects
 internal interface I
 
 internal class C {
-    internal fun foo1(i1: I, i2: I): Boolean {
+    fun foo1(i1: I, i2: I): Boolean {
         return i1 == i2
     }
 
-    internal fun foo2(i1: I, i2: I): Boolean {
+    fun foo2(i1: I, i2: I): Boolean {
         return i1 != i2
     }
 }
\ No newline at end of file
diff --git a/j2k/testData/fileOrElement/field/conversion.kt b/j2k/testData/fileOrElement/field/conversion.kt
index 36a1031dae2..5c506b49cdb 100644
--- a/j2k/testData/fileOrElement/field/conversion.kt
+++ b/j2k/testData/fileOrElement/field/conversion.kt
@@ -1,13 +1,13 @@
 internal class A {
     private var i: Int? = getByte().toInt()
 
-    internal fun foo() {
+    fun foo() {
         i = 10
     }
 
     companion object {
 
-        internal fun getByte(): Byte {
+        fun getByte(): Byte {
             return 0
         }
     }
diff --git a/j2k/testData/fileOrElement/field/internalField.kt b/j2k/testData/fileOrElement/field/internalField.kt
index 1325f2c11fe..c49abd9c60d 100644
--- a/j2k/testData/fileOrElement/field/internalField.kt
+++ b/j2k/testData/fileOrElement/field/internalField.kt
@@ -1,5 +1,5 @@
 // ERROR: Unresolved reference: Foo
 // ERROR: Property must be initialized or be abstract
 internal class C {
-    internal var f: Foo
+    var f: Foo
 }
\ No newline at end of file
diff --git a/j2k/testData/fileOrElement/field/specifyType.kt b/j2k/testData/fileOrElement/field/specifyType.kt
index d911a714cad..fcaaa51d9b5 100644
--- a/j2k/testData/fileOrElement/field/specifyType.kt
+++ b/j2k/testData/fileOrElement/field/specifyType.kt
@@ -2,24 +2,24 @@ import java.util.*
 
 internal class A {
     private val field1 = ArrayList<String>()
-    internal val field2: List<String> = ArrayList()
+    val field2: List<String> = ArrayList()
     val field3 = 0
     protected val field4 = 0
 
     private var field5: List<String> = ArrayList()
-    internal var field6: List<String> = ArrayList()
+    var field6: List<String> = ArrayList()
 
     private var field7 = 0
-    internal var field8 = 0
+    var field8 = 0
 
     private var field9: String? = "a"
     private var field10: String? = foo()
 
-    internal fun foo(): String {
+    fun foo(): String {
         return "x"
     }
 
-    internal fun bar() {
+    fun bar() {
         field5 = ArrayList<String>()
         field7++
         field8++
diff --git a/j2k/testData/fileOrElement/field/valOrVar.kt b/j2k/testData/fileOrElement/field/valOrVar.kt
index 56611fe898c..246f1e96fa6 100644
--- a/j2k/testData/fileOrElement/field/valOrVar.kt
+++ b/j2k/testData/fileOrElement/field/valOrVar.kt
@@ -1,9 +1,9 @@
-internal class A internal constructor(private val field6: Int, private val field8: Int, a: A) {
+internal class A(private val field6: Int, private val field8: Int, a: A) {
     private val field1 = 0
     private val field2 = 0
     private var field3 = 0
-    internal val field4 = 0
-    internal var field5 = 0
+    val field4 = 0
+    var field5 = 0
     private val field7: Int
     private val field9: Int
     private var field10: Int = 0
@@ -18,7 +18,7 @@ internal class A internal constructor(private val field6: Int, private val field
         a.field11 = 10
     }
 
-    internal fun foo() {
+    fun foo() {
         field3 = field2
     }
 }
\ No newline at end of file
diff --git a/j2k/testData/fileOrElement/field/valWithInit.kt b/j2k/testData/fileOrElement/field/valWithInit.kt
index d43fe3e3060..af8865c3843 100644
--- a/j2k/testData/fileOrElement/field/valWithInit.kt
+++ b/j2k/testData/fileOrElement/field/valWithInit.kt
@@ -1,4 +1,4 @@
 // ERROR: Unresolved reference: Foo
 internal class C {
-    internal val f = Foo(1, 2)
+    val f = Foo(1, 2)
 }
\ No newline at end of file
diff --git a/j2k/testData/fileOrElement/field/varWithInit.kt b/j2k/testData/fileOrElement/field/varWithInit.kt
index 4a26bd9d5be..fdffffcfe50 100644
--- a/j2k/testData/fileOrElement/field/varWithInit.kt
+++ b/j2k/testData/fileOrElement/field/varWithInit.kt
@@ -1,4 +1,4 @@
 // ERROR: Unresolved reference: Foo
 internal class C {
-    internal var f = Foo(1, 2)
+    var f = Foo(1, 2)
 }
\ No newline at end of file
diff --git a/j2k/testData/fileOrElement/field/varWithoutInit.kt b/j2k/testData/fileOrElement/field/varWithoutInit.kt
index 1325f2c11fe..c49abd9c60d 100644
--- a/j2k/testData/fileOrElement/field/varWithoutInit.kt
+++ b/j2k/testData/fileOrElement/field/varWithoutInit.kt
@@ -1,5 +1,5 @@
 // ERROR: Unresolved reference: Foo
 // ERROR: Property must be initialized or be abstract
 internal class C {
-    internal var f: Foo
+    var f: Foo
 }
\ No newline at end of file
diff --git a/j2k/testData/fileOrElement/field/volatileTransientAndStrictFp.kt b/j2k/testData/fileOrElement/field/volatileTransientAndStrictFp.kt
index 872f2dbffd2..70dea081ac1 100644
--- a/j2k/testData/fileOrElement/field/volatileTransientAndStrictFp.kt
+++ b/j2k/testData/fileOrElement/field/volatileTransientAndStrictFp.kt
@@ -1,10 +1,10 @@
 // ERROR: This annotation is not applicable to target 'member property'
 internal class A {
     @Deprecated("")
-    @Volatile internal var field1 = 0
+    @Volatile var field1 = 0
 
-    @Transient internal var field2 = 1
+    @Transient var field2 = 1
 
     // Should work even for bad modifiers
-    @Strictfp internal var field3 = 2.0
+    @Strictfp var field3 = 2.0
 }
\ No newline at end of file
diff --git a/j2k/testData/fileOrElement/for/forThroughCollectionIndices.kt b/j2k/testData/fileOrElement/for/forThroughCollectionIndices.kt
index 3cb33fa8a94..ca914ce1610 100644
--- a/j2k/testData/fileOrElement/for/forThroughCollectionIndices.kt
+++ b/j2k/testData/fileOrElement/for/forThroughCollectionIndices.kt
@@ -1,7 +1,7 @@
 import java.lang.System
 
 internal class C {
-    internal fun foo1(collection: Collection<String>) {
+    fun foo1(collection: Collection<String>) {
         for (i in collection.indices) {
             print(i)
         }
diff --git a/j2k/testData/fileOrElement/for/forThroughListIndices.kt b/j2k/testData/fileOrElement/for/forThroughListIndices.kt
index a518268e29b..8670db1fb31 100644
--- a/j2k/testData/fileOrElement/for/forThroughListIndices.kt
+++ b/j2k/testData/fileOrElement/for/forThroughListIndices.kt
@@ -1,13 +1,13 @@
 import java.util.ArrayList
 
 internal class C {
-    internal fun foo1(list: MutableList<String>) {
+    fun foo1(list: MutableList<String>) {
         for (i in list.indices) {
             list.set(i, "a")
         }
     }
 
-    internal fun foo2(list: ArrayList<String>) {
+    fun foo2(list: ArrayList<String>) {
         for (i in list.indices) {
             list.set(i, "a")
         }
diff --git a/j2k/testData/fileOrElement/for/forThroughListIndicesNE.kt b/j2k/testData/fileOrElement/for/forThroughListIndicesNE.kt
index de4a150cb79..9b869460c7f 100644
--- a/j2k/testData/fileOrElement/for/forThroughListIndicesNE.kt
+++ b/j2k/testData/fileOrElement/for/forThroughListIndicesNE.kt
@@ -1,7 +1,7 @@
 import java.util.ArrayList
 
 internal class C {
-    internal fun foo(list: MutableList<String>) {
+    fun foo(list: MutableList<String>) {
         for (i in list.indices) {
             list.set(i, "a")
         }
diff --git a/j2k/testData/fileOrElement/for/forThroughNonArrayIndices.kt b/j2k/testData/fileOrElement/for/forThroughNonArrayIndices.kt
index 63e0c02c82a..ecfb074f523 100644
--- a/j2k/testData/fileOrElement/for/forThroughNonArrayIndices.kt
+++ b/j2k/testData/fileOrElement/for/forThroughNonArrayIndices.kt
@@ -3,7 +3,7 @@ internal class X {
 }
 
 internal class C {
-    internal fun foo(x: X) {
+    fun foo(x: X) {
         for (i in 0..x.length - 1) {
             print(i)
         }
diff --git a/j2k/testData/fileOrElement/for/forThroughNonCollectionIndices.kt b/j2k/testData/fileOrElement/for/forThroughNonCollectionIndices.kt
index 3f29b04b980..f9c5308650a 100644
--- a/j2k/testData/fileOrElement/for/forThroughNonCollectionIndices.kt
+++ b/j2k/testData/fileOrElement/for/forThroughNonCollectionIndices.kt
@@ -5,7 +5,7 @@ internal class X {
 }
 
 internal class C {
-    internal fun foo(x: X) {
+    fun foo(x: X) {
         for (i in 0..x.size() - 1) {
             print(i)
         }
diff --git a/j2k/testData/fileOrElement/for/infiniteFor.kt b/j2k/testData/fileOrElement/for/infiniteFor.kt
index baef7912f1a..2bf8960aea3 100644
--- a/j2k/testData/fileOrElement/for/infiniteFor.kt
+++ b/j2k/testData/fileOrElement/for/infiniteFor.kt
@@ -1,4 +1,4 @@
-internal fun foo() {
+fun foo() {
     while (true) {
         if (!stop()) break
     }
diff --git a/j2k/testData/fileOrElement/for/nameConflict1.kt b/j2k/testData/fileOrElement/for/nameConflict1.kt
index 56d14f07dfa..b4ba39abad0 100644
--- a/j2k/testData/fileOrElement/for/nameConflict1.kt
+++ b/j2k/testData/fileOrElement/for/nameConflict1.kt
@@ -1,5 +1,5 @@
 internal class A {
-    internal fun foo() {
+    fun foo() {
         run {
             var i = 1
             while (i < 1000) {
diff --git a/j2k/testData/fileOrElement/for/nameConflict2.kt b/j2k/testData/fileOrElement/for/nameConflict2.kt
index 3df622553ce..11efb8eb8d0 100644
--- a/j2k/testData/fileOrElement/for/nameConflict2.kt
+++ b/j2k/testData/fileOrElement/for/nameConflict2.kt
@@ -1,5 +1,5 @@
 internal class A {
-    internal fun foo() {
+    fun foo() {
         run {
             var i = 1
             var j = 0
diff --git a/j2k/testData/fileOrElement/for/nameConflict3.kt b/j2k/testData/fileOrElement/for/nameConflict3.kt
index cd12212c3c6..31ad77cfd33 100644
--- a/j2k/testData/fileOrElement/for/nameConflict3.kt
+++ b/j2k/testData/fileOrElement/for/nameConflict3.kt
@@ -1,7 +1,7 @@
 internal class A {
-    internal var i = 1
+    var i = 1
 
-    internal fun foo() {
+    fun foo() {
         run {
             var i = 1
             while (i < 1000) {
diff --git a/j2k/testData/fileOrElement/for/nameConflict4.kt b/j2k/testData/fileOrElement/for/nameConflict4.kt
index 0e8067d923e..bdaa2a04b7b 100644
--- a/j2k/testData/fileOrElement/for/nameConflict4.kt
+++ b/j2k/testData/fileOrElement/for/nameConflict4.kt
@@ -1,5 +1,5 @@
 internal class A {
-    internal fun foo(p: Boolean) {
+    fun foo(p: Boolean) {
         run {
             var i = 1
             while (i < 1000) {
diff --git a/j2k/testData/fileOrElement/for/nameConflict5.kt b/j2k/testData/fileOrElement/for/nameConflict5.kt
index b10509188c3..b37b9744e2a 100644
--- a/j2k/testData/fileOrElement/for/nameConflict5.kt
+++ b/j2k/testData/fileOrElement/for/nameConflict5.kt
@@ -1,5 +1,5 @@
 internal class A {
-    internal fun foo(p: Boolean) {
+    fun foo(p: Boolean) {
         if (p) {
             val i = 10
         }
diff --git a/j2k/testData/fileOrElement/for/notInBlock.kt b/j2k/testData/fileOrElement/for/notInBlock.kt
index d998ee4ec9f..96f57e41187 100644
--- a/j2k/testData/fileOrElement/for/notInBlock.kt
+++ b/j2k/testData/fileOrElement/for/notInBlock.kt
@@ -1,5 +1,5 @@
 internal class A {
-    internal fun foo(p: Boolean) {
+    fun foo(p: Boolean) {
         if (p) {
             var i = 1
             while (i < 1000) {
diff --git a/j2k/testData/fileOrElement/foreachStatement/nullableIterable.kt b/j2k/testData/fileOrElement/foreachStatement/nullableIterable.kt
index 9817153f701..d3e4da0a12c 100644
--- a/j2k/testData/fileOrElement/foreachStatement/nullableIterable.kt
+++ b/j2k/testData/fileOrElement/foreachStatement/nullableIterable.kt
@@ -1,7 +1,7 @@
 internal class A {
-    internal var list: List<String>? = null
+    var list: List<String>? = null
 
-    internal fun foo() {
+    fun foo() {
         for (e in list!!) {
             println(e)
         }
diff --git a/j2k/testData/fileOrElement/formatting/lineBreaksBetweenArguments.kt b/j2k/testData/fileOrElement/formatting/lineBreaksBetweenArguments.kt
index cff39866012..7aa2289d71a 100644
--- a/j2k/testData/fileOrElement/formatting/lineBreaksBetweenArguments.kt
+++ b/j2k/testData/fileOrElement/formatting/lineBreaksBetweenArguments.kt
@@ -1,8 +1,8 @@
 internal class F {
-    internal fun f1(p1: Int, p2: Int, p3: Int, p4: Int, vararg p5: Int) {
+    fun f1(p1: Int, p2: Int, p3: Int, p4: Int, vararg p5: Int) {
     }
 
-    internal fun f2(array: IntArray) {
+    fun f2(array: IntArray) {
         f1(1, 2,
                 3, 4,
                 *array)
diff --git a/j2k/testData/fileOrElement/formatting/nonStaticMembers.kt b/j2k/testData/fileOrElement/formatting/nonStaticMembers.kt
index ce5d40249fe..8de4e02c3aa 100644
--- a/j2k/testData/fileOrElement/formatting/nonStaticMembers.kt
+++ b/j2k/testData/fileOrElement/formatting/nonStaticMembers.kt
@@ -1,14 +1,14 @@
 internal class F {
 
-    internal fun f1() {
+    fun f1() {
     }
 
 
-    internal fun f2() {
+    fun f2() {
     }
 
-    internal var i: Int? = 0
+    var i: Int? = 0
 
-    internal fun f3() {
+    fun f3() {
     }
 }
\ No newline at end of file
diff --git a/j2k/testData/fileOrElement/formatting/nonStaticMembersWithComments.kt b/j2k/testData/fileOrElement/formatting/nonStaticMembersWithComments.kt
index f93cb14548f..de6458ba7cf 100644
--- a/j2k/testData/fileOrElement/formatting/nonStaticMembersWithComments.kt
+++ b/j2k/testData/fileOrElement/formatting/nonStaticMembersWithComments.kt
@@ -4,7 +4,7 @@ internal class F {
 
     /*c2*/
 
-    internal fun f1() {
+    fun f1() {
     }
 
 
@@ -13,12 +13,12 @@ internal class F {
 
     //c4
 
-    internal fun f2() {
+    fun f2() {
     }
 
-    internal var i: Int? = 0
+    var i: Int? = 0
 
-    internal fun f3() {
+    fun f3() {
     }
 
     //c5
diff --git a/j2k/testData/fileOrElement/formatting/staticAndNonStaticMembersWithComments.kt b/j2k/testData/fileOrElement/formatting/staticAndNonStaticMembersWithComments.kt
index 909f3283a0e..595d0de453f 100644
--- a/j2k/testData/fileOrElement/formatting/staticAndNonStaticMembersWithComments.kt
+++ b/j2k/testData/fileOrElement/formatting/staticAndNonStaticMembersWithComments.kt
@@ -6,13 +6,13 @@ internal class F {
 
     //c4
 
-    internal fun f2() {
+    fun f2() {
     }
 
-    internal fun f3() {
+    fun f3() {
     }
 
-    internal fun f4() {
+    fun f4() {
     }
 
     companion object {
@@ -21,14 +21,14 @@ internal class F {
 
         /*c2*/
 
-        internal fun f1() {
+        fun f1() {
         }
 
-        internal var i: Int? = 0
+        var i: Int? = 0
 
         //c5
 
-        internal fun f5() {
+        fun f5() {
         }
     }
 
diff --git a/j2k/testData/fileOrElement/formatting/staticMembersWithComments.kt b/j2k/testData/fileOrElement/formatting/staticMembersWithComments.kt
index 883572c8a8d..3672301c490 100644
--- a/j2k/testData/fileOrElement/formatting/staticMembersWithComments.kt
+++ b/j2k/testData/fileOrElement/formatting/staticMembersWithComments.kt
@@ -4,7 +4,7 @@ internal object F {
 
     /*c2*/
 
-    internal fun f1() {
+    fun f1() {
     }
 
 
@@ -13,12 +13,12 @@ internal object F {
 
     //c4
 
-    internal fun f2() {
+    fun f2() {
     }
 
-    internal var i: Int? = 0
+    var i: Int? = 0
 
-    internal fun f3() {
+    fun f3() {
     }
 
     //c5
diff --git a/j2k/testData/fileOrElement/function/classGenericParam.kt b/j2k/testData/fileOrElement/function/classGenericParam.kt
index 343de375765..9286b7acb4b 100644
--- a/j2k/testData/fileOrElement/function/classGenericParam.kt
+++ b/j2k/testData/fileOrElement/function/classGenericParam.kt
@@ -1,2 +1,2 @@
-internal fun getT(): T {
+fun getT(): T {
 }
\ No newline at end of file
diff --git a/j2k/testData/fileOrElement/function/emptyVoidMethod.kt b/j2k/testData/fileOrElement/function/emptyVoidMethod.kt
index ab779625e2c..e97bc7ec751 100644
--- a/j2k/testData/fileOrElement/function/emptyVoidMethod.kt
+++ b/j2k/testData/fileOrElement/function/emptyVoidMethod.kt
@@ -1,2 +1,2 @@
-internal fun main() {
+fun main() {
 }
\ No newline at end of file
diff --git a/j2k/testData/fileOrElement/function/final.kt b/j2k/testData/fileOrElement/function/final.kt
index dfa82dd5eff..836f70823d6 100644
--- a/j2k/testData/fileOrElement/function/final.kt
+++ b/j2k/testData/fileOrElement/function/final.kt
@@ -1,3 +1,3 @@
-internal fun getString(): String {
+fun getString(): String {
     return ""
 }
\ No newline at end of file
diff --git a/j2k/testData/fileOrElement/function/functionInFinalClass.kt b/j2k/testData/fileOrElement/function/functionInFinalClass.kt
index c7369a87963..57745eb444a 100644
--- a/j2k/testData/fileOrElement/function/functionInFinalClass.kt
+++ b/j2k/testData/fileOrElement/function/functionInFinalClass.kt
@@ -1,6 +1,6 @@
 package demo
 
 internal class Final {
-    internal fun test() {
+    fun test() {
     }
 }
\ No newline at end of file
diff --git a/j2k/testData/fileOrElement/function/internal.kt b/j2k/testData/fileOrElement/function/internal.kt
index ba9eda2cf58..a7a0a149d8b 100644
--- a/j2k/testData/fileOrElement/function/internal.kt
+++ b/j2k/testData/fileOrElement/function/internal.kt
@@ -1,2 +1,2 @@
-internal fun test() {
+fun test() {
 }
\ No newline at end of file
diff --git a/j2k/testData/fileOrElement/function/methodClassType.kt b/j2k/testData/fileOrElement/function/methodClassType.kt
index 85f1e90f715..0124d08ad5b 100644
--- a/j2k/testData/fileOrElement/function/methodClassType.kt
+++ b/j2k/testData/fileOrElement/function/methodClassType.kt
@@ -1,2 +1,2 @@
-internal fun main(): String {
+fun main(): String {
 }
\ No newline at end of file
diff --git a/j2k/testData/fileOrElement/function/methodPrimitiveType.kt b/j2k/testData/fileOrElement/function/methodPrimitiveType.kt
index 8b7707df208..bf6eb1424e4 100644
--- a/j2k/testData/fileOrElement/function/methodPrimitiveType.kt
+++ b/j2k/testData/fileOrElement/function/methodPrimitiveType.kt
@@ -1,2 +1,2 @@
-internal fun main(): Int {
+fun main(): Int {
 }
\ No newline at end of file
diff --git a/j2k/testData/fileOrElement/function/methodPrimitiveType2.kt b/j2k/testData/fileOrElement/function/methodPrimitiveType2.kt
index 1a8452252bb..388e4288f4c 100644
--- a/j2k/testData/fileOrElement/function/methodPrimitiveType2.kt
+++ b/j2k/testData/fileOrElement/function/methodPrimitiveType2.kt
@@ -1,2 +1,2 @@
-internal fun main(): Boolean {
+fun main(): Boolean {
 }
\ No newline at end of file
diff --git a/j2k/testData/fileOrElement/function/methodWithReturnStatement.kt b/j2k/testData/fileOrElement/function/methodWithReturnStatement.kt
index f9ad532fe10..f2cd6c4849c 100644
--- a/j2k/testData/fileOrElement/function/methodWithReturnStatement.kt
+++ b/j2k/testData/fileOrElement/function/methodWithReturnStatement.kt
@@ -1,3 +1,3 @@
-internal fun isTrue(): Boolean {
+fun isTrue(): Boolean {
     return true
 }
\ No newline at end of file
diff --git a/j2k/testData/fileOrElement/function/open.kt b/j2k/testData/fileOrElement/function/open.kt
index dfa82dd5eff..836f70823d6 100644
--- a/j2k/testData/fileOrElement/function/open.kt
+++ b/j2k/testData/fileOrElement/function/open.kt
@@ -1,3 +1,3 @@
-internal fun getString(): String {
+fun getString(): String {
     return ""
 }
\ No newline at end of file
diff --git a/j2k/testData/fileOrElement/function/ownGenericParam.kt b/j2k/testData/fileOrElement/function/ownGenericParam.kt
index a6a7d15c3d3..e0a4fa6e530 100644
--- a/j2k/testData/fileOrElement/function/ownGenericParam.kt
+++ b/j2k/testData/fileOrElement/function/ownGenericParam.kt
@@ -1,2 +1,2 @@
-internal fun <U> putU(u: U) {
+fun <U> putU(u: U) {
 }
\ No newline at end of file
diff --git a/j2k/testData/fileOrElement/function/ownSeveralGenericParams.kt b/j2k/testData/fileOrElement/function/ownSeveralGenericParams.kt
index c9da1a73b37..6f04d1b814f 100644
--- a/j2k/testData/fileOrElement/function/ownSeveralGenericParams.kt
+++ b/j2k/testData/fileOrElement/function/ownSeveralGenericParams.kt
@@ -1,2 +1,2 @@
-internal fun <U, V, W> putUVW(u: U, v: V, w: W) {
+fun <U, V, W> putUVW(u: U, v: V, w: W) {
 }
\ No newline at end of file
diff --git a/j2k/testData/fileOrElement/function/parameterModification.kt b/j2k/testData/fileOrElement/function/parameterModification.kt
index 59d7ec29b54..6f9e8b853e1 100644
--- a/j2k/testData/fileOrElement/function/parameterModification.kt
+++ b/j2k/testData/fileOrElement/function/parameterModification.kt
@@ -1,4 +1,4 @@
-internal fun foo(p1: Int, p2: Int, p3: Int): Int {
+fun foo(p1: Int, p2: Int, p3: Int): Int {
     var p1 = p1
     var p3 = p3
     p1++
diff --git a/j2k/testData/fileOrElement/function/synchronizedMethod.kt b/j2k/testData/fileOrElement/function/synchronizedMethod.kt
index fbfb8454990..e02fe07935f 100644
--- a/j2k/testData/fileOrElement/function/synchronizedMethod.kt
+++ b/j2k/testData/fileOrElement/function/synchronizedMethod.kt
@@ -1,8 +1,8 @@
 internal class A {
-    @Synchronized internal fun foo() {
+    @Synchronized fun foo() {
         bar()
     }
 
-    internal fun bar() {
+    fun bar() {
     }
 }
\ No newline at end of file
diff --git a/j2k/testData/fileOrElement/function/throws.kt b/j2k/testData/fileOrElement/function/throws.kt
index b0497615f6a..13ac1a64825 100644
--- a/j2k/testData/fileOrElement/function/throws.kt
+++ b/j2k/testData/fileOrElement/function/throws.kt
@@ -1,2 +1,2 @@
 @Throws(IOException::class, SerializationException::class)
-internal fun foo()
\ No newline at end of file
+fun foo()
\ No newline at end of file
diff --git a/j2k/testData/fileOrElement/function/varVararg.kt b/j2k/testData/fileOrElement/function/varVararg.kt
index e46f9ddaf62..4a87cdc05e2 100644
--- a/j2k/testData/fileOrElement/function/varVararg.kt
+++ b/j2k/testData/fileOrElement/function/varVararg.kt
@@ -1,7 +1,7 @@
 package demo
 
 internal class Test {
-    internal fun test(vararg args: Any) {
+    fun test(vararg args: Any) {
         var args = args
         args = arrayOf(1, 2, 3)
     }
diff --git a/j2k/testData/fileOrElement/identifier/finalFieldReference.kt b/j2k/testData/fileOrElement/identifier/finalFieldReference.kt
index d94c48c911c..71767b10b8e 100644
--- a/j2k/testData/fileOrElement/identifier/finalFieldReference.kt
+++ b/j2k/testData/fileOrElement/identifier/finalFieldReference.kt
@@ -2,7 +2,7 @@ internal class `$$$$$`
 
 internal open class `$`
 
-internal class `$$`(internal val `$$$`: `$$$$$`) : `$`() {
+internal class `$$`(val `$$$`: `$$$$$`) : `$`() {
 
     fun `$$$$$$`(): `$$$$$` {
         return `$$$`
diff --git a/j2k/testData/fileOrElement/ifStatement/elseIf.kt b/j2k/testData/fileOrElement/ifStatement/elseIf.kt
index 1fb64066cd6..318da3fef2c 100644
--- a/j2k/testData/fileOrElement/ifStatement/elseIf.kt
+++ b/j2k/testData/fileOrElement/ifStatement/elseIf.kt
@@ -1,4 +1,4 @@
-internal fun foo() {
+fun foo() {
     if (a)
         println("a")
     else if (b)
diff --git a/j2k/testData/fileOrElement/inheritance/classOneExtendsBaseGeneric.kt b/j2k/testData/fileOrElement/inheritance/classOneExtendsBaseGeneric.kt
index 7d1141c33ce..896ce98b665 100644
--- a/j2k/testData/fileOrElement/inheritance/classOneExtendsBaseGeneric.kt
+++ b/j2k/testData/fileOrElement/inheritance/classOneExtendsBaseGeneric.kt
@@ -1,3 +1,3 @@
-internal open class Base<T> internal constructor(name: T)
+internal open class Base<T>(name: T)
 
-internal class One<T, K> internal constructor(name: T, private val mySecond: K) : Base<T>(name)
\ No newline at end of file
+internal class One<T, K>(name: T, private val mySecond: K) : Base<T>(name)
\ No newline at end of file
diff --git a/j2k/testData/fileOrElement/inheritance/classOneExtendsBaseWithOneParam.kt b/j2k/testData/fileOrElement/inheritance/classOneExtendsBaseWithOneParam.kt
index b904efc60b9..17ef4cd927d 100644
--- a/j2k/testData/fileOrElement/inheritance/classOneExtendsBaseWithOneParam.kt
+++ b/j2k/testData/fileOrElement/inheritance/classOneExtendsBaseWithOneParam.kt
@@ -1,3 +1,3 @@
-internal open class Base internal constructor(name: String)
+internal open class Base(name: String)
 
-internal class One internal constructor(name: String, second: String) : Base(name)
\ No newline at end of file
+internal class One(name: String, second: String) : Base(name)
\ No newline at end of file
diff --git a/j2k/testData/fileOrElement/inheritance/classOneExtendsBaseWithZeroParamsNonEmptyConstructor.kt b/j2k/testData/fileOrElement/inheritance/classOneExtendsBaseWithZeroParamsNonEmptyConstructor.kt
index 35905f9cb4c..090e66db118 100644
--- a/j2k/testData/fileOrElement/inheritance/classOneExtendsBaseWithZeroParamsNonEmptyConstructor.kt
+++ b/j2k/testData/fileOrElement/inheritance/classOneExtendsBaseWithZeroParamsNonEmptyConstructor.kt
@@ -1,3 +1,3 @@
-internal open class Base internal constructor(name: String)
+internal open class Base(name: String)
 
-internal class One internal constructor(name: String, private val mySecond: String) : Base(name)
\ No newline at end of file
+internal class One(name: String, private val mySecond: String) : Base(name)
\ No newline at end of file
diff --git a/j2k/testData/fileOrElement/inheritance/openModifier.kt b/j2k/testData/fileOrElement/inheritance/openModifier.kt
index b7eac93a180..ad21b07a913 100644
--- a/j2k/testData/fileOrElement/inheritance/openModifier.kt
+++ b/j2k/testData/fileOrElement/inheritance/openModifier.kt
@@ -37,7 +37,7 @@ internal abstract class E {
     internal open fun f2() {
     }
 
-    internal fun f3() {
+    fun f3() {
     }
 }
 
diff --git a/j2k/testData/fileOrElement/issues/comments.kt b/j2k/testData/fileOrElement/issues/comments.kt
index f440792e73c..90cbbf8ee2c 100644
--- a/j2k/testData/fileOrElement/issues/comments.kt
+++ b/j2k/testData/fileOrElement/issues/comments.kt
@@ -25,20 +25,20 @@ internal class C {
     }
 
     //simple one line comment for function
-    internal fun f1() {
+    fun f1() {
     }
 
     //simple one line comment for field
-    internal var j: Int = 0
+    var j: Int = 0
 
     //double c style
     //comment before function
-    internal fun f2() {
+    fun f2() {
     }
 
     //double c style
     //comment before field
-    internal var k: Int = 0
+    var k: Int = 0
 
     //combination
     /** of
@@ -48,7 +48,7 @@ internal class C {
      * different
      */
     //comments
-    internal fun f3() {
+    fun f3() {
     }
 
     //combination
@@ -59,8 +59,8 @@ internal class C {
      * different
      */
     //comments
-    internal var l: Int = 0
+    var l: Int = 0
 
     /*two*/ /*comments*//*line*/
-    internal var z: Int = 0
+    var z: Int = 0
 }
\ No newline at end of file
diff --git a/j2k/testData/fileOrElement/issues/kt-1074.kt b/j2k/testData/fileOrElement/issues/kt-1074.kt
index 16b0f00721b..e1435619ef1 100644
--- a/j2k/testData/fileOrElement/issues/kt-1074.kt
+++ b/j2k/testData/fileOrElement/issues/kt-1074.kt
@@ -1,7 +1,7 @@
 package demo
 
 internal object Test {
-    internal fun subListRangeCheck(fromIndex: Int, toIndex: Int, size: Int) {
+    fun subListRangeCheck(fromIndex: Int, toIndex: Int, size: Int) {
         if (fromIndex < 0)
             throw IndexOutOfBoundsException("fromIndex = " + fromIndex)
         if (toIndex > size)
diff --git a/j2k/testData/fileOrElement/issues/kt-5294.kt b/j2k/testData/fileOrElement/issues/kt-5294.kt
index 8c5a4277ab4..e3a17dcfdb0 100644
--- a/j2k/testData/fileOrElement/issues/kt-5294.kt
+++ b/j2k/testData/fileOrElement/issues/kt-5294.kt
@@ -1,4 +1,4 @@
-internal class X internal constructor(private val list: List<X.Y>) {
+internal class X(private val list: List<X.Y>) {
 
     internal inner class Y
 }
\ No newline at end of file
diff --git a/j2k/testData/fileOrElement/issues/kt-5400.kt b/j2k/testData/fileOrElement/issues/kt-5400.kt
index 7ff2504dbc5..5886a20474f 100644
--- a/j2k/testData/fileOrElement/issues/kt-5400.kt
+++ b/j2k/testData/fileOrElement/issues/kt-5400.kt
@@ -4,5 +4,5 @@ internal open class Base {
 }
 
 internal class Derived : Base() {
-    internal var field: Base.Nested
+    var field: Base.Nested
 }
\ No newline at end of file
diff --git a/j2k/testData/fileOrElement/issues/kt-543-boxed.kt b/j2k/testData/fileOrElement/issues/kt-543-boxed.kt
index 1d9d1c7bc3a..7322457e35f 100644
--- a/j2k/testData/fileOrElement/issues/kt-543-boxed.kt
+++ b/j2k/testData/fileOrElement/issues/kt-543-boxed.kt
@@ -1,10 +1,10 @@
 package demo
 
 internal class Test {
-    internal fun putInt(i: Int?) {
+    fun putInt(i: Int?) {
     }
 
-    internal fun test() {
+    fun test() {
         val b = 10
         putInt(b.toInt())
 
diff --git a/j2k/testData/fileOrElement/issues/kt-543-mixed.kt b/j2k/testData/fileOrElement/issues/kt-543-mixed.kt
index 04135d80b21..5b39dab8fd9 100644
--- a/j2k/testData/fileOrElement/issues/kt-543-mixed.kt
+++ b/j2k/testData/fileOrElement/issues/kt-543-mixed.kt
@@ -1,10 +1,10 @@
 package demo
 
 internal class Test {
-    internal fun putInt(i: Int?) {
+    fun putInt(i: Int?) {
     }
 
-    internal fun test() {
+    fun test() {
         val i = 10
         putInt(i)
     }
diff --git a/j2k/testData/fileOrElement/issues/kt-543.kt b/j2k/testData/fileOrElement/issues/kt-543.kt
index 55fc6eea636..e3e1ce9fc2a 100644
--- a/j2k/testData/fileOrElement/issues/kt-543.kt
+++ b/j2k/testData/fileOrElement/issues/kt-543.kt
@@ -1,10 +1,10 @@
 package demo
 
 internal class Test {
-    internal fun putInt(i: Int) {
+    fun putInt(i: Int) {
     }
 
-    internal fun test() {
+    fun test() {
         val b = 10
         putInt(b.toInt())
     }
diff --git a/j2k/testData/fileOrElement/issues/kt-792-mixed.kt b/j2k/testData/fileOrElement/issues/kt-792-mixed.kt
index 25cdaf0ea87..c42d5d13704 100644
--- a/j2k/testData/fileOrElement/issues/kt-792-mixed.kt
+++ b/j2k/testData/fileOrElement/issues/kt-792-mixed.kt
@@ -1,8 +1,8 @@
 package demo
 
-internal class Test internal constructor(i: Int?) {
+internal class Test(i: Int?) {
 
-    internal fun test() {
+    fun test() {
         val i = 10
         Test(i)
     }
diff --git a/j2k/testData/fileOrElement/issues/kt-792.kt b/j2k/testData/fileOrElement/issues/kt-792.kt
index 8489be57ac0..4bd12d5eaa0 100644
--- a/j2k/testData/fileOrElement/issues/kt-792.kt
+++ b/j2k/testData/fileOrElement/issues/kt-792.kt
@@ -1,8 +1,8 @@
 package demo
 
-internal class Test internal constructor(i: Int) {
+internal class Test(i: Int) {
 
-    internal fun test() {
+    fun test() {
         val b = 10
         Test(b.toInt())
     }
diff --git a/j2k/testData/fileOrElement/issues/kt-794-mixed.kt b/j2k/testData/fileOrElement/issues/kt-794-mixed.kt
index e78997ce32f..a1e9e4698fb 100644
--- a/j2k/testData/fileOrElement/issues/kt-794-mixed.kt
+++ b/j2k/testData/fileOrElement/issues/kt-794-mixed.kt
@@ -1,11 +1,11 @@
 package demo
 
 internal class Test {
-    internal fun getInteger(i: Int?): Int? {
+    fun getInteger(i: Int?): Int? {
         return i
     }
 
-    internal fun test() {
+    fun test() {
         val i = getInteger(10)!!
     }
 }
\ No newline at end of file
diff --git a/j2k/testData/fileOrElement/issues/kt-794.kt b/j2k/testData/fileOrElement/issues/kt-794.kt
index dd2be467e4d..5fbc2727308 100644
--- a/j2k/testData/fileOrElement/issues/kt-794.kt
+++ b/j2k/testData/fileOrElement/issues/kt-794.kt
@@ -1,5 +1,5 @@
 internal class Test {
-    internal fun getInt(): Int {
+    fun getInt(): Int {
         val b = 10
         return b.toInt()
     }
diff --git a/j2k/testData/fileOrElement/issues/kt-809-string.kt b/j2k/testData/fileOrElement/issues/kt-809-string.kt
index f391b655719..46f5937b242 100644
--- a/j2k/testData/fileOrElement/issues/kt-809-string.kt
+++ b/j2k/testData/fileOrElement/issues/kt-809-string.kt
@@ -1,20 +1,20 @@
 package demo
 
 internal class Container {
-    internal var myString = "1"
+    var myString = "1"
 }
 
 internal object One {
-    internal var myContainer = Container()
+    var myContainer = Container()
 }
 
-internal class StringContainer internal constructor(s: String)
+internal class StringContainer(s: String)
 
 internal class Test {
-    internal fun putString(s: String) {
+    fun putString(s: String) {
     }
 
-    internal fun test() {
+    fun test() {
         putString(One.myContainer.myString)
         StringContainer(One.myContainer.myString)
     }
diff --git a/j2k/testData/fileOrElement/issues/kt-809.kt b/j2k/testData/fileOrElement/issues/kt-809.kt
index f670d95b52f..145cfb26537 100644
--- a/j2k/testData/fileOrElement/issues/kt-809.kt
+++ b/j2k/testData/fileOrElement/issues/kt-809.kt
@@ -1,20 +1,20 @@
 package demo
 
 internal class Container {
-    internal var myInt = 1
+    var myInt = 1
 }
 
 internal object One {
-    internal var myContainer = Container()
+    var myContainer = Container()
 }
 
-internal class IntContainer internal constructor(i: Int)
+internal class IntContainer(i: Int)
 
 internal class Test {
-    internal fun putInt(i: Int) {
+    fun putInt(i: Int) {
     }
 
-    internal fun test() {
+    fun test() {
         putInt(One.myContainer.myInt)
         IntContainer(One.myContainer.myInt)
     }
diff --git a/j2k/testData/fileOrElement/issues/kt-820-field.kt b/j2k/testData/fileOrElement/issues/kt-820-field.kt
index fb5d804f9d4..ce8e7da3d93 100644
--- a/j2k/testData/fileOrElement/issues/kt-820-field.kt
+++ b/j2k/testData/fileOrElement/issues/kt-820-field.kt
@@ -1,13 +1,13 @@
 package demo
 
 internal class Container {
-    internal var myInt = 1
+    var myInt = 1
 }
 
 internal object One {
-    internal var myContainer = Container()
+    var myContainer = Container()
 }
 
 internal class Test {
-    internal var b = One.myContainer.myInt.toByte()
+    var b = One.myContainer.myInt.toByte()
 }
\ No newline at end of file
diff --git a/j2k/testData/fileOrElement/issues/kt-820.kt b/j2k/testData/fileOrElement/issues/kt-820.kt
index e245d07e359..45776f80a9c 100644
--- a/j2k/testData/fileOrElement/issues/kt-820.kt
+++ b/j2k/testData/fileOrElement/issues/kt-820.kt
@@ -1,15 +1,15 @@
 package demo
 
 internal class Container {
-    internal var myInt = 1
+    var myInt = 1
 }
 
 internal object One {
-    internal var myContainer = Container()
+    var myContainer = Container()
 }
 
 internal class Test {
-    internal fun test() {
+    fun test() {
         val b = One.myContainer.myInt.toByte()
     }
 }
\ No newline at end of file
diff --git a/j2k/testData/fileOrElement/issues/kt-824.kt b/j2k/testData/fileOrElement/issues/kt-824.kt
index e8293ce0ee4..29c8a509031 100644
--- a/j2k/testData/fileOrElement/issues/kt-824.kt
+++ b/j2k/testData/fileOrElement/issues/kt-824.kt
@@ -1,15 +1,15 @@
 package demo
 
 internal class Container {
-    internal var myBoolean = true
+    var myBoolean = true
 }
 
 internal object One {
-    internal var myContainer = Container()
+    var myContainer = Container()
 }
 
 internal class Test {
-    internal fun test() {
+    fun test() {
         if (One.myContainer.myBoolean)
             println("Ok")
 
diff --git a/j2k/testData/fileOrElement/issues/kt-828.kt b/j2k/testData/fileOrElement/issues/kt-828.kt
index dd02c0161c2..c43baa70a90 100644
--- a/j2k/testData/fileOrElement/issues/kt-828.kt
+++ b/j2k/testData/fileOrElement/issues/kt-828.kt
@@ -1,5 +1,5 @@
 internal class Test {
-    internal fun test() {
+    fun test() {
         var res = true
         res = res and false
         res = res or false
diff --git a/j2k/testData/fileOrElement/issues/kt-851.kt b/j2k/testData/fileOrElement/issues/kt-851.kt
index f72c8526364..e0ff1016237 100644
--- a/j2k/testData/fileOrElement/issues/kt-851.kt
+++ b/j2k/testData/fileOrElement/issues/kt-851.kt
@@ -1,8 +1,8 @@
 internal class Test {
-    internal fun putInt(i: Int) {
+    fun putInt(i: Int) {
     }
 
-    internal fun test() {
+    fun test() {
         val b = 10
         putInt(b.toInt())
     }
diff --git a/j2k/testData/fileOrElement/issues/kt-852.kt b/j2k/testData/fileOrElement/issues/kt-852.kt
index e80a3e3783b..8f0c15c5b21 100644
--- a/j2k/testData/fileOrElement/issues/kt-852.kt
+++ b/j2k/testData/fileOrElement/issues/kt-852.kt
@@ -1,7 +1,7 @@
 package demo
 
 internal class Test {
-    internal fun test(): String {
+    fun test(): String {
         val s1 = ""
         val s2 = ""
         val s3 = ""
diff --git a/j2k/testData/fileOrElement/issues/kt-893.kt b/j2k/testData/fileOrElement/issues/kt-893.kt
index dd55fb8c960..001676e255f 100644
--- a/j2k/testData/fileOrElement/issues/kt-893.kt
+++ b/j2k/testData/fileOrElement/issues/kt-893.kt
@@ -1,7 +1,7 @@
 package demo
 
 internal class Test {
-    internal fun test() {
+    fun test() {
         for (i in 0..9) {
             println(i)
         }
diff --git a/j2k/testData/fileOrElement/issues/kt-963.kt b/j2k/testData/fileOrElement/issues/kt-963.kt
index a0ae82e854b..03bae071c98 100644
--- a/j2k/testData/fileOrElement/issues/kt-963.kt
+++ b/j2k/testData/fileOrElement/issues/kt-963.kt
@@ -6,5 +6,5 @@ internal class C(a: Int) {
         abc = a * 2
     }
 
-    internal var abc = 0
+    var abc = 0
 }
\ No newline at end of file
diff --git a/j2k/testData/fileOrElement/issues/spaceBeforeAssignment.kt b/j2k/testData/fileOrElement/issues/spaceBeforeAssignment.kt
index e2deff34289..b2c82a31605 100644
--- a/j2k/testData/fileOrElement/issues/spaceBeforeAssignment.kt
+++ b/j2k/testData/fileOrElement/issues/spaceBeforeAssignment.kt
@@ -1,5 +1,5 @@
 import java.util.*
 
 internal class A {
-    internal var list: List<String> = ArrayList()
+    var list: List<String> = ArrayList()
 }
\ No newline at end of file
diff --git a/j2k/testData/fileOrElement/kotlinApiAccess/ClassObjectMembers.kt b/j2k/testData/fileOrElement/kotlinApiAccess/ClassObjectMembers.kt
index 391a2b43c66..fde5ce169c6 100644
--- a/j2k/testData/fileOrElement/kotlinApiAccess/ClassObjectMembers.kt
+++ b/j2k/testData/fileOrElement/kotlinApiAccess/ClassObjectMembers.kt
@@ -1,7 +1,7 @@
 import kotlinApi.KotlinClass
 
 internal class C {
-    internal fun foo(): Int {
+    fun foo(): Int {
         KotlinClass.staticVar = KotlinClass.staticVar * 2
         KotlinClass.staticProperty = KotlinClass.staticVar + KotlinClass.staticProperty
         return KotlinClass.staticFun(1)
diff --git a/j2k/testData/fileOrElement/kotlinApiAccess/CorrectFunNullabilityDetected.kt b/j2k/testData/fileOrElement/kotlinApiAccess/CorrectFunNullabilityDetected.kt
index d3e46189e06..58eb16f8a60 100644
--- a/j2k/testData/fileOrElement/kotlinApiAccess/CorrectFunNullabilityDetected.kt
+++ b/j2k/testData/fileOrElement/kotlinApiAccess/CorrectFunNullabilityDetected.kt
@@ -1,7 +1,7 @@
 import kotlinApi.*
 
 internal class A {
-    internal fun foo(t: KotlinTrait): Int {
+    fun foo(t: KotlinTrait): Int {
         return t.nullableFun()!!.length() + t.notNullableFun().length()
     }
 }
\ No newline at end of file
diff --git a/j2k/testData/fileOrElement/kotlinApiAccess/CorrectNullabilityDetected.kt b/j2k/testData/fileOrElement/kotlinApiAccess/CorrectNullabilityDetected.kt
index 41a818c54de..ba53d71606e 100644
--- a/j2k/testData/fileOrElement/kotlinApiAccess/CorrectNullabilityDetected.kt
+++ b/j2k/testData/fileOrElement/kotlinApiAccess/CorrectNullabilityDetected.kt
@@ -1,7 +1,7 @@
 import kotlinApi.*
 
 internal class A {
-    internal fun foo(c: KotlinClass): Int {
+    fun foo(c: KotlinClass): Int {
         return c.nullableProperty!!.length() + c.property.length() + KotlinClass.nullableStaticVar!! + KotlinClass.staticVar + KotlinClass.nullableStaticFun(1)!! + KotlinClass.staticFun(1) + nullableGlobalFunction("")!!.length() + globalFunction("").length()
     }
 }
\ No newline at end of file
diff --git a/j2k/testData/fileOrElement/kotlinApiAccess/ExtensionFunction.kt b/j2k/testData/fileOrElement/kotlinApiAccess/ExtensionFunction.kt
index 880f3a3c99a..63534b0507f 100644
--- a/j2k/testData/fileOrElement/kotlinApiAccess/ExtensionFunction.kt
+++ b/j2k/testData/fileOrElement/kotlinApiAccess/ExtensionFunction.kt
@@ -1,7 +1,7 @@
 import kotlinApi.*
 
 internal class C {
-    internal fun foo() {
+    fun foo() {
         val s = 1.extensionFunction()
     }
 }
\ No newline at end of file
diff --git a/j2k/testData/fileOrElement/kotlinApiAccess/ExtensionProperty.kt b/j2k/testData/fileOrElement/kotlinApiAccess/ExtensionProperty.kt
index 6757eaf0105..09dc691733a 100644
--- a/j2k/testData/fileOrElement/kotlinApiAccess/ExtensionProperty.kt
+++ b/j2k/testData/fileOrElement/kotlinApiAccess/ExtensionProperty.kt
@@ -1,7 +1,7 @@
 import kotlinApi.*
 
 internal class C {
-    internal fun foo(): Int {
+    fun foo(): Int {
         "a".extensionProperty = 1
         return "b".extensionProperty
     }
diff --git a/j2k/testData/fileOrElement/kotlinApiAccess/GlobalFunction.kt b/j2k/testData/fileOrElement/kotlinApiAccess/GlobalFunction.kt
index 887040c8488..d28d24a15a3 100644
--- a/j2k/testData/fileOrElement/kotlinApiAccess/GlobalFunction.kt
+++ b/j2k/testData/fileOrElement/kotlinApiAccess/GlobalFunction.kt
@@ -1,7 +1,7 @@
 import kotlinApi.*
 
 internal class C {
-    internal fun foo() {
+    fun foo() {
         val s = globalFunction("x")
     }
 }
diff --git a/j2k/testData/fileOrElement/kotlinApiAccess/GlobalGenericFunction.kt b/j2k/testData/fileOrElement/kotlinApiAccess/GlobalGenericFunction.kt
index 64c63b0819f..464bf49803a 100644
--- a/j2k/testData/fileOrElement/kotlinApiAccess/GlobalGenericFunction.kt
+++ b/j2k/testData/fileOrElement/kotlinApiAccess/GlobalGenericFunction.kt
@@ -1,7 +1,7 @@
 import kotlinApi.*
 
 internal class C {
-    internal fun foo() {
+    fun foo() {
         val v = globalGenericFunction(1)
     }
 }
\ No newline at end of file
diff --git a/j2k/testData/fileOrElement/kotlinApiAccess/GlobalValue1.kt b/j2k/testData/fileOrElement/kotlinApiAccess/GlobalValue1.kt
index 26336929c94..abd86cd845e 100644
--- a/j2k/testData/fileOrElement/kotlinApiAccess/GlobalValue1.kt
+++ b/j2k/testData/fileOrElement/kotlinApiAccess/GlobalValue1.kt
@@ -1,7 +1,7 @@
 import kotlinApi.*
 
 internal class C {
-    internal fun foo(): Int {
+    fun foo(): Int {
         globalValue1 = 0
         return globalValue1
     }
diff --git a/j2k/testData/fileOrElement/kotlinApiAccess/GlobalValue2.kt b/j2k/testData/fileOrElement/kotlinApiAccess/GlobalValue2.kt
index b03d9ca09a9..86653ad4f91 100644
--- a/j2k/testData/fileOrElement/kotlinApiAccess/GlobalValue2.kt
+++ b/j2k/testData/fileOrElement/kotlinApiAccess/GlobalValue2.kt
@@ -1,7 +1,7 @@
 import kotlinApi.*
 
 internal class C {
-    internal fun foo(): Int {
+    fun foo(): Int {
         globalValue2 = 0
         return globalValue2
     }
diff --git a/j2k/testData/fileOrElement/kotlinApiAccess/InheritedProperty.kt b/j2k/testData/fileOrElement/kotlinApiAccess/InheritedProperty.kt
index 4ade6160bca..c5e7f14c2c1 100644
--- a/j2k/testData/fileOrElement/kotlinApiAccess/InheritedProperty.kt
+++ b/j2k/testData/fileOrElement/kotlinApiAccess/InheritedProperty.kt
@@ -2,7 +2,7 @@
 import kotlinApi.*
 
 internal class C : KotlinClass() {
-    internal fun foo() {
+    fun foo() {
         println(property)
         property = "a"
     }
diff --git a/j2k/testData/fileOrElement/kotlinApiAccess/ObjectMembers.kt b/j2k/testData/fileOrElement/kotlinApiAccess/ObjectMembers.kt
index 7d7e091e235..c0073962dc4 100644
--- a/j2k/testData/fileOrElement/kotlinApiAccess/ObjectMembers.kt
+++ b/j2k/testData/fileOrElement/kotlinApiAccess/ObjectMembers.kt
@@ -1,7 +1,7 @@
 import kotlinApi.KotlinObject
 
 internal class C {
-    internal fun foo(): Int {
+    fun foo(): Int {
         KotlinObject.property1 = 1
         KotlinObject.property2 = 2
         return KotlinObject.foo() + KotlinObject.property1 + KotlinObject.property2
diff --git a/j2k/testData/fileOrElement/kotlinApiAccess/Property.kt b/j2k/testData/fileOrElement/kotlinApiAccess/Property.kt
index d822e6b656e..d1b0c94494b 100644
--- a/j2k/testData/fileOrElement/kotlinApiAccess/Property.kt
+++ b/j2k/testData/fileOrElement/kotlinApiAccess/Property.kt
@@ -1,7 +1,7 @@
 import kotlinApi.*
 
 internal class C {
-    internal fun foo(k: KotlinClass) {
+    fun foo(k: KotlinClass) {
         println(k.property)
         k.property = "a"
     }
diff --git a/j2k/testData/fileOrElement/kotlinApiAccess/Property2.kt b/j2k/testData/fileOrElement/kotlinApiAccess/Property2.kt
index e1dd60bd1b1..9038e2c81cf 100644
--- a/j2k/testData/fileOrElement/kotlinApiAccess/Property2.kt
+++ b/j2k/testData/fileOrElement/kotlinApiAccess/Property2.kt
@@ -1,7 +1,7 @@
 import kotlinApi.*
 
 internal class C {
-    internal fun foo(k: KotlinClass) {
+    fun foo(k: KotlinClass) {
         println(k.field)
         k.field = 1
     }
diff --git a/j2k/testData/fileOrElement/literalExpression/char.kt b/j2k/testData/fileOrElement/literalExpression/char.kt
index 38355d2bab2..ef93451178a 100644
--- a/j2k/testData/fileOrElement/literalExpression/char.kt
+++ b/j2k/testData/fileOrElement/literalExpression/char.kt
@@ -1,5 +1,5 @@
 internal class Test {
-    internal fun test() {
+    fun test() {
         val c1 = 'c'
         val c2 = 'C'
     }
diff --git a/j2k/testData/fileOrElement/literalExpression/dollarInsideString.kt b/j2k/testData/fileOrElement/literalExpression/dollarInsideString.kt
index 29a2cc42078..b6f4526ef87 100644
--- a/j2k/testData/fileOrElement/literalExpression/dollarInsideString.kt
+++ b/j2k/testData/fileOrElement/literalExpression/dollarInsideString.kt
@@ -1,7 +1,7 @@
 package demo
 
 internal class Test {
-    internal fun test() {
+    fun test() {
         var name = "$$$$"
         name = name.replaceAll("\\$[0-9]+", "\\$")
 
diff --git a/j2k/testData/fileOrElement/literalExpression/double.kt b/j2k/testData/fileOrElement/literalExpression/double.kt
index 280ccbe2873..9d9de2fe927 100644
--- a/j2k/testData/fileOrElement/literalExpression/double.kt
+++ b/j2k/testData/fileOrElement/literalExpression/double.kt
@@ -7,13 +7,13 @@ internal class A {
     private val d6 = 1.0
     private val d7 = Math.sqrt(2.0) - 1
 
-    internal fun foo1(d: Double) {
+    fun foo1(d: Double) {
     }
 
-    internal fun foo2(d: Double?) {
+    fun foo2(d: Double?) {
     }
 
-    internal fun bar() {
+    fun bar() {
         foo1(1.0)
         foo1(1.0)
         foo1(1.0)
diff --git a/j2k/testData/fileOrElement/literalExpression/endsWithDFL.kt b/j2k/testData/fileOrElement/literalExpression/endsWithDFL.kt
index 93888b19a9b..955f1ee6db8 100644
--- a/j2k/testData/fileOrElement/literalExpression/endsWithDFL.kt
+++ b/j2k/testData/fileOrElement/literalExpression/endsWithDFL.kt
@@ -1,5 +1,5 @@
 internal class Test {
-    internal fun test() {
+    fun test() {
         val l1 = 10L
         val d1 = 10.0
         val f1 = 10.0f
@@ -9,7 +9,7 @@ internal class Test {
         val f2 = 10.0f
     }
 
-    internal fun testBoxed() {
+    fun testBoxed() {
         val l1 = 10L
         val d1 = 10.0
         val f1 = 10.0f
diff --git a/j2k/testData/fileOrElement/literalExpression/float.kt b/j2k/testData/fileOrElement/literalExpression/float.kt
index bc2c6cbf652..483698051fa 100644
--- a/j2k/testData/fileOrElement/literalExpression/float.kt
+++ b/j2k/testData/fileOrElement/literalExpression/float.kt
@@ -8,13 +8,13 @@ internal class A {
     private val f7 = -1f
     private val f8 = +1f
 
-    internal fun foo1(f: Float) {
+    fun foo1(f: Float) {
     }
 
-    internal fun foo2(f: Float?) {
+    fun foo2(f: Float?) {
     }
 
-    internal fun bar() {
+    fun bar() {
         foo1(1f)
         foo2(1f)
         foo1(1f)
diff --git a/j2k/testData/fileOrElement/literalExpression/hex.kt b/j2k/testData/fileOrElement/literalExpression/hex.kt
index 9c736026746..690245b168e 100644
--- a/j2k/testData/fileOrElement/literalExpression/hex.kt
+++ b/j2k/testData/fileOrElement/literalExpression/hex.kt
@@ -1,5 +1,5 @@
 internal class Test {
-    internal fun test() {
+    fun test() {
         val i1 = 33
         val i2 = 51
     }
diff --git a/j2k/testData/fileOrElement/literalExpression/long.kt b/j2k/testData/fileOrElement/literalExpression/long.kt
index 8a34f586aef..7a131d68e00 100644
--- a/j2k/testData/fileOrElement/literalExpression/long.kt
+++ b/j2k/testData/fileOrElement/literalExpression/long.kt
@@ -8,13 +8,13 @@ internal class A {
     private val l7 = +1
     private val l8 = +1L
 
-    internal fun foo1(l: Long) {
+    fun foo1(l: Long) {
     }
 
-    internal fun foo2(l: Long?) {
+    fun foo2(l: Long?) {
     }
 
-    internal fun bar() {
+    fun bar() {
         foo1(1)
         foo1(1L)
         foo2(1L)
diff --git a/j2k/testData/fileOrElement/literalExpression/octal.kt b/j2k/testData/fileOrElement/literalExpression/octal.kt
index bb68e9e4fdd..0c43f2bf127 100644
--- a/j2k/testData/fileOrElement/literalExpression/octal.kt
+++ b/j2k/testData/fileOrElement/literalExpression/octal.kt
@@ -1,5 +1,5 @@
 internal class Test {
-    internal fun test() {
+    fun test() {
         val i1 = 37
         val i2 = 26
     }
diff --git a/j2k/testData/fileOrElement/literalExpression/trueOrFalse.kt b/j2k/testData/fileOrElement/literalExpression/trueOrFalse.kt
index ae4a7b22f43..1bc566a1c83 100644
--- a/j2k/testData/fileOrElement/literalExpression/trueOrFalse.kt
+++ b/j2k/testData/fileOrElement/literalExpression/trueOrFalse.kt
@@ -1,5 +1,5 @@
 internal class Test {
-    internal fun test() {
+    fun test() {
         val t1 = true
         val t2 = true
 
diff --git a/j2k/testData/fileOrElement/localVariable/autoBangBang.kt b/j2k/testData/fileOrElement/localVariable/autoBangBang.kt
index a36e6f2e7dc..076cff468aa 100644
--- a/j2k/testData/fileOrElement/localVariable/autoBangBang.kt
+++ b/j2k/testData/fileOrElement/localVariable/autoBangBang.kt
@@ -1,4 +1,4 @@
-internal fun foo(i: Int?) {
+fun foo(i: Int?) {
     var i1 = i!!
     i1++
 }
\ No newline at end of file
diff --git a/j2k/testData/fileOrElement/localVariable/conversion.kt b/j2k/testData/fileOrElement/localVariable/conversion.kt
index 9c1c18fc549..292c6507953 100644
--- a/j2k/testData/fileOrElement/localVariable/conversion.kt
+++ b/j2k/testData/fileOrElement/localVariable/conversion.kt
@@ -1,4 +1,4 @@
-internal fun foo(b: Byte) {
+fun foo(b: Byte) {
     var i: Int? = b.toInt()
     if (p) i = 10
 }
\ No newline at end of file
diff --git a/j2k/testData/fileOrElement/localVariable/literalConversion.kt b/j2k/testData/fileOrElement/localVariable/literalConversion.kt
index bbb6352d916..e7a2ba90a3f 100644
--- a/j2k/testData/fileOrElement/localVariable/literalConversion.kt
+++ b/j2k/testData/fileOrElement/localVariable/literalConversion.kt
@@ -1,4 +1,4 @@
-internal fun foo() {
+fun foo() {
     var i: Long = 1
     if (p) i = 10
 }
\ No newline at end of file
diff --git a/j2k/testData/fileOrElement/localVariable/unboxing.kt b/j2k/testData/fileOrElement/localVariable/unboxing.kt
index a2920eb4fbb..8cf5718da49 100644
--- a/j2k/testData/fileOrElement/localVariable/unboxing.kt
+++ b/j2k/testData/fileOrElement/localVariable/unboxing.kt
@@ -1,4 +1,4 @@
-internal fun foo() {
+fun foo() {
     var i: Int? = 1
     if (p) i = null
 }
\ No newline at end of file
diff --git a/j2k/testData/fileOrElement/localVariable/valTypeDoNotMatch.kt b/j2k/testData/fileOrElement/localVariable/valTypeDoNotMatch.kt
index 8eef363c729..50cdf727ad9 100644
--- a/j2k/testData/fileOrElement/localVariable/valTypeDoNotMatch.kt
+++ b/j2k/testData/fileOrElement/localVariable/valTypeDoNotMatch.kt
@@ -1,3 +1,3 @@
-internal fun foo() {
+fun foo() {
     val o = ""
 }
\ No newline at end of file
diff --git a/j2k/testData/fileOrElement/localVariable/varTypeDoNotMatch.kt b/j2k/testData/fileOrElement/localVariable/varTypeDoNotMatch.kt
index 70926216813..498ad219164 100644
--- a/j2k/testData/fileOrElement/localVariable/varTypeDoNotMatch.kt
+++ b/j2k/testData/fileOrElement/localVariable/varTypeDoNotMatch.kt
@@ -1,4 +1,4 @@
-internal fun foo() {
+fun foo() {
     var o: Any? = ""
     if (p) o = null
 }
\ No newline at end of file
diff --git a/j2k/testData/fileOrElement/localVariable/varWithNoInitializer.kt b/j2k/testData/fileOrElement/localVariable/varWithNoInitializer.kt
index 44313a06059..5b6ce5c1751 100644
--- a/j2k/testData/fileOrElement/localVariable/varWithNoInitializer.kt
+++ b/j2k/testData/fileOrElement/localVariable/varWithNoInitializer.kt
@@ -1,5 +1,5 @@
 internal class C {
-    internal fun foo(p: Boolean): Int {
+    fun foo(p: Boolean): Int {
         var a: Int
         var b: Int
         a = 10
diff --git a/j2k/testData/fileOrElement/methodCallExpression/collectionsMethods.kt b/j2k/testData/fileOrElement/methodCallExpression/collectionsMethods.kt
index 3f48e74311e..8f7dba38b3b 100644
--- a/j2k/testData/fileOrElement/methodCallExpression/collectionsMethods.kt
+++ b/j2k/testData/fileOrElement/methodCallExpression/collectionsMethods.kt
@@ -1,7 +1,7 @@
 import java.util.*
 
 internal class A {
-    internal fun foo(): Map<String, String> {
+    fun foo(): Map<String, String> {
         val list1 = emptyList<String>()
         val list2 = listOf(1)
         val set1 = emptySet<String>()
diff --git a/j2k/testData/fileOrElement/methodCallExpression/collectionsMethods2.kt b/j2k/testData/fileOrElement/methodCallExpression/collectionsMethods2.kt
index 3c351964b15..a3dd2648978 100644
--- a/j2k/testData/fileOrElement/methodCallExpression/collectionsMethods2.kt
+++ b/j2k/testData/fileOrElement/methodCallExpression/collectionsMethods2.kt
@@ -3,7 +3,7 @@
 import java.util.*
 
 internal class A {
-    internal fun foo() {
+    fun foo() {
         val list = listOf<String>(null)
         val set = setOf<String>(null)
     }
diff --git a/j2k/testData/fileOrElement/methodCallExpression/genericMethod.kt b/j2k/testData/fileOrElement/methodCallExpression/genericMethod.kt
index 26bfdf4f868..1dfb4fac31a 100644
--- a/j2k/testData/fileOrElement/methodCallExpression/genericMethod.kt
+++ b/j2k/testData/fileOrElement/methodCallExpression/genericMethod.kt
@@ -1,12 +1,12 @@
 package demo
 
 internal class Map {
-    internal fun <K, V> put(k: K?, v: V) {
+    fun <K, V> put(k: K?, v: V) {
     }
 }
 
 internal class U {
-    internal fun test() {
+    fun test() {
         val m = Map()
         m.put<String, Int>(null, 10)
     }
diff --git a/j2k/testData/fileOrElement/methodCallExpression/getClass.kt b/j2k/testData/fileOrElement/methodCallExpression/getClass.kt
index 4734b9c1db5..0b3be1c171c 100644
--- a/j2k/testData/fileOrElement/methodCallExpression/getClass.kt
+++ b/j2k/testData/fileOrElement/methodCallExpression/getClass.kt
@@ -1,5 +1,5 @@
 internal class A {
-    internal fun foo(o: Any) {
+    fun foo(o: Any) {
         println(o.javaClass)
         println(javaClass)
     }
diff --git a/j2k/testData/fileOrElement/methodCallExpression/systemOut.kt b/j2k/testData/fileOrElement/methodCallExpression/systemOut.kt
index d0796fd2180..7720c75c8a5 100644
--- a/j2k/testData/fileOrElement/methodCallExpression/systemOut.kt
+++ b/j2k/testData/fileOrElement/methodCallExpression/systemOut.kt
@@ -1,5 +1,5 @@
 internal class A {
-    internal fun foo() {
+    fun foo() {
         println()
         println(1)
         println("1")
diff --git a/j2k/testData/fileOrElement/methodCallExpression/vararg1.kt b/j2k/testData/fileOrElement/methodCallExpression/vararg1.kt
index 5fa9d941b08..f6e9408a841 100644
--- a/j2k/testData/fileOrElement/methodCallExpression/vararg1.kt
+++ b/j2k/testData/fileOrElement/methodCallExpression/vararg1.kt
@@ -2,7 +2,7 @@ import java.lang.reflect.Constructor
 
 internal object X {
     @Throws(Exception::class)
-    internal fun <T> foo(constructor: Constructor<T>, args1: Array<Any>, args2: Array<Any>) {
+    fun <T> foo(constructor: Constructor<T>, args1: Array<Any>, args2: Array<Any>) {
         constructor.newInstance(*args1)
         constructor.newInstance(args1, args2)
     }
diff --git a/j2k/testData/fileOrElement/methodCallExpression/vararg2.kt b/j2k/testData/fileOrElement/methodCallExpression/vararg2.kt
index d9004f86425..ab0ce04239f 100644
--- a/j2k/testData/fileOrElement/methodCallExpression/vararg2.kt
+++ b/j2k/testData/fileOrElement/methodCallExpression/vararg2.kt
@@ -1,7 +1,7 @@
 import javaApi.WithVarargConstructor
 
 internal class X {
-    internal fun foo() {
+    fun foo() {
         val o1 = WithVarargConstructor(1, *arrayOf<Any>("a"))
         val o2 = WithVarargConstructor(2, arrayOf<Any>("a"), arrayOf<Any>("b"))
         val o3 = WithVarargConstructor(2, "a")
diff --git a/j2k/testData/fileOrElement/mutableCollections/FunctionParameters.kt b/j2k/testData/fileOrElement/mutableCollections/FunctionParameters.kt
index 063d3756ceb..75d142c0c65 100644
--- a/j2k/testData/fileOrElement/mutableCollections/FunctionParameters.kt
+++ b/j2k/testData/fileOrElement/mutableCollections/FunctionParameters.kt
@@ -2,10 +2,10 @@
 import java.util.*
 
 internal class A<T> {
-    internal fun foo(nonMutableCollection: Collection<String>,
-                     mutableCollection: MutableCollection<String>,
-                     mutableSet: MutableSet<T>,
-                     mutableMap: MutableMap<String, T>) {
+    fun foo(nonMutableCollection: Collection<String>,
+            mutableCollection: MutableCollection<String>,
+            mutableSet: MutableSet<T>,
+            mutableMap: MutableMap<String, T>) {
         mutableCollection.addAll(nonMutableCollection)
         mutableSet.add(mutableMap.remove("a"))
     }
diff --git a/j2k/testData/fileOrElement/mutableCollections/FunctionParameters2.kt b/j2k/testData/fileOrElement/mutableCollections/FunctionParameters2.kt
index c1d1f664117..ad3edcba85e 100644
--- a/j2k/testData/fileOrElement/mutableCollections/FunctionParameters2.kt
+++ b/j2k/testData/fileOrElement/mutableCollections/FunctionParameters2.kt
@@ -1,11 +1,11 @@
 import java.util.*
 
 internal class A {
-    internal fun foo(set: MutableSet<String>) {
+    fun foo(set: MutableSet<String>) {
         bar(set)
     }
 
-    internal fun bar(collection: MutableCollection<String>) {
+    fun bar(collection: MutableCollection<String>) {
         collection.add("a")
     }
 }
diff --git a/j2k/testData/fileOrElement/mutableCollections/FunctionReturnValue.kt b/j2k/testData/fileOrElement/mutableCollections/FunctionReturnValue.kt
index 17be8c5fd4f..598698a34d9 100644
--- a/j2k/testData/fileOrElement/mutableCollections/FunctionReturnValue.kt
+++ b/j2k/testData/fileOrElement/mutableCollections/FunctionReturnValue.kt
@@ -1,11 +1,11 @@
 import java.util.*
 
 internal class A {
-    internal fun createCollection(): MutableCollection<String> {
+    fun createCollection(): MutableCollection<String> {
         return ArrayList()
     }
 
-    internal fun foo(): Collection<String> {
+    fun foo(): Collection<String> {
         val collection = createCollection()
         collection.add("a")
         return collection
diff --git a/j2k/testData/fileOrElement/mutableCollections/FunctionReturnValue2.kt b/j2k/testData/fileOrElement/mutableCollections/FunctionReturnValue2.kt
index faf98eaea92..c9fdd3cc1ea 100644
--- a/j2k/testData/fileOrElement/mutableCollections/FunctionReturnValue2.kt
+++ b/j2k/testData/fileOrElement/mutableCollections/FunctionReturnValue2.kt
@@ -1,13 +1,13 @@
 import java.util.*
 
-internal class A internal constructor() {
+internal class A {
     private val collection: MutableCollection<String>
 
     init {
         collection = createCollection()
     }
 
-    internal fun createCollection(): MutableCollection<String> {
+    fun createCollection(): MutableCollection<String> {
         return ArrayList()
     }
 
diff --git a/j2k/testData/fileOrElement/mutableCollections/Recursion.kt b/j2k/testData/fileOrElement/mutableCollections/Recursion.kt
index 5953c36ff22..adcc4ff8053 100644
--- a/j2k/testData/fileOrElement/mutableCollections/Recursion.kt
+++ b/j2k/testData/fileOrElement/mutableCollections/Recursion.kt
@@ -1,11 +1,11 @@
 import java.util.*
 
 internal class A {
-    internal fun foo(collection: MutableCollection<String>) {
+    fun foo(collection: MutableCollection<String>) {
         bar(collection)
     }
 
-    internal fun bar(collection: MutableCollection<String>) {
+    fun bar(collection: MutableCollection<String>) {
         if (collection.size() < 5) {
             foo(collection)
         } else {
diff --git a/j2k/testData/fileOrElement/newClassExpression/fullQualifiedName.kt b/j2k/testData/fileOrElement/newClassExpression/fullQualifiedName.kt
index 19f08a2b0bd..5164446a254 100644
--- a/j2k/testData/fileOrElement/newClassExpression/fullQualifiedName.kt
+++ b/j2k/testData/fileOrElement/newClassExpression/fullQualifiedName.kt
@@ -2,7 +2,7 @@
 package test
 
 internal class User {
-    internal fun main() {
+    fun main() {
         val list = java.util.ArrayList()
     }
 }
\ No newline at end of file
diff --git a/j2k/testData/fileOrElement/newClassExpression/fullQualifiedName2.kt b/j2k/testData/fileOrElement/newClassExpression/fullQualifiedName2.kt
index 19f08a2b0bd..5164446a254 100644
--- a/j2k/testData/fileOrElement/newClassExpression/fullQualifiedName2.kt
+++ b/j2k/testData/fileOrElement/newClassExpression/fullQualifiedName2.kt
@@ -2,7 +2,7 @@
 package test
 
 internal class User {
-    internal fun main() {
+    fun main() {
         val list = java.util.ArrayList()
     }
 }
\ No newline at end of file
diff --git a/j2k/testData/fileOrElement/newClassExpression/genericClassInvocation.kt b/j2k/testData/fileOrElement/newClassExpression/genericClassInvocation.kt
index 8be554970fb..df8de932f9c 100644
--- a/j2k/testData/fileOrElement/newClassExpression/genericClassInvocation.kt
+++ b/j2k/testData/fileOrElement/newClassExpression/genericClassInvocation.kt
@@ -1,7 +1,7 @@
 import java.util.ArrayList
 
 internal class User {
-    internal fun main() {
+    fun main() {
         val list = ArrayList<String>()
     }
 }
\ No newline at end of file
diff --git a/j2k/testData/fileOrElement/newClassExpression/lineBreaks.kt b/j2k/testData/fileOrElement/newClassExpression/lineBreaks.kt
index 193baeb73b9..3790a35a9e0 100644
--- a/j2k/testData/fileOrElement/newClassExpression/lineBreaks.kt
+++ b/j2k/testData/fileOrElement/newClassExpression/lineBreaks.kt
@@ -1,7 +1,7 @@
-internal class C internal constructor(p1: Int, p2: Int, p3: Int)
+internal class C(p1: Int, p2: Int, p3: Int)
 
 internal class User {
-    internal fun foo() {
+    fun foo() {
         C(1,
                 2,
                 3)
diff --git a/j2k/testData/fileOrElement/newClassExpression/newAnonymousClass2.kt b/j2k/testData/fileOrElement/newClassExpression/newAnonymousClass2.kt
index 8f231152fcd..b7c0109f367 100644
--- a/j2k/testData/fileOrElement/newClassExpression/newAnonymousClass2.kt
+++ b/j2k/testData/fileOrElement/newClassExpression/newAnonymousClass2.kt
@@ -1,7 +1,7 @@
 internal abstract class A
 
 internal class C {
-    internal fun foo() {
+    fun foo() {
         val a = object : A() {
             override fun toString(): String {
                 return "a"
diff --git a/j2k/testData/fileOrElement/newClassExpression/newAnonymousClass3.kt b/j2k/testData/fileOrElement/newClassExpression/newAnonymousClass3.kt
index 166ff9fba80..15e285d3f5c 100644
--- a/j2k/testData/fileOrElement/newClassExpression/newAnonymousClass3.kt
+++ b/j2k/testData/fileOrElement/newClassExpression/newAnonymousClass3.kt
@@ -1,7 +1,7 @@
 import kotlinApi.KotlinTrait
 
 internal class C {
-    internal fun foo() {
+    fun foo() {
         val t = object : KotlinTrait {
             override fun nullableFun(): String? {
                 return null
diff --git a/j2k/testData/fileOrElement/newClassExpression/newClassByFullName.kt b/j2k/testData/fileOrElement/newClassExpression/newClassByFullName.kt
index cb8dfda4a5b..f6e8396b130 100644
--- a/j2k/testData/fileOrElement/newClassExpression/newClassByFullName.kt
+++ b/j2k/testData/fileOrElement/newClassExpression/newClassByFullName.kt
@@ -3,7 +3,7 @@ package org.test
 internal class Library
 
 internal class User {
-    internal fun main() {
+    fun main() {
         val lib = Library()
     }
 }
\ No newline at end of file
diff --git a/j2k/testData/fileOrElement/newClassExpression/newInnerClass.kt b/j2k/testData/fileOrElement/newClassExpression/newInnerClass.kt
index 9769ee1c1df..b0ecbff06d5 100644
--- a/j2k/testData/fileOrElement/newClassExpression/newInnerClass.kt
+++ b/j2k/testData/fileOrElement/newClassExpression/newInnerClass.kt
@@ -5,7 +5,7 @@ internal class OuterClass {
 }
 
 internal class User {
-    internal fun main() {
+    fun main() {
         val outerObject = OuterClass()
         val innerObject = outerObject.InnerClass()
     }
diff --git a/j2k/testData/fileOrElement/newClassExpression/newListAndNewMember.kt b/j2k/testData/fileOrElement/newClassExpression/newListAndNewMember.kt
index 2a0186cdee8..61394d125fd 100644
--- a/j2k/testData/fileOrElement/newClassExpression/newListAndNewMember.kt
+++ b/j2k/testData/fileOrElement/newClassExpression/newListAndNewMember.kt
@@ -5,7 +5,7 @@ import java.util.ArrayList
 internal class Member
 
 internal class User {
-    internal fun main() {
+    fun main() {
         val members = ArrayList<Member>()
         members.add(Member())
     }
diff --git a/j2k/testData/fileOrElement/newClassExpression/newStaticInnerClass.kt b/j2k/testData/fileOrElement/newClassExpression/newStaticInnerClass.kt
index 4ce8fe98604..c028ddcc4c4 100644
--- a/j2k/testData/fileOrElement/newClassExpression/newStaticInnerClass.kt
+++ b/j2k/testData/fileOrElement/newClassExpression/newStaticInnerClass.kt
@@ -5,7 +5,7 @@ internal class Foo {
 }
 
 internal class User {
-    internal fun main() {
+    fun main() {
         val boo = Foo.Bar()
     }
 }
\ No newline at end of file
diff --git a/j2k/testData/fileOrElement/nullability/FieldAssignedWithNull.kt b/j2k/testData/fileOrElement/nullability/FieldAssignedWithNull.kt
index 9e6309536d9..8fe0726e49f 100644
--- a/j2k/testData/fileOrElement/nullability/FieldAssignedWithNull.kt
+++ b/j2k/testData/fileOrElement/nullability/FieldAssignedWithNull.kt
@@ -1,7 +1,7 @@
 internal class C {
     private var s: String? = ""
 
-    internal fun foo() {
+    fun foo() {
         s = null
     }
 }
\ No newline at end of file
diff --git a/j2k/testData/fileOrElement/nullability/FieldComparedWithNull.kt b/j2k/testData/fileOrElement/nullability/FieldComparedWithNull.kt
index 8bd1d9dc0cd..44acc4b591e 100644
--- a/j2k/testData/fileOrElement/nullability/FieldComparedWithNull.kt
+++ b/j2k/testData/fileOrElement/nullability/FieldComparedWithNull.kt
@@ -2,7 +2,7 @@
 internal class C {
     private val s = x()
 
-    internal fun foo() {
+    fun foo() {
         if (s == null) {
             print("null")
         }
diff --git a/j2k/testData/fileOrElement/nullability/FieldComparedWithNull2.kt b/j2k/testData/fileOrElement/nullability/FieldComparedWithNull2.kt
index 7996fdb1902..0e8d009e5ea 100644
--- a/j2k/testData/fileOrElement/nullability/FieldComparedWithNull2.kt
+++ b/j2k/testData/fileOrElement/nullability/FieldComparedWithNull2.kt
@@ -1,6 +1,6 @@
 internal class C(private val s: String?) {
 
-    internal fun foo() {
+    fun foo() {
         if (s != null) {
             print("not null")
         }
diff --git a/j2k/testData/fileOrElement/nullability/FieldComparedWithNull3.kt b/j2k/testData/fileOrElement/nullability/FieldComparedWithNull3.kt
index c627b52f32b..7d0ae35aebf 100644
--- a/j2k/testData/fileOrElement/nullability/FieldComparedWithNull3.kt
+++ b/j2k/testData/fileOrElement/nullability/FieldComparedWithNull3.kt
@@ -3,7 +3,7 @@ internal class C {
 }
 
 internal class D {
-    internal fun foo(c: C) {
+    fun foo(c: C) {
         if (null == c.s) {
             println("null")
         }
diff --git a/j2k/testData/fileOrElement/nullability/FieldInitializedWithNull.kt b/j2k/testData/fileOrElement/nullability/FieldInitializedWithNull.kt
index b287666a6b0..b19757913c8 100644
--- a/j2k/testData/fileOrElement/nullability/FieldInitializedWithNull.kt
+++ b/j2k/testData/fileOrElement/nullability/FieldInitializedWithNull.kt
@@ -1,7 +1,7 @@
 internal class C {
     private var s: String? = null
 
-    internal fun foo() {
+    fun foo() {
         s = "x"
     }
 }
\ No newline at end of file
diff --git a/j2k/testData/fileOrElement/nullability/MethodInvokedWithNullArg.kt b/j2k/testData/fileOrElement/nullability/MethodInvokedWithNullArg.kt
index 1dab01027cb..f4902233a25 100644
--- a/j2k/testData/fileOrElement/nullability/MethodInvokedWithNullArg.kt
+++ b/j2k/testData/fileOrElement/nullability/MethodInvokedWithNullArg.kt
@@ -2,7 +2,7 @@ internal class C {
     private fun foo(s: String?) {
     }
 
-    internal fun bar() {
+    fun bar() {
         foo(null)
     }
 }
\ No newline at end of file
diff --git a/j2k/testData/fileOrElement/nullability/MethodInvokedWithNullArg2.kt b/j2k/testData/fileOrElement/nullability/MethodInvokedWithNullArg2.kt
index 40979a40272..972696f68ce 100644
--- a/j2k/testData/fileOrElement/nullability/MethodInvokedWithNullArg2.kt
+++ b/j2k/testData/fileOrElement/nullability/MethodInvokedWithNullArg2.kt
@@ -4,7 +4,7 @@ internal class C {
 }
 
 internal class D {
-    internal fun bar(c: C) {
+    fun bar(c: C) {
         c.foo(null)
     }
 }
\ No newline at end of file
diff --git a/j2k/testData/fileOrElement/nullability/MethodInvokedWithTernaryNullArg.kt b/j2k/testData/fileOrElement/nullability/MethodInvokedWithTernaryNullArg.kt
index 673ebde9e8e..bb8439e71c9 100644
--- a/j2k/testData/fileOrElement/nullability/MethodInvokedWithTernaryNullArg.kt
+++ b/j2k/testData/fileOrElement/nullability/MethodInvokedWithTernaryNullArg.kt
@@ -2,7 +2,7 @@ internal class C {
     private fun foo(s: String?) {
     }
 
-    internal fun bar(b: Boolean) {
+    fun bar(b: Boolean) {
         foo(if (b) "a" else null)
     }
 }
\ No newline at end of file
diff --git a/j2k/testData/fileOrElement/nullability/MethodResultComparedWithNull.kt b/j2k/testData/fileOrElement/nullability/MethodResultComparedWithNull.kt
index de3446658cb..b8c5d1e4dd3 100644
--- a/j2k/testData/fileOrElement/nullability/MethodResultComparedWithNull.kt
+++ b/j2k/testData/fileOrElement/nullability/MethodResultComparedWithNull.kt
@@ -3,7 +3,7 @@ internal interface I {
 }
 
 internal class C {
-    internal fun foo(i: I) {
+    fun foo(i: I) {
         if (i.getString() == null) {
             println("null")
         }
diff --git a/j2k/testData/fileOrElement/nullability/MethodResultComparedWithNull2.kt b/j2k/testData/fileOrElement/nullability/MethodResultComparedWithNull2.kt
index 57d92d4a23e..81b6eb8a822 100644
--- a/j2k/testData/fileOrElement/nullability/MethodResultComparedWithNull2.kt
+++ b/j2k/testData/fileOrElement/nullability/MethodResultComparedWithNull2.kt
@@ -3,7 +3,7 @@ internal interface I {
 }
 
 internal class C {
-    internal fun foo(i: I) {
+    fun foo(i: I) {
         val result = i.getString()
         if (result != null) {
             print(result)
diff --git a/j2k/testData/fileOrElement/nullability/MethodResultComparedWithNull3.kt b/j2k/testData/fileOrElement/nullability/MethodResultComparedWithNull3.kt
index 57d92d4a23e..81b6eb8a822 100644
--- a/j2k/testData/fileOrElement/nullability/MethodResultComparedWithNull3.kt
+++ b/j2k/testData/fileOrElement/nullability/MethodResultComparedWithNull3.kt
@@ -3,7 +3,7 @@ internal interface I {
 }
 
 internal class C {
-    internal fun foo(i: I) {
+    fun foo(i: I) {
         val result = i.getString()
         if (result != null) {
             print(result)
diff --git a/j2k/testData/fileOrElement/nullability/MethodResultComparedWithNull4.kt b/j2k/testData/fileOrElement/nullability/MethodResultComparedWithNull4.kt
index 7a312961b1f..212e7b610b9 100644
--- a/j2k/testData/fileOrElement/nullability/MethodResultComparedWithNull4.kt
+++ b/j2k/testData/fileOrElement/nullability/MethodResultComparedWithNull4.kt
@@ -3,7 +3,7 @@ internal interface I {
 }
 
 internal class C {
-    internal fun foo(i: I, b: Boolean) {
+    fun foo(i: I, b: Boolean) {
         var result: String? = i.getString()
         if (b) result = null
         if (result != null) {
diff --git a/j2k/testData/fileOrElement/nullability/MethodResultInitializesNullableField.kt b/j2k/testData/fileOrElement/nullability/MethodResultInitializesNullableField.kt
index 2c100f7992c..6fa75648e49 100644
--- a/j2k/testData/fileOrElement/nullability/MethodResultInitializesNullableField.kt
+++ b/j2k/testData/fileOrElement/nullability/MethodResultInitializesNullableField.kt
@@ -4,7 +4,7 @@ internal class C {
 
     companion object {
 
-        internal fun getString(): String? {
+        fun getString(): String? {
             return x()
         }
     }
diff --git a/j2k/testData/fileOrElement/nullability/MethodReturnsNull.kt b/j2k/testData/fileOrElement/nullability/MethodReturnsNull.kt
index b8f98854d78..143747ad408 100644
--- a/j2k/testData/fileOrElement/nullability/MethodReturnsNull.kt
+++ b/j2k/testData/fileOrElement/nullability/MethodReturnsNull.kt
@@ -1,5 +1,5 @@
 internal class C {
-    internal fun foo(b: Boolean): String? {
+    fun foo(b: Boolean): String? {
         if (b) {
             return "abc"
         } else {
diff --git a/j2k/testData/fileOrElement/nullability/MethodReturnsNullInAnonymousClass.kt b/j2k/testData/fileOrElement/nullability/MethodReturnsNullInAnonymousClass.kt
index 3c21a3e950a..fdcfa855377 100644
--- a/j2k/testData/fileOrElement/nullability/MethodReturnsNullInAnonymousClass.kt
+++ b/j2k/testData/fileOrElement/nullability/MethodReturnsNullInAnonymousClass.kt
@@ -4,7 +4,7 @@ internal interface Getter {
 }
 
 internal class C {
-    internal fun foo(b: Boolean): String {
+    fun foo(b: Boolean): String {
         val getter = object : Getter {
             override fun get(): String? {
                 return null
diff --git a/j2k/testData/fileOrElement/nullability/MethodReturnsNullInLocalClass.kt b/j2k/testData/fileOrElement/nullability/MethodReturnsNullInLocalClass.kt
index a1b78836f35..9d88691de31 100644
--- a/j2k/testData/fileOrElement/nullability/MethodReturnsNullInLocalClass.kt
+++ b/j2k/testData/fileOrElement/nullability/MethodReturnsNullInLocalClass.kt
@@ -1,7 +1,7 @@
 internal class C {
-    internal fun foo(): String {
+    fun foo(): String {
         internal class Local {
-            internal fun foo(): String? {
+            fun foo(): String? {
                 return null
             }
         }
diff --git a/j2k/testData/fileOrElement/nullability/MethodReturnsTernaryNull.kt b/j2k/testData/fileOrElement/nullability/MethodReturnsTernaryNull.kt
index f0ebc4ddd5f..46e3883ccd6 100644
--- a/j2k/testData/fileOrElement/nullability/MethodReturnsTernaryNull.kt
+++ b/j2k/testData/fileOrElement/nullability/MethodReturnsTernaryNull.kt
@@ -1,5 +1,5 @@
 internal class C {
-    internal fun foo(b: Boolean): String? {
+    fun foo(b: Boolean): String? {
         return if (b) "abc" else null
     }
 }
\ No newline at end of file
diff --git a/j2k/testData/fileOrElement/nullability/NullableIntNoCrash.kt b/j2k/testData/fileOrElement/nullability/NullableIntNoCrash.kt
index c0371b243d1..65abe5509f8 100644
--- a/j2k/testData/fileOrElement/nullability/NullableIntNoCrash.kt
+++ b/j2k/testData/fileOrElement/nullability/NullableIntNoCrash.kt
@@ -1,7 +1,7 @@
 internal class A {
-    internal var field = foo()
+    var field = foo()
 
-    internal fun foo(): Int {
+    fun foo(): Int {
         return 1
     }
 }
\ No newline at end of file
diff --git a/j2k/testData/fileOrElement/nullability/NullableMethodDotAccess.kt b/j2k/testData/fileOrElement/nullability/NullableMethodDotAccess.kt
index ed038a8f235..2d25b1cd2ef 100644
--- a/j2k/testData/fileOrElement/nullability/NullableMethodDotAccess.kt
+++ b/j2k/testData/fileOrElement/nullability/NullableMethodDotAccess.kt
@@ -1,9 +1,9 @@
 internal class C {
-    internal fun getString(b: Boolean): String? {
+    fun getString(b: Boolean): String? {
         return if (b) "a" else null
     }
 
-    internal fun foo(): Int {
+    fun foo(): Int {
         return getString(true)!!.length()
     }
 }
diff --git a/j2k/testData/fileOrElement/nullability/NullableVariableDotAccess.kt b/j2k/testData/fileOrElement/nullability/NullableVariableDotAccess.kt
index 6736462e36e..677f73205fd 100644
--- a/j2k/testData/fileOrElement/nullability/NullableVariableDotAccess.kt
+++ b/j2k/testData/fileOrElement/nullability/NullableVariableDotAccess.kt
@@ -1,4 +1,4 @@
-internal fun foo(s: String?, b: Boolean): Int {
+fun foo(s: String?, b: Boolean): Int {
     if (s == null) println("null")
     if (b) return s!!.length()
     return 10
diff --git a/j2k/testData/fileOrElement/nullability/ParameterComparedWithNull.kt b/j2k/testData/fileOrElement/nullability/ParameterComparedWithNull.kt
index c2dce0ad9d6..743fe1eedd4 100644
--- a/j2k/testData/fileOrElement/nullability/ParameterComparedWithNull.kt
+++ b/j2k/testData/fileOrElement/nullability/ParameterComparedWithNull.kt
@@ -1,4 +1,4 @@
-internal fun foo(s: String?) {
+fun foo(s: String?) {
     if (s != null) {
         zoo(s)
     }
diff --git a/j2k/testData/fileOrElement/nullability/VariableAssignedWithNull.kt b/j2k/testData/fileOrElement/nullability/VariableAssignedWithNull.kt
index ae5deed3517..71c11a12390 100644
--- a/j2k/testData/fileOrElement/nullability/VariableAssignedWithNull.kt
+++ b/j2k/testData/fileOrElement/nullability/VariableAssignedWithNull.kt
@@ -1,5 +1,5 @@
 // !specifyLocalVariableTypeByDefault: true
-internal fun foo(b: Boolean) {
+fun foo(b: Boolean) {
     var s: String? = "abc"
     if (b) {
         s = null
diff --git a/j2k/testData/fileOrElement/nullability/VariableComparedWithNull.kt b/j2k/testData/fileOrElement/nullability/VariableComparedWithNull.kt
index ca85883e562..c95cb3f308d 100644
--- a/j2k/testData/fileOrElement/nullability/VariableComparedWithNull.kt
+++ b/j2k/testData/fileOrElement/nullability/VariableComparedWithNull.kt
@@ -1,5 +1,5 @@
 // !specifyLocalVariableTypeByDefault: true
-internal fun foo() {
+fun foo() {
     val s: String? = bar()
     if (s != null) {
         zoo(s)
diff --git a/j2k/testData/fileOrElement/nullability/VariableInitializedWithNull.kt b/j2k/testData/fileOrElement/nullability/VariableInitializedWithNull.kt
index 4c96ef545b8..1c9b83d495b 100644
--- a/j2k/testData/fileOrElement/nullability/VariableInitializedWithNull.kt
+++ b/j2k/testData/fileOrElement/nullability/VariableInitializedWithNull.kt
@@ -1,5 +1,5 @@
 // !specifyLocalVariableTypeByDefault: true
-internal fun foo(b: Boolean) {
+fun foo(b: Boolean) {
     var s: String? = null
     if (b) {
         s = "abc"
diff --git a/j2k/testData/fileOrElement/nullability/VariableInitializedWithTernaryNull.kt b/j2k/testData/fileOrElement/nullability/VariableInitializedWithTernaryNull.kt
index d5aa7926d5e..caa9571090f 100644
--- a/j2k/testData/fileOrElement/nullability/VariableInitializedWithTernaryNull.kt
+++ b/j2k/testData/fileOrElement/nullability/VariableInitializedWithTernaryNull.kt
@@ -1,4 +1,4 @@
 // !specifyLocalVariableTypeByDefault: true
-internal fun foo(b: Boolean) {
+fun foo(b: Boolean) {
     val s: String? = (if (b) "abc" else null)
 }
\ No newline at end of file
diff --git a/j2k/testData/fileOrElement/nullability/autoNotNull.kt b/j2k/testData/fileOrElement/nullability/autoNotNull.kt
index b7c6d9ae31a..e54f147cccc 100644
--- a/j2k/testData/fileOrElement/nullability/autoNotNull.kt
+++ b/j2k/testData/fileOrElement/nullability/autoNotNull.kt
@@ -1,5 +1,5 @@
 internal class A {
-    internal fun foo(s: String?): Int {
+    fun foo(s: String?): Int {
         if (s != null) {
             return s.length()
         }
diff --git a/j2k/testData/fileOrElement/overloads/Annotations.kt b/j2k/testData/fileOrElement/overloads/Annotations.kt
index 8ea0865e595..976202cf677 100644
--- a/j2k/testData/fileOrElement/overloads/Annotations.kt
+++ b/j2k/testData/fileOrElement/overloads/Annotations.kt
@@ -1,17 +1,17 @@
 // ERROR: Type mismatch: inferred type is kotlin.Any? but kotlin.Any was expected
 // ERROR: Type mismatch: inferred type is kotlin.Any? but kotlin.Any was expected
 internal class A {
-    @JvmOverloads internal fun foo(s: String? = null): Any {
+    @JvmOverloads fun foo(s: String? = null): Any {
         println("s = " + s!!)
         return ""
     }
 
-    internal fun bar(s: String?): Any? {
+    fun bar(s: String?): Any? {
         println("s = " + s!!)
         return if (s == null) "" else null
     }
 
-    internal fun bar(): Any {
+    fun bar(): Any {
         return bar(null)
     }
 
diff --git a/j2k/testData/fileOrElement/overloads/Simple.kt b/j2k/testData/fileOrElement/overloads/Simple.kt
index c4625b66bca..b475c9ac937 100644
--- a/j2k/testData/fileOrElement/overloads/Simple.kt
+++ b/j2k/testData/fileOrElement/overloads/Simple.kt
@@ -1,9 +1,9 @@
 internal class A {
-    @JvmOverloads internal fun foo(i: Int, c: Char = 'a', s: String = "") {
+    @JvmOverloads fun foo(i: Int, c: Char = 'a', s: String = "") {
         println("foo" + i + c + s)
     }
 
-    @JvmOverloads internal fun bar(s: String? = null): Int {
+    @JvmOverloads fun bar(s: String? = null): Int {
         println("s = " + s!!)
         return 0
     }
diff --git a/j2k/testData/fileOrElement/projections/projections.kt b/j2k/testData/fileOrElement/projections/projections.kt
index 5dffedbf01f..eff8c4b5923 100644
--- a/j2k/testData/fileOrElement/projections/projections.kt
+++ b/j2k/testData/fileOrElement/projections/projections.kt
@@ -1,22 +1,22 @@
 import java.util.ArrayList
 
 internal class C<T> {
-    internal fun foo1(src: Collection<T>) {
+    fun foo1(src: Collection<T>) {
         val t = src.iterator().next()
     }
 
-    internal fun foo2(src: ArrayList<out T>) {
+    fun foo2(src: ArrayList<out T>) {
         val t = src.iterator().next()
     }
 
-    internal fun foo3(dst: MutableCollection<in T>, t: T) {
+    fun foo3(dst: MutableCollection<in T>, t: T) {
         dst.add(t)
     }
 
-    internal fun foo4(comparable: Comparable<T>, t: T): Int {
+    fun foo4(comparable: Comparable<T>, t: T): Int {
         return comparable.compareTo(t)
     }
 
-    internal fun foo5(w: Collection<*>) {
+    fun foo5(w: Collection<*>) {
     }
 }
diff --git a/j2k/testData/fileOrElement/rawGenerics/kt-540-map.kt b/j2k/testData/fileOrElement/rawGenerics/kt-540-map.kt
index 080146ce4bb..a96c10c5792 100644
--- a/j2k/testData/fileOrElement/rawGenerics/kt-540-map.kt
+++ b/j2k/testData/fileOrElement/rawGenerics/kt-540-map.kt
@@ -4,7 +4,7 @@ package demo
 import java.util.HashMap
 
 internal class Test {
-    internal fun main() {
+    fun main() {
         val commonMap = HashMap<String, Int>()
         val rawMap = HashMap<String, Int>()
         val superRawMap = HashMap()
diff --git a/j2k/testData/fileOrElement/rawGenerics/kt-540-rawGenericClass.kt b/j2k/testData/fileOrElement/rawGenerics/kt-540-rawGenericClass.kt
index a25d2ae8dcf..3db17f5ad3f 100644
--- a/j2k/testData/fileOrElement/rawGenerics/kt-540-rawGenericClass.kt
+++ b/j2k/testData/fileOrElement/rawGenerics/kt-540-rawGenericClass.kt
@@ -1,13 +1,13 @@
 package demo
 
-internal class Collection<E> internal constructor(e: E) {
+internal class Collection<E>(e: E) {
     init {
         println(e)
     }
 }
 
 internal class Test {
-    internal fun main() {
+    fun main() {
         val raw1 = Collection(1)
         val raw2 = Collection(1)
         val raw3 = Collection("1")
diff --git a/j2k/testData/fileOrElement/rawGenerics/kt-540.kt b/j2k/testData/fileOrElement/rawGenerics/kt-540.kt
index 212981f8676..6bf71b8af31 100644
--- a/j2k/testData/fileOrElement/rawGenerics/kt-540.kt
+++ b/j2k/testData/fileOrElement/rawGenerics/kt-540.kt
@@ -4,7 +4,7 @@ package demo
 import java.util.ArrayList
 
 internal class Test {
-    internal fun main() {
+    fun main() {
         val common = ArrayList<String>()
         val raw = ArrayList<String>()
         val superRaw = ArrayList()
diff --git a/j2k/testData/fileOrElement/rawGenerics/rawGenericMethod.kt b/j2k/testData/fileOrElement/rawGenerics/rawGenericMethod.kt
index bc8e774ae7f..d76ff61305c 100644
--- a/j2k/testData/fileOrElement/rawGenerics/rawGenericMethod.kt
+++ b/j2k/testData/fileOrElement/rawGenerics/rawGenericMethod.kt
@@ -1,12 +1,12 @@
 package demo
 
 internal class TestT {
-    internal fun <T> getT() {
+    fun <T> getT() {
     }
 }
 
 internal class U {
-    internal fun main() {
+    fun main() {
         val t = TestT()
         t.getT<String>()
         t.getT<Int>()
diff --git a/j2k/testData/fileOrElement/returnStatement/currentMethodBug.kt b/j2k/testData/fileOrElement/returnStatement/currentMethodBug.kt
index dce43f699e5..5bcb73c8fcb 100644
--- a/j2k/testData/fileOrElement/returnStatement/currentMethodBug.kt
+++ b/j2k/testData/fileOrElement/returnStatement/currentMethodBug.kt
@@ -3,7 +3,7 @@ internal interface I {
 }
 
 internal class C {
-    internal fun getObject(): Any? {
+    fun getObject(): Any? {
         foo(object : I {
             override fun getInt(): Int {
                 return 0
@@ -12,8 +12,8 @@ internal class C {
         return string
     }
 
-    internal fun foo(i: I) {
+    fun foo(i: I) {
     }
 
-    internal var string: String? = null
+    var string: String? = null
 }
\ No newline at end of file
diff --git a/j2k/testData/fileOrElement/settings/openByDefault.kt b/j2k/testData/fileOrElement/settings/openByDefault.kt
index 5c30d23b374..f20aaa05214 100644
--- a/j2k/testData/fileOrElement/settings/openByDefault.kt
+++ b/j2k/testData/fileOrElement/settings/openByDefault.kt
@@ -7,12 +7,12 @@ internal open class A {
     private fun foo2() {
     }
 
-    internal fun foo3() {
+    fun foo3() {
     }
 }
 
 internal class B {
-    internal fun foo() {
+    fun foo() {
     }
 }
 
@@ -31,7 +31,7 @@ internal open class D : I {
 
 internal enum class E {
     ;
-    internal fun foo(): Int {
+    fun foo(): Int {
         return 0
     }
 }
diff --git a/j2k/testData/fileOrElement/settings/specifyFieldTypeByDefault.kt b/j2k/testData/fileOrElement/settings/specifyFieldTypeByDefault.kt
index 17f314ac622..16949c81091 100644
--- a/j2k/testData/fileOrElement/settings/specifyFieldTypeByDefault.kt
+++ b/j2k/testData/fileOrElement/settings/specifyFieldTypeByDefault.kt
@@ -3,7 +3,7 @@ import java.util.*
 
 internal class A {
     private val field1: List<String> = ArrayList()
-    internal val field2: List<String> = ArrayList()
+    val field2: List<String> = ArrayList()
     val field3: Int = 0
     protected val field4: Int = 0
 }
\ No newline at end of file
diff --git a/j2k/testData/fileOrElement/staticMembers/PrivateStaticMethods3.kt b/j2k/testData/fileOrElement/staticMembers/PrivateStaticMethods3.kt
index 176a629a712..8093bfa3fba 100644
--- a/j2k/testData/fileOrElement/staticMembers/PrivateStaticMethods3.kt
+++ b/j2k/testData/fileOrElement/staticMembers/PrivateStaticMethods3.kt
@@ -5,7 +5,7 @@ internal class A {
         }
     }
 
-    internal fun bar() {
+    fun bar() {
         privateStatic2()
     }
 
diff --git a/j2k/testData/fileOrElement/staticMembers/PrivateStaticMethods4.kt b/j2k/testData/fileOrElement/staticMembers/PrivateStaticMethods4.kt
index f542100dc37..6d1b32d09c4 100644
--- a/j2k/testData/fileOrElement/staticMembers/PrivateStaticMethods4.kt
+++ b/j2k/testData/fileOrElement/staticMembers/PrivateStaticMethods4.kt
@@ -5,7 +5,7 @@ internal class A {
         }
     }
 
-    internal fun bar() {
+    fun bar() {
         privateStatic2()
     }
 
diff --git a/j2k/testData/fileOrElement/superExpression/classAdotSuperFoo.kt b/j2k/testData/fileOrElement/superExpression/classAdotSuperFoo.kt
index fc7839bb754..68b2ca3fc2f 100644
--- a/j2k/testData/fileOrElement/superExpression/classAdotSuperFoo.kt
+++ b/j2k/testData/fileOrElement/superExpression/classAdotSuperFoo.kt
@@ -1,13 +1,13 @@
 package a.b
 
 internal open class Base {
-    internal fun foo() {
+    fun foo() {
     }
 }
 
 internal class A : Base() {
     internal inner class C {
-        internal fun test() {
+        fun test() {
             super@A.foo()
         }
     }
diff --git a/j2k/testData/fileOrElement/superExpression/classAextendsB.kt b/j2k/testData/fileOrElement/superExpression/classAextendsB.kt
index 5dabaf0d197..a88e9741f7b 100644
--- a/j2k/testData/fileOrElement/superExpression/classAextendsB.kt
+++ b/j2k/testData/fileOrElement/superExpression/classAextendsB.kt
@@ -1,10 +1,10 @@
-internal open class B internal constructor(i: Int) {
+internal open class B(i: Int) {
     internal open fun call(): Int {
         return 1
     }
 }
 
-internal class A internal constructor() : B(10) {
+internal class A : B(10) {
 
     override fun call(): Int {
         return super.call()
diff --git a/j2k/testData/fileOrElement/switch/caseWithBlock.kt b/j2k/testData/fileOrElement/switch/caseWithBlock.kt
index 0ca50428e5e..cc5b7f41d77 100644
--- a/j2k/testData/fileOrElement/switch/caseWithBlock.kt
+++ b/j2k/testData/fileOrElement/switch/caseWithBlock.kt
@@ -1,4 +1,4 @@
-internal fun foo() {
+fun foo() {
     when (a) {
         1 -> {
             val x = 1
diff --git a/j2k/testData/fileOrElement/switch/continueAndBreakWithLabel.kt b/j2k/testData/fileOrElement/switch/continueAndBreakWithLabel.kt
index e811ca4d5a7..d76b7777695 100644
--- a/j2k/testData/fileOrElement/switch/continueAndBreakWithLabel.kt
+++ b/j2k/testData/fileOrElement/switch/continueAndBreakWithLabel.kt
@@ -1,4 +1,4 @@
-internal fun foo() {
+fun foo() {
     Loop@ while (true) {
         when (take()) {
             1 -> continue
diff --git a/j2k/testData/fileOrElement/switch/enumConstants.kt b/j2k/testData/fileOrElement/switch/enumConstants.kt
index 8f30b47c32a..bf53363ba64 100644
--- a/j2k/testData/fileOrElement/switch/enumConstants.kt
+++ b/j2k/testData/fileOrElement/switch/enumConstants.kt
@@ -3,7 +3,7 @@ internal enum class ColorEnum {
 }
 
 internal class MyClass {
-    internal fun method(colorEnum: ColorEnum): Int {
+    fun method(colorEnum: ColorEnum): Int {
         when (colorEnum) {
             ColorEnum.GREEN -> return 1
             else -> return 2
diff --git a/j2k/testData/fileOrElement/switch/invalidSwitch.kt b/j2k/testData/fileOrElement/switch/invalidSwitch.kt
index cc1768522df..ec525e9c042 100644
--- a/j2k/testData/fileOrElement/switch/invalidSwitch.kt
+++ b/j2k/testData/fileOrElement/switch/invalidSwitch.kt
@@ -1,4 +1,4 @@
-internal fun foo() {
+fun foo() {
     when (a) {
         -> {
             println("1")
diff --git a/j2k/testData/fileOrElement/switch/returnsAndThrows.kt b/j2k/testData/fileOrElement/switch/returnsAndThrows.kt
index 54a17597c57..0f406429c1f 100644
--- a/j2k/testData/fileOrElement/switch/returnsAndThrows.kt
+++ b/j2k/testData/fileOrElement/switch/returnsAndThrows.kt
@@ -1,4 +1,4 @@
-internal fun foo(a: Int): Int {
+fun foo(a: Int): Int {
     when (a) {
         1 -> {
             println("1")
diff --git a/j2k/testData/fileOrElement/thisExpression/classAdotThisFoo.kt b/j2k/testData/fileOrElement/thisExpression/classAdotThisFoo.kt
index f1b2d37882d..650054ee114 100644
--- a/j2k/testData/fileOrElement/thisExpression/classAdotThisFoo.kt
+++ b/j2k/testData/fileOrElement/thisExpression/classAdotThisFoo.kt
@@ -1,13 +1,13 @@
 package a.b
 
 internal open class Base {
-    internal fun foo() {
+    fun foo() {
     }
 }
 
 internal class A : Base() {
     internal inner class C {
-        internal fun test() {
+        fun test() {
             this@A.foo()
         }
     }
diff --git a/j2k/testData/fileOrElement/tryStatement/disjunctionType.kt b/j2k/testData/fileOrElement/tryStatement/disjunctionType.kt
index 3d2c7a5b70c..f69e3dc727a 100644
--- a/j2k/testData/fileOrElement/tryStatement/disjunctionType.kt
+++ b/j2k/testData/fileOrElement/tryStatement/disjunctionType.kt
@@ -2,7 +2,7 @@
 import java.io.IOException
 
 internal class A {
-    internal fun foo() {
+    fun foo() {
         try {
             bar()
         } catch (e: RuntimeException) {
diff --git a/j2k/testData/fileOrElement/typeCastExpression/castNullable.kt b/j2k/testData/fileOrElement/typeCastExpression/castNullable.kt
index 9ca75153ab3..e435745665b 100644
--- a/j2k/testData/fileOrElement/typeCastExpression/castNullable.kt
+++ b/j2k/testData/fileOrElement/typeCastExpression/castNullable.kt
@@ -4,7 +4,7 @@ internal class A {
         return ""
     }
 
-    internal fun bar() {
+    fun bar() {
         if (foo(null, true) == null) {
             println("null")
         }
diff --git a/j2k/testData/fileOrElement/typeParameters/methodDoubleParametrizationWithTwoBounds.kt b/j2k/testData/fileOrElement/typeParameters/methodDoubleParametrizationWithTwoBounds.kt
index 42787872dad..6a7b22e6666 100644
--- a/j2k/testData/fileOrElement/typeParameters/methodDoubleParametrizationWithTwoBounds.kt
+++ b/j2k/testData/fileOrElement/typeParameters/methodDoubleParametrizationWithTwoBounds.kt
@@ -1,2 +1,2 @@
-internal fun <T : Any, K : Node> max(coll: Collection<T>): T where T : Comparable<T>, K : Collection<in K> {
+fun <T : Any, K : Node> max(coll: Collection<T>): T where T : Comparable<T>, K : Collection<in K> {
 }
\ No newline at end of file
diff --git a/j2k/testData/fileOrElement/typeParameters/needTypeArgs.kt b/j2k/testData/fileOrElement/typeParameters/needTypeArgs.kt
index 952873bfecd..d1e8dac8bf2 100644
--- a/j2k/testData/fileOrElement/typeParameters/needTypeArgs.kt
+++ b/j2k/testData/fileOrElement/typeParameters/needTypeArgs.kt
@@ -1,16 +1,16 @@
 import java.util.HashMap
 
 internal class A {
-    internal fun foo() {
+    fun foo() {
         val map1 = getMap1<String, Int>()
         val map2 = getMap2("a", 1)
     }
 
-    internal fun <K, V> getMap1(): Map<K, V> {
+    fun <K, V> getMap1(): Map<K, V> {
         return HashMap()
     }
 
-    internal fun <K, V> getMap2(k: K, v: V): Map<K, V> {
+    fun <K, V> getMap2(k: K, v: V): Map<K, V> {
         val map = HashMap<K, V>()
         map.put(k, v)
         return map
diff --git a/j2k/testData/fileOrElement/typeParameters/where.kt b/j2k/testData/fileOrElement/typeParameters/where.kt
index 385145671f1..4c6e6f81c15 100644
--- a/j2k/testData/fileOrElement/typeParameters/where.kt
+++ b/j2k/testData/fileOrElement/typeParameters/where.kt
@@ -1,2 +1,2 @@
-internal fun <T : Any> max(coll: Collection<T>): T where T : Comparable<T> {
+fun <T : Any> max(coll: Collection<T>): T where T : Comparable<T> {
 }
\ No newline at end of file
diff --git a/j2k/testData/fileOrElement/varArg/ellipsisTypeSeveralParams.kt b/j2k/testData/fileOrElement/varArg/ellipsisTypeSeveralParams.kt
index 7c52d28ff45..28aec67d146 100644
--- a/j2k/testData/fileOrElement/varArg/ellipsisTypeSeveralParams.kt
+++ b/j2k/testData/fileOrElement/varArg/ellipsisTypeSeveralParams.kt
@@ -1 +1 @@
-internal fun format(pattern: String, vararg arguments: Any): String
\ No newline at end of file
+fun format(pattern: String, vararg arguments: Any): String
\ No newline at end of file
diff --git a/j2k/testData/fileOrElement/varArg/ellipsisTypeSingleParams.kt b/j2k/testData/fileOrElement/varArg/ellipsisTypeSingleParams.kt
index 8adf755e20f..e1403964927 100644
--- a/j2k/testData/fileOrElement/varArg/ellipsisTypeSingleParams.kt
+++ b/j2k/testData/fileOrElement/varArg/ellipsisTypeSingleParams.kt
@@ -1,2 +1,2 @@
-internal fun pushAll(vararg objs: Any) {
+fun pushAll(vararg objs: Any) {
 }
\ No newline at end of file
diff --git a/j2k/testData/multiFile/GetterAndSetterUsages/2.kt b/j2k/testData/multiFile/GetterAndSetterUsages/2.kt
index f17917e5348..615d1838d59 100644
--- a/j2k/testData/multiFile/GetterAndSetterUsages/2.kt
+++ b/j2k/testData/multiFile/GetterAndSetterUsages/2.kt
@@ -1,5 +1,5 @@
 internal class B {
-    internal fun foo(a: AAA) {
+    fun foo(a: AAA) {
         a.x = a.x + 1
         YY += "a"
     }
diff --git a/j2k/tests/org/jetbrains/kotlin/j2k/AbstractJavaToKotlinConverterSingleFileTest.kt b/j2k/tests/org/jetbrains/kotlin/j2k/AbstractJavaToKotlinConverterSingleFileTest.kt
index 2b1b6303e04..970a788efa6 100644
--- a/j2k/tests/org/jetbrains/kotlin/j2k/AbstractJavaToKotlinConverterSingleFileTest.kt
+++ b/j2k/tests/org/jetbrains/kotlin/j2k/AbstractJavaToKotlinConverterSingleFileTest.kt
@@ -117,7 +117,7 @@ public abstract class AbstractJavaToKotlinConverterSingleFileTest : AbstractJava
 
     private fun statementToKotlin(text: String, settings: ConverterSettings, project: Project): String {
         val result = methodToKotlin("void main() {" + text + "}", settings, project)
-        return result.substring(0, result.lastIndexOf("}")).replaceFirst("internal fun main() {", "").trim()
+        return result.substring(0, result.lastIndexOf("}")).replaceFirst("fun main() {", "").trim()
     }
 
     private fun expressionToKotlin(code: String, settings: ConverterSettings, project: Project): String {