diff --git a/idea/idea-maven/src/org/jetbrains/kotlin/idea/maven/MavenCompletionProviders.kt b/idea/idea-maven/src/org/jetbrains/kotlin/idea/maven/MavenCompletionProviders.kt
index 5627dfb845b..fe2790ebe58 100644
--- a/idea/idea-maven/src/org/jetbrains/kotlin/idea/maven/MavenCompletionProviders.kt
+++ b/idea/idea-maven/src/org/jetbrains/kotlin/idea/maven/MavenCompletionProviders.kt
@@ -23,22 +23,22 @@ import org.jetbrains.kotlin.config.JvmTarget
 import org.jetbrains.kotlin.config.LanguageVersion
 import org.jetbrains.kotlin.idea.actions.internal.KotlinInternalMode
 
-class LanguageVersionsProvider : MavenFixedValueReferenceProvider(
+class MavenLanguageVersionsCompletionProvider : MavenFixedValueReferenceProvider(
         LanguageVersion.values().filter { it.isStable || KotlinInternalMode.enabled }.map { it.versionString }.toTypedArray()
 )
 
-class ApiVersionsProvider : MavenFixedValueReferenceProvider(
+class MavenApiVersionsCompletionProvider : MavenFixedValueReferenceProvider(
         LanguageVersion.values().filter { it.isStable || KotlinInternalMode.enabled }.map { it.versionString }.toTypedArray()
 )
 
-class JvmTargetsProvider : MavenFixedValueReferenceProvider(
-        JvmTarget.values().map { it.description }.toTypedArray()
+class MavenJvmTargetsCompletionProvider : MavenFixedValueReferenceProvider(
+        JvmTarget.values().map(JvmTarget::description).toTypedArray()
 )
 
-class JsModuleKindsProvider : MavenFixedValueReferenceProvider(
-        DefaultValues.JsModuleKinds.possibleValues?.map { StringUtil.unquoteString(it) }?.toTypedArray() ?: emptyArray()
+class MavenJsModuleKindsCompletionProvider : MavenFixedValueReferenceProvider(
+        DefaultValues.JsModuleKinds.possibleValues!!.map(StringUtil::unquoteString).toTypedArray()
 )
 
-class JsMainCallProvider : MavenFixedValueReferenceProvider(
-        DefaultValues.JsMain.possibleValues?.map { StringUtil.unquoteString(it) }?.toTypedArray() ?: emptyArray()
+class MavenJsMainCallCompletionProvider : MavenFixedValueReferenceProvider(
+        DefaultValues.JsMain.possibleValues!!.map(StringUtil::unquoteString).toTypedArray()
 )
\ No newline at end of file
diff --git a/idea/src/META-INF/maven.xml b/idea/src/META-INF/maven.xml
index fa6f515d830..dea8c99a851 100644
--- a/idea/src/META-INF/maven.xml
+++ b/idea/src/META-INF/maven.xml
@@ -20,11 +20,11 @@
       <param name="defaultSourceDirs/dir" refProvider="org.jetbrains.idea.maven.plugins.api.common.MavenCommonParamReferenceProviders$DirPath"/>
 
       <param name="experimentalCoroutines" values="enable,warn,error"/>
-      <param name="languageVersion" refProvider="org.jetbrains.kotlin.idea.maven.LanguageVersionsProvider" />
-      <param name="apiVersion" refProvider="org.jetbrains.kotlin.idea.maven.ApiVersionsProvider" />
-      <param name="main" refProvider="org.jetbrains.kotlin.idea.maven.JsMainCallProvider" />
-      <param name="moduleKind" refProvider="org.jetbrains.kotlin.idea.maven.JsModuleKindsProvider" />
-      <param name="jvmTarget" refProvider="org.jetbrains.kotlin.idea.maven.JvmTargetsProvider" />
+      <param name="languageVersion" refProvider="org.jetbrains.kotlin.idea.maven.MavenLanguageVersionsCompletionProvider" />
+      <param name="apiVersion" refProvider="org.jetbrains.kotlin.idea.maven.MavenApiVersionsCompletionProvider" />
+      <param name="main" refProvider="org.jetbrains.kotlin.idea.maven.MavenJsMainCallCompletionProvider" />
+      <param name="moduleKind" refProvider="org.jetbrains.kotlin.idea.maven.MavenJsModuleKindsCompletionProvider" />
+      <param name="jvmTarget" refProvider="org.jetbrains.kotlin.idea.maven.MavenJvmTargetsCompletionProvider" />
 
       <param name="script" language="kotlin" />
     </pluginDescriptor>