diff --git a/java/kotlin-extractor/kotlin_plugin_versions.py b/java/kotlin-extractor/kotlin_plugin_versions.py
index 439b69236d2..659bbe53961 100755
--- a/java/kotlin-extractor/kotlin_plugin_versions.py
+++ b/java/kotlin-extractor/kotlin_plugin_versions.py
@@ -25,7 +25,7 @@ def version_string_to_tuple(version):
 ci_version = '1.7.0'
 
 # Version numbers in the list need to be in semantically increasing order
-many_versions = [ '1.4.32', '1.5.0', '1.5.10', '1.5.21', '1.5.31', '1.6.10', '1.6.20', '1.7.0', '1.7.20-Beta' ]
+many_versions = [ '1.4.32', '1.5.0', '1.5.10', '1.5.20', '1.5.30', '1.6.0', '1.6.20', '1.7.0', '1.7.20-Beta' ]
 
 many_versions_tuples = [version_string_to_tuple(v) for v in many_versions]
 
diff --git a/java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_5_21/Descriptors.kt b/java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_5_20/Descriptors.kt
similarity index 100%
rename from java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_5_21/Descriptors.kt
rename to java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_5_20/Descriptors.kt
diff --git a/java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_5_21/FileEntry.kt b/java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_5_20/FileEntry.kt
similarity index 100%
rename from java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_5_21/FileEntry.kt
rename to java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_5_20/FileEntry.kt
diff --git a/java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_5_21/Psi2Ir.kt b/java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_5_20/Psi2Ir.kt
similarity index 100%
rename from java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_5_21/Psi2Ir.kt
rename to java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_5_20/Psi2Ir.kt
diff --git a/java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_6_10/Descriptors.kt b/java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_6_0/Descriptors.kt
similarity index 100%
rename from java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_6_10/Descriptors.kt
rename to java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_6_0/Descriptors.kt
diff --git a/java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_6_10/Functions.kt b/java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_6_0/Functions.kt
similarity index 100%
rename from java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_6_10/Functions.kt
rename to java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_6_0/Functions.kt