diff --git a/libraries/kotlin.test/Module.md b/libraries/kotlin.test/Module.md
index ebba7c05409..c3e4efad834 100644
--- a/libraries/kotlin.test/Module.md
+++ b/libraries/kotlin.test/Module.md
@@ -1,4 +1,4 @@
-# Module kotlin.test
+# Module kotlin-test
 
 ## kotlin.test
 
diff --git a/libraries/stdlib/src/Module.md b/libraries/stdlib/src/Module.md
index a2c8548fde6..c3c36f2d3c2 100644
--- a/libraries/stdlib/src/Module.md
+++ b/libraries/stdlib/src/Module.md
@@ -1,4 +1,4 @@
-# Module stdlib
+# Module kotlin-stdlib
 
 ## Kotlin Standard Library
 
diff --git a/libraries/tools/kotlin-stdlib-docs/build.gradle b/libraries/tools/kotlin-stdlib-docs/build.gradle
index aba76bc67c6..9021bfb6ab8 100644
--- a/libraries/tools/kotlin-stdlib-docs/build.gradle
+++ b/libraries/tools/kotlin-stdlib-docs/build.gradle
@@ -13,6 +13,8 @@ def pKotlinBig() { return project('kotlin_big').extensions }
 def pKotlinNative() { return project('kotlin_native').extensions }
 
 ext.outputDir = "$buildDir/doc"
+ext.outputDirLatest = "$outputDir/latest"
+ext.outputDirPrevious = "$outputDir/previous"
 ext.kotlin_root = pKotlinBig().kotlin_root
 ext.kotlin_libs = pKotlinBig().kotlin_libs
 ext.kotlin_native_root = pKotlinNative().kotlin_native_root
@@ -68,14 +70,15 @@ TaskProvider<DokkaTask> createStdLibVersionedDocTask(String version, Boolean isL
             kotlinLanguageVersion =  "1.1"
 
 
-        moduleName.set("stdlib")
+        moduleName.set("kotlin-stdlib")
+        def moduleDirName = "kotlin-stdlib"
         if (isLatest) {
-            outputDirectory.set(new File(outputDir, "/kotlin-stdlib/latest"))
+            outputDirectory.set(new File(outputDirLatest, moduleDirName))
             pluginsMapConfiguration.set(["org.jetbrains.dokka.base.DokkaBase"                       : """{ "mergeImplicitExpectActualDeclarations": "true", "templatesDir": "$templatesDir" }""",
                                          "org.jetbrains.dokka.kotlinlang.StdLibConfigurationPlugin": """{ "ignoreCommonBuiltIns": "true" }""",
-                                         "org.jetbrains.dokka.versioning.VersioningPlugin"         : """{ "version": "$version", "olderVersionsDir": "${outputDir.toString().replace('\\', '/')}//kotlin-stdlib/old" }"""])
+                                         "org.jetbrains.dokka.versioning.VersioningPlugin"         : """{ "version": "$version", "olderVersionsDir": "${outputDirPrevious.toString().replace('\\', '/')}/$moduleDirName" }"""])
         } else {
-            outputDirectory.set(new File(outputDir, "/kotlin-stdlib/old/" + version))
+            outputDirectory.set(new File(new File(outputDirPrevious, moduleDirName), version))
             pluginsMapConfiguration.set(["org.jetbrains.dokka.base.DokkaBase"                      : """{ "mergeImplicitExpectActualDeclarations": "true", "templatesDir": "$templatesDir" }""",
                                          "org.jetbrains.dokka.kotlinlang.StdLibConfigurationPlugin": """{ "ignoreCommonBuiltIns": "true" }""",
                                          "org.jetbrains.dokka.kotlinlang.VersionFilterPlugin"      : """{ "targetVersion": "$version" }""",
@@ -237,18 +240,19 @@ TaskProvider<DokkaTask> createKotlinTestVersionedDocTask(String version, Boolean
         def kotlinTestJsClasspath = fileTree("$kotlin_libs/kotlin-test-js")
         def kotlinTestJvmClasspath = fileTree("$kotlin_libs/kotlin-test")
 
-        def stdlibPackageList = new URL("file:///${stdlibDocTask.get().outputDirectory.get()}/stdlib/package-list".toString())
+        def stdlibPackageList = new URL("file:///${stdlibDocTask.get().outputDirectory.get()}/kotlin-stdlib/package-list".toString())
         def junit5PackageList = new URL("https://junit.org/junit5/docs/current/api/element-list".toString())
         def kotlinLanguageVersion = version
 
-        moduleName.set("kotlin.test")
+        moduleName.set("kotlin-test")
 
+        def moduleDirName = "kotlin-test"
         if (isLatest) {
-            outputDirectory.set(new File(outputDir, "/kotlin.test/latest"))
+            outputDirectory.set(new File(outputDirLatest, moduleDirName))
             pluginsMapConfiguration.set(["org.jetbrains.dokka.base.DokkaBase"             : """{ "mergeImplicitExpectActualDeclarations": "true", "templatesDir": "$templatesDir" }""",
-                                         "org.jetbrains.dokka.versioning.VersioningPlugin": """{ "version": "$version", "olderVersionsDir": "${outputDir.toString().replace('\\', '/')}//kotlin.test/old" }"""])
+                                         "org.jetbrains.dokka.versioning.VersioningPlugin": """{ "version": "$version", "olderVersionsDir": "${outputDirPrevious.toString().replace('\\', '/')}/$moduleDirName" }"""])
         } else {
-            outputDirectory.set(new File(outputDir, "/kotlin.test/old/" + version))
+            outputDirectory.set(new File(new File(outputDirPrevious, moduleDirName), version))
             pluginsMapConfiguration.set(["org.jetbrains.dokka.base.DokkaBase"                : """{ "mergeImplicitExpectActualDeclarations": "true", "templatesDir": "$templatesDir" }""",
                                          "org.jetbrains.dokka.kotlinlang.VersionFilterPlugin": """{ "targetVersion": "$version" }""",
                                          "org.jetbrains.dokka.versioning.VersioningPlugin"   : """{ "version": "$version" }"""])