diff --git a/libraries/tools/kotlin-maven-lombok/src/main/kotlin/LombokMavenPluginExtensions.kt b/libraries/tools/kotlin-maven-lombok/src/main/kotlin/LombokMavenPluginExtensions.kt
index 553925d64ab..0430771c60a 100644
--- a/libraries/tools/kotlin-maven-lombok/src/main/kotlin/LombokMavenPluginExtensions.kt
+++ b/libraries/tools/kotlin-maven-lombok/src/main/kotlin/LombokMavenPluginExtensions.kt
@@ -24,7 +24,7 @@ import org.jetbrains.kotlin.maven.*
 
 val LOMBOK_COMPILER_PLUGIN_ID = "org.jetbrains.kotlin.lombok"
 
-@Component(role = KotlinMavenPluginExtension::class, hint = "kotlin-lombok")
+@Component(role = KotlinMavenPluginExtension::class, hint = "lombok")
 class KotlinLombokMavenPluginExtension : KotlinMavenPluginExtension {
     @Requirement
     lateinit var logger: Logger
diff --git a/libraries/tools/kotlin-maven-plugin-test/src/it/test-lombok-simple/pom.xml b/libraries/tools/kotlin-maven-plugin-test/src/it/test-lombok-simple/pom.xml
index d645c1a4a5f..790988c3d3a 100644
--- a/libraries/tools/kotlin-maven-plugin-test/src/it/test-lombok-simple/pom.xml
+++ b/libraries/tools/kotlin-maven-plugin-test/src/it/test-lombok-simple/pom.xml
@@ -30,11 +30,11 @@
                 <version>${kotlin.version}</version>
                 <configuration>
                     <compilerPlugins>
-                        <plugin>kotlin-lombok</plugin>
+                        <plugin>lombok</plugin>
                     </compilerPlugins>
 
                     <pluginOptions>
-                        <option>kotlin-lombok:config=lombok.config</option>
+                        <option>lombok:config=lombok.config</option>
                     </pluginOptions>
                 </configuration>
                 <executions>
diff --git a/libraries/tools/kotlin-maven-plugin-test/src/it/test-lombok-simple/verify.bsh b/libraries/tools/kotlin-maven-plugin-test/src/it/test-lombok-simple/verify.bsh
index ecea41a643b..13fb8d80ac5 100644
--- a/libraries/tools/kotlin-maven-plugin-test/src/it/test-lombok-simple/verify.bsh
+++ b/libraries/tools/kotlin-maven-plugin-test/src/it/test-lombok-simple/verify.bsh
@@ -1,4 +1,4 @@
 source(new File(basedir, "../../../verify-common.bsh").getAbsolutePath());
 
-assertBuildLogHasLineThatContains("Applied plugin: 'kotlin-lombok'");
+assertBuildLogHasLineThatContains("Applied plugin: 'lombok'");
 assertFileExists("target/test-lombok-simple-1.0-SNAPSHOT.jar");
diff --git a/libraries/tools/kotlin-maven-plugin-test/src/it/test-lombok-with-kapt/pom.xml b/libraries/tools/kotlin-maven-plugin-test/src/it/test-lombok-with-kapt/pom.xml
index 748ff87adde..aa15ca34ea1 100644
--- a/libraries/tools/kotlin-maven-plugin-test/src/it/test-lombok-with-kapt/pom.xml
+++ b/libraries/tools/kotlin-maven-plugin-test/src/it/test-lombok-with-kapt/pom.xml
@@ -33,7 +33,7 @@
                 <version>${kotlin.version}</version>
                 <configuration>
                     <compilerPlugins>
-                        <plugin>kotlin-lombok</plugin>
+                        <plugin>lombok</plugin>
                     </compilerPlugins>
                 </configuration>
                 <executions>
diff --git a/libraries/tools/kotlin-maven-plugin-test/src/it/test-lombok-with-kapt/verify.bsh b/libraries/tools/kotlin-maven-plugin-test/src/it/test-lombok-with-kapt/verify.bsh
index d3d44bcd7d8..21e12dbf4b5 100644
--- a/libraries/tools/kotlin-maven-plugin-test/src/it/test-lombok-with-kapt/verify.bsh
+++ b/libraries/tools/kotlin-maven-plugin-test/src/it/test-lombok-with-kapt/verify.bsh
@@ -1,6 +1,6 @@
 source(new File(basedir, "../../../verify-common.bsh").getAbsolutePath());
 
-assertBuildLogHasLineThatContains("Applied plugin: 'kotlin-lombok'");
+assertBuildLogHasLineThatContains("Applied plugin: 'lombok'");
 assertFileExists("target/test-lombok-with-kapt-1.0-SNAPSHOT.jar");
 assertFileExists("target/kaptStubs/compile/lab2/SomeObj.java");
 assertFileExists("target/generated-sources/kapt/compile/lab2/SomeObjJsonAdapter.kt");