diff --git a/plugins/kotlin/base/analysis-api-platform/src/org/jetbrains/kotlin/idea/base/analysisApiPlatform/IdeKotlinAnnotationsResolverFactory.kt b/plugins/kotlin/base/analysis-api-platform/src/org/jetbrains/kotlin/idea/base/analysisApiPlatform/IdeKotlinAnnotationsResolverFactory.kt
index 5b9122a7df67..3f0f47ec0bec 100644
--- a/plugins/kotlin/base/analysis-api-platform/src/org/jetbrains/kotlin/idea/base/analysisApiPlatform/IdeKotlinAnnotationsResolverFactory.kt
+++ b/plugins/kotlin/base/analysis-api-platform/src/org/jetbrains/kotlin/idea/base/analysisApiPlatform/IdeKotlinAnnotationsResolverFactory.kt
@@ -12,7 +12,7 @@ import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.name.Name
 import org.jetbrains.kotlin.psi.*
 
-internal class IdeKotlinAnnotationsResolverFactory(private val project: Project) : KotlinAnnotationsResolverFactory {
+class IdeKotlinAnnotationsResolverFactory(private val project: Project) : KotlinAnnotationsResolverFactory {
     override fun createAnnotationResolver(searchScope: GlobalSearchScope): KotlinAnnotationsResolver {
         return IdeKotlinAnnotationsResolver(project, searchScope)
     }
diff --git a/plugins/kotlin/base/analysis-api-platform/src/org/jetbrains/kotlin/idea/base/analysisApiPlatform/IdeKotlinDeclarationProviderFactory.kt b/plugins/kotlin/base/analysis-api-platform/src/org/jetbrains/kotlin/idea/base/analysisApiPlatform/IdeKotlinDeclarationProviderFactory.kt
index b5cd3b072207..d3ab3bb01252 100644
--- a/plugins/kotlin/base/analysis-api-platform/src/org/jetbrains/kotlin/idea/base/analysisApiPlatform/IdeKotlinDeclarationProviderFactory.kt
+++ b/plugins/kotlin/base/analysis-api-platform/src/org/jetbrains/kotlin/idea/base/analysisApiPlatform/IdeKotlinDeclarationProviderFactory.kt
@@ -28,7 +28,7 @@ import org.jetbrains.kotlin.name.Name
 import org.jetbrains.kotlin.psi.*
 import org.jetbrains.kotlin.utils.addToStdlib.safeAs
 
-internal class IdeKotlinDeclarationProviderFactory(private val project: Project) : KotlinDeclarationProviderFactory {
+class IdeKotlinDeclarationProviderFactory(private val project: Project) : KotlinDeclarationProviderFactory {
     override fun createDeclarationProvider(scope: GlobalSearchScope, contextualModule: KaModule?): KotlinDeclarationProvider {
         val mainProvider = IdeKotlinDeclarationProvider(project, scope, contextualModule)
 
@@ -44,7 +44,7 @@ internal class IdeKotlinDeclarationProviderFactory(private val project: Project)
     }
 }
 
-internal class IdeKotlinDeclarationProviderMerger(private val project: Project) : KotlinDeclarationProviderMerger {
+class IdeKotlinDeclarationProviderMerger(private val project: Project) : KotlinDeclarationProviderMerger {
     override fun merge(providers: List<KotlinDeclarationProvider>): KotlinDeclarationProvider =
         providers.mergeSpecificProviders<_, IdeKotlinDeclarationProvider>(KotlinCompositeDeclarationProvider.factory) { targetProviders ->
             IdeKotlinDeclarationProvider(
diff --git a/plugins/kotlin/base/analysis-api-platform/src/org/jetbrains/kotlin/idea/base/analysisApiPlatform/IdeKotlinPackagePartProviderFactory.kt b/plugins/kotlin/base/analysis-api-platform/src/org/jetbrains/kotlin/idea/base/analysisApiPlatform/IdeKotlinPackagePartProviderFactory.kt
index 4e9d08153fc2..97dd94088f55 100644
--- a/plugins/kotlin/base/analysis-api-platform/src/org/jetbrains/kotlin/idea/base/analysisApiPlatform/IdeKotlinPackagePartProviderFactory.kt
+++ b/plugins/kotlin/base/analysis-api-platform/src/org/jetbrains/kotlin/idea/base/analysisApiPlatform/IdeKotlinPackagePartProviderFactory.kt
@@ -6,7 +6,7 @@ import org.jetbrains.kotlin.analysis.api.platform.packages.KotlinPackagePartProv
 import org.jetbrains.kotlin.idea.caches.resolve.IDEPackagePartProvider
 import org.jetbrains.kotlin.load.kotlin.PackagePartProvider
 
-internal class IdeKotlinPackagePartProviderFactory : KotlinPackagePartProviderFactory {
+class IdeKotlinPackagePartProviderFactory : KotlinPackagePartProviderFactory {
     override fun createPackagePartProvider(scope: GlobalSearchScope): PackagePartProvider {
         return IDEPackagePartProvider(scope)
     }
diff --git a/plugins/kotlin/base/analysis-api-platform/src/org/jetbrains/kotlin/idea/base/analysisApiPlatform/IdeKotlinPackageProviderFactory.kt b/plugins/kotlin/base/analysis-api-platform/src/org/jetbrains/kotlin/idea/base/analysisApiPlatform/IdeKotlinPackageProviderFactory.kt
index 8103f67bf7ff..4acc7bf5c51a 100644
--- a/plugins/kotlin/base/analysis-api-platform/src/org/jetbrains/kotlin/idea/base/analysisApiPlatform/IdeKotlinPackageProviderFactory.kt
+++ b/plugins/kotlin/base/analysis-api-platform/src/org/jetbrains/kotlin/idea/base/analysisApiPlatform/IdeKotlinPackageProviderFactory.kt
@@ -19,13 +19,13 @@ import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.name.Name
 import java.util.concurrent.ConcurrentHashMap
 
-internal class IdeKotlinPackageProviderFactory(private val project: Project) : KotlinPackageProviderFactory {
+class IdeKotlinPackageProviderFactory(private val project: Project) : KotlinPackageProviderFactory {
     override fun createPackageProvider(searchScope: GlobalSearchScope): KotlinPackageProvider {
         return IdeKotlinPackageProvider(project, searchScope)
     }
 }
 
-internal class IdeKotlinPackageProviderMerger(private val project: Project) : KotlinPackageProviderMerger {
+class IdeKotlinPackageProviderMerger(private val project: Project) : KotlinPackageProviderMerger {
     override fun merge(providers: List<KotlinPackageProvider>): KotlinPackageProvider =
         providers.mergeSpecificProviders<_, IdeKotlinPackageProvider>(KotlinCompositePackageProvider.factory) { targetProviders ->
             IdeKotlinPackageProvider(
diff --git a/plugins/kotlin/base/indices/src/org/jetbrains/kotlin/idea/stubindex/KotlinAnnotationsIndex.kt b/plugins/kotlin/base/indices/src/org/jetbrains/kotlin/idea/stubindex/KotlinAnnotationsIndex.kt
index c300f9793958..ab8b9c089e57 100644
--- a/plugins/kotlin/base/indices/src/org/jetbrains/kotlin/idea/stubindex/KotlinAnnotationsIndex.kt
+++ b/plugins/kotlin/base/indices/src/org/jetbrains/kotlin/idea/stubindex/KotlinAnnotationsIndex.kt
@@ -7,7 +7,7 @@ import com.intellij.psi.stubs.StringStubIndexExtension
 import com.intellij.psi.stubs.StubIndexKey
 import org.jetbrains.kotlin.psi.KtAnnotationEntry
 
-class KotlinAnnotationsIndex internal constructor() : StringStubIndexExtension<KtAnnotationEntry>() {
+class KotlinAnnotationsIndex : StringStubIndexExtension<KtAnnotationEntry>() {
     companion object Helper : KotlinStringStubIndexHelper<KtAnnotationEntry>(KtAnnotationEntry::class.java) {
         @JvmField
         @Deprecated("Use the Helper object instead", level = DeprecationLevel.HIDDEN)
diff --git a/plugins/kotlin/base/indices/src/org/jetbrains/kotlin/idea/stubindex/KotlinClassShortNameIndex.kt b/plugins/kotlin/base/indices/src/org/jetbrains/kotlin/idea/stubindex/KotlinClassShortNameIndex.kt
index 6469b0a6b70e..13ef162cb10f 100644
--- a/plugins/kotlin/base/indices/src/org/jetbrains/kotlin/idea/stubindex/KotlinClassShortNameIndex.kt
+++ b/plugins/kotlin/base/indices/src/org/jetbrains/kotlin/idea/stubindex/KotlinClassShortNameIndex.kt
@@ -8,7 +8,7 @@ import com.intellij.psi.stubs.StubIndexKey
 import org.jetbrains.annotations.ApiStatus
 import org.jetbrains.kotlin.psi.KtClassOrObject
 
-class KotlinClassShortNameIndex internal constructor() : StringStubIndexExtension<KtClassOrObject>() {
+class KotlinClassShortNameIndex : StringStubIndexExtension<KtClassOrObject>() {
     companion object Helper : KotlinStringStubIndexHelper<KtClassOrObject>(KtClassOrObject::class.java) {
         @JvmField
         @ApiStatus.ScheduledForRemoval
diff --git a/plugins/kotlin/base/indices/src/org/jetbrains/kotlin/idea/stubindex/KotlinExactPackagesIndex.kt b/plugins/kotlin/base/indices/src/org/jetbrains/kotlin/idea/stubindex/KotlinExactPackagesIndex.kt
index 83f2abd0502c..07f2f37248a4 100644
--- a/plugins/kotlin/base/indices/src/org/jetbrains/kotlin/idea/stubindex/KotlinExactPackagesIndex.kt
+++ b/plugins/kotlin/base/indices/src/org/jetbrains/kotlin/idea/stubindex/KotlinExactPackagesIndex.kt
@@ -10,7 +10,7 @@ import com.intellij.psi.stubs.StubIndexKey
 import org.jetbrains.kotlin.idea.base.indices.getByKeyAndMeasure
 import org.jetbrains.kotlin.psi.KtFile
 
-class KotlinExactPackagesIndex internal constructor() : StringStubIndexExtension<KtFile>() {
+class KotlinExactPackagesIndex : StringStubIndexExtension<KtFile>() {
     companion object {
         @JvmStatic
         private val LOG = Logger.getInstance(KotlinExactPackagesIndex::class.java)
diff --git a/plugins/kotlin/base/indices/src/org/jetbrains/kotlin/idea/stubindex/KotlinExtensionsInObjectsByReceiverTypeIndex.kt b/plugins/kotlin/base/indices/src/org/jetbrains/kotlin/idea/stubindex/KotlinExtensionsInObjectsByReceiverTypeIndex.kt
index 0c5520845db8..301695b01ece 100644
--- a/plugins/kotlin/base/indices/src/org/jetbrains/kotlin/idea/stubindex/KotlinExtensionsInObjectsByReceiverTypeIndex.kt
+++ b/plugins/kotlin/base/indices/src/org/jetbrains/kotlin/idea/stubindex/KotlinExtensionsInObjectsByReceiverTypeIndex.kt
@@ -7,7 +7,7 @@ import com.intellij.psi.stubs.StringStubIndexExtension
 import com.intellij.psi.stubs.StubIndexKey
 import org.jetbrains.kotlin.psi.KtCallableDeclaration
 
-class KotlinExtensionsInObjectsByReceiverTypeIndex internal constructor() : StringStubIndexExtension<KtCallableDeclaration>() {
+class KotlinExtensionsInObjectsByReceiverTypeIndex  : StringStubIndexExtension<KtCallableDeclaration>() {
     companion object Helper : KotlinExtensionsByReceiverTypeStubIndexHelper() {
         override val indexKey: StubIndexKey<String, KtCallableDeclaration> =
             StubIndexKey.createIndexKey(KotlinExtensionsInObjectsByReceiverTypeIndex::class.java.simpleName)
diff --git a/plugins/kotlin/base/indices/src/org/jetbrains/kotlin/idea/stubindex/KotlinFileFacadeClassByPackageIndex.kt b/plugins/kotlin/base/indices/src/org/jetbrains/kotlin/idea/stubindex/KotlinFileFacadeClassByPackageIndex.kt
index a86c489e020a..21bc26b7099c 100644
--- a/plugins/kotlin/base/indices/src/org/jetbrains/kotlin/idea/stubindex/KotlinFileFacadeClassByPackageIndex.kt
+++ b/plugins/kotlin/base/indices/src/org/jetbrains/kotlin/idea/stubindex/KotlinFileFacadeClassByPackageIndex.kt
@@ -8,7 +8,7 @@ import com.intellij.psi.stubs.StringStubIndexExtension
 import com.intellij.psi.stubs.StubIndexKey
 import org.jetbrains.kotlin.psi.KtFile
 
-class KotlinFileFacadeClassByPackageIndex internal constructor() : StringStubIndexExtension<KtFile>() {
+class KotlinFileFacadeClassByPackageIndex  : StringStubIndexExtension<KtFile>() {
     companion object Helper : KotlinStringStubIndexHelper<KtFile>(KtFile::class.java) {
         override val indexKey: StubIndexKey<String, KtFile> =
             StubIndexKey.createIndexKey(KotlinFileFacadeClassByPackageIndex::class.java.simpleName)
diff --git a/plugins/kotlin/base/indices/src/org/jetbrains/kotlin/idea/stubindex/KotlinFileFacadeFqNameIndex.kt b/plugins/kotlin/base/indices/src/org/jetbrains/kotlin/idea/stubindex/KotlinFileFacadeFqNameIndex.kt
index daee2dee65c1..359167d0860e 100644
--- a/plugins/kotlin/base/indices/src/org/jetbrains/kotlin/idea/stubindex/KotlinFileFacadeFqNameIndex.kt
+++ b/plugins/kotlin/base/indices/src/org/jetbrains/kotlin/idea/stubindex/KotlinFileFacadeFqNameIndex.kt
@@ -8,7 +8,7 @@ import com.intellij.psi.stubs.StringStubIndexExtension
 import com.intellij.psi.stubs.StubIndexKey
 import org.jetbrains.kotlin.psi.KtFile
 
-class KotlinFileFacadeFqNameIndex internal constructor() : StringStubIndexExtension<KtFile>() {
+class KotlinFileFacadeFqNameIndex : StringStubIndexExtension<KtFile>() {
     companion object Helper : KotlinStringStubIndexHelper<KtFile>(KtFile::class.java) {
         override val indexKey: StubIndexKey<String, KtFile> =
             StubIndexKey.createIndexKey("org.jetbrains.kotlin.idea.stubindex.KotlinFileFacadeFqNameIndex")
diff --git a/plugins/kotlin/base/indices/src/org/jetbrains/kotlin/idea/stubindex/KotlinFileFacadeShortNameIndex.kt b/plugins/kotlin/base/indices/src/org/jetbrains/kotlin/idea/stubindex/KotlinFileFacadeShortNameIndex.kt
index f66ced2db19d..8d9c156d672c 100644
--- a/plugins/kotlin/base/indices/src/org/jetbrains/kotlin/idea/stubindex/KotlinFileFacadeShortNameIndex.kt
+++ b/plugins/kotlin/base/indices/src/org/jetbrains/kotlin/idea/stubindex/KotlinFileFacadeShortNameIndex.kt
@@ -8,7 +8,7 @@ import com.intellij.psi.stubs.StringStubIndexExtension
 import com.intellij.psi.stubs.StubIndexKey
 import org.jetbrains.kotlin.psi.KtFile
 
-class KotlinFileFacadeShortNameIndex internal constructor() : StringStubIndexExtension<KtFile>() {
+class KotlinFileFacadeShortNameIndex : StringStubIndexExtension<KtFile>() {
     companion object Helper : KotlinStringStubIndexHelper<KtFile>(KtFile::class.java) {
         override val indexKey: StubIndexKey<String, KtFile> =
             StubIndexKey.createIndexKey("org.jetbrains.kotlin.idea.stubindex.KotlinFileFacadeShortNameIndex")
diff --git a/plugins/kotlin/base/indices/src/org/jetbrains/kotlin/idea/stubindex/KotlinFilePartClassIndex.kt b/plugins/kotlin/base/indices/src/org/jetbrains/kotlin/idea/stubindex/KotlinFilePartClassIndex.kt
index 56086e700bb7..1742ea1f5f68 100644
--- a/plugins/kotlin/base/indices/src/org/jetbrains/kotlin/idea/stubindex/KotlinFilePartClassIndex.kt
+++ b/plugins/kotlin/base/indices/src/org/jetbrains/kotlin/idea/stubindex/KotlinFilePartClassIndex.kt
@@ -13,7 +13,7 @@ import org.jetbrains.kotlin.psi.KtFile
  * "kotlin.text.StringsKt___StringsJvmKt" -> KtFile("_StringsJvm") (sources)
  * "kotlin.LazyKt__LazyKt" -> KtFile("Lazy.kt") (sources)
  */
-class KotlinFilePartClassIndex internal constructor() : StringStubIndexExtension<KtFile>() {
+class KotlinFilePartClassIndex : StringStubIndexExtension<KtFile>() {
     companion object Helper : KotlinStringStubIndexHelper<KtFile>(KtFile::class.java) {
         override val indexKey: StubIndexKey<String, KtFile> =
             StubIndexKey.createIndexKey("org.jetbrains.kotlin.idea.stubindex.KotlinFilePartClassIndex")
diff --git a/plugins/kotlin/base/indices/src/org/jetbrains/kotlin/idea/stubindex/KotlinFullClassNameIndex.kt b/plugins/kotlin/base/indices/src/org/jetbrains/kotlin/idea/stubindex/KotlinFullClassNameIndex.kt
index c31779e23d40..64afa0f8fed6 100644
--- a/plugins/kotlin/base/indices/src/org/jetbrains/kotlin/idea/stubindex/KotlinFullClassNameIndex.kt
+++ b/plugins/kotlin/base/indices/src/org/jetbrains/kotlin/idea/stubindex/KotlinFullClassNameIndex.kt
@@ -7,7 +7,7 @@ import com.intellij.psi.stubs.StringStubIndexExtension
 import com.intellij.psi.stubs.StubIndexKey
 import org.jetbrains.kotlin.psi.KtClassOrObject
 
-class KotlinFullClassNameIndex internal constructor() : StringStubIndexExtension<KtClassOrObject>() {
+class KotlinFullClassNameIndex : StringStubIndexExtension<KtClassOrObject>() {
     companion object Helper : KotlinStringStubIndexHelper<KtClassOrObject>(KtClassOrObject::class.java) {
         @JvmField
         @Deprecated("Use the Helper object instead", level = DeprecationLevel.ERROR)
diff --git a/plugins/kotlin/base/indices/src/org/jetbrains/kotlin/idea/stubindex/KotlinFunctionShortNameIndex.kt b/plugins/kotlin/base/indices/src/org/jetbrains/kotlin/idea/stubindex/KotlinFunctionShortNameIndex.kt
index fe04e3ac16c1..537523affaab 100644
--- a/plugins/kotlin/base/indices/src/org/jetbrains/kotlin/idea/stubindex/KotlinFunctionShortNameIndex.kt
+++ b/plugins/kotlin/base/indices/src/org/jetbrains/kotlin/idea/stubindex/KotlinFunctionShortNameIndex.kt
@@ -7,7 +7,7 @@ import com.intellij.psi.stubs.StringStubIndexExtension
 import com.intellij.psi.stubs.StubIndexKey
 import org.jetbrains.kotlin.psi.KtNamedFunction
 
-class KotlinFunctionShortNameIndex internal constructor() : StringStubIndexExtension<KtNamedFunction>() {
+class KotlinFunctionShortNameIndex : StringStubIndexExtension<KtNamedFunction>() {
     companion object Helper : KotlinStringStubIndexHelper<KtNamedFunction>(KtNamedFunction::class.java) {
         override val indexKey: StubIndexKey<String, KtNamedFunction> =
             StubIndexKey.createIndexKey("org.jetbrains.kotlin.idea.stubindex.KotlinFunctionShortNameIndex")
diff --git a/plugins/kotlin/base/indices/src/org/jetbrains/kotlin/idea/stubindex/KotlinInnerTypeAliasClassIdIndex.kt b/plugins/kotlin/base/indices/src/org/jetbrains/kotlin/idea/stubindex/KotlinInnerTypeAliasClassIdIndex.kt
index 0d994ad41016..3833efef6c40 100644
--- a/plugins/kotlin/base/indices/src/org/jetbrains/kotlin/idea/stubindex/KotlinInnerTypeAliasClassIdIndex.kt
+++ b/plugins/kotlin/base/indices/src/org/jetbrains/kotlin/idea/stubindex/KotlinInnerTypeAliasClassIdIndex.kt
@@ -13,7 +13,7 @@ import org.jetbrains.kotlin.psi.KtTypeAlias
  * The key is stringified [org.jetbrains.kotlin.name.ClassId] by the rules described in [org.jetbrains.kotlin.name.ClassId.asString]:
  * packages are delimited by '/' and classes by '.', e.g. "kotlin/Map.Entry"
  */
-class KotlinInnerTypeAliasClassIdIndex internal constructor() : StringStubIndexExtension<KtTypeAlias>() {
+class KotlinInnerTypeAliasClassIdIndex  : StringStubIndexExtension<KtTypeAlias>() {
     companion object Helper : KotlinStringStubIndexHelper<KtTypeAlias>(KtTypeAlias::class.java) {
         override val indexKey: StubIndexKey<String, KtTypeAlias> =
             StubIndexKey.createIndexKey("org.jetbrains.kotlin.idea.stubindex.KotlinInnerTypeAliasClassIdIndex")
diff --git a/plugins/kotlin/base/indices/src/org/jetbrains/kotlin/idea/stubindex/KotlinJvmNameAnnotationIndex.kt b/plugins/kotlin/base/indices/src/org/jetbrains/kotlin/idea/stubindex/KotlinJvmNameAnnotationIndex.kt
index 5e523618f11c..de2dfd5ee149 100644
--- a/plugins/kotlin/base/indices/src/org/jetbrains/kotlin/idea/stubindex/KotlinJvmNameAnnotationIndex.kt
+++ b/plugins/kotlin/base/indices/src/org/jetbrains/kotlin/idea/stubindex/KotlinJvmNameAnnotationIndex.kt
@@ -8,7 +8,7 @@ import com.intellij.psi.stubs.StringStubIndexExtension
 import com.intellij.psi.stubs.StubIndexKey
 import org.jetbrains.kotlin.psi.KtAnnotationEntry
 
-class KotlinJvmNameAnnotationIndex internal constructor() : StringStubIndexExtension<KtAnnotationEntry>() {
+class KotlinJvmNameAnnotationIndex : StringStubIndexExtension<KtAnnotationEntry>() {
     companion object Helper : KotlinStringStubIndexHelper<KtAnnotationEntry>(KtAnnotationEntry::class.java) {
         override val indexKey: StubIndexKey<String, KtAnnotationEntry> =
             StubIndexKey.createIndexKey("org.jetbrains.kotlin.idea.stubindex.KotlinJvmNameAnnotationIndex")
diff --git a/plugins/kotlin/base/indices/src/org/jetbrains/kotlin/idea/stubindex/KotlinMultiFileClassPartIndex.kt b/plugins/kotlin/base/indices/src/org/jetbrains/kotlin/idea/stubindex/KotlinMultiFileClassPartIndex.kt
index a6a1fc5dd40f..7bd1accf6545 100644
--- a/plugins/kotlin/base/indices/src/org/jetbrains/kotlin/idea/stubindex/KotlinMultiFileClassPartIndex.kt
+++ b/plugins/kotlin/base/indices/src/org/jetbrains/kotlin/idea/stubindex/KotlinMultiFileClassPartIndex.kt
@@ -13,7 +13,7 @@ import org.jetbrains.kotlin.psi.KtFile
  * "kotlin.LazyKt__LazyKt" -> KtClsFile("LazyKt.class")
  * "kotlin.text.StringsKt___StringsJvmKt" -> KtClsFile("StringsKt.class")
  */
-class KotlinMultiFileClassPartIndex internal constructor() : StringStubIndexExtension<KtFile>() {
+class KotlinMultiFileClassPartIndex : StringStubIndexExtension<KtFile>() {
     companion object Helper : KotlinStringStubIndexHelper<KtFile>(KtFile::class.java) {
         override val indexKey: StubIndexKey<String, KtFile> =
             StubIndexKey.createIndexKey("org.jetbrains.kotlin.idea.stubindex.KotlinMultifileClassPartIndex")
diff --git a/plugins/kotlin/base/indices/src/org/jetbrains/kotlin/idea/stubindex/KotlinOverridableInternalMembersShortNameIndex.kt b/plugins/kotlin/base/indices/src/org/jetbrains/kotlin/idea/stubindex/KotlinOverridableInternalMembersShortNameIndex.kt
index a0551d52e38a..8ff4b0dc669e 100644
--- a/plugins/kotlin/base/indices/src/org/jetbrains/kotlin/idea/stubindex/KotlinOverridableInternalMembersShortNameIndex.kt
+++ b/plugins/kotlin/base/indices/src/org/jetbrains/kotlin/idea/stubindex/KotlinOverridableInternalMembersShortNameIndex.kt
@@ -8,7 +8,7 @@ import com.intellij.psi.stubs.StringStubIndexExtension
 import com.intellij.psi.stubs.StubIndexKey
 import org.jetbrains.kotlin.psi.KtCallableDeclaration
 
-class KotlinOverridableInternalMembersShortNameIndex internal constructor() : StringStubIndexExtension<KtCallableDeclaration>() {
+class KotlinOverridableInternalMembersShortNameIndex : StringStubIndexExtension<KtCallableDeclaration>() {
     companion object Helper : KotlinStringStubIndexHelper<KtCallableDeclaration>(KtCallableDeclaration::class.java) {
         override val indexKey: StubIndexKey<String, KtCallableDeclaration> =
             StubIndexKey.createIndexKey(KotlinOverridableInternalMembersShortNameIndex::class.java.simpleName)
diff --git a/plugins/kotlin/base/indices/src/org/jetbrains/kotlin/idea/stubindex/KotlinPrimeSymbolNameIndex.kt b/plugins/kotlin/base/indices/src/org/jetbrains/kotlin/idea/stubindex/KotlinPrimeSymbolNameIndex.kt
index 1d5fb7357c7c..777dba17a707 100644
--- a/plugins/kotlin/base/indices/src/org/jetbrains/kotlin/idea/stubindex/KotlinPrimeSymbolNameIndex.kt
+++ b/plugins/kotlin/base/indices/src/org/jetbrains/kotlin/idea/stubindex/KotlinPrimeSymbolNameIndex.kt
@@ -5,7 +5,7 @@ import com.intellij.psi.NavigatablePsiElement
 import com.intellij.psi.stubs.StringStubIndexExtension
 import com.intellij.psi.stubs.StubIndexKey
 
-class KotlinPrimeSymbolNameIndex internal constructor() : StringStubIndexExtension<NavigatablePsiElement>() {
+class KotlinPrimeSymbolNameIndex : StringStubIndexExtension<NavigatablePsiElement>() {
     companion object Helper : KotlinStringStubIndexHelper<NavigatablePsiElement>(NavigatablePsiElement::class.java) {
         override val indexKey: StubIndexKey<String, NavigatablePsiElement> = StubIndexKey.createIndexKey("kotlin.primeIndexKey")
     }
diff --git a/plugins/kotlin/base/indices/src/org/jetbrains/kotlin/idea/stubindex/KotlinProbablyContractedFunctionShortNameIndex.kt b/plugins/kotlin/base/indices/src/org/jetbrains/kotlin/idea/stubindex/KotlinProbablyContractedFunctionShortNameIndex.kt
index a470079cef25..dee3f50ede7f 100644
--- a/plugins/kotlin/base/indices/src/org/jetbrains/kotlin/idea/stubindex/KotlinProbablyContractedFunctionShortNameIndex.kt
+++ b/plugins/kotlin/base/indices/src/org/jetbrains/kotlin/idea/stubindex/KotlinProbablyContractedFunctionShortNameIndex.kt
@@ -10,7 +10,7 @@ import org.jetbrains.annotations.ApiStatus
 import org.jetbrains.kotlin.psi.KtNamedFunction
 
 @ApiStatus.Internal
-class KotlinProbablyContractedFunctionShortNameIndex internal constructor() : StringStubIndexExtension<KtNamedFunction>() {
+class KotlinProbablyContractedFunctionShortNameIndex : StringStubIndexExtension<KtNamedFunction>() {
     companion object Helper : KotlinStringStubIndexHelper<KtNamedFunction>(KtNamedFunction::class.java) {
         override val indexKey: StubIndexKey<String, KtNamedFunction> =
             StubIndexKey.createIndexKey(KotlinProbablyContractedFunctionShortNameIndex::class.java.simpleName)
diff --git a/plugins/kotlin/base/indices/src/org/jetbrains/kotlin/idea/stubindex/KotlinProbablyNothingFunctionShortNameIndex.kt b/plugins/kotlin/base/indices/src/org/jetbrains/kotlin/idea/stubindex/KotlinProbablyNothingFunctionShortNameIndex.kt
index fe6114273960..d5f0cbb334f1 100644
--- a/plugins/kotlin/base/indices/src/org/jetbrains/kotlin/idea/stubindex/KotlinProbablyNothingFunctionShortNameIndex.kt
+++ b/plugins/kotlin/base/indices/src/org/jetbrains/kotlin/idea/stubindex/KotlinProbablyNothingFunctionShortNameIndex.kt
@@ -9,7 +9,7 @@ import org.jetbrains.annotations.ApiStatus
 import org.jetbrains.kotlin.psi.KtNamedFunction
 
 @ApiStatus.Internal
-class KotlinProbablyNothingFunctionShortNameIndex internal constructor() : StringStubIndexExtension<KtNamedFunction>() {
+class KotlinProbablyNothingFunctionShortNameIndex : StringStubIndexExtension<KtNamedFunction>() {
     companion object Helper : KotlinStringStubIndexHelper<KtNamedFunction>(KtNamedFunction::class.java) {
         override val indexKey: StubIndexKey<String, KtNamedFunction> =
             StubIndexKey.createIndexKey(KotlinProbablyNothingFunctionShortNameIndex::class.java.simpleName)
diff --git a/plugins/kotlin/base/indices/src/org/jetbrains/kotlin/idea/stubindex/KotlinProbablyNothingPropertyShortNameIndex.kt b/plugins/kotlin/base/indices/src/org/jetbrains/kotlin/idea/stubindex/KotlinProbablyNothingPropertyShortNameIndex.kt
index 3b216822e354..87288c45c19b 100644
--- a/plugins/kotlin/base/indices/src/org/jetbrains/kotlin/idea/stubindex/KotlinProbablyNothingPropertyShortNameIndex.kt
+++ b/plugins/kotlin/base/indices/src/org/jetbrains/kotlin/idea/stubindex/KotlinProbablyNothingPropertyShortNameIndex.kt
@@ -9,7 +9,7 @@ import org.jetbrains.annotations.ApiStatus
 import org.jetbrains.kotlin.psi.KtProperty
 
 @ApiStatus.Internal
-class KotlinProbablyNothingPropertyShortNameIndex internal constructor() : StringStubIndexExtension<KtProperty>() {
+class KotlinProbablyNothingPropertyShortNameIndex : StringStubIndexExtension<KtProperty>() {
     companion object Helper : KotlinStringStubIndexHelper<KtProperty>(KtProperty::class.java) {
         override val indexKey: StubIndexKey<String, KtProperty> =
             StubIndexKey.createIndexKey(KotlinProbablyNothingPropertyShortNameIndex::class.java.simpleName)
diff --git a/plugins/kotlin/base/indices/src/org/jetbrains/kotlin/idea/stubindex/KotlinPropertyShortNameIndex.kt b/plugins/kotlin/base/indices/src/org/jetbrains/kotlin/idea/stubindex/KotlinPropertyShortNameIndex.kt
index 309417c2b339..51350b85c0bf 100644
--- a/plugins/kotlin/base/indices/src/org/jetbrains/kotlin/idea/stubindex/KotlinPropertyShortNameIndex.kt
+++ b/plugins/kotlin/base/indices/src/org/jetbrains/kotlin/idea/stubindex/KotlinPropertyShortNameIndex.kt
@@ -7,7 +7,7 @@ import com.intellij.psi.stubs.StringStubIndexExtension
 import com.intellij.psi.stubs.StubIndexKey
 import org.jetbrains.kotlin.psi.KtNamedDeclaration
 
-class KotlinPropertyShortNameIndex internal constructor() : StringStubIndexExtension<KtNamedDeclaration>() {
+class KotlinPropertyShortNameIndex : StringStubIndexExtension<KtNamedDeclaration>() {
     companion object Helper : KotlinStringStubIndexHelper<KtNamedDeclaration>(KtNamedDeclaration::class.java) {
         override val indexKey: StubIndexKey<String, KtNamedDeclaration> =
             StubIndexKey.createIndexKey("org.jetbrains.kotlin.idea.stubindex.KotlinPropertyShortNameIndex")
diff --git a/plugins/kotlin/base/indices/src/org/jetbrains/kotlin/idea/stubindex/KotlinScriptFqnIndex.kt b/plugins/kotlin/base/indices/src/org/jetbrains/kotlin/idea/stubindex/KotlinScriptFqnIndex.kt
index 2056d33cbce1..3310835be529 100644
--- a/plugins/kotlin/base/indices/src/org/jetbrains/kotlin/idea/stubindex/KotlinScriptFqnIndex.kt
+++ b/plugins/kotlin/base/indices/src/org/jetbrains/kotlin/idea/stubindex/KotlinScriptFqnIndex.kt
@@ -10,7 +10,7 @@ import org.jetbrains.annotations.ApiStatus
 import org.jetbrains.kotlin.psi.KtScript
 
 @ApiStatus.Internal
-class KotlinScriptFqnIndex internal constructor() : StringStubIndexExtension<KtScript>() {
+class KotlinScriptFqnIndex : StringStubIndexExtension<KtScript>() {
     companion object Helper : KotlinStringStubIndexHelper<KtScript>(KtScript::class.java) {
         override val indexKey: StubIndexKey<String, KtScript> =
             StubIndexKey.createIndexKey("org.jetbrains.kotlin.idea.stubindex.KotlinScriptFqnIndex")
diff --git a/plugins/kotlin/base/indices/src/org/jetbrains/kotlin/idea/stubindex/KotlinSubclassObjectNameIndex.kt b/plugins/kotlin/base/indices/src/org/jetbrains/kotlin/idea/stubindex/KotlinSubclassObjectNameIndex.kt
index 5dc22f7d99eb..c9975dbb3252 100644
--- a/plugins/kotlin/base/indices/src/org/jetbrains/kotlin/idea/stubindex/KotlinSubclassObjectNameIndex.kt
+++ b/plugins/kotlin/base/indices/src/org/jetbrains/kotlin/idea/stubindex/KotlinSubclassObjectNameIndex.kt
@@ -14,7 +14,7 @@ import org.jetbrains.kotlin.psi.KtObjectDeclaration
  * See [org.jetbrains.kotlin.idea.core.KotlinIndicesHelper.processAllCallablesFromSubclassObjects]
  * for a usage example.
  */
-class KotlinSubclassObjectNameIndex internal constructor() : StringStubIndexExtension<KtObjectDeclaration>() {
+class KotlinSubclassObjectNameIndex : StringStubIndexExtension<KtObjectDeclaration>() {
     companion object Helper : KotlinStringStubIndexHelper<KtObjectDeclaration>(KtObjectDeclaration::class.java) {
         override val indexKey: StubIndexKey<String, KtObjectDeclaration> =
             StubIndexKey.createIndexKey("org.jetbrains.kotlin.idea.stubindex.KotlinSubclassObjectNameIndex")
diff --git a/plugins/kotlin/base/indices/src/org/jetbrains/kotlin/idea/stubindex/KotlinSuperClassIndex.kt b/plugins/kotlin/base/indices/src/org/jetbrains/kotlin/idea/stubindex/KotlinSuperClassIndex.kt
index 286846fd63cc..0747a83c04ae 100644
--- a/plugins/kotlin/base/indices/src/org/jetbrains/kotlin/idea/stubindex/KotlinSuperClassIndex.kt
+++ b/plugins/kotlin/base/indices/src/org/jetbrains/kotlin/idea/stubindex/KotlinSuperClassIndex.kt
@@ -7,7 +7,7 @@ import com.intellij.psi.stubs.StringStubIndexExtension
 import com.intellij.psi.stubs.StubIndexKey
 import org.jetbrains.kotlin.psi.KtClassOrObject
 
-class KotlinSuperClassIndex internal constructor() : StringStubIndexExtension<KtClassOrObject>() {
+class KotlinSuperClassIndex : StringStubIndexExtension<KtClassOrObject>() {
     companion object Helper : KotlinStringStubIndexHelper<KtClassOrObject>(KtClassOrObject::class.java) {
         override val indexKey: StubIndexKey<String, KtClassOrObject> =
             StubIndexKey.createIndexKey("org.jetbrains.kotlin.idea.stubindex.KotlinSuperClassIndex")
diff --git a/plugins/kotlin/base/indices/src/org/jetbrains/kotlin/idea/stubindex/KotlinTopLevelClassByPackageIndex.kt b/plugins/kotlin/base/indices/src/org/jetbrains/kotlin/idea/stubindex/KotlinTopLevelClassByPackageIndex.kt
index 3095f03311d8..2c8f9bfa3c87 100644
--- a/plugins/kotlin/base/indices/src/org/jetbrains/kotlin/idea/stubindex/KotlinTopLevelClassByPackageIndex.kt
+++ b/plugins/kotlin/base/indices/src/org/jetbrains/kotlin/idea/stubindex/KotlinTopLevelClassByPackageIndex.kt
@@ -7,7 +7,7 @@ import com.intellij.psi.stubs.StringStubIndexExtension
 import com.intellij.psi.stubs.StubIndexKey
 import org.jetbrains.kotlin.psi.KtClassOrObject
 
-class KotlinTopLevelClassByPackageIndex internal constructor() : StringStubIndexExtension<KtClassOrObject>() {
+class KotlinTopLevelClassByPackageIndex : StringStubIndexExtension<KtClassOrObject>() {
     companion object Helper : KotlinStringStubIndexHelper<KtClassOrObject>(KtClassOrObject::class.java) {
         override val indexKey: StubIndexKey<String, KtClassOrObject> =
             StubIndexKey.createIndexKey("org.jetbrains.kotlin.idea.stubindex.KotlinTopLevelClassByPackageIndex")
diff --git a/plugins/kotlin/base/indices/src/org/jetbrains/kotlin/idea/stubindex/KotlinTopLevelExpectFunctionFqNameIndex.kt b/plugins/kotlin/base/indices/src/org/jetbrains/kotlin/idea/stubindex/KotlinTopLevelExpectFunctionFqNameIndex.kt
index 9dd674185045..aa1daea2aa53 100644
--- a/plugins/kotlin/base/indices/src/org/jetbrains/kotlin/idea/stubindex/KotlinTopLevelExpectFunctionFqNameIndex.kt
+++ b/plugins/kotlin/base/indices/src/org/jetbrains/kotlin/idea/stubindex/KotlinTopLevelExpectFunctionFqNameIndex.kt
@@ -8,7 +8,7 @@ import org.jetbrains.kotlin.psi.KtNamedFunction
 /**
  * Stores top level functions with `expect` modifier by full qualified name
  */
-class KotlinTopLevelExpectFunctionFqNameIndex internal constructor() : StringStubIndexExtension<KtNamedFunction>() {
+class KotlinTopLevelExpectFunctionFqNameIndex : StringStubIndexExtension<KtNamedFunction>() {
     companion object Helper : KotlinStringStubIndexHelper<KtNamedFunction>(KtNamedFunction::class.java) {
         override val indexKey: StubIndexKey<String, KtNamedFunction> =
             StubIndexKey.createIndexKey(KotlinTopLevelExpectFunctionFqNameIndex::class.simpleName!!)
diff --git a/plugins/kotlin/base/indices/src/org/jetbrains/kotlin/idea/stubindex/KotlinTopLevelExpectPropertyFqNameIndex.kt b/plugins/kotlin/base/indices/src/org/jetbrains/kotlin/idea/stubindex/KotlinTopLevelExpectPropertyFqNameIndex.kt
index a47841e64dc3..d8726ede8e7d 100644
--- a/plugins/kotlin/base/indices/src/org/jetbrains/kotlin/idea/stubindex/KotlinTopLevelExpectPropertyFqNameIndex.kt
+++ b/plugins/kotlin/base/indices/src/org/jetbrains/kotlin/idea/stubindex/KotlinTopLevelExpectPropertyFqNameIndex.kt
@@ -8,7 +8,7 @@ import org.jetbrains.kotlin.psi.KtProperty
 /**
  * Stores top level properties with `expect` modifier by full qualified name
  */
-class KotlinTopLevelExpectPropertyFqNameIndex internal constructor() : StringStubIndexExtension<KtProperty>() {
+class KotlinTopLevelExpectPropertyFqNameIndex : StringStubIndexExtension<KtProperty>() {
     companion object Helper : KotlinStringStubIndexHelper<KtProperty>(KtProperty::class.java) {
         override val indexKey: StubIndexKey<String, KtProperty> =
             StubIndexKey.createIndexKey(KotlinTopLevelExpectPropertyFqNameIndex::class.simpleName!!)
diff --git a/plugins/kotlin/base/indices/src/org/jetbrains/kotlin/idea/stubindex/KotlinTopLevelExtensionsByReceiverTypeIndex.kt b/plugins/kotlin/base/indices/src/org/jetbrains/kotlin/idea/stubindex/KotlinTopLevelExtensionsByReceiverTypeIndex.kt
index 1c1acf26db70..48ebb0f3049b 100644
--- a/plugins/kotlin/base/indices/src/org/jetbrains/kotlin/idea/stubindex/KotlinTopLevelExtensionsByReceiverTypeIndex.kt
+++ b/plugins/kotlin/base/indices/src/org/jetbrains/kotlin/idea/stubindex/KotlinTopLevelExtensionsByReceiverTypeIndex.kt
@@ -9,7 +9,7 @@ import com.intellij.psi.stubs.StubIndexKey
 import org.jetbrains.annotations.ApiStatus
 import org.jetbrains.kotlin.psi.KtCallableDeclaration
 
-class KotlinTopLevelExtensionsByReceiverTypeIndex internal constructor() : StringStubIndexExtension<KtCallableDeclaration>() {
+class KotlinTopLevelExtensionsByReceiverTypeIndex : StringStubIndexExtension<KtCallableDeclaration>() {
     companion object Helper : KotlinExtensionsByReceiverTypeStubIndexHelper() {
         @JvmField
         @Suppress("DeprecatedCallableAddReplaceWith")
diff --git a/plugins/kotlin/base/indices/src/org/jetbrains/kotlin/idea/stubindex/KotlinTopLevelFunctionByPackageIndex.kt b/plugins/kotlin/base/indices/src/org/jetbrains/kotlin/idea/stubindex/KotlinTopLevelFunctionByPackageIndex.kt
index 889d908b6327..dfdeb821741d 100644
--- a/plugins/kotlin/base/indices/src/org/jetbrains/kotlin/idea/stubindex/KotlinTopLevelFunctionByPackageIndex.kt
+++ b/plugins/kotlin/base/indices/src/org/jetbrains/kotlin/idea/stubindex/KotlinTopLevelFunctionByPackageIndex.kt
@@ -7,7 +7,7 @@ import com.intellij.psi.stubs.StringStubIndexExtension
 import com.intellij.psi.stubs.StubIndexKey
 import org.jetbrains.kotlin.psi.KtNamedFunction
 
-class KotlinTopLevelFunctionByPackageIndex internal constructor() : StringStubIndexExtension<KtNamedFunction>() {
+class KotlinTopLevelFunctionByPackageIndex : StringStubIndexExtension<KtNamedFunction>() {
     companion object Helper : KotlinStringStubIndexHelper<KtNamedFunction>(KtNamedFunction::class.java) {
         override val indexKey: StubIndexKey<String, KtNamedFunction> =
             StubIndexKey.createIndexKey(KotlinTopLevelFunctionByPackageIndex::class.java.simpleName)
diff --git a/plugins/kotlin/base/indices/src/org/jetbrains/kotlin/idea/stubindex/KotlinTopLevelFunctionFqnNameIndex.kt b/plugins/kotlin/base/indices/src/org/jetbrains/kotlin/idea/stubindex/KotlinTopLevelFunctionFqnNameIndex.kt
index 22eb2e23b725..747552dd3e32 100644
--- a/plugins/kotlin/base/indices/src/org/jetbrains/kotlin/idea/stubindex/KotlinTopLevelFunctionFqnNameIndex.kt
+++ b/plugins/kotlin/base/indices/src/org/jetbrains/kotlin/idea/stubindex/KotlinTopLevelFunctionFqnNameIndex.kt
@@ -10,7 +10,7 @@ import org.jetbrains.kotlin.psi.KtNamedFunction
 /**
  * Stores package top level function (both extension and non-extension) full qualified names.
  */
-class KotlinTopLevelFunctionFqnNameIndex internal constructor() : StringStubIndexExtension<KtNamedFunction>() {
+class KotlinTopLevelFunctionFqnNameIndex: StringStubIndexExtension<KtNamedFunction>() {
     companion object Helper : KotlinStringStubIndexHelper<KtNamedFunction>(KtNamedFunction::class.java) {
         override val indexKey: StubIndexKey<String, KtNamedFunction> =
             StubIndexKey.createIndexKey("org.jetbrains.kotlin.idea.stubindex.KotlinTopLevelFunctionFqnNameIndex")
diff --git a/plugins/kotlin/base/indices/src/org/jetbrains/kotlin/idea/stubindex/KotlinTopLevelPropertyByPackageIndex.kt b/plugins/kotlin/base/indices/src/org/jetbrains/kotlin/idea/stubindex/KotlinTopLevelPropertyByPackageIndex.kt
index 6ee9aa4ec8aa..e087e23da2f4 100644
--- a/plugins/kotlin/base/indices/src/org/jetbrains/kotlin/idea/stubindex/KotlinTopLevelPropertyByPackageIndex.kt
+++ b/plugins/kotlin/base/indices/src/org/jetbrains/kotlin/idea/stubindex/KotlinTopLevelPropertyByPackageIndex.kt
@@ -7,7 +7,7 @@ import com.intellij.psi.stubs.StringStubIndexExtension
 import com.intellij.psi.stubs.StubIndexKey
 import org.jetbrains.kotlin.psi.KtProperty
 
-class KotlinTopLevelPropertyByPackageIndex internal constructor() : StringStubIndexExtension<KtProperty>() {
+class KotlinTopLevelPropertyByPackageIndex : StringStubIndexExtension<KtProperty>() {
     companion object Helper : KotlinStringStubIndexHelper<KtProperty>(KtProperty::class.java) {
         override val indexKey: StubIndexKey<String, KtProperty> =
             StubIndexKey.createIndexKey(KotlinTopLevelPropertyByPackageIndex::class.java.simpleName)
diff --git a/plugins/kotlin/base/indices/src/org/jetbrains/kotlin/idea/stubindex/KotlinTopLevelPropertyFqnNameIndex.kt b/plugins/kotlin/base/indices/src/org/jetbrains/kotlin/idea/stubindex/KotlinTopLevelPropertyFqnNameIndex.kt
index 3e9e4892f807..38ed57741251 100644
--- a/plugins/kotlin/base/indices/src/org/jetbrains/kotlin/idea/stubindex/KotlinTopLevelPropertyFqnNameIndex.kt
+++ b/plugins/kotlin/base/indices/src/org/jetbrains/kotlin/idea/stubindex/KotlinTopLevelPropertyFqnNameIndex.kt
@@ -7,7 +7,7 @@ import com.intellij.psi.stubs.StringStubIndexExtension
 import com.intellij.psi.stubs.StubIndexKey
 import org.jetbrains.kotlin.psi.KtProperty
 
-class KotlinTopLevelPropertyFqnNameIndex internal constructor() : StringStubIndexExtension<KtProperty>() {
+class KotlinTopLevelPropertyFqnNameIndex : StringStubIndexExtension<KtProperty>() {
     companion object Helper : KotlinStringStubIndexHelper<KtProperty>(KtProperty::class.java) {
         override val indexKey: StubIndexKey<String, KtProperty> =
             StubIndexKey.createIndexKey("org.jetbrains.kotlin.idea.stubindex.KotlinTopLevelPropertyFqnNameIndex")
diff --git a/plugins/kotlin/base/indices/src/org/jetbrains/kotlin/idea/stubindex/KotlinTopLevelTypeAliasByPackageIndex.kt b/plugins/kotlin/base/indices/src/org/jetbrains/kotlin/idea/stubindex/KotlinTopLevelTypeAliasByPackageIndex.kt
index d04550231aea..71022de49ffc 100644
--- a/plugins/kotlin/base/indices/src/org/jetbrains/kotlin/idea/stubindex/KotlinTopLevelTypeAliasByPackageIndex.kt
+++ b/plugins/kotlin/base/indices/src/org/jetbrains/kotlin/idea/stubindex/KotlinTopLevelTypeAliasByPackageIndex.kt
@@ -8,7 +8,7 @@ import com.intellij.psi.stubs.StringStubIndexExtension
 import com.intellij.psi.stubs.StubIndexKey
 import org.jetbrains.kotlin.psi.KtTypeAlias
 
-class KotlinTopLevelTypeAliasByPackageIndex internal constructor() : StringStubIndexExtension<KtTypeAlias>() {
+class KotlinTopLevelTypeAliasByPackageIndex : StringStubIndexExtension<KtTypeAlias>() {
     companion object Helper : KotlinStringStubIndexHelper<KtTypeAlias>(KtTypeAlias::class.java) {
         override val indexKey: StubIndexKey<String, KtTypeAlias> =
             StubIndexKey.createIndexKey(KotlinTopLevelTypeAliasByPackageIndex::class.java.simpleName)
diff --git a/plugins/kotlin/base/indices/src/org/jetbrains/kotlin/idea/stubindex/KotlinTopLevelTypeAliasFqNameIndex.kt b/plugins/kotlin/base/indices/src/org/jetbrains/kotlin/idea/stubindex/KotlinTopLevelTypeAliasFqNameIndex.kt
index fac290e89a38..440b00638039 100644
--- a/plugins/kotlin/base/indices/src/org/jetbrains/kotlin/idea/stubindex/KotlinTopLevelTypeAliasFqNameIndex.kt
+++ b/plugins/kotlin/base/indices/src/org/jetbrains/kotlin/idea/stubindex/KotlinTopLevelTypeAliasFqNameIndex.kt
@@ -9,7 +9,7 @@ import com.intellij.psi.stubs.StubIndexKey
 import org.jetbrains.annotations.ApiStatus
 import org.jetbrains.kotlin.psi.KtTypeAlias
 
-class KotlinTopLevelTypeAliasFqNameIndex internal constructor() : StringStubIndexExtension<KtTypeAlias>() {
+class KotlinTopLevelTypeAliasFqNameIndex : StringStubIndexExtension<KtTypeAlias>() {
     companion object Helper : KotlinStringStubIndexHelper<KtTypeAlias>(KtTypeAlias::class.java) {
         override val indexKey: StubIndexKey<String, KtTypeAlias> =
             StubIndexKey.createIndexKey("org.jetbrains.kotlin.idea.stubindex.KotlinTopLevelTypeAliasFqNameIndex")
diff --git a/plugins/kotlin/base/indices/src/org/jetbrains/kotlin/idea/stubindex/KotlinTypeAliasByExpansionShortNameIndex.kt b/plugins/kotlin/base/indices/src/org/jetbrains/kotlin/idea/stubindex/KotlinTypeAliasByExpansionShortNameIndex.kt
index 53988eaff22d..578f55424231 100644
--- a/plugins/kotlin/base/indices/src/org/jetbrains/kotlin/idea/stubindex/KotlinTypeAliasByExpansionShortNameIndex.kt
+++ b/plugins/kotlin/base/indices/src/org/jetbrains/kotlin/idea/stubindex/KotlinTypeAliasByExpansionShortNameIndex.kt
@@ -9,7 +9,7 @@ import com.intellij.psi.stubs.StubIndexKey
 import org.jetbrains.annotations.ApiStatus
 import org.jetbrains.kotlin.psi.KtTypeAlias
 
-class KotlinTypeAliasByExpansionShortNameIndex internal constructor() : StringStubIndexExtension<KtTypeAlias>() {
+class KotlinTypeAliasByExpansionShortNameIndex : StringStubIndexExtension<KtTypeAlias>() {
     companion object Helper : KotlinStringStubIndexHelper<KtTypeAlias>(KtTypeAlias::class.java) {
         @JvmField
         @ApiStatus.ScheduledForRemoval
diff --git a/plugins/kotlin/base/indices/src/org/jetbrains/kotlin/idea/stubindex/KotlinTypeAliasShortNameIndex.kt b/plugins/kotlin/base/indices/src/org/jetbrains/kotlin/idea/stubindex/KotlinTypeAliasShortNameIndex.kt
index 27f2d2aa4a70..b8c690b2d4c9 100644
--- a/plugins/kotlin/base/indices/src/org/jetbrains/kotlin/idea/stubindex/KotlinTypeAliasShortNameIndex.kt
+++ b/plugins/kotlin/base/indices/src/org/jetbrains/kotlin/idea/stubindex/KotlinTypeAliasShortNameIndex.kt
@@ -7,7 +7,7 @@ import com.intellij.psi.stubs.StringStubIndexExtension
 import com.intellij.psi.stubs.StubIndexKey
 import org.jetbrains.kotlin.psi.KtTypeAlias
 
-class KotlinTypeAliasShortNameIndex internal constructor() : StringStubIndexExtension<KtTypeAlias>() {
+class KotlinTypeAliasShortNameIndex : StringStubIndexExtension<KtTypeAlias>() {
     companion object Helper : KotlinStringStubIndexHelper<KtTypeAlias>(KtTypeAlias::class.java) {
         override val indexKey: StubIndexKey<String, KtTypeAlias> =
             StubIndexKey.createIndexKey("org.jetbrains.kotlin.idea.stubindex.KotlinTypeAliasShortNameIndex")
diff --git a/plugins/kotlin/base/indices/src/org/jetbrains/kotlin/idea/vfilefinder/KotlinJvmModuleAnnotationsIndex.kt b/plugins/kotlin/base/indices/src/org/jetbrains/kotlin/idea/vfilefinder/KotlinJvmModuleAnnotationsIndex.kt
index dc8c07b40693..5022f72ea59c 100644
--- a/plugins/kotlin/base/indices/src/org/jetbrains/kotlin/idea/vfilefinder/KotlinJvmModuleAnnotationsIndex.kt
+++ b/plugins/kotlin/base/indices/src/org/jetbrains/kotlin/idea/vfilefinder/KotlinJvmModuleAnnotationsIndex.kt
@@ -14,7 +14,7 @@ import java.io.DataInput
 import java.io.DataOutput
 
 
-class KotlinJvmModuleAnnotationsIndex internal constructor() : FileBasedIndexExtension<String, List<ClassId>>() {
+class KotlinJvmModuleAnnotationsIndex : FileBasedIndexExtension<String, List<ClassId>>() {
     companion object {
         val NAME: ID<String, List<ClassId>> = ID.create(KotlinJvmModuleAnnotationsIndex::class.java.canonicalName)
     }
diff --git a/plugins/kotlin/base/indices/src/org/jetbrains/kotlin/idea/vfilefinder/KotlinModuleMappingIndex.kt b/plugins/kotlin/base/indices/src/org/jetbrains/kotlin/idea/vfilefinder/KotlinModuleMappingIndex.kt
index 9253c82145a3..5910dee96256 100644
--- a/plugins/kotlin/base/indices/src/org/jetbrains/kotlin/idea/vfilefinder/KotlinModuleMappingIndex.kt
+++ b/plugins/kotlin/base/indices/src/org/jetbrains/kotlin/idea/vfilefinder/KotlinModuleMappingIndex.kt
@@ -15,7 +15,7 @@ import java.io.DataInput
 import java.io.DataOutput
 
 internal const val MAPPING_FILE_DOT_FILE_EXTENSION = ".${ModuleMapping.MAPPING_FILE_EXT}"
-class KotlinModuleMappingIndex internal constructor() : FileBasedIndexExtension<String, PackageParts>() {
+class KotlinModuleMappingIndex : FileBasedIndexExtension<String, PackageParts>() {
     companion object {
         val NAME: ID<String, PackageParts> = ID.create(KotlinModuleMappingIndex::class.java.canonicalName)