From c72b5dab616d4f1fc47fb11bc5c8f9baa01240c6 Mon Sep 17 00:00:00 2001
From: Kamil Doległo <kamilok1965@interia.pl>
Date: Thu, 16 Apr 2020 14:13:29 +0200
Subject: Change '<>' to '[]' in default package name as Windows prohibits
 filenames with '<>'

---
 .../DefaultDescriptorToDocumentableTranslator.kt   |  2 +-
 plugins/base/src/test/kotlin/model/PackagesTest.kt |  4 +-
 .../annotatedFunction/out/html/navigation.html     |  6 +-
 .../out/html/root/<jvm root>/f.html                | 31 --------
 .../out/html/root/<jvm root>/index.html            | 46 ------------
 .../out/html/root/[jvm root]/f.html                | 31 ++++++++
 .../out/html/root/[jvm root]/index.html            | 46 ++++++++++++
 .../annotatedFunction/out/html/root/index.html     |  2 +-
 .../annotatedFunction/out/html/root/package-list   |  4 +-
 .../annotatedFunction/out/html/scripts/pages.js    |  4 +-
 .../out/html/navigation.html                       | 10 +--
 .../out/html/root/<jvm root>/-fancy/-init-.html    | 31 --------
 .../out/html/root/<jvm root>/-fancy/equals.html    | 31 --------
 .../out/html/root/<jvm root>/-fancy/hash-code.html | 31 --------
 .../out/html/root/<jvm root>/-fancy/index.html     | 83 ----------------------
 .../out/html/root/<jvm root>/-fancy/to-string.html | 31 --------
 .../out/html/root/<jvm root>/f.html                | 31 --------
 .../out/html/root/<jvm root>/index.html            | 62 ----------------
 .../out/html/root/[jvm root]/-fancy/-init-.html    | 31 ++++++++
 .../out/html/root/[jvm root]/-fancy/equals.html    | 31 ++++++++
 .../out/html/root/[jvm root]/-fancy/hash-code.html | 31 ++++++++
 .../out/html/root/[jvm root]/-fancy/index.html     | 83 ++++++++++++++++++++++
 .../out/html/root/[jvm root]/-fancy/to-string.html | 31 ++++++++
 .../out/html/root/[jvm root]/f.html                | 31 ++++++++
 .../out/html/root/[jvm root]/index.html            | 62 ++++++++++++++++
 .../out/html/root/index.html                       |  2 +-
 .../out/html/root/package-list                     | 10 +--
 .../out/html/scripts/pages.js                      | 14 ++--
 .../expect/function/out/html/navigation.html       |  6 +-
 .../function/out/html/root/<jvm root>/fn.html      | 33 ---------
 .../function/out/html/root/<jvm root>/index.html   | 46 ------------
 .../function/out/html/root/[jvm root]/fn.html      | 33 +++++++++
 .../function/out/html/root/[jvm root]/index.html   | 46 ++++++++++++
 .../expect/function/out/html/root/index.html       |  2 +-
 .../expect/function/out/html/root/package-list     |  4 +-
 .../expect/function/out/html/scripts/pages.js      |  4 +-
 .../out/html/navigation.html                       | 10 +--
 .../out/html/root/<jvm root>/-fancy/-init-.html    | 31 --------
 .../out/html/root/<jvm root>/-fancy/equals.html    | 31 --------
 .../out/html/root/<jvm root>/-fancy/hash-code.html | 31 --------
 .../out/html/root/<jvm root>/-fancy/index.html     | 67 -----------------
 .../out/html/root/<jvm root>/-fancy/to-string.html | 31 --------
 .../out/html/root/<jvm root>/function.html         | 31 --------
 .../out/html/root/<jvm root>/index.html            | 62 ----------------
 .../out/html/root/[jvm root]/-fancy/-init-.html    | 31 ++++++++
 .../out/html/root/[jvm root]/-fancy/equals.html    | 31 ++++++++
 .../out/html/root/[jvm root]/-fancy/hash-code.html | 31 ++++++++
 .../out/html/root/[jvm root]/-fancy/index.html     | 67 +++++++++++++++++
 .../out/html/root/[jvm root]/-fancy/to-string.html | 31 ++++++++
 .../out/html/root/[jvm root]/function.html         | 31 ++++++++
 .../out/html/root/[jvm root]/index.html            | 62 ++++++++++++++++
 .../out/html/root/index.html                       |  2 +-
 .../out/html/root/package-list                     | 10 +--
 .../out/html/scripts/pages.js                      | 14 ++--
 .../out/html/navigation.html                       |  6 +-
 .../out/html/root/<jvm root>/f.html                | 31 --------
 .../out/html/root/<jvm root>/index.html            | 46 ------------
 .../out/html/root/[jvm root]/f.html                | 31 ++++++++
 .../out/html/root/[jvm root]/index.html            | 46 ++++++++++++
 .../out/html/root/index.html                       |  2 +-
 .../out/html/root/package-list                     |  4 +-
 .../out/html/scripts/pages.js                      |  4 +-
 .../out/html/navigation.html                       |  6 +-
 .../out/html/root/<jvm root>/function.html         | 31 --------
 .../out/html/root/<jvm root>/index.html            | 46 ------------
 .../out/html/root/[jvm root]/function.html         | 31 ++++++++
 .../out/html/root/[jvm root]/index.html            | 46 ++++++++++++
 .../out/html/root/index.html                       |  2 +-
 .../out/html/root/package-list                     |  4 +-
 .../out/html/scripts/pages.js                      |  4 +-
 .../out/html/navigation.html                       |  6 +-
 .../out/html/root/<jvm root>/f.html                | 31 --------
 .../out/html/root/<jvm root>/index.html            | 46 ------------
 .../out/html/root/[jvm root]/f.html                | 31 ++++++++
 .../out/html/root/[jvm root]/index.html            | 46 ++++++++++++
 .../out/html/root/index.html                       |  2 +-
 .../out/html/root/package-list                     |  4 +-
 .../out/html/scripts/pages.js                      |  4 +-
 .../functionWithParams/out/html/navigation.html    |  6 +-
 .../out/html/root/<jvm root>/function.html         | 33 ---------
 .../out/html/root/<jvm root>/index.html            | 46 ------------
 .../out/html/root/[jvm root]/function.html         | 33 +++++++++
 .../out/html/root/[jvm root]/index.html            | 46 ++++++++++++
 .../functionWithParams/out/html/root/index.html    |  2 +-
 .../functionWithParams/out/html/root/package-list  |  4 +-
 .../functionWithParams/out/html/scripts/pages.js   |  4 +-
 .../functionWithReceiver/out/html/navigation.html  |  6 +-
 .../out/html/root/<jvm root>/fn.html               | 39 ----------
 .../out/html/root/<jvm root>/index.html            | 56 ---------------
 .../out/html/root/[jvm root]/fn.html               | 39 ++++++++++
 .../out/html/root/[jvm root]/index.html            | 56 +++++++++++++++
 .../functionWithReceiver/out/html/root/index.html  |  2 +-
 .../out/html/root/package-list                     |  6 +-
 .../functionWithReceiver/out/html/scripts/pages.js |  4 +-
 .../genericFunction/out/html/navigation.html       |  6 +-
 .../out/html/root/<jvm root>/generic.html          | 33 ---------
 .../out/html/root/<jvm root>/index.html            | 46 ------------
 .../out/html/root/[jvm root]/generic.html          | 33 +++++++++
 .../out/html/root/[jvm root]/index.html            | 46 ++++++++++++
 .../genericFunction/out/html/root/index.html       |  2 +-
 .../genericFunction/out/html/root/package-list     |  4 +-
 .../genericFunction/out/html/scripts/pages.js      |  4 +-
 .../out/html/navigation.html                       |  6 +-
 .../out/html/root/<jvm root>/generic.html          | 33 ---------
 .../out/html/root/<jvm root>/index.html            | 46 ------------
 .../out/html/root/[jvm root]/generic.html          | 33 +++++++++
 .../out/html/root/[jvm root]/index.html            | 46 ++++++++++++
 .../out/html/root/index.html                       |  2 +-
 .../out/html/root/package-list                     |  4 +-
 .../out/html/scripts/pages.js                      |  4 +-
 .../expect/inlineFunction/out/html/navigation.html |  6 +-
 .../inlineFunction/out/html/root/<jvm root>/f.html | 31 --------
 .../out/html/root/<jvm root>/index.html            | 46 ------------
 .../inlineFunction/out/html/root/[jvm root]/f.html | 31 ++++++++
 .../out/html/root/[jvm root]/index.html            | 46 ++++++++++++
 .../expect/inlineFunction/out/html/root/index.html |  2 +-
 .../inlineFunction/out/html/root/package-list      |  4 +-
 .../inlineFunction/out/html/scripts/pages.js       |  4 +-
 .../inlineSuspendFunction/out/html/navigation.html |  6 +-
 .../out/html/root/<jvm root>/f.html                | 31 --------
 .../out/html/root/<jvm root>/index.html            | 46 ------------
 .../out/html/root/[jvm root]/f.html                | 31 ++++++++
 .../out/html/root/[jvm root]/index.html            | 46 ++++++++++++
 .../inlineSuspendFunction/out/html/root/index.html |  2 +-
 .../out/html/root/package-list                     |  4 +-
 .../out/html/scripts/pages.js                      |  4 +-
 .../expect/sinceKotlin/out/html/navigation.html    |  6 +-
 .../html/root/<jvm root>/available-since1.1.html   | 33 ---------
 .../out/html/root/<jvm root>/index.html            | 46 ------------
 .../html/root/[jvm root]/available-since1.1.html   | 33 +++++++++
 .../out/html/root/[jvm root]/index.html            | 46 ++++++++++++
 .../expect/sinceKotlin/out/html/root/index.html    |  2 +-
 .../expect/sinceKotlin/out/html/root/package-list  |  4 +-
 .../expect/sinceKotlin/out/html/scripts/pages.js   |  4 +-
 .../suspendFunction/out/html/navigation.html       |  6 +-
 .../out/html/root/<jvm root>/f.html                | 31 --------
 .../out/html/root/<jvm root>/index.html            | 46 ------------
 .../out/html/root/[jvm root]/f.html                | 31 ++++++++
 .../out/html/root/[jvm root]/index.html            | 46 ++++++++++++
 .../suspendFunction/out/html/root/index.html       |  2 +-
 .../suspendFunction/out/html/root/package-list     |  4 +-
 .../suspendFunction/out/html/scripts/pages.js      |  4 +-
 .../suspendInlineFunction/out/html/navigation.html |  6 +-
 .../out/html/root/<jvm root>/f.html                | 31 --------
 .../out/html/root/<jvm root>/index.html            | 46 ------------
 .../out/html/root/[jvm root]/f.html                | 31 ++++++++
 .../out/html/root/[jvm root]/index.html            | 46 ++++++++++++
 .../suspendInlineFunction/out/html/root/index.html |  2 +-
 .../out/html/root/package-list                     |  4 +-
 .../out/html/scripts/pages.js                      |  4 +-
 150 files changed, 1842 insertions(+), 1842 deletions(-)
 delete mode 100644 plugins/base/src/test/resources/expect/annotatedFunction/out/html/root/<jvm root>/f.html
 delete mode 100644 plugins/base/src/test/resources/expect/annotatedFunction/out/html/root/<jvm root>/index.html
 create mode 100644 plugins/base/src/test/resources/expect/annotatedFunction/out/html/root/[jvm root]/f.html
 create mode 100644 plugins/base/src/test/resources/expect/annotatedFunction/out/html/root/[jvm root]/index.html
 delete mode 100644 plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/<jvm root>/-fancy/-init-.html
 delete mode 100644 plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/<jvm root>/-fancy/equals.html
 delete mode 100644 plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/<jvm root>/-fancy/hash-code.html
 delete mode 100644 plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/<jvm root>/-fancy/index.html
 delete mode 100644 plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/<jvm root>/-fancy/to-string.html
 delete mode 100644 plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/<jvm root>/f.html
 delete mode 100644 plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/<jvm root>/index.html
 create mode 100644 plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/[jvm root]/-fancy/-init-.html
 create mode 100644 plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/[jvm root]/-fancy/equals.html
 create mode 100644 plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/[jvm root]/-fancy/hash-code.html
 create mode 100644 plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/[jvm root]/-fancy/index.html
 create mode 100644 plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/[jvm root]/-fancy/to-string.html
 create mode 100644 plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/[jvm root]/f.html
 create mode 100644 plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/[jvm root]/index.html
 delete mode 100644 plugins/base/src/test/resources/expect/function/out/html/root/<jvm root>/fn.html
 delete mode 100644 plugins/base/src/test/resources/expect/function/out/html/root/<jvm root>/index.html
 create mode 100644 plugins/base/src/test/resources/expect/function/out/html/root/[jvm root]/fn.html
 create mode 100644 plugins/base/src/test/resources/expect/function/out/html/root/[jvm root]/index.html
 delete mode 100644 plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/<jvm root>/-fancy/-init-.html
 delete mode 100644 plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/<jvm root>/-fancy/equals.html
 delete mode 100644 plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/<jvm root>/-fancy/hash-code.html
 delete mode 100644 plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/<jvm root>/-fancy/index.html
 delete mode 100644 plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/<jvm root>/-fancy/to-string.html
 delete mode 100644 plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/<jvm root>/function.html
 delete mode 100644 plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/<jvm root>/index.html
 create mode 100644 plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/[jvm root]/-fancy/-init-.html
 create mode 100644 plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/[jvm root]/-fancy/equals.html
 create mode 100644 plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/[jvm root]/-fancy/hash-code.html
 create mode 100644 plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/[jvm root]/-fancy/index.html
 create mode 100644 plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/[jvm root]/-fancy/to-string.html
 create mode 100644 plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/[jvm root]/function.html
 create mode 100644 plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/[jvm root]/index.html
 delete mode 100644 plugins/base/src/test/resources/expect/functionWithDefaultParameter/out/html/root/<jvm root>/f.html
 delete mode 100644 plugins/base/src/test/resources/expect/functionWithDefaultParameter/out/html/root/<jvm root>/index.html
 create mode 100644 plugins/base/src/test/resources/expect/functionWithDefaultParameter/out/html/root/[jvm root]/f.html
 create mode 100644 plugins/base/src/test/resources/expect/functionWithDefaultParameter/out/html/root/[jvm root]/index.html
 delete mode 100644 plugins/base/src/test/resources/expect/functionWithNoinlineParam/out/html/root/<jvm root>/function.html
 delete mode 100644 plugins/base/src/test/resources/expect/functionWithNoinlineParam/out/html/root/<jvm root>/index.html
 create mode 100644 plugins/base/src/test/resources/expect/functionWithNoinlineParam/out/html/root/[jvm root]/function.html
 create mode 100644 plugins/base/src/test/resources/expect/functionWithNoinlineParam/out/html/root/[jvm root]/index.html
 delete mode 100644 plugins/base/src/test/resources/expect/functionWithNotDocumentedAnnotation/out/html/root/<jvm root>/f.html
 delete mode 100644 plugins/base/src/test/resources/expect/functionWithNotDocumentedAnnotation/out/html/root/<jvm root>/index.html
 create mode 100644 plugins/base/src/test/resources/expect/functionWithNotDocumentedAnnotation/out/html/root/[jvm root]/f.html
 create mode 100644 plugins/base/src/test/resources/expect/functionWithNotDocumentedAnnotation/out/html/root/[jvm root]/index.html
 delete mode 100644 plugins/base/src/test/resources/expect/functionWithParams/out/html/root/<jvm root>/function.html
 delete mode 100644 plugins/base/src/test/resources/expect/functionWithParams/out/html/root/<jvm root>/index.html
 create mode 100644 plugins/base/src/test/resources/expect/functionWithParams/out/html/root/[jvm root]/function.html
 create mode 100644 plugins/base/src/test/resources/expect/functionWithParams/out/html/root/[jvm root]/index.html
 delete mode 100644 plugins/base/src/test/resources/expect/functionWithReceiver/out/html/root/<jvm root>/fn.html
 delete mode 100644 plugins/base/src/test/resources/expect/functionWithReceiver/out/html/root/<jvm root>/index.html
 create mode 100644 plugins/base/src/test/resources/expect/functionWithReceiver/out/html/root/[jvm root]/fn.html
 create mode 100644 plugins/base/src/test/resources/expect/functionWithReceiver/out/html/root/[jvm root]/index.html
 delete mode 100644 plugins/base/src/test/resources/expect/genericFunction/out/html/root/<jvm root>/generic.html
 delete mode 100644 plugins/base/src/test/resources/expect/genericFunction/out/html/root/<jvm root>/index.html
 create mode 100644 plugins/base/src/test/resources/expect/genericFunction/out/html/root/[jvm root]/generic.html
 create mode 100644 plugins/base/src/test/resources/expect/genericFunction/out/html/root/[jvm root]/index.html
 delete mode 100644 plugins/base/src/test/resources/expect/genericFunctionWithConstraints/out/html/root/<jvm root>/generic.html
 delete mode 100644 plugins/base/src/test/resources/expect/genericFunctionWithConstraints/out/html/root/<jvm root>/index.html
 create mode 100644 plugins/base/src/test/resources/expect/genericFunctionWithConstraints/out/html/root/[jvm root]/generic.html
 create mode 100644 plugins/base/src/test/resources/expect/genericFunctionWithConstraints/out/html/root/[jvm root]/index.html
 delete mode 100644 plugins/base/src/test/resources/expect/inlineFunction/out/html/root/<jvm root>/f.html
 delete mode 100644 plugins/base/src/test/resources/expect/inlineFunction/out/html/root/<jvm root>/index.html
 create mode 100644 plugins/base/src/test/resources/expect/inlineFunction/out/html/root/[jvm root]/f.html
 create mode 100644 plugins/base/src/test/resources/expect/inlineFunction/out/html/root/[jvm root]/index.html
 delete mode 100644 plugins/base/src/test/resources/expect/inlineSuspendFunction/out/html/root/<jvm root>/f.html
 delete mode 100644 plugins/base/src/test/resources/expect/inlineSuspendFunction/out/html/root/<jvm root>/index.html
 create mode 100644 plugins/base/src/test/resources/expect/inlineSuspendFunction/out/html/root/[jvm root]/f.html
 create mode 100644 plugins/base/src/test/resources/expect/inlineSuspendFunction/out/html/root/[jvm root]/index.html
 delete mode 100644 plugins/base/src/test/resources/expect/sinceKotlin/out/html/root/<jvm root>/available-since1.1.html
 delete mode 100644 plugins/base/src/test/resources/expect/sinceKotlin/out/html/root/<jvm root>/index.html
 create mode 100644 plugins/base/src/test/resources/expect/sinceKotlin/out/html/root/[jvm root]/available-since1.1.html
 create mode 100644 plugins/base/src/test/resources/expect/sinceKotlin/out/html/root/[jvm root]/index.html
 delete mode 100644 plugins/base/src/test/resources/expect/suspendFunction/out/html/root/<jvm root>/f.html
 delete mode 100644 plugins/base/src/test/resources/expect/suspendFunction/out/html/root/<jvm root>/index.html
 create mode 100644 plugins/base/src/test/resources/expect/suspendFunction/out/html/root/[jvm root]/f.html
 create mode 100644 plugins/base/src/test/resources/expect/suspendFunction/out/html/root/[jvm root]/index.html
 delete mode 100644 plugins/base/src/test/resources/expect/suspendInlineFunction/out/html/root/<jvm root>/f.html
 delete mode 100644 plugins/base/src/test/resources/expect/suspendInlineFunction/out/html/root/<jvm root>/index.html
 create mode 100644 plugins/base/src/test/resources/expect/suspendInlineFunction/out/html/root/[jvm root]/f.html
 create mode 100644 plugins/base/src/test/resources/expect/suspendInlineFunction/out/html/root/[jvm root]/index.html

(limited to 'plugins/base/src')

diff --git a/plugins/base/src/main/kotlin/translators/descriptors/DefaultDescriptorToDocumentableTranslator.kt b/plugins/base/src/main/kotlin/translators/descriptors/DefaultDescriptorToDocumentableTranslator.kt
index c2f190c2..25e6f6ac 100644
--- a/plugins/base/src/main/kotlin/translators/descriptors/DefaultDescriptorToDocumentableTranslator.kt
+++ b/plugins/base/src/main/kotlin/translators/descriptors/DefaultDescriptorToDocumentableTranslator.kt
@@ -73,7 +73,7 @@ private class DokkaDescriptorVisitor(
         parent: DRIWithPlatformInfo
     ): DPackage {
         val name = descriptor.fqName.asString().takeUnless { it.isBlank() } ?:
-                "<" + platformData.targets.joinToString(",")  + " root>"// TODO: error-prone, find a better way to do it
+                "[" + platformData.targets.joinToString(" ")  + " root]"// TODO: error-prone, find a better way to do it
         val driWithPlatform = DRI(packageName = name).withEmptyInfo()
         val scope = descriptor.getMemberScope()
 
diff --git a/plugins/base/src/test/kotlin/model/PackagesTest.kt b/plugins/base/src/test/kotlin/model/PackagesTest.kt
index ec8921d6..11d456ce 100644
--- a/plugins/base/src/test/kotlin/model/PackagesTest.kt
+++ b/plugins/base/src/test/kotlin/model/PackagesTest.kt
@@ -14,8 +14,8 @@ class PackagesTest : AbstractModelTest("/src/main/kotlin/packages/Test.kt", "pac
             """.trimIndent(),
             prependPackage = false
         ) {
-            with((this / "<jvm root>").cast<DPackage>()) {
-                name equals "<jvm root>"
+            with((this / "[jvm root]").cast<DPackage>()) {
+                name equals "[jvm root]"
                 children counts 0
             }
         }
diff --git a/plugins/base/src/test/resources/expect/annotatedFunction/out/html/navigation.html b/plugins/base/src/test/resources/expect/annotatedFunction/out/html/navigation.html
index 463b028f..35fe78dc 100644
--- a/plugins/base/src/test/resources/expect/annotatedFunction/out/html/navigation.html
+++ b/plugins/base/src/test/resources/expect/annotatedFunction/out/html/navigation.html
@@ -1,9 +1,9 @@
 <div class="sideMenuPart" id="nav-submenu" pageId="/////">
   <div class="overview"><a href="root/index.html">root</a><span class="navButton" onclick="document.getElementById(&quot;nav-submenu&quot;).classList.toggle(&quot;hidden&quot;);"><span class="navButtonContent"></span></span></div>
-  <div class="sideMenuPart" id="nav-submenu-0" pageId="&lt;jvm root&gt;/////">
-    <div class="overview"><a href="root/&lt;jvm root&gt;/index.html">&lt;jvm root&gt;</a><span class="navButton" onclick="document.getElementById(&quot;nav-submenu-0&quot;).classList.toggle(&quot;hidden&quot;);"><span class="navButtonContent"></span></span></div>
+  <div class="sideMenuPart" id="nav-submenu-0" pageId="[jvm root]/////">
+    <div class="overview"><a href="root/[jvm root]/index.html">[jvm root]</a><span class="navButton" onclick="document.getElementById(&quot;nav-submenu-0&quot;).classList.toggle(&quot;hidden&quot;);"><span class="navButtonContent"></span></span></div>
     <div class="sideMenuPart" id="nav-submenu-0-0" pageId="//f/#//">
-      <div class="overview"><a href="root/&lt;jvm root&gt;/f.html">f</a></div>
+      <div class="overview"><a href="root/[jvm root]/f.html">f</a></div>
     </div>
   </div>
 </div>
diff --git a/plugins/base/src/test/resources/expect/annotatedFunction/out/html/root/<jvm root>/f.html b/plugins/base/src/test/resources/expect/annotatedFunction/out/html/root/<jvm root>/f.html
deleted file mode 100644
index 9de96412..00000000
--- a/plugins/base/src/test/resources/expect/annotatedFunction/out/html/root/<jvm root>/f.html	
+++ /dev/null
@@ -1,31 +0,0 @@
-<html>
-  <head>
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <title>f</title>
-    <link href="../../styles/style.css" rel="Stylesheet">
-    <script type="text/javascript" src="../../scripts/navigationLoader.js" async="async"></script>
-    <script type="text/javascript" src="../../scripts/platformContentHandler.js" async="async"></script>
-    <script>var pathToRoot = "../../";</script>
-  </head>
-  <body>
-    <div id="container">
-      <div id="leftColumn">
-        <div id="logo"></div>
-        <div id="sideMenu"></div>
-      </div>
-      <div id="main">
-        <div id="searchBar"></div>
-        <script type="text/javascript" src="../../scripts/pages.js"></script>
-        <script type="text/javascript" src="../../scripts/main.js"></script>
-        <div id="content" pageIds="//f/#//">
-          <div class="breadcrumbs">//<a href="../index.html">root</a>/<a href="index.html">&lt;jvm root&gt;</a>/<a href="f.html">f</a></div>
-          <div class="cover ">
-            <h1>f</h1>
-            <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm"><div class="symbol monospace">final fun <a href="f.html">f</a>()</div></div></div>
-          </div>
-        </div>
-      </div>
-    </div>
-  </body>
-</html>
-
diff --git a/plugins/base/src/test/resources/expect/annotatedFunction/out/html/root/<jvm root>/index.html b/plugins/base/src/test/resources/expect/annotatedFunction/out/html/root/<jvm root>/index.html
deleted file mode 100644
index 1ebe6dce..00000000
--- a/plugins/base/src/test/resources/expect/annotatedFunction/out/html/root/<jvm root>/index.html	
+++ /dev/null
@@ -1,46 +0,0 @@
-<html>
-  <head>
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <title>&lt;jvm root&gt;</title>
-    <link href="../../styles/style.css" rel="Stylesheet">
-    <script type="text/javascript" src="../../scripts/navigationLoader.js" async="async"></script>
-    <script type="text/javascript" src="../../scripts/platformContentHandler.js" async="async"></script>
-    <script>var pathToRoot = "../../";</script>
-  </head>
-  <body>
-    <div id="container">
-      <div id="leftColumn">
-        <div id="logo"></div>
-        <div id="sideMenu"></div>
-      </div>
-      <div id="main">
-        <div id="searchBar"></div>
-        <script type="text/javascript" src="../../scripts/pages.js"></script>
-        <script type="text/javascript" src="../../scripts/main.js"></script>
-        <div id="content" pageIds="&lt;jvm root&gt;/////">
-          <div class="breadcrumbs">//<a href="../index.html">root</a>/<a href="index.html">&lt;jvm root&gt;</a></div>
-          <div class="cover ">
-            <h1>Package &lt;jvm root&gt;</h1>
-          </div>
-          <h2>Functions</h2>
-          <table>
-            <thead></thead>
-            <tbody>
-              <tr class="platform-tagged">
-                <td class="content"><a href="f.html">f</a></td>
-                <td class="content">
-                  <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm"><div class="symbol monospace">final fun <a href="f.html">f</a>()</div></div></div>
-                  <div class="brief "> </div>
-                </td>
-                <td class="platform-tagged">
-                  <div class="platform-tag jvm">JVM</div>
-                </td>
-              </tr>
-            </tbody>
-          </table>
-        </div>
-      </div>
-    </div>
-  </body>
-</html>
-
diff --git a/plugins/base/src/test/resources/expect/annotatedFunction/out/html/root/[jvm root]/f.html b/plugins/base/src/test/resources/expect/annotatedFunction/out/html/root/[jvm root]/f.html
new file mode 100644
index 00000000..6c049b35
--- /dev/null
+++ b/plugins/base/src/test/resources/expect/annotatedFunction/out/html/root/[jvm root]/f.html	
@@ -0,0 +1,31 @@
+<html>
+  <head>
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <title>f</title>
+    <link href="../../styles/style.css" rel="Stylesheet">
+    <script type="text/javascript" src="../../scripts/navigationLoader.js" async="async"></script>
+    <script type="text/javascript" src="../../scripts/platformContentHandler.js" async="async"></script>
+    <script>var pathToRoot = "../../";</script>
+  </head>
+  <body>
+    <div id="container">
+      <div id="leftColumn">
+        <div id="logo"></div>
+        <div id="sideMenu"></div>
+      </div>
+      <div id="main">
+        <div id="searchBar"></div>
+        <script type="text/javascript" src="../../scripts/pages.js"></script>
+        <script type="text/javascript" src="../../scripts/main.js"></script>
+        <div id="content" pageIds="//f/#//">
+          <div class="breadcrumbs">//<a href="../index.html">root</a>/<a href="index.html">[jvm root]</a>/<a href="f.html">f</a></div>
+          <div class="cover ">
+            <h1>f</h1>
+            <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm"><div class="symbol monospace">final fun <a href="f.html">f</a>()</div></div></div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </body>
+</html>
+
diff --git a/plugins/base/src/test/resources/expect/annotatedFunction/out/html/root/[jvm root]/index.html b/plugins/base/src/test/resources/expect/annotatedFunction/out/html/root/[jvm root]/index.html
new file mode 100644
index 00000000..8ab1c93f
--- /dev/null
+++ b/plugins/base/src/test/resources/expect/annotatedFunction/out/html/root/[jvm root]/index.html	
@@ -0,0 +1,46 @@
+<html>
+  <head>
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <title>[jvm root]</title>
+    <link href="../../styles/style.css" rel="Stylesheet">
+    <script type="text/javascript" src="../../scripts/navigationLoader.js" async="async"></script>
+    <script type="text/javascript" src="../../scripts/platformContentHandler.js" async="async"></script>
+    <script>var pathToRoot = "../../";</script>
+  </head>
+  <body>
+    <div id="container">
+      <div id="leftColumn">
+        <div id="logo"></div>
+        <div id="sideMenu"></div>
+      </div>
+      <div id="main">
+        <div id="searchBar"></div>
+        <script type="text/javascript" src="../../scripts/pages.js"></script>
+        <script type="text/javascript" src="../../scripts/main.js"></script>
+        <div id="content" pageIds="[jvm root]/////">
+          <div class="breadcrumbs">//<a href="../index.html">root</a>/<a href="index.html">[jvm root]</a></div>
+          <div class="cover ">
+            <h1>Package [jvm root]</h1>
+          </div>
+          <h2>Functions</h2>
+          <table>
+            <thead></thead>
+            <tbody>
+              <tr class="platform-tagged">
+                <td class="content"><a href="f.html">f</a></td>
+                <td class="content">
+                  <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm"><div class="symbol monospace">final fun <a href="f.html">f</a>()</div></div></div>
+                  <div class="brief "> </div>
+                </td>
+                <td class="platform-tagged">
+                  <div class="platform-tag jvm">JVM</div>
+                </td>
+              </tr>
+            </tbody>
+          </table>
+        </div>
+      </div>
+    </div>
+  </body>
+</html>
+
diff --git a/plugins/base/src/test/resources/expect/annotatedFunction/out/html/root/index.html b/plugins/base/src/test/resources/expect/annotatedFunction/out/html/root/index.html
index a3211166..440758c2 100644
--- a/plugins/base/src/test/resources/expect/annotatedFunction/out/html/root/index.html
+++ b/plugins/base/src/test/resources/expect/annotatedFunction/out/html/root/index.html
@@ -27,7 +27,7 @@
             <thead></thead>
             <tbody>
               <tr class="platform-tagged">
-                <td class="content"><a href="&lt;jvm root&gt;/index.html">&lt;jvm root&gt;</a></td>
+                <td class="content"><a href="[jvm root]/index.html">[jvm root]</a></td>
                 <td class="platform-tagged">
                   <div class="platform-tag jvm">JVM</div>
                 </td>
diff --git a/plugins/base/src/test/resources/expect/annotatedFunction/out/html/root/package-list b/plugins/base/src/test/resources/expect/annotatedFunction/out/html/root/package-list
index caf6273a..8f1c5fd9 100644
--- a/plugins/base/src/test/resources/expect/annotatedFunction/out/html/root/package-list
+++ b/plugins/base/src/test/resources/expect/annotatedFunction/out/html/root/package-list
@@ -1,5 +1,5 @@
 $dokka.format:html
 $dokka.linkExtension:html
-$dokka.location://f/#//root/<jvm root>/f.html
-<jvm root>
+$dokka.location://f/#//root/[jvm root]/f.html
+[jvm root]
 
diff --git a/plugins/base/src/test/resources/expect/annotatedFunction/out/html/scripts/pages.js b/plugins/base/src/test/resources/expect/annotatedFunction/out/html/scripts/pages.js
index 68e0c564..310827d1 100644
--- a/plugins/base/src/test/resources/expect/annotatedFunction/out/html/scripts/pages.js
+++ b/plugins/base/src/test/resources/expect/annotatedFunction/out/html/scripts/pages.js
@@ -1,5 +1,5 @@
 var pages = [
 { "name": "root",  "location": "root/index.html" },
-{ "name": "<jvm root>",  "location": "root/<jvm root>/index.html" },
-{ "name": "f",  "location": "root/<jvm root>/f.html" }
+{ "name": "[jvm root]",  "location": "root/[jvm root]/index.html" },
+{ "name": "f",  "location": "root/[jvm root]/f.html" }
 ]
diff --git a/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/navigation.html b/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/navigation.html
index b082a50a..a7486efc 100644
--- a/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/navigation.html
+++ b/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/navigation.html
@@ -1,12 +1,12 @@
 <div class="sideMenuPart" id="nav-submenu" pageId="/////">
   <div class="overview"><a href="root/index.html">root</a><span class="navButton" onclick="document.getElementById(&quot;nav-submenu&quot;).classList.toggle(&quot;hidden&quot;);"><span class="navButtonContent"></span></span></div>
-  <div class="sideMenuPart" id="nav-submenu-0" pageId="&lt;jvm root&gt;/////">
-    <div class="overview"><a href="root/&lt;jvm root&gt;/index.html">&lt;jvm root&gt;</a><span class="navButton" onclick="document.getElementById(&quot;nav-submenu-0&quot;).classList.toggle(&quot;hidden&quot;);"><span class="navButtonContent"></span></span></div>
-    <div class="sideMenuPart" id="nav-submenu-0-0" pageId="&lt;jvm root&gt;/Fancy////">
-      <div class="overview"><a href="root/&lt;jvm root&gt;/-fancy/index.html">Fancy</a></div>
+  <div class="sideMenuPart" id="nav-submenu-0" pageId="[jvm root]/////">
+    <div class="overview"><a href="root/[jvm root]/index.html">[jvm root]</a><span class="navButton" onclick="document.getElementById(&quot;nav-submenu-0&quot;).classList.toggle(&quot;hidden&quot;);"><span class="navButtonContent"></span></span></div>
+    <div class="sideMenuPart" id="nav-submenu-0-0" pageId="[jvm root]/Fancy////">
+      <div class="overview"><a href="root/[jvm root]/-fancy/index.html">Fancy</a></div>
     </div>
     <div class="sideMenuPart" id="nav-submenu-0-1" pageId="//f/#//">
-      <div class="overview"><a href="root/&lt;jvm root&gt;/f.html">f</a></div>
+      <div class="overview"><a href="root/[jvm root]/f.html">f</a></div>
     </div>
   </div>
 </div>
diff --git a/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/<jvm root>/-fancy/-init-.html b/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/<jvm root>/-fancy/-init-.html
deleted file mode 100644
index d1bfe590..00000000
--- a/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/<jvm root>/-fancy/-init-.html	
+++ /dev/null
@@ -1,31 +0,0 @@
-<html>
-  <head>
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <title>&lt;init&gt;</title>
-    <link href="../../../styles/style.css" rel="Stylesheet">
-    <script type="text/javascript" src="../../../scripts/navigationLoader.js" async="async"></script>
-    <script type="text/javascript" src="../../../scripts/platformContentHandler.js" async="async"></script>
-    <script>var pathToRoot = "../../../";</script>
-  </head>
-  <body>
-    <div id="container">
-      <div id="leftColumn">
-        <div id="logo"></div>
-        <div id="sideMenu"></div>
-      </div>
-      <div id="main">
-        <div id="searchBar"></div>
-        <script type="text/javascript" src="../../../scripts/pages.js"></script>
-        <script type="text/javascript" src="../../../scripts/main.js"></script>
-        <div id="content" pageIds="&lt;jvm root&gt;/Fancy/&lt;init&gt;/#kotlin.Int//">
-          <div class="breadcrumbs">//<a href="../../index.html">root</a>/<a href="../index.html">&lt;jvm root&gt;</a>/<a href="index.html">Fancy</a>/<a href="-init-.html">&lt;init&gt;</a></div>
-          <div class="cover ">
-            <h1>&lt;init&gt;</h1>
-            <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm"><div class="symbol monospace">final fun <a href="-init-.html">&lt;init&gt;</a>(size: <a href="">Int</a>)</div></div></div>
-          </div>
-        </div>
-      </div>
-    </div>
-  </body>
-</html>
-
diff --git a/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/<jvm root>/-fancy/equals.html b/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/<jvm root>/-fancy/equals.html
deleted file mode 100644
index 2645051d..00000000
--- a/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/<jvm root>/-fancy/equals.html	
+++ /dev/null
@@ -1,31 +0,0 @@
-<html>
-  <head>
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <title>equals</title>
-    <link href="../../../styles/style.css" rel="Stylesheet">
-    <script type="text/javascript" src="../../../scripts/navigationLoader.js" async="async"></script>
-    <script type="text/javascript" src="../../../scripts/platformContentHandler.js" async="async"></script>
-    <script>var pathToRoot = "../../../";</script>
-  </head>
-  <body>
-    <div id="container">
-      <div id="leftColumn">
-        <div id="logo"></div>
-        <div id="sideMenu"></div>
-      </div>
-      <div id="main">
-        <div id="searchBar"></div>
-        <script type="text/javascript" src="../../../scripts/pages.js"></script>
-        <script type="text/javascript" src="../../../scripts/main.js"></script>
-        <div id="content" pageIds="/Fancy/equals/#kotlin.Any?//">
-          <div class="breadcrumbs">//<a href="../../index.html">root</a>/<a href="../index.html">&lt;jvm root&gt;</a>/<a href="index.html">Fancy</a>/<a href="equals.html">equals</a></div>
-          <div class="cover ">
-            <h1>equals</h1>
-            <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm"><div class="symbol monospace">open fun <a href="equals.html">equals</a>(other: <a href="">Any</a>): <a href="">Boolean</a></div></div></div>
-          </div>
-        </div>
-      </div>
-    </div>
-  </body>
-</html>
-
diff --git a/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/<jvm root>/-fancy/hash-code.html b/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/<jvm root>/-fancy/hash-code.html
deleted file mode 100644
index 09cf0e01..00000000
--- a/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/<jvm root>/-fancy/hash-code.html	
+++ /dev/null
@@ -1,31 +0,0 @@
-<html>
-  <head>
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <title>hashCode</title>
-    <link href="../../../styles/style.css" rel="Stylesheet">
-    <script type="text/javascript" src="../../../scripts/navigationLoader.js" async="async"></script>
-    <script type="text/javascript" src="../../../scripts/platformContentHandler.js" async="async"></script>
-    <script>var pathToRoot = "../../../";</script>
-  </head>
-  <body>
-    <div id="container">
-      <div id="leftColumn">
-        <div id="logo"></div>
-        <div id="sideMenu"></div>
-      </div>
-      <div id="main">
-        <div id="searchBar"></div>
-        <script type="text/javascript" src="../../../scripts/pages.js"></script>
-        <script type="text/javascript" src="../../../scripts/main.js"></script>
-        <div id="content" pageIds="/Fancy/hashCode/#//">
-          <div class="breadcrumbs">//<a href="../../index.html">root</a>/<a href="../index.html">&lt;jvm root&gt;</a>/<a href="index.html">Fancy</a>/<a href="hash-code.html">hashCode</a></div>
-          <div class="cover ">
-            <h1>hashCode</h1>
-            <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm"><div class="symbol monospace">open fun <a href="hash-code.html">hashCode</a>(): <a href="">Int</a></div></div></div>
-          </div>
-        </div>
-      </div>
-    </div>
-  </body>
-</html>
-
diff --git a/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/<jvm root>/-fancy/index.html b/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/<jvm root>/-fancy/index.html
deleted file mode 100644
index 743c6dcc..00000000
--- a/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/<jvm root>/-fancy/index.html	
+++ /dev/null
@@ -1,83 +0,0 @@
-<html>
-  <head>
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <title>Fancy</title>
-    <link href="../../../styles/style.css" rel="Stylesheet">
-    <script type="text/javascript" src="../../../scripts/navigationLoader.js" async="async"></script>
-    <script type="text/javascript" src="../../../scripts/platformContentHandler.js" async="async"></script>
-    <script>var pathToRoot = "../../../";</script>
-  </head>
-  <body>
-    <div id="container">
-      <div id="leftColumn">
-        <div id="logo"></div>
-        <div id="sideMenu"></div>
-      </div>
-      <div id="main">
-        <div id="searchBar"></div>
-        <script type="text/javascript" src="../../../scripts/pages.js"></script>
-        <script type="text/javascript" src="../../../scripts/main.js"></script>
-        <div id="content" pageIds="&lt;jvm root&gt;/Fancy////">
-          <div class="breadcrumbs">//<a href="../../index.html">root</a>/<a href="../index.html">&lt;jvm root&gt;</a>/<a href="index.html">Fancy</a></div>
-          <div class="cover ">
-            <h1>Fancy</h1>
-            <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm"><div class="symbol monospace">annotation class <a href="index.html">Fancy</a></div></div></div>
-          </div>
-          <h2>Functions</h2>
-          <table>
-            <thead></thead>
-            <tbody>
-              <tr class="platform-tagged">
-                <td class="content"><a href="equals.html">equals</a></td>
-                <td class="content">
-                  <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm"><div class="symbol monospace">open fun <a href="equals.html">equals</a>(other: <a href="">Any</a>): <a href="">Boolean</a></div></div></div>
-                  <div class="brief "> </div>
-                </td>
-                <td class="platform-tagged">
-                  <div class="platform-tag jvm">JVM</div>
-                </td>
-              </tr>
-              <tr class="platform-tagged">
-                <td class="content"><a href="hash-code.html">hashCode</a></td>
-                <td class="content">
-                  <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm"><div class="symbol monospace">open fun <a href="hash-code.html">hashCode</a>(): <a href="">Int</a></div></div></div>
-                  <div class="brief "> </div>
-                </td>
-                <td class="platform-tagged">
-                  <div class="platform-tag jvm">JVM</div>
-                </td>
-              </tr>
-              <tr class="platform-tagged">
-                <td class="content"><a href="to-string.html">toString</a></td>
-                <td class="content">
-                  <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm"><div class="symbol monospace">open fun <a href="to-string.html">toString</a>(): <a href="">String</a></div></div></div>
-                  <div class="brief "> </div>
-                </td>
-                <td class="platform-tagged">
-                  <div class="platform-tag jvm">JVM</div>
-                </td>
-              </tr>
-            </tbody>
-          </table>
-          <h2>Properties</h2>
-          <table>
-            <thead></thead>
-            <tbody>
-              <tr class="platform-tagged">
-                <td class="content"><a href="">size</a></td>
-                <td class="content">
-                  <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm"><div class="symbol monospace"><a href="">Int</a></div></div></div>
-                  <div class="brief "> </div>
-                </td>
-                <td class="platform-tagged">
-                  <div class="platform-tag jvm">JVM</div>
-                </td>
-              </tr>
-            </tbody>
-          </table>
-        </div>
-      </div>
-    </div>
-  </body>
-</html>
-
diff --git a/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/<jvm root>/-fancy/to-string.html b/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/<jvm root>/-fancy/to-string.html
deleted file mode 100644
index 48b4711c..00000000
--- a/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/<jvm root>/-fancy/to-string.html	
+++ /dev/null
@@ -1,31 +0,0 @@
-<html>
-  <head>
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <title>toString</title>
-    <link href="../../../styles/style.css" rel="Stylesheet">
-    <script type="text/javascript" src="../../../scripts/navigationLoader.js" async="async"></script>
-    <script type="text/javascript" src="../../../scripts/platformContentHandler.js" async="async"></script>
-    <script>var pathToRoot = "../../../";</script>
-  </head>
-  <body>
-    <div id="container">
-      <div id="leftColumn">
-        <div id="logo"></div>
-        <div id="sideMenu"></div>
-      </div>
-      <div id="main">
-        <div id="searchBar"></div>
-        <script type="text/javascript" src="../../../scripts/pages.js"></script>
-        <script type="text/javascript" src="../../../scripts/main.js"></script>
-        <div id="content" pageIds="/Fancy/toString/#//">
-          <div class="breadcrumbs">//<a href="../../index.html">root</a>/<a href="../index.html">&lt;jvm root&gt;</a>/<a href="index.html">Fancy</a>/<a href="to-string.html">toString</a></div>
-          <div class="cover ">
-            <h1>toString</h1>
-            <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm"><div class="symbol monospace">open fun <a href="to-string.html">toString</a>(): <a href="">String</a></div></div></div>
-          </div>
-        </div>
-      </div>
-    </div>
-  </body>
-</html>
-
diff --git a/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/<jvm root>/f.html b/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/<jvm root>/f.html
deleted file mode 100644
index 9de96412..00000000
--- a/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/<jvm root>/f.html	
+++ /dev/null
@@ -1,31 +0,0 @@
-<html>
-  <head>
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <title>f</title>
-    <link href="../../styles/style.css" rel="Stylesheet">
-    <script type="text/javascript" src="../../scripts/navigationLoader.js" async="async"></script>
-    <script type="text/javascript" src="../../scripts/platformContentHandler.js" async="async"></script>
-    <script>var pathToRoot = "../../";</script>
-  </head>
-  <body>
-    <div id="container">
-      <div id="leftColumn">
-        <div id="logo"></div>
-        <div id="sideMenu"></div>
-      </div>
-      <div id="main">
-        <div id="searchBar"></div>
-        <script type="text/javascript" src="../../scripts/pages.js"></script>
-        <script type="text/javascript" src="../../scripts/main.js"></script>
-        <div id="content" pageIds="//f/#//">
-          <div class="breadcrumbs">//<a href="../index.html">root</a>/<a href="index.html">&lt;jvm root&gt;</a>/<a href="f.html">f</a></div>
-          <div class="cover ">
-            <h1>f</h1>
-            <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm"><div class="symbol monospace">final fun <a href="f.html">f</a>()</div></div></div>
-          </div>
-        </div>
-      </div>
-    </div>
-  </body>
-</html>
-
diff --git a/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/<jvm root>/index.html b/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/<jvm root>/index.html
deleted file mode 100644
index 25340ae7..00000000
--- a/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/<jvm root>/index.html	
+++ /dev/null
@@ -1,62 +0,0 @@
-<html>
-  <head>
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <title>&lt;jvm root&gt;</title>
-    <link href="../../styles/style.css" rel="Stylesheet">
-    <script type="text/javascript" src="../../scripts/navigationLoader.js" async="async"></script>
-    <script type="text/javascript" src="../../scripts/platformContentHandler.js" async="async"></script>
-    <script>var pathToRoot = "../../";</script>
-  </head>
-  <body>
-    <div id="container">
-      <div id="leftColumn">
-        <div id="logo"></div>
-        <div id="sideMenu"></div>
-      </div>
-      <div id="main">
-        <div id="searchBar"></div>
-        <script type="text/javascript" src="../../scripts/pages.js"></script>
-        <script type="text/javascript" src="../../scripts/main.js"></script>
-        <div id="content" pageIds="&lt;jvm root&gt;/////">
-          <div class="breadcrumbs">//<a href="../index.html">root</a>/<a href="index.html">&lt;jvm root&gt;</a></div>
-          <div class="cover ">
-            <h1>Package &lt;jvm root&gt;</h1>
-          </div>
-          <h2>Types</h2>
-          <table>
-            <thead></thead>
-            <tbody>
-              <tr class="platform-tagged">
-                <td class="content"><a href="-fancy/index.html">Fancy</a></td>
-                <td class="content">
-                  <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm"><div class="symbol monospace">annotation class <a href="-fancy/index.html">Fancy</a></div></div></div>
-                  <div class="brief "> </div>
-                </td>
-                <td class="platform-tagged">
-                  <div class="platform-tag jvm">JVM</div>
-                </td>
-              </tr>
-            </tbody>
-          </table>
-          <h2>Functions</h2>
-          <table>
-            <thead></thead>
-            <tbody>
-              <tr class="platform-tagged">
-                <td class="content"><a href="f.html">f</a></td>
-                <td class="content">
-                  <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm"><div class="symbol monospace">final fun <a href="f.html">f</a>()</div></div></div>
-                  <div class="brief "> </div>
-                </td>
-                <td class="platform-tagged">
-                  <div class="platform-tag jvm">JVM</div>
-                </td>
-              </tr>
-            </tbody>
-          </table>
-        </div>
-      </div>
-    </div>
-  </body>
-</html>
-
diff --git a/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/[jvm root]/-fancy/-init-.html b/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/[jvm root]/-fancy/-init-.html
new file mode 100644
index 00000000..09cadac4
--- /dev/null
+++ b/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/[jvm root]/-fancy/-init-.html	
@@ -0,0 +1,31 @@
+<html>
+  <head>
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <title>&lt;init&gt;</title>
+    <link href="../../../styles/style.css" rel="Stylesheet">
+    <script type="text/javascript" src="../../../scripts/navigationLoader.js" async="async"></script>
+    <script type="text/javascript" src="../../../scripts/platformContentHandler.js" async="async"></script>
+    <script>var pathToRoot = "../../../";</script>
+  </head>
+  <body>
+    <div id="container">
+      <div id="leftColumn">
+        <div id="logo"></div>
+        <div id="sideMenu"></div>
+      </div>
+      <div id="main">
+        <div id="searchBar"></div>
+        <script type="text/javascript" src="../../../scripts/pages.js"></script>
+        <script type="text/javascript" src="../../../scripts/main.js"></script>
+        <div id="content" pageIds="[jvm root]/Fancy/&lt;init&gt;/#kotlin.Int//">
+          <div class="breadcrumbs">//<a href="../../index.html">root</a>/<a href="../index.html">[jvm root]</a>/<a href="index.html">Fancy</a>/<a href="-init-.html">&lt;init&gt;</a></div>
+          <div class="cover ">
+            <h1>&lt;init&gt;</h1>
+            <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm"><div class="symbol monospace">final fun <a href="-init-.html">&lt;init&gt;</a>(size: <a href="">Int</a>)</div></div></div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </body>
+</html>
+
diff --git a/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/[jvm root]/-fancy/equals.html b/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/[jvm root]/-fancy/equals.html
new file mode 100644
index 00000000..0c1760d6
--- /dev/null
+++ b/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/[jvm root]/-fancy/equals.html	
@@ -0,0 +1,31 @@
+<html>
+  <head>
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <title>equals</title>
+    <link href="../../../styles/style.css" rel="Stylesheet">
+    <script type="text/javascript" src="../../../scripts/navigationLoader.js" async="async"></script>
+    <script type="text/javascript" src="../../../scripts/platformContentHandler.js" async="async"></script>
+    <script>var pathToRoot = "../../../";</script>
+  </head>
+  <body>
+    <div id="container">
+      <div id="leftColumn">
+        <div id="logo"></div>
+        <div id="sideMenu"></div>
+      </div>
+      <div id="main">
+        <div id="searchBar"></div>
+        <script type="text/javascript" src="../../../scripts/pages.js"></script>
+        <script type="text/javascript" src="../../../scripts/main.js"></script>
+        <div id="content" pageIds="/Fancy/equals/#kotlin.Any?//">
+          <div class="breadcrumbs">//<a href="../../index.html">root</a>/<a href="../index.html">[jvm root]</a>/<a href="index.html">Fancy</a>/<a href="equals.html">equals</a></div>
+          <div class="cover ">
+            <h1>equals</h1>
+            <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm"><div class="symbol monospace">open fun <a href="equals.html">equals</a>(other: <a href="">Any</a>): <a href="">Boolean</a></div></div></div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </body>
+</html>
+
diff --git a/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/[jvm root]/-fancy/hash-code.html b/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/[jvm root]/-fancy/hash-code.html
new file mode 100644
index 00000000..654b11b4
--- /dev/null
+++ b/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/[jvm root]/-fancy/hash-code.html	
@@ -0,0 +1,31 @@
+<html>
+  <head>
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <title>hashCode</title>
+    <link href="../../../styles/style.css" rel="Stylesheet">
+    <script type="text/javascript" src="../../../scripts/navigationLoader.js" async="async"></script>
+    <script type="text/javascript" src="../../../scripts/platformContentHandler.js" async="async"></script>
+    <script>var pathToRoot = "../../../";</script>
+  </head>
+  <body>
+    <div id="container">
+      <div id="leftColumn">
+        <div id="logo"></div>
+        <div id="sideMenu"></div>
+      </div>
+      <div id="main">
+        <div id="searchBar"></div>
+        <script type="text/javascript" src="../../../scripts/pages.js"></script>
+        <script type="text/javascript" src="../../../scripts/main.js"></script>
+        <div id="content" pageIds="/Fancy/hashCode/#//">
+          <div class="breadcrumbs">//<a href="../../index.html">root</a>/<a href="../index.html">[jvm root]</a>/<a href="index.html">Fancy</a>/<a href="hash-code.html">hashCode</a></div>
+          <div class="cover ">
+            <h1>hashCode</h1>
+            <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm"><div class="symbol monospace">open fun <a href="hash-code.html">hashCode</a>(): <a href="">Int</a></div></div></div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </body>
+</html>
+
diff --git a/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/[jvm root]/-fancy/index.html b/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/[jvm root]/-fancy/index.html
new file mode 100644
index 00000000..c3b383d1
--- /dev/null
+++ b/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/[jvm root]/-fancy/index.html	
@@ -0,0 +1,83 @@
+<html>
+  <head>
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <title>Fancy</title>
+    <link href="../../../styles/style.css" rel="Stylesheet">
+    <script type="text/javascript" src="../../../scripts/navigationLoader.js" async="async"></script>
+    <script type="text/javascript" src="../../../scripts/platformContentHandler.js" async="async"></script>
+    <script>var pathToRoot = "../../../";</script>
+  </head>
+  <body>
+    <div id="container">
+      <div id="leftColumn">
+        <div id="logo"></div>
+        <div id="sideMenu"></div>
+      </div>
+      <div id="main">
+        <div id="searchBar"></div>
+        <script type="text/javascript" src="../../../scripts/pages.js"></script>
+        <script type="text/javascript" src="../../../scripts/main.js"></script>
+        <div id="content" pageIds="[jvm root]/Fancy////">
+          <div class="breadcrumbs">//<a href="../../index.html">root</a>/<a href="../index.html">[jvm root]</a>/<a href="index.html">Fancy</a></div>
+          <div class="cover ">
+            <h1>Fancy</h1>
+            <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm"><div class="symbol monospace">annotation class <a href="index.html">Fancy</a></div></div></div>
+          </div>
+          <h2>Functions</h2>
+          <table>
+            <thead></thead>
+            <tbody>
+              <tr class="platform-tagged">
+                <td class="content"><a href="equals.html">equals</a></td>
+                <td class="content">
+                  <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm"><div class="symbol monospace">open fun <a href="equals.html">equals</a>(other: <a href="">Any</a>): <a href="">Boolean</a></div></div></div>
+                  <div class="brief "> </div>
+                </td>
+                <td class="platform-tagged">
+                  <div class="platform-tag jvm">JVM</div>
+                </td>
+              </tr>
+              <tr class="platform-tagged">
+                <td class="content"><a href="hash-code.html">hashCode</a></td>
+                <td class="content">
+                  <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm"><div class="symbol monospace">open fun <a href="hash-code.html">hashCode</a>(): <a href="">Int</a></div></div></div>
+                  <div class="brief "> </div>
+                </td>
+                <td class="platform-tagged">
+                  <div class="platform-tag jvm">JVM</div>
+                </td>
+              </tr>
+              <tr class="platform-tagged">
+                <td class="content"><a href="to-string.html">toString</a></td>
+                <td class="content">
+                  <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm"><div class="symbol monospace">open fun <a href="to-string.html">toString</a>(): <a href="">String</a></div></div></div>
+                  <div class="brief "> </div>
+                </td>
+                <td class="platform-tagged">
+                  <div class="platform-tag jvm">JVM</div>
+                </td>
+              </tr>
+            </tbody>
+          </table>
+          <h2>Properties</h2>
+          <table>
+            <thead></thead>
+            <tbody>
+              <tr class="platform-tagged">
+                <td class="content"><a href="">size</a></td>
+                <td class="content">
+                  <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm"><div class="symbol monospace"><a href="">Int</a></div></div></div>
+                  <div class="brief "> </div>
+                </td>
+                <td class="platform-tagged">
+                  <div class="platform-tag jvm">JVM</div>
+                </td>
+              </tr>
+            </tbody>
+          </table>
+        </div>
+      </div>
+    </div>
+  </body>
+</html>
+
diff --git a/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/[jvm root]/-fancy/to-string.html b/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/[jvm root]/-fancy/to-string.html
new file mode 100644
index 00000000..c0a3a7e0
--- /dev/null
+++ b/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/[jvm root]/-fancy/to-string.html	
@@ -0,0 +1,31 @@
+<html>
+  <head>
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <title>toString</title>
+    <link href="../../../styles/style.css" rel="Stylesheet">
+    <script type="text/javascript" src="../../../scripts/navigationLoader.js" async="async"></script>
+    <script type="text/javascript" src="../../../scripts/platformContentHandler.js" async="async"></script>
+    <script>var pathToRoot = "../../../";</script>
+  </head>
+  <body>
+    <div id="container">
+      <div id="leftColumn">
+        <div id="logo"></div>
+        <div id="sideMenu"></div>
+      </div>
+      <div id="main">
+        <div id="searchBar"></div>
+        <script type="text/javascript" src="../../../scripts/pages.js"></script>
+        <script type="text/javascript" src="../../../scripts/main.js"></script>
+        <div id="content" pageIds="/Fancy/toString/#//">
+          <div class="breadcrumbs">//<a href="../../index.html">root</a>/<a href="../index.html">[jvm root]</a>/<a href="index.html">Fancy</a>/<a href="to-string.html">toString</a></div>
+          <div class="cover ">
+            <h1>toString</h1>
+            <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm"><div class="symbol monospace">open fun <a href="to-string.html">toString</a>(): <a href="">String</a></div></div></div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </body>
+</html>
+
diff --git a/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/[jvm root]/f.html b/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/[jvm root]/f.html
new file mode 100644
index 00000000..6c049b35
--- /dev/null
+++ b/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/[jvm root]/f.html	
@@ -0,0 +1,31 @@
+<html>
+  <head>
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <title>f</title>
+    <link href="../../styles/style.css" rel="Stylesheet">
+    <script type="text/javascript" src="../../scripts/navigationLoader.js" async="async"></script>
+    <script type="text/javascript" src="../../scripts/platformContentHandler.js" async="async"></script>
+    <script>var pathToRoot = "../../";</script>
+  </head>
+  <body>
+    <div id="container">
+      <div id="leftColumn">
+        <div id="logo"></div>
+        <div id="sideMenu"></div>
+      </div>
+      <div id="main">
+        <div id="searchBar"></div>
+        <script type="text/javascript" src="../../scripts/pages.js"></script>
+        <script type="text/javascript" src="../../scripts/main.js"></script>
+        <div id="content" pageIds="//f/#//">
+          <div class="breadcrumbs">//<a href="../index.html">root</a>/<a href="index.html">[jvm root]</a>/<a href="f.html">f</a></div>
+          <div class="cover ">
+            <h1>f</h1>
+            <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm"><div class="symbol monospace">final fun <a href="f.html">f</a>()</div></div></div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </body>
+</html>
+
diff --git a/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/[jvm root]/index.html b/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/[jvm root]/index.html
new file mode 100644
index 00000000..dfad54b3
--- /dev/null
+++ b/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/[jvm root]/index.html	
@@ -0,0 +1,62 @@
+<html>
+  <head>
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <title>[jvm root]</title>
+    <link href="../../styles/style.css" rel="Stylesheet">
+    <script type="text/javascript" src="../../scripts/navigationLoader.js" async="async"></script>
+    <script type="text/javascript" src="../../scripts/platformContentHandler.js" async="async"></script>
+    <script>var pathToRoot = "../../";</script>
+  </head>
+  <body>
+    <div id="container">
+      <div id="leftColumn">
+        <div id="logo"></div>
+        <div id="sideMenu"></div>
+      </div>
+      <div id="main">
+        <div id="searchBar"></div>
+        <script type="text/javascript" src="../../scripts/pages.js"></script>
+        <script type="text/javascript" src="../../scripts/main.js"></script>
+        <div id="content" pageIds="[jvm root]/////">
+          <div class="breadcrumbs">//<a href="../index.html">root</a>/<a href="index.html">[jvm root]</a></div>
+          <div class="cover ">
+            <h1>Package [jvm root]</h1>
+          </div>
+          <h2>Types</h2>
+          <table>
+            <thead></thead>
+            <tbody>
+              <tr class="platform-tagged">
+                <td class="content"><a href="-fancy/index.html">Fancy</a></td>
+                <td class="content">
+                  <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm"><div class="symbol monospace">annotation class <a href="-fancy/index.html">Fancy</a></div></div></div>
+                  <div class="brief "> </div>
+                </td>
+                <td class="platform-tagged">
+                  <div class="platform-tag jvm">JVM</div>
+                </td>
+              </tr>
+            </tbody>
+          </table>
+          <h2>Functions</h2>
+          <table>
+            <thead></thead>
+            <tbody>
+              <tr class="platform-tagged">
+                <td class="content"><a href="f.html">f</a></td>
+                <td class="content">
+                  <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm"><div class="symbol monospace">final fun <a href="f.html">f</a>()</div></div></div>
+                  <div class="brief "> </div>
+                </td>
+                <td class="platform-tagged">
+                  <div class="platform-tag jvm">JVM</div>
+                </td>
+              </tr>
+            </tbody>
+          </table>
+        </div>
+      </div>
+    </div>
+  </body>
+</html>
+
diff --git a/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/index.html b/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/index.html
index a3211166..440758c2 100644
--- a/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/index.html
+++ b/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/index.html
@@ -27,7 +27,7 @@
             <thead></thead>
             <tbody>
               <tr class="platform-tagged">
-                <td class="content"><a href="&lt;jvm root&gt;/index.html">&lt;jvm root&gt;</a></td>
+                <td class="content"><a href="[jvm root]/index.html">[jvm root]</a></td>
                 <td class="platform-tagged">
                   <div class="platform-tag jvm">JVM</div>
                 </td>
diff --git a/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/package-list b/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/package-list
index d2e42c86..8dcb9116 100644
--- a/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/package-list
+++ b/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/package-list
@@ -1,8 +1,8 @@
 $dokka.format:html
 $dokka.linkExtension:html
-$dokka.location://f/#//root/<jvm root>/f.html
-$dokka.location:/Fancy/equals/#kotlin.Any?//root/<jvm root>/-fancy/equals.html
-$dokka.location:/Fancy/hashCode/#//root/<jvm root>/-fancy/hash-code.html
-$dokka.location:/Fancy/toString/#//root/<jvm root>/-fancy/to-string.html
-<jvm root>
+$dokka.location://f/#//root/[jvm root]/f.html
+$dokka.location:/Fancy/equals/#kotlin.Any?//root/[jvm root]/-fancy/equals.html
+$dokka.location:/Fancy/hashCode/#//root/[jvm root]/-fancy/hash-code.html
+$dokka.location:/Fancy/toString/#//root/[jvm root]/-fancy/to-string.html
+[jvm root]
 
diff --git a/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/scripts/pages.js b/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/scripts/pages.js
index 58dc2831..d4254fdd 100644
--- a/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/scripts/pages.js
+++ b/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/scripts/pages.js
@@ -1,10 +1,10 @@
 var pages = [
 { "name": "root",  "location": "root/index.html" },
-{ "name": "<jvm root>",  "location": "root/<jvm root>/index.html" },
-{ "name": "Fancy", "class": "Fancy", "location": "root/<jvm root>/-fancy/index.html" },
-{ "name": "<init>",  "location": "root/<jvm root>/-fancy/-init-.html" },
-{ "name": "equals",  "location": "root/<jvm root>/-fancy/equals.html" },
-{ "name": "hashCode",  "location": "root/<jvm root>/-fancy/hash-code.html" },
-{ "name": "toString",  "location": "root/<jvm root>/-fancy/to-string.html" },
-{ "name": "f",  "location": "root/<jvm root>/f.html" }
+{ "name": "[jvm root]",  "location": "root/[jvm root]/index.html" },
+{ "name": "Fancy", "class": "Fancy", "location": "root/[jvm root]/-fancy/index.html" },
+{ "name": "<init>",  "location": "root/[jvm root]/-fancy/-init-.html" },
+{ "name": "equals",  "location": "root/[jvm root]/-fancy/equals.html" },
+{ "name": "hashCode",  "location": "root/[jvm root]/-fancy/hash-code.html" },
+{ "name": "toString",  "location": "root/[jvm root]/-fancy/to-string.html" },
+{ "name": "f",  "location": "root/[jvm root]/f.html" }
 ]
diff --git a/plugins/base/src/test/resources/expect/function/out/html/navigation.html b/plugins/base/src/test/resources/expect/function/out/html/navigation.html
index 0158be7d..3e532bec 100644
--- a/plugins/base/src/test/resources/expect/function/out/html/navigation.html
+++ b/plugins/base/src/test/resources/expect/function/out/html/navigation.html
@@ -1,9 +1,9 @@
 <div class="sideMenuPart" id="nav-submenu" pageId="/////">
   <div class="overview"><a href="root/index.html">root</a><span class="navButton" onclick="document.getElementById(&quot;nav-submenu&quot;).classList.toggle(&quot;hidden&quot;);"><span class="navButtonContent"></span></span></div>
-  <div class="sideMenuPart" id="nav-submenu-0" pageId="&lt;jvm root&gt;/////">
-    <div class="overview"><a href="root/&lt;jvm root&gt;/index.html">&lt;jvm root&gt;</a><span class="navButton" onclick="document.getElementById(&quot;nav-submenu-0&quot;).classList.toggle(&quot;hidden&quot;);"><span class="navButtonContent"></span></span></div>
+  <div class="sideMenuPart" id="nav-submenu-0" pageId="[jvm root]/////">
+    <div class="overview"><a href="root/[jvm root]/index.html">[jvm root]</a><span class="navButton" onclick="document.getElementById(&quot;nav-submenu-0&quot;).classList.toggle(&quot;hidden&quot;);"><span class="navButtonContent"></span></span></div>
     <div class="sideMenuPart" id="nav-submenu-0-0" pageId="//fn/#//">
-      <div class="overview"><a href="root/&lt;jvm root&gt;/fn.html">fn</a></div>
+      <div class="overview"><a href="root/[jvm root]/fn.html">fn</a></div>
     </div>
   </div>
 </div>
diff --git a/plugins/base/src/test/resources/expect/function/out/html/root/<jvm root>/fn.html b/plugins/base/src/test/resources/expect/function/out/html/root/<jvm root>/fn.html
deleted file mode 100644
index e49ade86..00000000
--- a/plugins/base/src/test/resources/expect/function/out/html/root/<jvm root>/fn.html	
+++ /dev/null
@@ -1,33 +0,0 @@
-<html>
-  <head>
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <title>fn</title>
-    <link href="../../styles/style.css" rel="Stylesheet">
-    <script type="text/javascript" src="../../scripts/navigationLoader.js" async="async"></script>
-    <script type="text/javascript" src="../../scripts/platformContentHandler.js" async="async"></script>
-    <script>var pathToRoot = "../../";</script>
-  </head>
-  <body>
-    <div id="container">
-      <div id="leftColumn">
-        <div id="logo"></div>
-        <div id="sideMenu"></div>
-      </div>
-      <div id="main">
-        <div id="searchBar"></div>
-        <script type="text/javascript" src="../../scripts/pages.js"></script>
-        <script type="text/javascript" src="../../scripts/main.js"></script>
-        <div id="content" pageIds="//fn/#//">
-          <div class="breadcrumbs">//<a href="../index.html">root</a>/<a href="index.html">&lt;jvm root&gt;</a>/<a href="fn.html">fn</a></div>
-          <div class="cover ">
-            <h1>fn</h1>
-            <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm"><div class="symbol monospace">final fun <a href="fn.html">fn</a>()</div></div></div>
-          </div>
-          <h3>Description</h3>
-          <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm">Function fn</div></div>
-        </div>
-      </div>
-    </div>
-  </body>
-</html>
-
diff --git a/plugins/base/src/test/resources/expect/function/out/html/root/<jvm root>/index.html b/plugins/base/src/test/resources/expect/function/out/html/root/<jvm root>/index.html
deleted file mode 100644
index 58d5c404..00000000
--- a/plugins/base/src/test/resources/expect/function/out/html/root/<jvm root>/index.html	
+++ /dev/null
@@ -1,46 +0,0 @@
-<html>
-  <head>
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <title>&lt;jvm root&gt;</title>
-    <link href="../../styles/style.css" rel="Stylesheet">
-    <script type="text/javascript" src="../../scripts/navigationLoader.js" async="async"></script>
-    <script type="text/javascript" src="../../scripts/platformContentHandler.js" async="async"></script>
-    <script>var pathToRoot = "../../";</script>
-  </head>
-  <body>
-    <div id="container">
-      <div id="leftColumn">
-        <div id="logo"></div>
-        <div id="sideMenu"></div>
-      </div>
-      <div id="main">
-        <div id="searchBar"></div>
-        <script type="text/javascript" src="../../scripts/pages.js"></script>
-        <script type="text/javascript" src="../../scripts/main.js"></script>
-        <div id="content" pageIds="&lt;jvm root&gt;/////">
-          <div class="breadcrumbs">//<a href="../index.html">root</a>/<a href="index.html">&lt;jvm root&gt;</a></div>
-          <div class="cover ">
-            <h1>Package &lt;jvm root&gt;</h1>
-          </div>
-          <h2>Functions</h2>
-          <table>
-            <thead></thead>
-            <tbody>
-              <tr class="platform-tagged">
-                <td class="content"><a href="fn.html">fn</a></td>
-                <td class="content">
-                  <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm"><div class="symbol monospace">final fun <a href="fn.html">fn</a>()</div></div></div>
-                  <div class="brief "> </div>
-                </td>
-                <td class="platform-tagged">
-                  <div class="platform-tag jvm">JVM</div>
-                </td>
-              </tr>
-            </tbody>
-          </table>
-        </div>
-      </div>
-    </div>
-  </body>
-</html>
-
diff --git a/plugins/base/src/test/resources/expect/function/out/html/root/[jvm root]/fn.html b/plugins/base/src/test/resources/expect/function/out/html/root/[jvm root]/fn.html
new file mode 100644
index 00000000..f6ae6ff7
--- /dev/null
+++ b/plugins/base/src/test/resources/expect/function/out/html/root/[jvm root]/fn.html	
@@ -0,0 +1,33 @@
+<html>
+  <head>
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <title>fn</title>
+    <link href="../../styles/style.css" rel="Stylesheet">
+    <script type="text/javascript" src="../../scripts/navigationLoader.js" async="async"></script>
+    <script type="text/javascript" src="../../scripts/platformContentHandler.js" async="async"></script>
+    <script>var pathToRoot = "../../";</script>
+  </head>
+  <body>
+    <div id="container">
+      <div id="leftColumn">
+        <div id="logo"></div>
+        <div id="sideMenu"></div>
+      </div>
+      <div id="main">
+        <div id="searchBar"></div>
+        <script type="text/javascript" src="../../scripts/pages.js"></script>
+        <script type="text/javascript" src="../../scripts/main.js"></script>
+        <div id="content" pageIds="//fn/#//">
+          <div class="breadcrumbs">//<a href="../index.html">root</a>/<a href="index.html">[jvm root]</a>/<a href="fn.html">fn</a></div>
+          <div class="cover ">
+            <h1>fn</h1>
+            <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm"><div class="symbol monospace">final fun <a href="fn.html">fn</a>()</div></div></div>
+          </div>
+          <h3>Description</h3>
+          <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm">Function fn</div></div>
+        </div>
+      </div>
+    </div>
+  </body>
+</html>
+
diff --git a/plugins/base/src/test/resources/expect/function/out/html/root/[jvm root]/index.html b/plugins/base/src/test/resources/expect/function/out/html/root/[jvm root]/index.html
new file mode 100644
index 00000000..23d4864c
--- /dev/null
+++ b/plugins/base/src/test/resources/expect/function/out/html/root/[jvm root]/index.html	
@@ -0,0 +1,46 @@
+<html>
+  <head>
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <title>[jvm root]</title>
+    <link href="../../styles/style.css" rel="Stylesheet">
+    <script type="text/javascript" src="../../scripts/navigationLoader.js" async="async"></script>
+    <script type="text/javascript" src="../../scripts/platformContentHandler.js" async="async"></script>
+    <script>var pathToRoot = "../../";</script>
+  </head>
+  <body>
+    <div id="container">
+      <div id="leftColumn">
+        <div id="logo"></div>
+        <div id="sideMenu"></div>
+      </div>
+      <div id="main">
+        <div id="searchBar"></div>
+        <script type="text/javascript" src="../../scripts/pages.js"></script>
+        <script type="text/javascript" src="../../scripts/main.js"></script>
+        <div id="content" pageIds="[jvm root]/////">
+          <div class="breadcrumbs">//<a href="../index.html">root</a>/<a href="index.html">[jvm root]</a></div>
+          <div class="cover ">
+            <h1>Package [jvm root]</h1>
+          </div>
+          <h2>Functions</h2>
+          <table>
+            <thead></thead>
+            <tbody>
+              <tr class="platform-tagged">
+                <td class="content"><a href="fn.html">fn</a></td>
+                <td class="content">
+                  <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm"><div class="symbol monospace">final fun <a href="fn.html">fn</a>()</div></div></div>
+                  <div class="brief "> </div>
+                </td>
+                <td class="platform-tagged">
+                  <div class="platform-tag jvm">JVM</div>
+                </td>
+              </tr>
+            </tbody>
+          </table>
+        </div>
+      </div>
+    </div>
+  </body>
+</html>
+
diff --git a/plugins/base/src/test/resources/expect/function/out/html/root/index.html b/plugins/base/src/test/resources/expect/function/out/html/root/index.html
index a3211166..440758c2 100644
--- a/plugins/base/src/test/resources/expect/function/out/html/root/index.html
+++ b/plugins/base/src/test/resources/expect/function/out/html/root/index.html
@@ -27,7 +27,7 @@
             <thead></thead>
             <tbody>
               <tr class="platform-tagged">
-                <td class="content"><a href="&lt;jvm root&gt;/index.html">&lt;jvm root&gt;</a></td>
+                <td class="content"><a href="[jvm root]/index.html">[jvm root]</a></td>
                 <td class="platform-tagged">
                   <div class="platform-tag jvm">JVM</div>
                 </td>
diff --git a/plugins/base/src/test/resources/expect/function/out/html/root/package-list b/plugins/base/src/test/resources/expect/function/out/html/root/package-list
index 3a7c6807..9430f445 100644
--- a/plugins/base/src/test/resources/expect/function/out/html/root/package-list
+++ b/plugins/base/src/test/resources/expect/function/out/html/root/package-list
@@ -1,5 +1,5 @@
 $dokka.format:html
 $dokka.linkExtension:html
-$dokka.location://fn/#//root/<jvm root>/fn.html
-<jvm root>
+$dokka.location://fn/#//root/[jvm root]/fn.html
+[jvm root]
 
diff --git a/plugins/base/src/test/resources/expect/function/out/html/scripts/pages.js b/plugins/base/src/test/resources/expect/function/out/html/scripts/pages.js
index c6ec7c4b..8a0c4c55 100644
--- a/plugins/base/src/test/resources/expect/function/out/html/scripts/pages.js
+++ b/plugins/base/src/test/resources/expect/function/out/html/scripts/pages.js
@@ -1,5 +1,5 @@
 var pages = [
 { "name": "root",  "location": "root/index.html" },
-{ "name": "<jvm root>",  "location": "root/<jvm root>/index.html" },
-{ "name": "fn",  "location": "root/<jvm root>/fn.html" }
+{ "name": "[jvm root]",  "location": "root/[jvm root]/index.html" },
+{ "name": "fn",  "location": "root/[jvm root]/fn.html" }
 ]
diff --git a/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/navigation.html b/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/navigation.html
index 73443522..df89ba77 100644
--- a/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/navigation.html
+++ b/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/navigation.html
@@ -1,12 +1,12 @@
 <div class="sideMenuPart" id="nav-submenu" pageId="/////">
   <div class="overview"><a href="root/index.html">root</a><span class="navButton" onclick="document.getElementById(&quot;nav-submenu&quot;).classList.toggle(&quot;hidden&quot;);"><span class="navButtonContent"></span></span></div>
-  <div class="sideMenuPart" id="nav-submenu-0" pageId="&lt;jvm root&gt;/////">
-    <div class="overview"><a href="root/&lt;jvm root&gt;/index.html">&lt;jvm root&gt;</a><span class="navButton" onclick="document.getElementById(&quot;nav-submenu-0&quot;).classList.toggle(&quot;hidden&quot;);"><span class="navButtonContent"></span></span></div>
-    <div class="sideMenuPart" id="nav-submenu-0-0" pageId="&lt;jvm root&gt;/Fancy////">
-      <div class="overview"><a href="root/&lt;jvm root&gt;/-fancy/index.html">Fancy</a></div>
+  <div class="sideMenuPart" id="nav-submenu-0" pageId="[jvm root]/////">
+    <div class="overview"><a href="root/[jvm root]/index.html">[jvm root]</a><span class="navButton" onclick="document.getElementById(&quot;nav-submenu-0&quot;).classList.toggle(&quot;hidden&quot;);"><span class="navButtonContent"></span></span></div>
+    <div class="sideMenuPart" id="nav-submenu-0-0" pageId="[jvm root]/Fancy////">
+      <div class="overview"><a href="root/[jvm root]/-fancy/index.html">Fancy</a></div>
     </div>
     <div class="sideMenuPart" id="nav-submenu-0-1" pageId="//function/#kotlin.Function0[kotlin.Unit]//">
-      <div class="overview"><a href="root/&lt;jvm root&gt;/function.html">function</a></div>
+      <div class="overview"><a href="root/[jvm root]/function.html">function</a></div>
     </div>
   </div>
 </div>
diff --git a/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/<jvm root>/-fancy/-init-.html b/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/<jvm root>/-fancy/-init-.html
deleted file mode 100644
index 03d4d238..00000000
--- a/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/<jvm root>/-fancy/-init-.html	
+++ /dev/null
@@ -1,31 +0,0 @@
-<html>
-  <head>
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <title>&lt;init&gt;</title>
-    <link href="../../../styles/style.css" rel="Stylesheet">
-    <script type="text/javascript" src="../../../scripts/navigationLoader.js" async="async"></script>
-    <script type="text/javascript" src="../../../scripts/platformContentHandler.js" async="async"></script>
-    <script>var pathToRoot = "../../../";</script>
-  </head>
-  <body>
-    <div id="container">
-      <div id="leftColumn">
-        <div id="logo"></div>
-        <div id="sideMenu"></div>
-      </div>
-      <div id="main">
-        <div id="searchBar"></div>
-        <script type="text/javascript" src="../../../scripts/pages.js"></script>
-        <script type="text/javascript" src="../../../scripts/main.js"></script>
-        <div id="content" pageIds="&lt;jvm root&gt;/Fancy/&lt;init&gt;/#//">
-          <div class="breadcrumbs">//<a href="../../index.html">root</a>/<a href="../index.html">&lt;jvm root&gt;</a>/<a href="index.html">Fancy</a>/<a href="-init-.html">&lt;init&gt;</a></div>
-          <div class="cover ">
-            <h1>&lt;init&gt;</h1>
-            <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm"><div class="symbol monospace">final fun <a href="-init-.html">&lt;init&gt;</a>()</div></div></div>
-          </div>
-        </div>
-      </div>
-    </div>
-  </body>
-</html>
-
diff --git a/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/<jvm root>/-fancy/equals.html b/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/<jvm root>/-fancy/equals.html
deleted file mode 100644
index 2645051d..00000000
--- a/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/<jvm root>/-fancy/equals.html	
+++ /dev/null
@@ -1,31 +0,0 @@
-<html>
-  <head>
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <title>equals</title>
-    <link href="../../../styles/style.css" rel="Stylesheet">
-    <script type="text/javascript" src="../../../scripts/navigationLoader.js" async="async"></script>
-    <script type="text/javascript" src="../../../scripts/platformContentHandler.js" async="async"></script>
-    <script>var pathToRoot = "../../../";</script>
-  </head>
-  <body>
-    <div id="container">
-      <div id="leftColumn">
-        <div id="logo"></div>
-        <div id="sideMenu"></div>
-      </div>
-      <div id="main">
-        <div id="searchBar"></div>
-        <script type="text/javascript" src="../../../scripts/pages.js"></script>
-        <script type="text/javascript" src="../../../scripts/main.js"></script>
-        <div id="content" pageIds="/Fancy/equals/#kotlin.Any?//">
-          <div class="breadcrumbs">//<a href="../../index.html">root</a>/<a href="../index.html">&lt;jvm root&gt;</a>/<a href="index.html">Fancy</a>/<a href="equals.html">equals</a></div>
-          <div class="cover ">
-            <h1>equals</h1>
-            <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm"><div class="symbol monospace">open fun <a href="equals.html">equals</a>(other: <a href="">Any</a>): <a href="">Boolean</a></div></div></div>
-          </div>
-        </div>
-      </div>
-    </div>
-  </body>
-</html>
-
diff --git a/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/<jvm root>/-fancy/hash-code.html b/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/<jvm root>/-fancy/hash-code.html
deleted file mode 100644
index 09cf0e01..00000000
--- a/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/<jvm root>/-fancy/hash-code.html	
+++ /dev/null
@@ -1,31 +0,0 @@
-<html>
-  <head>
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <title>hashCode</title>
-    <link href="../../../styles/style.css" rel="Stylesheet">
-    <script type="text/javascript" src="../../../scripts/navigationLoader.js" async="async"></script>
-    <script type="text/javascript" src="../../../scripts/platformContentHandler.js" async="async"></script>
-    <script>var pathToRoot = "../../../";</script>
-  </head>
-  <body>
-    <div id="container">
-      <div id="leftColumn">
-        <div id="logo"></div>
-        <div id="sideMenu"></div>
-      </div>
-      <div id="main">
-        <div id="searchBar"></div>
-        <script type="text/javascript" src="../../../scripts/pages.js"></script>
-        <script type="text/javascript" src="../../../scripts/main.js"></script>
-        <div id="content" pageIds="/Fancy/hashCode/#//">
-          <div class="breadcrumbs">//<a href="../../index.html">root</a>/<a href="../index.html">&lt;jvm root&gt;</a>/<a href="index.html">Fancy</a>/<a href="hash-code.html">hashCode</a></div>
-          <div class="cover ">
-            <h1>hashCode</h1>
-            <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm"><div class="symbol monospace">open fun <a href="hash-code.html">hashCode</a>(): <a href="">Int</a></div></div></div>
-          </div>
-        </div>
-      </div>
-    </div>
-  </body>
-</html>
-
diff --git a/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/<jvm root>/-fancy/index.html b/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/<jvm root>/-fancy/index.html
deleted file mode 100644
index 4f02e43a..00000000
--- a/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/<jvm root>/-fancy/index.html	
+++ /dev/null
@@ -1,67 +0,0 @@
-<html>
-  <head>
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <title>Fancy</title>
-    <link href="../../../styles/style.css" rel="Stylesheet">
-    <script type="text/javascript" src="../../../scripts/navigationLoader.js" async="async"></script>
-    <script type="text/javascript" src="../../../scripts/platformContentHandler.js" async="async"></script>
-    <script>var pathToRoot = "../../../";</script>
-  </head>
-  <body>
-    <div id="container">
-      <div id="leftColumn">
-        <div id="logo"></div>
-        <div id="sideMenu"></div>
-      </div>
-      <div id="main">
-        <div id="searchBar"></div>
-        <script type="text/javascript" src="../../../scripts/pages.js"></script>
-        <script type="text/javascript" src="../../../scripts/main.js"></script>
-        <div id="content" pageIds="&lt;jvm root&gt;/Fancy////">
-          <div class="breadcrumbs">//<a href="../../index.html">root</a>/<a href="../index.html">&lt;jvm root&gt;</a>/<a href="index.html">Fancy</a></div>
-          <div class="cover ">
-            <h1>Fancy</h1>
-            <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm"><div class="symbol monospace">annotation class <a href="index.html">Fancy</a></div></div></div>
-          </div>
-          <h2>Functions</h2>
-          <table>
-            <thead></thead>
-            <tbody>
-              <tr class="platform-tagged">
-                <td class="content"><a href="equals.html">equals</a></td>
-                <td class="content">
-                  <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm"><div class="symbol monospace">open fun <a href="equals.html">equals</a>(other: <a href="">Any</a>): <a href="">Boolean</a></div></div></div>
-                  <div class="brief "> </div>
-                </td>
-                <td class="platform-tagged">
-                  <div class="platform-tag jvm">JVM</div>
-                </td>
-              </tr>
-              <tr class="platform-tagged">
-                <td class="content"><a href="hash-code.html">hashCode</a></td>
-                <td class="content">
-                  <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm"><div class="symbol monospace">open fun <a href="hash-code.html">hashCode</a>(): <a href="">Int</a></div></div></div>
-                  <div class="brief "> </div>
-                </td>
-                <td class="platform-tagged">
-                  <div class="platform-tag jvm">JVM</div>
-                </td>
-              </tr>
-              <tr class="platform-tagged">
-                <td class="content"><a href="to-string.html">toString</a></td>
-                <td class="content">
-                  <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm"><div class="symbol monospace">open fun <a href="to-string.html">toString</a>(): <a href="">String</a></div></div></div>
-                  <div class="brief "> </div>
-                </td>
-                <td class="platform-tagged">
-                  <div class="platform-tag jvm">JVM</div>
-                </td>
-              </tr>
-            </tbody>
-          </table>
-        </div>
-      </div>
-    </div>
-  </body>
-</html>
-
diff --git a/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/<jvm root>/-fancy/to-string.html b/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/<jvm root>/-fancy/to-string.html
deleted file mode 100644
index 48b4711c..00000000
--- a/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/<jvm root>/-fancy/to-string.html	
+++ /dev/null
@@ -1,31 +0,0 @@
-<html>
-  <head>
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <title>toString</title>
-    <link href="../../../styles/style.css" rel="Stylesheet">
-    <script type="text/javascript" src="../../../scripts/navigationLoader.js" async="async"></script>
-    <script type="text/javascript" src="../../../scripts/platformContentHandler.js" async="async"></script>
-    <script>var pathToRoot = "../../../";</script>
-  </head>
-  <body>
-    <div id="container">
-      <div id="leftColumn">
-        <div id="logo"></div>
-        <div id="sideMenu"></div>
-      </div>
-      <div id="main">
-        <div id="searchBar"></div>
-        <script type="text/javascript" src="../../../scripts/pages.js"></script>
-        <script type="text/javascript" src="../../../scripts/main.js"></script>
-        <div id="content" pageIds="/Fancy/toString/#//">
-          <div class="breadcrumbs">//<a href="../../index.html">root</a>/<a href="../index.html">&lt;jvm root&gt;</a>/<a href="index.html">Fancy</a>/<a href="to-string.html">toString</a></div>
-          <div class="cover ">
-            <h1>toString</h1>
-            <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm"><div class="symbol monospace">open fun <a href="to-string.html">toString</a>(): <a href="">String</a></div></div></div>
-          </div>
-        </div>
-      </div>
-    </div>
-  </body>
-</html>
-
diff --git a/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/<jvm root>/function.html b/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/<jvm root>/function.html
deleted file mode 100644
index 6464397a..00000000
--- a/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/<jvm root>/function.html	
+++ /dev/null
@@ -1,31 +0,0 @@
-<html>
-  <head>
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <title>function</title>
-    <link href="../../styles/style.css" rel="Stylesheet">
-    <script type="text/javascript" src="../../scripts/navigationLoader.js" async="async"></script>
-    <script type="text/javascript" src="../../scripts/platformContentHandler.js" async="async"></script>
-    <script>var pathToRoot = "../../";</script>
-  </head>
-  <body>
-    <div id="container">
-      <div id="leftColumn">
-        <div id="logo"></div>
-        <div id="sideMenu"></div>
-      </div>
-      <div id="main">
-        <div id="searchBar"></div>
-        <script type="text/javascript" src="../../scripts/pages.js"></script>
-        <script type="text/javascript" src="../../scripts/main.js"></script>
-        <div id="content" pageIds="//function/#kotlin.Function0[kotlin.Unit]//">
-          <div class="breadcrumbs">//<a href="../index.html">root</a>/<a href="index.html">&lt;jvm root&gt;</a>/<a href="function.html">function</a></div>
-          <div class="cover ">
-            <h1>function</h1>
-            <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm"><div class="symbol monospace">final fun <a href="function.html">function</a>(notInlined: <div class="symbol monospace">() -&gt; <a href="">Unit</a></div>)</div></div></div>
-          </div>
-        </div>
-      </div>
-    </div>
-  </body>
-</html>
-
diff --git a/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/<jvm root>/index.html b/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/<jvm root>/index.html
deleted file mode 100644
index b6f76db9..00000000
--- a/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/<jvm root>/index.html	
+++ /dev/null
@@ -1,62 +0,0 @@
-<html>
-  <head>
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <title>&lt;jvm root&gt;</title>
-    <link href="../../styles/style.css" rel="Stylesheet">
-    <script type="text/javascript" src="../../scripts/navigationLoader.js" async="async"></script>
-    <script type="text/javascript" src="../../scripts/platformContentHandler.js" async="async"></script>
-    <script>var pathToRoot = "../../";</script>
-  </head>
-  <body>
-    <div id="container">
-      <div id="leftColumn">
-        <div id="logo"></div>
-        <div id="sideMenu"></div>
-      </div>
-      <div id="main">
-        <div id="searchBar"></div>
-        <script type="text/javascript" src="../../scripts/pages.js"></script>
-        <script type="text/javascript" src="../../scripts/main.js"></script>
-        <div id="content" pageIds="&lt;jvm root&gt;/////">
-          <div class="breadcrumbs">//<a href="../index.html">root</a>/<a href="index.html">&lt;jvm root&gt;</a></div>
-          <div class="cover ">
-            <h1>Package &lt;jvm root&gt;</h1>
-          </div>
-          <h2>Types</h2>
-          <table>
-            <thead></thead>
-            <tbody>
-              <tr class="platform-tagged">
-                <td class="content"><a href="-fancy/index.html">Fancy</a></td>
-                <td class="content">
-                  <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm"><div class="symbol monospace">annotation class <a href="-fancy/index.html">Fancy</a></div></div></div>
-                  <div class="brief "> </div>
-                </td>
-                <td class="platform-tagged">
-                  <div class="platform-tag jvm">JVM</div>
-                </td>
-              </tr>
-            </tbody>
-          </table>
-          <h2>Functions</h2>
-          <table>
-            <thead></thead>
-            <tbody>
-              <tr class="platform-tagged">
-                <td class="content"><a href="function.html">function</a></td>
-                <td class="content">
-                  <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm"><div class="symbol monospace">final fun <a href="function.html">function</a>(notInlined: <div class="symbol monospace">() -&gt; <a href="">Unit</a></div>)</div></div></div>
-                  <div class="brief "> </div>
-                </td>
-                <td class="platform-tagged">
-                  <div class="platform-tag jvm">JVM</div>
-                </td>
-              </tr>
-            </tbody>
-          </table>
-        </div>
-      </div>
-    </div>
-  </body>
-</html>
-
diff --git a/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/[jvm root]/-fancy/-init-.html b/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/[jvm root]/-fancy/-init-.html
new file mode 100644
index 00000000..6fa1a1f0
--- /dev/null
+++ b/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/[jvm root]/-fancy/-init-.html	
@@ -0,0 +1,31 @@
+<html>
+  <head>
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <title>&lt;init&gt;</title>
+    <link href="../../../styles/style.css" rel="Stylesheet">
+    <script type="text/javascript" src="../../../scripts/navigationLoader.js" async="async"></script>
+    <script type="text/javascript" src="../../../scripts/platformContentHandler.js" async="async"></script>
+    <script>var pathToRoot = "../../../";</script>
+  </head>
+  <body>
+    <div id="container">
+      <div id="leftColumn">
+        <div id="logo"></div>
+        <div id="sideMenu"></div>
+      </div>
+      <div id="main">
+        <div id="searchBar"></div>
+        <script type="text/javascript" src="../../../scripts/pages.js"></script>
+        <script type="text/javascript" src="../../../scripts/main.js"></script>
+        <div id="content" pageIds="[jvm root]/Fancy/&lt;init&gt;/#//">
+          <div class="breadcrumbs">//<a href="../../index.html">root</a>/<a href="../index.html">[jvm root]</a>/<a href="index.html">Fancy</a>/<a href="-init-.html">&lt;init&gt;</a></div>
+          <div class="cover ">
+            <h1>&lt;init&gt;</h1>
+            <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm"><div class="symbol monospace">final fun <a href="-init-.html">&lt;init&gt;</a>()</div></div></div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </body>
+</html>
+
diff --git a/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/[jvm root]/-fancy/equals.html b/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/[jvm root]/-fancy/equals.html
new file mode 100644
index 00000000..0c1760d6
--- /dev/null
+++ b/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/[jvm root]/-fancy/equals.html	
@@ -0,0 +1,31 @@
+<html>
+  <head>
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <title>equals</title>
+    <link href="../../../styles/style.css" rel="Stylesheet">
+    <script type="text/javascript" src="../../../scripts/navigationLoader.js" async="async"></script>
+    <script type="text/javascript" src="../../../scripts/platformContentHandler.js" async="async"></script>
+    <script>var pathToRoot = "../../../";</script>
+  </head>
+  <body>
+    <div id="container">
+      <div id="leftColumn">
+        <div id="logo"></div>
+        <div id="sideMenu"></div>
+      </div>
+      <div id="main">
+        <div id="searchBar"></div>
+        <script type="text/javascript" src="../../../scripts/pages.js"></script>
+        <script type="text/javascript" src="../../../scripts/main.js"></script>
+        <div id="content" pageIds="/Fancy/equals/#kotlin.Any?//">
+          <div class="breadcrumbs">//<a href="../../index.html">root</a>/<a href="../index.html">[jvm root]</a>/<a href="index.html">Fancy</a>/<a href="equals.html">equals</a></div>
+          <div class="cover ">
+            <h1>equals</h1>
+            <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm"><div class="symbol monospace">open fun <a href="equals.html">equals</a>(other: <a href="">Any</a>): <a href="">Boolean</a></div></div></div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </body>
+</html>
+
diff --git a/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/[jvm root]/-fancy/hash-code.html b/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/[jvm root]/-fancy/hash-code.html
new file mode 100644
index 00000000..654b11b4
--- /dev/null
+++ b/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/[jvm root]/-fancy/hash-code.html	
@@ -0,0 +1,31 @@
+<html>
+  <head>
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <title>hashCode</title>
+    <link href="../../../styles/style.css" rel="Stylesheet">
+    <script type="text/javascript" src="../../../scripts/navigationLoader.js" async="async"></script>
+    <script type="text/javascript" src="../../../scripts/platformContentHandler.js" async="async"></script>
+    <script>var pathToRoot = "../../../";</script>
+  </head>
+  <body>
+    <div id="container">
+      <div id="leftColumn">
+        <div id="logo"></div>
+        <div id="sideMenu"></div>
+      </div>
+      <div id="main">
+        <div id="searchBar"></div>
+        <script type="text/javascript" src="../../../scripts/pages.js"></script>
+        <script type="text/javascript" src="../../../scripts/main.js"></script>
+        <div id="content" pageIds="/Fancy/hashCode/#//">
+          <div class="breadcrumbs">//<a href="../../index.html">root</a>/<a href="../index.html">[jvm root]</a>/<a href="index.html">Fancy</a>/<a href="hash-code.html">hashCode</a></div>
+          <div class="cover ">
+            <h1>hashCode</h1>
+            <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm"><div class="symbol monospace">open fun <a href="hash-code.html">hashCode</a>(): <a href="">Int</a></div></div></div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </body>
+</html>
+
diff --git a/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/[jvm root]/-fancy/index.html b/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/[jvm root]/-fancy/index.html
new file mode 100644
index 00000000..2f458d5a
--- /dev/null
+++ b/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/[jvm root]/-fancy/index.html	
@@ -0,0 +1,67 @@
+<html>
+  <head>
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <title>Fancy</title>
+    <link href="../../../styles/style.css" rel="Stylesheet">
+    <script type="text/javascript" src="../../../scripts/navigationLoader.js" async="async"></script>
+    <script type="text/javascript" src="../../../scripts/platformContentHandler.js" async="async"></script>
+    <script>var pathToRoot = "../../../";</script>
+  </head>
+  <body>
+    <div id="container">
+      <div id="leftColumn">
+        <div id="logo"></div>
+        <div id="sideMenu"></div>
+      </div>
+      <div id="main">
+        <div id="searchBar"></div>
+        <script type="text/javascript" src="../../../scripts/pages.js"></script>
+        <script type="text/javascript" src="../../../scripts/main.js"></script>
+        <div id="content" pageIds="[jvm root]/Fancy////">
+          <div class="breadcrumbs">//<a href="../../index.html">root</a>/<a href="../index.html">[jvm root]</a>/<a href="index.html">Fancy</a></div>
+          <div class="cover ">
+            <h1>Fancy</h1>
+            <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm"><div class="symbol monospace">annotation class <a href="index.html">Fancy</a></div></div></div>
+          </div>
+          <h2>Functions</h2>
+          <table>
+            <thead></thead>
+            <tbody>
+              <tr class="platform-tagged">
+                <td class="content"><a href="equals.html">equals</a></td>
+                <td class="content">
+                  <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm"><div class="symbol monospace">open fun <a href="equals.html">equals</a>(other: <a href="">Any</a>): <a href="">Boolean</a></div></div></div>
+                  <div class="brief "> </div>
+                </td>
+                <td class="platform-tagged">
+                  <div class="platform-tag jvm">JVM</div>
+                </td>
+              </tr>
+              <tr class="platform-tagged">
+                <td class="content"><a href="hash-code.html">hashCode</a></td>
+                <td class="content">
+                  <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm"><div class="symbol monospace">open fun <a href="hash-code.html">hashCode</a>(): <a href="">Int</a></div></div></div>
+                  <div class="brief "> </div>
+                </td>
+                <td class="platform-tagged">
+                  <div class="platform-tag jvm">JVM</div>
+                </td>
+              </tr>
+              <tr class="platform-tagged">
+                <td class="content"><a href="to-string.html">toString</a></td>
+                <td class="content">
+                  <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm"><div class="symbol monospace">open fun <a href="to-string.html">toString</a>(): <a href="">String</a></div></div></div>
+                  <div class="brief "> </div>
+                </td>
+                <td class="platform-tagged">
+                  <div class="platform-tag jvm">JVM</div>
+                </td>
+              </tr>
+            </tbody>
+          </table>
+        </div>
+      </div>
+    </div>
+  </body>
+</html>
+
diff --git a/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/[jvm root]/-fancy/to-string.html b/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/[jvm root]/-fancy/to-string.html
new file mode 100644
index 00000000..c0a3a7e0
--- /dev/null
+++ b/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/[jvm root]/-fancy/to-string.html	
@@ -0,0 +1,31 @@
+<html>
+  <head>
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <title>toString</title>
+    <link href="../../../styles/style.css" rel="Stylesheet">
+    <script type="text/javascript" src="../../../scripts/navigationLoader.js" async="async"></script>
+    <script type="text/javascript" src="../../../scripts/platformContentHandler.js" async="async"></script>
+    <script>var pathToRoot = "../../../";</script>
+  </head>
+  <body>
+    <div id="container">
+      <div id="leftColumn">
+        <div id="logo"></div>
+        <div id="sideMenu"></div>
+      </div>
+      <div id="main">
+        <div id="searchBar"></div>
+        <script type="text/javascript" src="../../../scripts/pages.js"></script>
+        <script type="text/javascript" src="../../../scripts/main.js"></script>
+        <div id="content" pageIds="/Fancy/toString/#//">
+          <div class="breadcrumbs">//<a href="../../index.html">root</a>/<a href="../index.html">[jvm root]</a>/<a href="index.html">Fancy</a>/<a href="to-string.html">toString</a></div>
+          <div class="cover ">
+            <h1>toString</h1>
+            <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm"><div class="symbol monospace">open fun <a href="to-string.html">toString</a>(): <a href="">String</a></div></div></div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </body>
+</html>
+
diff --git a/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/[jvm root]/function.html b/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/[jvm root]/function.html
new file mode 100644
index 00000000..9e0ce05c
--- /dev/null
+++ b/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/[jvm root]/function.html	
@@ -0,0 +1,31 @@
+<html>
+  <head>
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <title>function</title>
+    <link href="../../styles/style.css" rel="Stylesheet">
+    <script type="text/javascript" src="../../scripts/navigationLoader.js" async="async"></script>
+    <script type="text/javascript" src="../../scripts/platformContentHandler.js" async="async"></script>
+    <script>var pathToRoot = "../../";</script>
+  </head>
+  <body>
+    <div id="container">
+      <div id="leftColumn">
+        <div id="logo"></div>
+        <div id="sideMenu"></div>
+      </div>
+      <div id="main">
+        <div id="searchBar"></div>
+        <script type="text/javascript" src="../../scripts/pages.js"></script>
+        <script type="text/javascript" src="../../scripts/main.js"></script>
+        <div id="content" pageIds="//function/#kotlin.Function0[kotlin.Unit]//">
+          <div class="breadcrumbs">//<a href="../index.html">root</a>/<a href="index.html">[jvm root]</a>/<a href="function.html">function</a></div>
+          <div class="cover ">
+            <h1>function</h1>
+            <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm"><div class="symbol monospace">final fun <a href="function.html">function</a>(notInlined: <div class="symbol monospace">() -&gt; <a href="">Unit</a></div>)</div></div></div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </body>
+</html>
+
diff --git a/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/[jvm root]/index.html b/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/[jvm root]/index.html
new file mode 100644
index 00000000..5a7adf9f
--- /dev/null
+++ b/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/[jvm root]/index.html	
@@ -0,0 +1,62 @@
+<html>
+  <head>
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <title>[jvm root]</title>
+    <link href="../../styles/style.css" rel="Stylesheet">
+    <script type="text/javascript" src="../../scripts/navigationLoader.js" async="async"></script>
+    <script type="text/javascript" src="../../scripts/platformContentHandler.js" async="async"></script>
+    <script>var pathToRoot = "../../";</script>
+  </head>
+  <body>
+    <div id="container">
+      <div id="leftColumn">
+        <div id="logo"></div>
+        <div id="sideMenu"></div>
+      </div>
+      <div id="main">
+        <div id="searchBar"></div>
+        <script type="text/javascript" src="../../scripts/pages.js"></script>
+        <script type="text/javascript" src="../../scripts/main.js"></script>
+        <div id="content" pageIds="[jvm root]/////">
+          <div class="breadcrumbs">//<a href="../index.html">root</a>/<a href="index.html">[jvm root]</a></div>
+          <div class="cover ">
+            <h1>Package [jvm root]</h1>
+          </div>
+          <h2>Types</h2>
+          <table>
+            <thead></thead>
+            <tbody>
+              <tr class="platform-tagged">
+                <td class="content"><a href="-fancy/index.html">Fancy</a></td>
+                <td class="content">
+                  <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm"><div class="symbol monospace">annotation class <a href="-fancy/index.html">Fancy</a></div></div></div>
+                  <div class="brief "> </div>
+                </td>
+                <td class="platform-tagged">
+                  <div class="platform-tag jvm">JVM</div>
+                </td>
+              </tr>
+            </tbody>
+          </table>
+          <h2>Functions</h2>
+          <table>
+            <thead></thead>
+            <tbody>
+              <tr class="platform-tagged">
+                <td class="content"><a href="function.html">function</a></td>
+                <td class="content">
+                  <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm"><div class="symbol monospace">final fun <a href="function.html">function</a>(notInlined: <div class="symbol monospace">() -&gt; <a href="">Unit</a></div>)</div></div></div>
+                  <div class="brief "> </div>
+                </td>
+                <td class="platform-tagged">
+                  <div class="platform-tag jvm">JVM</div>
+                </td>
+              </tr>
+            </tbody>
+          </table>
+        </div>
+      </div>
+    </div>
+  </body>
+</html>
+
diff --git a/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/index.html b/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/index.html
index a3211166..440758c2 100644
--- a/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/index.html
+++ b/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/index.html
@@ -27,7 +27,7 @@
             <thead></thead>
             <tbody>
               <tr class="platform-tagged">
-                <td class="content"><a href="&lt;jvm root&gt;/index.html">&lt;jvm root&gt;</a></td>
+                <td class="content"><a href="[jvm root]/index.html">[jvm root]</a></td>
                 <td class="platform-tagged">
                   <div class="platform-tag jvm">JVM</div>
                 </td>
diff --git a/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/package-list b/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/package-list
index 0b48e7e0..141e96fd 100644
--- a/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/package-list
+++ b/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/package-list
@@ -1,8 +1,8 @@
 $dokka.format:html
 $dokka.linkExtension:html
-$dokka.location://function/#kotlin.Function0[kotlin.Unit]//root/<jvm root>/function.html
-$dokka.location:/Fancy/equals/#kotlin.Any?//root/<jvm root>/-fancy/equals.html
-$dokka.location:/Fancy/hashCode/#//root/<jvm root>/-fancy/hash-code.html
-$dokka.location:/Fancy/toString/#//root/<jvm root>/-fancy/to-string.html
-<jvm root>
+$dokka.location://function/#kotlin.Function0[kotlin.Unit]//root/[jvm root]/function.html
+$dokka.location:/Fancy/equals/#kotlin.Any?//root/[jvm root]/-fancy/equals.html
+$dokka.location:/Fancy/hashCode/#//root/[jvm root]/-fancy/hash-code.html
+$dokka.location:/Fancy/toString/#//root/[jvm root]/-fancy/to-string.html
+[jvm root]
 
diff --git a/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/scripts/pages.js b/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/scripts/pages.js
index 74e79947..95ff3d6f 100644
--- a/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/scripts/pages.js
+++ b/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/scripts/pages.js
@@ -1,10 +1,10 @@
 var pages = [
 { "name": "root",  "location": "root/index.html" },
-{ "name": "<jvm root>",  "location": "root/<jvm root>/index.html" },
-{ "name": "Fancy", "class": "Fancy", "location": "root/<jvm root>/-fancy/index.html" },
-{ "name": "<init>",  "location": "root/<jvm root>/-fancy/-init-.html" },
-{ "name": "equals",  "location": "root/<jvm root>/-fancy/equals.html" },
-{ "name": "hashCode",  "location": "root/<jvm root>/-fancy/hash-code.html" },
-{ "name": "toString",  "location": "root/<jvm root>/-fancy/to-string.html" },
-{ "name": "function",  "location": "root/<jvm root>/function.html" }
+{ "name": "[jvm root]",  "location": "root/[jvm root]/index.html" },
+{ "name": "Fancy", "class": "Fancy", "location": "root/[jvm root]/-fancy/index.html" },
+{ "name": "<init>",  "location": "root/[jvm root]/-fancy/-init-.html" },
+{ "name": "equals",  "location": "root/[jvm root]/-fancy/equals.html" },
+{ "name": "hashCode",  "location": "root/[jvm root]/-fancy/hash-code.html" },
+{ "name": "toString",  "location": "root/[jvm root]/-fancy/to-string.html" },
+{ "name": "function",  "location": "root/[jvm root]/function.html" }
 ]
diff --git a/plugins/base/src/test/resources/expect/functionWithDefaultParameter/out/html/navigation.html b/plugins/base/src/test/resources/expect/functionWithDefaultParameter/out/html/navigation.html
index 388f9e2f..6d159123 100644
--- a/plugins/base/src/test/resources/expect/functionWithDefaultParameter/out/html/navigation.html
+++ b/plugins/base/src/test/resources/expect/functionWithDefaultParameter/out/html/navigation.html
@@ -1,9 +1,9 @@
 <div class="sideMenuPart" id="nav-submenu" pageId="/////">
   <div class="overview"><a href="root/index.html">root</a><span class="navButton" onclick="document.getElementById(&quot;nav-submenu&quot;).classList.toggle(&quot;hidden&quot;);"><span class="navButtonContent"></span></span></div>
-  <div class="sideMenuPart" id="nav-submenu-0" pageId="&lt;jvm root&gt;/////">
-    <div class="overview"><a href="root/&lt;jvm root&gt;/index.html">&lt;jvm root&gt;</a><span class="navButton" onclick="document.getElementById(&quot;nav-submenu-0&quot;).classList.toggle(&quot;hidden&quot;);"><span class="navButtonContent"></span></span></div>
+  <div class="sideMenuPart" id="nav-submenu-0" pageId="[jvm root]/////">
+    <div class="overview"><a href="root/[jvm root]/index.html">[jvm root]</a><span class="navButton" onclick="document.getElementById(&quot;nav-submenu-0&quot;).classList.toggle(&quot;hidden&quot;);"><span class="navButtonContent"></span></span></div>
     <div class="sideMenuPart" id="nav-submenu-0-0" pageId="//f/#kotlin.String//">
-      <div class="overview"><a href="root/&lt;jvm root&gt;/f.html">f</a></div>
+      <div class="overview"><a href="root/[jvm root]/f.html">f</a></div>
     </div>
   </div>
 </div>
diff --git a/plugins/base/src/test/resources/expect/functionWithDefaultParameter/out/html/root/<jvm root>/f.html b/plugins/base/src/test/resources/expect/functionWithDefaultParameter/out/html/root/<jvm root>/f.html
deleted file mode 100644
index 47b3db1c..00000000
--- a/plugins/base/src/test/resources/expect/functionWithDefaultParameter/out/html/root/<jvm root>/f.html	
+++ /dev/null
@@ -1,31 +0,0 @@
-<html>
-  <head>
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <title>f</title>
-    <link href="../../styles/style.css" rel="Stylesheet">
-    <script type="text/javascript" src="../../scripts/navigationLoader.js" async="async"></script>
-    <script type="text/javascript" src="../../scripts/platformContentHandler.js" async="async"></script>
-    <script>var pathToRoot = "../../";</script>
-  </head>
-  <body>
-    <div id="container">
-      <div id="leftColumn">
-        <div id="logo"></div>
-        <div id="sideMenu"></div>
-      </div>
-      <div id="main">
-        <div id="searchBar"></div>
-        <script type="text/javascript" src="../../scripts/pages.js"></script>
-        <script type="text/javascript" src="../../scripts/main.js"></script>
-        <div id="content" pageIds="//f/#kotlin.String//">
-          <div class="breadcrumbs">//<a href="../index.html">root</a>/<a href="index.html">&lt;jvm root&gt;</a>/<a href="f.html">f</a></div>
-          <div class="cover ">
-            <h1>f</h1>
-            <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm"><div class="symbol monospace">final fun <a href="f.html">f</a>(x: <a href="">String</a>)</div></div></div>
-          </div>
-        </div>
-      </div>
-    </div>
-  </body>
-</html>
-
diff --git a/plugins/base/src/test/resources/expect/functionWithDefaultParameter/out/html/root/<jvm root>/index.html b/plugins/base/src/test/resources/expect/functionWithDefaultParameter/out/html/root/<jvm root>/index.html
deleted file mode 100644
index fb7eacf2..00000000
--- a/plugins/base/src/test/resources/expect/functionWithDefaultParameter/out/html/root/<jvm root>/index.html	
+++ /dev/null
@@ -1,46 +0,0 @@
-<html>
-  <head>
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <title>&lt;jvm root&gt;</title>
-    <link href="../../styles/style.css" rel="Stylesheet">
-    <script type="text/javascript" src="../../scripts/navigationLoader.js" async="async"></script>
-    <script type="text/javascript" src="../../scripts/platformContentHandler.js" async="async"></script>
-    <script>var pathToRoot = "../../";</script>
-  </head>
-  <body>
-    <div id="container">
-      <div id="leftColumn">
-        <div id="logo"></div>
-        <div id="sideMenu"></div>
-      </div>
-      <div id="main">
-        <div id="searchBar"></div>
-        <script type="text/javascript" src="../../scripts/pages.js"></script>
-        <script type="text/javascript" src="../../scripts/main.js"></script>
-        <div id="content" pageIds="&lt;jvm root&gt;/////">
-          <div class="breadcrumbs">//<a href="../index.html">root</a>/<a href="index.html">&lt;jvm root&gt;</a></div>
-          <div class="cover ">
-            <h1>Package &lt;jvm root&gt;</h1>
-          </div>
-          <h2>Functions</h2>
-          <table>
-            <thead></thead>
-            <tbody>
-              <tr class="platform-tagged">
-                <td class="content"><a href="f.html">f</a></td>
-                <td class="content">
-                  <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm"><div class="symbol monospace">final fun <a href="f.html">f</a>(x: <a href="">String</a>)</div></div></div>
-                  <div class="brief "> </div>
-                </td>
-                <td class="platform-tagged">
-                  <div class="platform-tag jvm">JVM</div>
-                </td>
-              </tr>
-            </tbody>
-          </table>
-        </div>
-      </div>
-    </div>
-  </body>
-</html>
-
diff --git a/plugins/base/src/test/resources/expect/functionWithDefaultParameter/out/html/root/[jvm root]/f.html b/plugins/base/src/test/resources/expect/functionWithDefaultParameter/out/html/root/[jvm root]/f.html
new file mode 100644
index 00000000..bde81d3f
--- /dev/null
+++ b/plugins/base/src/test/resources/expect/functionWithDefaultParameter/out/html/root/[jvm root]/f.html	
@@ -0,0 +1,31 @@
+<html>
+  <head>
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <title>f</title>
+    <link href="../../styles/style.css" rel="Stylesheet">
+    <script type="text/javascript" src="../../scripts/navigationLoader.js" async="async"></script>
+    <script type="text/javascript" src="../../scripts/platformContentHandler.js" async="async"></script>
+    <script>var pathToRoot = "../../";</script>
+  </head>
+  <body>
+    <div id="container">
+      <div id="leftColumn">
+        <div id="logo"></div>
+        <div id="sideMenu"></div>
+      </div>
+      <div id="main">
+        <div id="searchBar"></div>
+        <script type="text/javascript" src="../../scripts/pages.js"></script>
+        <script type="text/javascript" src="../../scripts/main.js"></script>
+        <div id="content" pageIds="//f/#kotlin.String//">
+          <div class="breadcrumbs">//<a href="../index.html">root</a>/<a href="index.html">[jvm root]</a>/<a href="f.html">f</a></div>
+          <div class="cover ">
+            <h1>f</h1>
+            <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm"><div class="symbol monospace">final fun <a href="f.html">f</a>(x: <a href="">String</a>)</div></div></div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </body>
+</html>
+
diff --git a/plugins/base/src/test/resources/expect/functionWithDefaultParameter/out/html/root/[jvm root]/index.html b/plugins/base/src/test/resources/expect/functionWithDefaultParameter/out/html/root/[jvm root]/index.html
new file mode 100644
index 00000000..16e168fa
--- /dev/null
+++ b/plugins/base/src/test/resources/expect/functionWithDefaultParameter/out/html/root/[jvm root]/index.html	
@@ -0,0 +1,46 @@
+<html>
+  <head>
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <title>[jvm root]</title>
+    <link href="../../styles/style.css" rel="Stylesheet">
+    <script type="text/javascript" src="../../scripts/navigationLoader.js" async="async"></script>
+    <script type="text/javascript" src="../../scripts/platformContentHandler.js" async="async"></script>
+    <script>var pathToRoot = "../../";</script>
+  </head>
+  <body>
+    <div id="container">
+      <div id="leftColumn">
+        <div id="logo"></div>
+        <div id="sideMenu"></div>
+      </div>
+      <div id="main">
+        <div id="searchBar"></div>
+        <script type="text/javascript" src="../../scripts/pages.js"></script>
+        <script type="text/javascript" src="../../scripts/main.js"></script>
+        <div id="content" pageIds="[jvm root]/////">
+          <div class="breadcrumbs">//<a href="../index.html">root</a>/<a href="index.html">[jvm root]</a></div>
+          <div class="cover ">
+            <h1>Package [jvm root]</h1>
+          </div>
+          <h2>Functions</h2>
+          <table>
+            <thead></thead>
+            <tbody>
+              <tr class="platform-tagged">
+                <td class="content"><a href="f.html">f</a></td>
+                <td class="content">
+                  <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm"><div class="symbol monospace">final fun <a href="f.html">f</a>(x: <a href="">String</a>)</div></div></div>
+                  <div class="brief "> </div>
+                </td>
+                <td class="platform-tagged">
+                  <div class="platform-tag jvm">JVM</div>
+                </td>
+              </tr>
+            </tbody>
+          </table>
+        </div>
+      </div>
+    </div>
+  </body>
+</html>
+
diff --git a/plugins/base/src/test/resources/expect/functionWithDefaultParameter/out/html/root/index.html b/plugins/base/src/test/resources/expect/functionWithDefaultParameter/out/html/root/index.html
index a3211166..440758c2 100644
--- a/plugins/base/src/test/resources/expect/functionWithDefaultParameter/out/html/root/index.html
+++ b/plugins/base/src/test/resources/expect/functionWithDefaultParameter/out/html/root/index.html
@@ -27,7 +27,7 @@
             <thead></thead>
             <tbody>
               <tr class="platform-tagged">
-                <td class="content"><a href="&lt;jvm root&gt;/index.html">&lt;jvm root&gt;</a></td>
+                <td class="content"><a href="[jvm root]/index.html">[jvm root]</a></td>
                 <td class="platform-tagged">
                   <div class="platform-tag jvm">JVM</div>
                 </td>
diff --git a/plugins/base/src/test/resources/expect/functionWithDefaultParameter/out/html/root/package-list b/plugins/base/src/test/resources/expect/functionWithDefaultParameter/out/html/root/package-list
index c8e4e8e1..2887ed99 100644
--- a/plugins/base/src/test/resources/expect/functionWithDefaultParameter/out/html/root/package-list
+++ b/plugins/base/src/test/resources/expect/functionWithDefaultParameter/out/html/root/package-list
@@ -1,5 +1,5 @@
 $dokka.format:html
 $dokka.linkExtension:html
-$dokka.location://f/#kotlin.String//root/<jvm root>/f.html
-<jvm root>
+$dokka.location://f/#kotlin.String//root/[jvm root]/f.html
+[jvm root]
 
diff --git a/plugins/base/src/test/resources/expect/functionWithDefaultParameter/out/html/scripts/pages.js b/plugins/base/src/test/resources/expect/functionWithDefaultParameter/out/html/scripts/pages.js
index 68e0c564..310827d1 100644
--- a/plugins/base/src/test/resources/expect/functionWithDefaultParameter/out/html/scripts/pages.js
+++ b/plugins/base/src/test/resources/expect/functionWithDefaultParameter/out/html/scripts/pages.js
@@ -1,5 +1,5 @@
 var pages = [
 { "name": "root",  "location": "root/index.html" },
-{ "name": "<jvm root>",  "location": "root/<jvm root>/index.html" },
-{ "name": "f",  "location": "root/<jvm root>/f.html" }
+{ "name": "[jvm root]",  "location": "root/[jvm root]/index.html" },
+{ "name": "f",  "location": "root/[jvm root]/f.html" }
 ]
diff --git a/plugins/base/src/test/resources/expect/functionWithNoinlineParam/out/html/navigation.html b/plugins/base/src/test/resources/expect/functionWithNoinlineParam/out/html/navigation.html
index c0205733..b3a068a3 100644
--- a/plugins/base/src/test/resources/expect/functionWithNoinlineParam/out/html/navigation.html
+++ b/plugins/base/src/test/resources/expect/functionWithNoinlineParam/out/html/navigation.html
@@ -1,9 +1,9 @@
 <div class="sideMenuPart" id="nav-submenu" pageId="/////">
   <div class="overview"><a href="root/index.html">root</a><span class="navButton" onclick="document.getElementById(&quot;nav-submenu&quot;).classList.toggle(&quot;hidden&quot;);"><span class="navButtonContent"></span></span></div>
-  <div class="sideMenuPart" id="nav-submenu-0" pageId="&lt;jvm root&gt;/////">
-    <div class="overview"><a href="root/&lt;jvm root&gt;/index.html">&lt;jvm root&gt;</a><span class="navButton" onclick="document.getElementById(&quot;nav-submenu-0&quot;).classList.toggle(&quot;hidden&quot;);"><span class="navButtonContent"></span></span></div>
+  <div class="sideMenuPart" id="nav-submenu-0" pageId="[jvm root]/////">
+    <div class="overview"><a href="root/[jvm root]/index.html">[jvm root]</a><span class="navButton" onclick="document.getElementById(&quot;nav-submenu-0&quot;).classList.toggle(&quot;hidden&quot;);"><span class="navButtonContent"></span></span></div>
     <div class="sideMenuPart" id="nav-submenu-0-0" pageId="//function/#kotlin.Function0[kotlin.Unit]//">
-      <div class="overview"><a href="root/&lt;jvm root&gt;/function.html">function</a></div>
+      <div class="overview"><a href="root/[jvm root]/function.html">function</a></div>
     </div>
   </div>
 </div>
diff --git a/plugins/base/src/test/resources/expect/functionWithNoinlineParam/out/html/root/<jvm root>/function.html b/plugins/base/src/test/resources/expect/functionWithNoinlineParam/out/html/root/<jvm root>/function.html
deleted file mode 100644
index 6464397a..00000000
--- a/plugins/base/src/test/resources/expect/functionWithNoinlineParam/out/html/root/<jvm root>/function.html	
+++ /dev/null
@@ -1,31 +0,0 @@
-<html>
-  <head>
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <title>function</title>
-    <link href="../../styles/style.css" rel="Stylesheet">
-    <script type="text/javascript" src="../../scripts/navigationLoader.js" async="async"></script>
-    <script type="text/javascript" src="../../scripts/platformContentHandler.js" async="async"></script>
-    <script>var pathToRoot = "../../";</script>
-  </head>
-  <body>
-    <div id="container">
-      <div id="leftColumn">
-        <div id="logo"></div>
-        <div id="sideMenu"></div>
-      </div>
-      <div id="main">
-        <div id="searchBar"></div>
-        <script type="text/javascript" src="../../scripts/pages.js"></script>
-        <script type="text/javascript" src="../../scripts/main.js"></script>
-        <div id="content" pageIds="//function/#kotlin.Function0[kotlin.Unit]//">
-          <div class="breadcrumbs">//<a href="../index.html">root</a>/<a href="index.html">&lt;jvm root&gt;</a>/<a href="function.html">function</a></div>
-          <div class="cover ">
-            <h1>function</h1>
-            <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm"><div class="symbol monospace">final fun <a href="function.html">function</a>(notInlined: <div class="symbol monospace">() -&gt; <a href="">Unit</a></div>)</div></div></div>
-          </div>
-        </div>
-      </div>
-    </div>
-  </body>
-</html>
-
diff --git a/plugins/base/src/test/resources/expect/functionWithNoinlineParam/out/html/root/<jvm root>/index.html b/plugins/base/src/test/resources/expect/functionWithNoinlineParam/out/html/root/<jvm root>/index.html
deleted file mode 100644
index c509e95e..00000000
--- a/plugins/base/src/test/resources/expect/functionWithNoinlineParam/out/html/root/<jvm root>/index.html	
+++ /dev/null
@@ -1,46 +0,0 @@
-<html>
-  <head>
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <title>&lt;jvm root&gt;</title>
-    <link href="../../styles/style.css" rel="Stylesheet">
-    <script type="text/javascript" src="../../scripts/navigationLoader.js" async="async"></script>
-    <script type="text/javascript" src="../../scripts/platformContentHandler.js" async="async"></script>
-    <script>var pathToRoot = "../../";</script>
-  </head>
-  <body>
-    <div id="container">
-      <div id="leftColumn">
-        <div id="logo"></div>
-        <div id="sideMenu"></div>
-      </div>
-      <div id="main">
-        <div id="searchBar"></div>
-        <script type="text/javascript" src="../../scripts/pages.js"></script>
-        <script type="text/javascript" src="../../scripts/main.js"></script>
-        <div id="content" pageIds="&lt;jvm root&gt;/////">
-          <div class="breadcrumbs">//<a href="../index.html">root</a>/<a href="index.html">&lt;jvm root&gt;</a></div>
-          <div class="cover ">
-            <h1>Package &lt;jvm root&gt;</h1>
-          </div>
-          <h2>Functions</h2>
-          <table>
-            <thead></thead>
-            <tbody>
-              <tr class="platform-tagged">
-                <td class="content"><a href="function.html">function</a></td>
-                <td class="content">
-                  <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm"><div class="symbol monospace">final fun <a href="function.html">function</a>(notInlined: <div class="symbol monospace">() -&gt; <a href="">Unit</a></div>)</div></div></div>
-                  <div class="brief "> </div>
-                </td>
-                <td class="platform-tagged">
-                  <div class="platform-tag jvm">JVM</div>
-                </td>
-              </tr>
-            </tbody>
-          </table>
-        </div>
-      </div>
-    </div>
-  </body>
-</html>
-
diff --git a/plugins/base/src/test/resources/expect/functionWithNoinlineParam/out/html/root/[jvm root]/function.html b/plugins/base/src/test/resources/expect/functionWithNoinlineParam/out/html/root/[jvm root]/function.html
new file mode 100644
index 00000000..9e0ce05c
--- /dev/null
+++ b/plugins/base/src/test/resources/expect/functionWithNoinlineParam/out/html/root/[jvm root]/function.html	
@@ -0,0 +1,31 @@
+<html>
+  <head>
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <title>function</title>
+    <link href="../../styles/style.css" rel="Stylesheet">
+    <script type="text/javascript" src="../../scripts/navigationLoader.js" async="async"></script>
+    <script type="text/javascript" src="../../scripts/platformContentHandler.js" async="async"></script>
+    <script>var pathToRoot = "../../";</script>
+  </head>
+  <body>
+    <div id="container">
+      <div id="leftColumn">
+        <div id="logo"></div>
+        <div id="sideMenu"></div>
+      </div>
+      <div id="main">
+        <div id="searchBar"></div>
+        <script type="text/javascript" src="../../scripts/pages.js"></script>
+        <script type="text/javascript" src="../../scripts/main.js"></script>
+        <div id="content" pageIds="//function/#kotlin.Function0[kotlin.Unit]//">
+          <div class="breadcrumbs">//<a href="../index.html">root</a>/<a href="index.html">[jvm root]</a>/<a href="function.html">function</a></div>
+          <div class="cover ">
+            <h1>function</h1>
+            <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm"><div class="symbol monospace">final fun <a href="function.html">function</a>(notInlined: <div class="symbol monospace">() -&gt; <a href="">Unit</a></div>)</div></div></div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </body>
+</html>
+
diff --git a/plugins/base/src/test/resources/expect/functionWithNoinlineParam/out/html/root/[jvm root]/index.html b/plugins/base/src/test/resources/expect/functionWithNoinlineParam/out/html/root/[jvm root]/index.html
new file mode 100644
index 00000000..48dcf46a
--- /dev/null
+++ b/plugins/base/src/test/resources/expect/functionWithNoinlineParam/out/html/root/[jvm root]/index.html	
@@ -0,0 +1,46 @@
+<html>
+  <head>
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <title>[jvm root]</title>
+    <link href="../../styles/style.css" rel="Stylesheet">
+    <script type="text/javascript" src="../../scripts/navigationLoader.js" async="async"></script>
+    <script type="text/javascript" src="../../scripts/platformContentHandler.js" async="async"></script>
+    <script>var pathToRoot = "../../";</script>
+  </head>
+  <body>
+    <div id="container">
+      <div id="leftColumn">
+        <div id="logo"></div>
+        <div id="sideMenu"></div>
+      </div>
+      <div id="main">
+        <div id="searchBar"></div>
+        <script type="text/javascript" src="../../scripts/pages.js"></script>
+        <script type="text/javascript" src="../../scripts/main.js"></script>
+        <div id="content" pageIds="[jvm root]/////">
+          <div class="breadcrumbs">//<a href="../index.html">root</a>/<a href="index.html">[jvm root]</a></div>
+          <div class="cover ">
+            <h1>Package [jvm root]</h1>
+          </div>
+          <h2>Functions</h2>
+          <table>
+            <thead></thead>
+            <tbody>
+              <tr class="platform-tagged">
+                <td class="content"><a href="function.html">function</a></td>
+                <td class="content">
+                  <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm"><div class="symbol monospace">final fun <a href="function.html">function</a>(notInlined: <div class="symbol monospace">() -&gt; <a href="">Unit</a></div>)</div></div></div>
+                  <div class="brief "> </div>
+                </td>
+                <td class="platform-tagged">
+                  <div class="platform-tag jvm">JVM</div>
+                </td>
+              </tr>
+            </tbody>
+          </table>
+        </div>
+      </div>
+    </div>
+  </body>
+</html>
+
diff --git a/plugins/base/src/test/resources/expect/functionWithNoinlineParam/out/html/root/index.html b/plugins/base/src/test/resources/expect/functionWithNoinlineParam/out/html/root/index.html
index a3211166..440758c2 100644
--- a/plugins/base/src/test/resources/expect/functionWithNoinlineParam/out/html/root/index.html
+++ b/plugins/base/src/test/resources/expect/functionWithNoinlineParam/out/html/root/index.html
@@ -27,7 +27,7 @@
             <thead></thead>
             <tbody>
               <tr class="platform-tagged">
-                <td class="content"><a href="&lt;jvm root&gt;/index.html">&lt;jvm root&gt;</a></td>
+                <td class="content"><a href="[jvm root]/index.html">[jvm root]</a></td>
                 <td class="platform-tagged">
                   <div class="platform-tag jvm">JVM</div>
                 </td>
diff --git a/plugins/base/src/test/resources/expect/functionWithNoinlineParam/out/html/root/package-list b/plugins/base/src/test/resources/expect/functionWithNoinlineParam/out/html/root/package-list
index 7de7dd3b..4200e2d8 100644
--- a/plugins/base/src/test/resources/expect/functionWithNoinlineParam/out/html/root/package-list
+++ b/plugins/base/src/test/resources/expect/functionWithNoinlineParam/out/html/root/package-list
@@ -1,5 +1,5 @@
 $dokka.format:html
 $dokka.linkExtension:html
-$dokka.location://function/#kotlin.Function0[kotlin.Unit]//root/<jvm root>/function.html
-<jvm root>
+$dokka.location://function/#kotlin.Function0[kotlin.Unit]//root/[jvm root]/function.html
+[jvm root]
 
diff --git a/plugins/base/src/test/resources/expect/functionWithNoinlineParam/out/html/scripts/pages.js b/plugins/base/src/test/resources/expect/functionWithNoinlineParam/out/html/scripts/pages.js
index cf4e69e1..88b23abe 100644
--- a/plugins/base/src/test/resources/expect/functionWithNoinlineParam/out/html/scripts/pages.js
+++ b/plugins/base/src/test/resources/expect/functionWithNoinlineParam/out/html/scripts/pages.js
@@ -1,5 +1,5 @@
 var pages = [
 { "name": "root",  "location": "root/index.html" },
-{ "name": "<jvm root>",  "location": "root/<jvm root>/index.html" },
-{ "name": "function",  "location": "root/<jvm root>/function.html" }
+{ "name": "[jvm root]",  "location": "root/[jvm root]/index.html" },
+{ "name": "function",  "location": "root/[jvm root]/function.html" }
 ]
diff --git a/plugins/base/src/test/resources/expect/functionWithNotDocumentedAnnotation/out/html/navigation.html b/plugins/base/src/test/resources/expect/functionWithNotDocumentedAnnotation/out/html/navigation.html
index 463b028f..35fe78dc 100644
--- a/plugins/base/src/test/resources/expect/functionWithNotDocumentedAnnotation/out/html/navigation.html
+++ b/plugins/base/src/test/resources/expect/functionWithNotDocumentedAnnotation/out/html/navigation.html
@@ -1,9 +1,9 @@
 <div class="sideMenuPart" id="nav-submenu" pageId="/////">
   <div class="overview"><a href="root/index.html">root</a><span class="navButton" onclick="document.getElementById(&quot;nav-submenu&quot;).classList.toggle(&quot;hidden&quot;);"><span class="navButtonContent"></span></span></div>
-  <div class="sideMenuPart" id="nav-submenu-0" pageId="&lt;jvm root&gt;/////">
-    <div class="overview"><a href="root/&lt;jvm root&gt;/index.html">&lt;jvm root&gt;</a><span class="navButton" onclick="document.getElementById(&quot;nav-submenu-0&quot;).classList.toggle(&quot;hidden&quot;);"><span class="navButtonContent"></span></span></div>
+  <div class="sideMenuPart" id="nav-submenu-0" pageId="[jvm root]/////">
+    <div class="overview"><a href="root/[jvm root]/index.html">[jvm root]</a><span class="navButton" onclick="document.getElementById(&quot;nav-submenu-0&quot;).classList.toggle(&quot;hidden&quot;);"><span class="navButtonContent"></span></span></div>
     <div class="sideMenuPart" id="nav-submenu-0-0" pageId="//f/#//">
-      <div class="overview"><a href="root/&lt;jvm root&gt;/f.html">f</a></div>
+      <div class="overview"><a href="root/[jvm root]/f.html">f</a></div>
     </div>
   </div>
 </div>
diff --git a/plugins/base/src/test/resources/expect/functionWithNotDocumentedAnnotation/out/html/root/<jvm root>/f.html b/plugins/base/src/test/resources/expect/functionWithNotDocumentedAnnotation/out/html/root/<jvm root>/f.html
deleted file mode 100644
index 9de96412..00000000
--- a/plugins/base/src/test/resources/expect/functionWithNotDocumentedAnnotation/out/html/root/<jvm root>/f.html	
+++ /dev/null
@@ -1,31 +0,0 @@
-<html>
-  <head>
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <title>f</title>
-    <link href="../../styles/style.css" rel="Stylesheet">
-    <script type="text/javascript" src="../../scripts/navigationLoader.js" async="async"></script>
-    <script type="text/javascript" src="../../scripts/platformContentHandler.js" async="async"></script>
-    <script>var pathToRoot = "../../";</script>
-  </head>
-  <body>
-    <div id="container">
-      <div id="leftColumn">
-        <div id="logo"></div>
-        <div id="sideMenu"></div>
-      </div>
-      <div id="main">
-        <div id="searchBar"></div>
-        <script type="text/javascript" src="../../scripts/pages.js"></script>
-        <script type="text/javascript" src="../../scripts/main.js"></script>
-        <div id="content" pageIds="//f/#//">
-          <div class="breadcrumbs">//<a href="../index.html">root</a>/<a href="index.html">&lt;jvm root&gt;</a>/<a href="f.html">f</a></div>
-          <div class="cover ">
-            <h1>f</h1>
-            <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm"><div class="symbol monospace">final fun <a href="f.html">f</a>()</div></div></div>
-          </div>
-        </div>
-      </div>
-    </div>
-  </body>
-</html>
-
diff --git a/plugins/base/src/test/resources/expect/functionWithNotDocumentedAnnotation/out/html/root/<jvm root>/index.html b/plugins/base/src/test/resources/expect/functionWithNotDocumentedAnnotation/out/html/root/<jvm root>/index.html
deleted file mode 100644
index 1ebe6dce..00000000
--- a/plugins/base/src/test/resources/expect/functionWithNotDocumentedAnnotation/out/html/root/<jvm root>/index.html	
+++ /dev/null
@@ -1,46 +0,0 @@
-<html>
-  <head>
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <title>&lt;jvm root&gt;</title>
-    <link href="../../styles/style.css" rel="Stylesheet">
-    <script type="text/javascript" src="../../scripts/navigationLoader.js" async="async"></script>
-    <script type="text/javascript" src="../../scripts/platformContentHandler.js" async="async"></script>
-    <script>var pathToRoot = "../../";</script>
-  </head>
-  <body>
-    <div id="container">
-      <div id="leftColumn">
-        <div id="logo"></div>
-        <div id="sideMenu"></div>
-      </div>
-      <div id="main">
-        <div id="searchBar"></div>
-        <script type="text/javascript" src="../../scripts/pages.js"></script>
-        <script type="text/javascript" src="../../scripts/main.js"></script>
-        <div id="content" pageIds="&lt;jvm root&gt;/////">
-          <div class="breadcrumbs">//<a href="../index.html">root</a>/<a href="index.html">&lt;jvm root&gt;</a></div>
-          <div class="cover ">
-            <h1>Package &lt;jvm root&gt;</h1>
-          </div>
-          <h2>Functions</h2>
-          <table>
-            <thead></thead>
-            <tbody>
-              <tr class="platform-tagged">
-                <td class="content"><a href="f.html">f</a></td>
-                <td class="content">
-                  <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm"><div class="symbol monospace">final fun <a href="f.html">f</a>()</div></div></div>
-                  <div class="brief "> </div>
-                </td>
-                <td class="platform-tagged">
-                  <div class="platform-tag jvm">JVM</div>
-                </td>
-              </tr>
-            </tbody>
-          </table>
-        </div>
-      </div>
-    </div>
-  </body>
-</html>
-
diff --git a/plugins/base/src/test/resources/expect/functionWithNotDocumentedAnnotation/out/html/root/[jvm root]/f.html b/plugins/base/src/test/resources/expect/functionWithNotDocumentedAnnotation/out/html/root/[jvm root]/f.html
new file mode 100644
index 00000000..6c049b35
--- /dev/null
+++ b/plugins/base/src/test/resources/expect/functionWithNotDocumentedAnnotation/out/html/root/[jvm root]/f.html	
@@ -0,0 +1,31 @@
+<html>
+  <head>
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <title>f</title>
+    <link href="../../styles/style.css" rel="Stylesheet">
+    <script type="text/javascript" src="../../scripts/navigationLoader.js" async="async"></script>
+    <script type="text/javascript" src="../../scripts/platformContentHandler.js" async="async"></script>
+    <script>var pathToRoot = "../../";</script>
+  </head>
+  <body>
+    <div id="container">
+      <div id="leftColumn">
+        <div id="logo"></div>
+        <div id="sideMenu"></div>
+      </div>
+      <div id="main">
+        <div id="searchBar"></div>
+        <script type="text/javascript" src="../../scripts/pages.js"></script>
+        <script type="text/javascript" src="../../scripts/main.js"></script>
+        <div id="content" pageIds="//f/#//">
+          <div class="breadcrumbs">//<a href="../index.html">root</a>/<a href="index.html">[jvm root]</a>/<a href="f.html">f</a></div>
+          <div class="cover ">
+            <h1>f</h1>
+            <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm"><div class="symbol monospace">final fun <a href="f.html">f</a>()</div></div></div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </body>
+</html>
+
diff --git a/plugins/base/src/test/resources/expect/functionWithNotDocumentedAnnotation/out/html/root/[jvm root]/index.html b/plugins/base/src/test/resources/expect/functionWithNotDocumentedAnnotation/out/html/root/[jvm root]/index.html
new file mode 100644
index 00000000..8ab1c93f
--- /dev/null
+++ b/plugins/base/src/test/resources/expect/functionWithNotDocumentedAnnotation/out/html/root/[jvm root]/index.html	
@@ -0,0 +1,46 @@
+<html>
+  <head>
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <title>[jvm root]</title>
+    <link href="../../styles/style.css" rel="Stylesheet">
+    <script type="text/javascript" src="../../scripts/navigationLoader.js" async="async"></script>
+    <script type="text/javascript" src="../../scripts/platformContentHandler.js" async="async"></script>
+    <script>var pathToRoot = "../../";</script>
+  </head>
+  <body>
+    <div id="container">
+      <div id="leftColumn">
+        <div id="logo"></div>
+        <div id="sideMenu"></div>
+      </div>
+      <div id="main">
+        <div id="searchBar"></div>
+        <script type="text/javascript" src="../../scripts/pages.js"></script>
+        <script type="text/javascript" src="../../scripts/main.js"></script>
+        <div id="content" pageIds="[jvm root]/////">
+          <div class="breadcrumbs">//<a href="../index.html">root</a>/<a href="index.html">[jvm root]</a></div>
+          <div class="cover ">
+            <h1>Package [jvm root]</h1>
+          </div>
+          <h2>Functions</h2>
+          <table>
+            <thead></thead>
+            <tbody>
+              <tr class="platform-tagged">
+                <td class="content"><a href="f.html">f</a></td>
+                <td class="content">
+                  <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm"><div class="symbol monospace">final fun <a href="f.html">f</a>()</div></div></div>
+                  <div class="brief "> </div>
+                </td>
+                <td class="platform-tagged">
+                  <div class="platform-tag jvm">JVM</div>
+                </td>
+              </tr>
+            </tbody>
+          </table>
+        </div>
+      </div>
+    </div>
+  </body>
+</html>
+
diff --git a/plugins/base/src/test/resources/expect/functionWithNotDocumentedAnnotation/out/html/root/index.html b/plugins/base/src/test/resources/expect/functionWithNotDocumentedAnnotation/out/html/root/index.html
index a3211166..440758c2 100644
--- a/plugins/base/src/test/resources/expect/functionWithNotDocumentedAnnotation/out/html/root/index.html
+++ b/plugins/base/src/test/resources/expect/functionWithNotDocumentedAnnotation/out/html/root/index.html
@@ -27,7 +27,7 @@
             <thead></thead>
             <tbody>
               <tr class="platform-tagged">
-                <td class="content"><a href="&lt;jvm root&gt;/index.html">&lt;jvm root&gt;</a></td>
+                <td class="content"><a href="[jvm root]/index.html">[jvm root]</a></td>
                 <td class="platform-tagged">
                   <div class="platform-tag jvm">JVM</div>
                 </td>
diff --git a/plugins/base/src/test/resources/expect/functionWithNotDocumentedAnnotation/out/html/root/package-list b/plugins/base/src/test/resources/expect/functionWithNotDocumentedAnnotation/out/html/root/package-list
index caf6273a..8f1c5fd9 100644
--- a/plugins/base/src/test/resources/expect/functionWithNotDocumentedAnnotation/out/html/root/package-list
+++ b/plugins/base/src/test/resources/expect/functionWithNotDocumentedAnnotation/out/html/root/package-list
@@ -1,5 +1,5 @@
 $dokka.format:html
 $dokka.linkExtension:html
-$dokka.location://f/#//root/<jvm root>/f.html
-<jvm root>
+$dokka.location://f/#//root/[jvm root]/f.html
+[jvm root]
 
diff --git a/plugins/base/src/test/resources/expect/functionWithNotDocumentedAnnotation/out/html/scripts/pages.js b/plugins/base/src/test/resources/expect/functionWithNotDocumentedAnnotation/out/html/scripts/pages.js
index 68e0c564..310827d1 100644
--- a/plugins/base/src/test/resources/expect/functionWithNotDocumentedAnnotation/out/html/scripts/pages.js
+++ b/plugins/base/src/test/resources/expect/functionWithNotDocumentedAnnotation/out/html/scripts/pages.js
@@ -1,5 +1,5 @@
 var pages = [
 { "name": "root",  "location": "root/index.html" },
-{ "name": "<jvm root>",  "location": "root/<jvm root>/index.html" },
-{ "name": "f",  "location": "root/<jvm root>/f.html" }
+{ "name": "[jvm root]",  "location": "root/[jvm root]/index.html" },
+{ "name": "f",  "location": "root/[jvm root]/f.html" }
 ]
diff --git a/plugins/base/src/test/resources/expect/functionWithParams/out/html/navigation.html b/plugins/base/src/test/resources/expect/functionWithParams/out/html/navigation.html
index 4f3b7eda..9e098fd0 100644
--- a/plugins/base/src/test/resources/expect/functionWithParams/out/html/navigation.html
+++ b/plugins/base/src/test/resources/expect/functionWithParams/out/html/navigation.html
@@ -1,9 +1,9 @@
 <div class="sideMenuPart" id="nav-submenu" pageId="/////">
   <div class="overview"><a href="root/index.html">root</a><span class="navButton" onclick="document.getElementById(&quot;nav-submenu&quot;).classList.toggle(&quot;hidden&quot;);"><span class="navButtonContent"></span></span></div>
-  <div class="sideMenuPart" id="nav-submenu-0" pageId="&lt;jvm root&gt;/////">
-    <div class="overview"><a href="root/&lt;jvm root&gt;/index.html">&lt;jvm root&gt;</a><span class="navButton" onclick="document.getElementById(&quot;nav-submenu-0&quot;).classList.toggle(&quot;hidden&quot;);"><span class="navButtonContent"></span></span></div>
+  <div class="sideMenuPart" id="nav-submenu-0" pageId="[jvm root]/////">
+    <div class="overview"><a href="root/[jvm root]/index.html">[jvm root]</a><span class="navButton" onclick="document.getElementById(&quot;nav-submenu-0&quot;).classList.toggle(&quot;hidden&quot;);"><span class="navButtonContent"></span></span></div>
     <div class="sideMenuPart" id="nav-submenu-0-0" pageId="//function/#kotlin.Int//">
-      <div class="overview"><a href="root/&lt;jvm root&gt;/function.html">function</a></div>
+      <div class="overview"><a href="root/[jvm root]/function.html">function</a></div>
     </div>
   </div>
 </div>
diff --git a/plugins/base/src/test/resources/expect/functionWithParams/out/html/root/<jvm root>/function.html b/plugins/base/src/test/resources/expect/functionWithParams/out/html/root/<jvm root>/function.html
deleted file mode 100644
index 6e34095f..00000000
--- a/plugins/base/src/test/resources/expect/functionWithParams/out/html/root/<jvm root>/function.html	
+++ /dev/null
@@ -1,33 +0,0 @@
-<html>
-  <head>
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <title>function</title>
-    <link href="../../styles/style.css" rel="Stylesheet">
-    <script type="text/javascript" src="../../scripts/navigationLoader.js" async="async"></script>
-    <script type="text/javascript" src="../../scripts/platformContentHandler.js" async="async"></script>
-    <script>var pathToRoot = "../../";</script>
-  </head>
-  <body>
-    <div id="container">
-      <div id="leftColumn">
-        <div id="logo"></div>
-        <div id="sideMenu"></div>
-      </div>
-      <div id="main">
-        <div id="searchBar"></div>
-        <script type="text/javascript" src="../../scripts/pages.js"></script>
-        <script type="text/javascript" src="../../scripts/main.js"></script>
-        <div id="content" pageIds="//function/#kotlin.Int//">
-          <div class="breadcrumbs">//<a href="../index.html">root</a>/<a href="index.html">&lt;jvm root&gt;</a>/<a href="function.html">function</a></div>
-          <div class="cover ">
-            <h1>function</h1>
-            <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm"><div class="symbol monospace">final fun <a href="function.html">function</a>(x: <a href="">Int</a>)</div></div></div>
-          </div>
-          <h3>Description</h3>
-          <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm">MultilineFunction Documentation</div></div>
-        </div>
-      </div>
-    </div>
-  </body>
-</html>
-
diff --git a/plugins/base/src/test/resources/expect/functionWithParams/out/html/root/<jvm root>/index.html b/plugins/base/src/test/resources/expect/functionWithParams/out/html/root/<jvm root>/index.html
deleted file mode 100644
index 42458c2a..00000000
--- a/plugins/base/src/test/resources/expect/functionWithParams/out/html/root/<jvm root>/index.html	
+++ /dev/null
@@ -1,46 +0,0 @@
-<html>
-  <head>
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <title>&lt;jvm root&gt;</title>
-    <link href="../../styles/style.css" rel="Stylesheet">
-    <script type="text/javascript" src="../../scripts/navigationLoader.js" async="async"></script>
-    <script type="text/javascript" src="../../scripts/platformContentHandler.js" async="async"></script>
-    <script>var pathToRoot = "../../";</script>
-  </head>
-  <body>
-    <div id="container">
-      <div id="leftColumn">
-        <div id="logo"></div>
-        <div id="sideMenu"></div>
-      </div>
-      <div id="main">
-        <div id="searchBar"></div>
-        <script type="text/javascript" src="../../scripts/pages.js"></script>
-        <script type="text/javascript" src="../../scripts/main.js"></script>
-        <div id="content" pageIds="&lt;jvm root&gt;/////">
-          <div class="breadcrumbs">//<a href="../index.html">root</a>/<a href="index.html">&lt;jvm root&gt;</a></div>
-          <div class="cover ">
-            <h1>Package &lt;jvm root&gt;</h1>
-          </div>
-          <h2>Functions</h2>
-          <table>
-            <thead></thead>
-            <tbody>
-              <tr class="platform-tagged">
-                <td class="content"><a href="function.html">function</a></td>
-                <td class="content">
-                  <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm"><div class="symbol monospace">final fun <a href="function.html">function</a>(x: <a href="">Int</a>)</div></div></div>
-                  <div class="brief "> </div>
-                </td>
-                <td class="platform-tagged">
-                  <div class="platform-tag jvm">JVM</div>
-                </td>
-              </tr>
-            </tbody>
-          </table>
-        </div>
-      </div>
-    </div>
-  </body>
-</html>
-
diff --git a/plugins/base/src/test/resources/expect/functionWithParams/out/html/root/[jvm root]/function.html b/plugins/base/src/test/resources/expect/functionWithParams/out/html/root/[jvm root]/function.html
new file mode 100644
index 00000000..e70eca57
--- /dev/null
+++ b/plugins/base/src/test/resources/expect/functionWithParams/out/html/root/[jvm root]/function.html	
@@ -0,0 +1,33 @@
+<html>
+  <head>
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <title>function</title>
+    <link href="../../styles/style.css" rel="Stylesheet">
+    <script type="text/javascript" src="../../scripts/navigationLoader.js" async="async"></script>
+    <script type="text/javascript" src="../../scripts/platformContentHandler.js" async="async"></script>
+    <script>var pathToRoot = "../../";</script>
+  </head>
+  <body>
+    <div id="container">
+      <div id="leftColumn">
+        <div id="logo"></div>
+        <div id="sideMenu"></div>
+      </div>
+      <div id="main">
+        <div id="searchBar"></div>
+        <script type="text/javascript" src="../../scripts/pages.js"></script>
+        <script type="text/javascript" src="../../scripts/main.js"></script>
+        <div id="content" pageIds="//function/#kotlin.Int//">
+          <div class="breadcrumbs">//<a href="../index.html">root</a>/<a href="index.html">[jvm root]</a>/<a href="function.html">function</a></div>
+          <div class="cover ">
+            <h1>function</h1>
+            <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm"><div class="symbol monospace">final fun <a href="function.html">function</a>(x: <a href="">Int</a>)</div></div></div>
+          </div>
+          <h3>Description</h3>
+          <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm">MultilineFunction Documentation</div></div>
+        </div>
+      </div>
+    </div>
+  </body>
+</html>
+
diff --git a/plugins/base/src/test/resources/expect/functionWithParams/out/html/root/[jvm root]/index.html b/plugins/base/src/test/resources/expect/functionWithParams/out/html/root/[jvm root]/index.html
new file mode 100644
index 00000000..57ff2cc6
--- /dev/null
+++ b/plugins/base/src/test/resources/expect/functionWithParams/out/html/root/[jvm root]/index.html	
@@ -0,0 +1,46 @@
+<html>
+  <head>
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <title>[jvm root]</title>
+    <link href="../../styles/style.css" rel="Stylesheet">
+    <script type="text/javascript" src="../../scripts/navigationLoader.js" async="async"></script>
+    <script type="text/javascript" src="../../scripts/platformContentHandler.js" async="async"></script>
+    <script>var pathToRoot = "../../";</script>
+  </head>
+  <body>
+    <div id="container">
+      <div id="leftColumn">
+        <div id="logo"></div>
+        <div id="sideMenu"></div>
+      </div>
+      <div id="main">
+        <div id="searchBar"></div>
+        <script type="text/javascript" src="../../scripts/pages.js"></script>
+        <script type="text/javascript" src="../../scripts/main.js"></script>
+        <div id="content" pageIds="[jvm root]/////">
+          <div class="breadcrumbs">//<a href="../index.html">root</a>/<a href="index.html">[jvm root]</a></div>
+          <div class="cover ">
+            <h1>Package [jvm root]</h1>
+          </div>
+          <h2>Functions</h2>
+          <table>
+            <thead></thead>
+            <tbody>
+              <tr class="platform-tagged">
+                <td class="content"><a href="function.html">function</a></td>
+                <td class="content">
+                  <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm"><div class="symbol monospace">final fun <a href="function.html">function</a>(x: <a href="">Int</a>)</div></div></div>
+                  <div class="brief "> </div>
+                </td>
+                <td class="platform-tagged">
+                  <div class="platform-tag jvm">JVM</div>
+                </td>
+              </tr>
+            </tbody>
+          </table>
+        </div>
+      </div>
+    </div>
+  </body>
+</html>
+
diff --git a/plugins/base/src/test/resources/expect/functionWithParams/out/html/root/index.html b/plugins/base/src/test/resources/expect/functionWithParams/out/html/root/index.html
index a3211166..440758c2 100644
--- a/plugins/base/src/test/resources/expect/functionWithParams/out/html/root/index.html
+++ b/plugins/base/src/test/resources/expect/functionWithParams/out/html/root/index.html
@@ -27,7 +27,7 @@
             <thead></thead>
             <tbody>
               <tr class="platform-tagged">
-                <td class="content"><a href="&lt;jvm root&gt;/index.html">&lt;jvm root&gt;</a></td>
+                <td class="content"><a href="[jvm root]/index.html">[jvm root]</a></td>
                 <td class="platform-tagged">
                   <div class="platform-tag jvm">JVM</div>
                 </td>
diff --git a/plugins/base/src/test/resources/expect/functionWithParams/out/html/root/package-list b/plugins/base/src/test/resources/expect/functionWithParams/out/html/root/package-list
index 8b5d43ee..6394d253 100644
--- a/plugins/base/src/test/resources/expect/functionWithParams/out/html/root/package-list
+++ b/plugins/base/src/test/resources/expect/functionWithParams/out/html/root/package-list
@@ -1,5 +1,5 @@
 $dokka.format:html
 $dokka.linkExtension:html
-$dokka.location://function/#kotlin.Int//root/<jvm root>/function.html
-<jvm root>
+$dokka.location://function/#kotlin.Int//root/[jvm root]/function.html
+[jvm root]
 
diff --git a/plugins/base/src/test/resources/expect/functionWithParams/out/html/scripts/pages.js b/plugins/base/src/test/resources/expect/functionWithParams/out/html/scripts/pages.js
index cf4e69e1..88b23abe 100644
--- a/plugins/base/src/test/resources/expect/functionWithParams/out/html/scripts/pages.js
+++ b/plugins/base/src/test/resources/expect/functionWithParams/out/html/scripts/pages.js
@@ -1,5 +1,5 @@
 var pages = [
 { "name": "root",  "location": "root/index.html" },
-{ "name": "<jvm root>",  "location": "root/<jvm root>/index.html" },
-{ "name": "function",  "location": "root/<jvm root>/function.html" }
+{ "name": "[jvm root]",  "location": "root/[jvm root]/index.html" },
+{ "name": "function",  "location": "root/[jvm root]/function.html" }
 ]
diff --git a/plugins/base/src/test/resources/expect/functionWithReceiver/out/html/navigation.html b/plugins/base/src/test/resources/expect/functionWithReceiver/out/html/navigation.html
index f59f7e4c..d5d3a9f4 100644
--- a/plugins/base/src/test/resources/expect/functionWithReceiver/out/html/navigation.html
+++ b/plugins/base/src/test/resources/expect/functionWithReceiver/out/html/navigation.html
@@ -1,9 +1,9 @@
 <div class="sideMenuPart" id="nav-submenu" pageId="/////">
   <div class="overview"><a href="root/index.html">root</a><span class="navButton" onclick="document.getElementById(&quot;nav-submenu&quot;).classList.toggle(&quot;hidden&quot;);"><span class="navButtonContent"></span></span></div>
-  <div class="sideMenuPart" id="nav-submenu-0" pageId="&lt;jvm root&gt;/////">
-    <div class="overview"><a href="root/&lt;jvm root&gt;/index.html">&lt;jvm root&gt;</a><span class="navButton" onclick="document.getElementById(&quot;nav-submenu-0&quot;).classList.toggle(&quot;hidden&quot;);"><span class="navButtonContent"></span></span></div>
+  <div class="sideMenuPart" id="nav-submenu-0" pageId="[jvm root]/////">
+    <div class="overview"><a href="root/[jvm root]/index.html">[jvm root]</a><span class="navButton" onclick="document.getElementById(&quot;nav-submenu-0&quot;).classList.toggle(&quot;hidden&quot;);"><span class="navButtonContent"></span></span></div>
     <div class="sideMenuPart" id="nav-submenu-0-0" pageId="//fn/kotlin.String#//">
-      <div class="overview"><a href="root/&lt;jvm root&gt;/fn.html">fn</a></div>
+      <div class="overview"><a href="root/[jvm root]/fn.html">fn</a></div>
     </div>
   </div>
 </div>
diff --git a/plugins/base/src/test/resources/expect/functionWithReceiver/out/html/root/<jvm root>/fn.html b/plugins/base/src/test/resources/expect/functionWithReceiver/out/html/root/<jvm root>/fn.html
deleted file mode 100644
index fdcd4a9d..00000000
--- a/plugins/base/src/test/resources/expect/functionWithReceiver/out/html/root/<jvm root>/fn.html	
+++ /dev/null
@@ -1,39 +0,0 @@
-<html>
-  <head>
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <title>fn</title>
-    <link href="../../styles/style.css" rel="Stylesheet">
-    <script type="text/javascript" src="../../scripts/navigationLoader.js" async="async"></script>
-    <script type="text/javascript" src="../../scripts/platformContentHandler.js" async="async"></script>
-    <script>var pathToRoot = "../../";</script>
-  </head>
-  <body>
-    <div id="container">
-      <div id="leftColumn">
-        <div id="logo"></div>
-        <div id="sideMenu"></div>
-      </div>
-      <div id="main">
-        <div id="searchBar"></div>
-        <script type="text/javascript" src="../../scripts/pages.js"></script>
-        <script type="text/javascript" src="../../scripts/main.js"></script>
-        <div id="content" pageIds="//fn/kotlin.String#//">
-          <div class="breadcrumbs">//<a href="../index.html">root</a>/<a href="index.html">&lt;jvm root&gt;</a>/<a href="fn.html">fn</a></div>
-          <div class="cover ">
-            <h1>fn</h1>
-            <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm"><div class="symbol monospace">final fun <a href="">String</a>.<a href="fn.html">fn</a>()</div></div></div>
-          </div>
-          <h3>Description</h3>
-          <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm">Function with receiver</div></div>
-          <div class="cover ">
-            <h1>fn</h1>
-            <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm"><div class="symbol monospace">final fun <a href="">String</a>.<a href="fn.html">fn</a>(x: <a href="">Int</a>)</div></div></div>
-          </div>
-          <h3>Description</h3>
-          <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm">Function with receiver</div></div>
-        </div>
-      </div>
-    </div>
-  </body>
-</html>
-
diff --git a/plugins/base/src/test/resources/expect/functionWithReceiver/out/html/root/<jvm root>/index.html b/plugins/base/src/test/resources/expect/functionWithReceiver/out/html/root/<jvm root>/index.html
deleted file mode 100644
index 4e481086..00000000
--- a/plugins/base/src/test/resources/expect/functionWithReceiver/out/html/root/<jvm root>/index.html	
+++ /dev/null
@@ -1,56 +0,0 @@
-<html>
-  <head>
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <title>&lt;jvm root&gt;</title>
-    <link href="../../styles/style.css" rel="Stylesheet">
-    <script type="text/javascript" src="../../scripts/navigationLoader.js" async="async"></script>
-    <script type="text/javascript" src="../../scripts/platformContentHandler.js" async="async"></script>
-    <script>var pathToRoot = "../../";</script>
-  </head>
-  <body>
-    <div id="container">
-      <div id="leftColumn">
-        <div id="logo"></div>
-        <div id="sideMenu"></div>
-      </div>
-      <div id="main">
-        <div id="searchBar"></div>
-        <script type="text/javascript" src="../../scripts/pages.js"></script>
-        <script type="text/javascript" src="../../scripts/main.js"></script>
-        <div id="content" pageIds="&lt;jvm root&gt;/////">
-          <div class="breadcrumbs">//<a href="../index.html">root</a>/<a href="index.html">&lt;jvm root&gt;</a></div>
-          <div class="cover ">
-            <h1>Package &lt;jvm root&gt;</h1>
-          </div>
-          <h2>Functions</h2>
-          <table>
-            <thead></thead>
-            <tbody>
-              <tr class="platform-tagged">
-                <td class="content"><a href="fn.html">fn</a></td>
-                <td class="content">
-                  <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm"><div class="symbol monospace">final fun <a href="">String</a>.<a href="fn.html">fn</a>()</div></div></div>
-                  <div class="brief "> </div>
-                </td>
-                <td class="platform-tagged">
-                  <div class="platform-tag jvm">JVM</div>
-                </td>
-              </tr>
-              <tr class="platform-tagged">
-                <td class="content"><a href="fn.html">fn</a></td>
-                <td class="content">
-                  <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm"><div class="symbol monospace">final fun <a href="">String</a>.<a href="fn.html">fn</a>(x: <a href="">Int</a>)</div></div></div>
-                  <div class="brief "> </div>
-                </td>
-                <td class="platform-tagged">
-                  <div class="platform-tag jvm">JVM</div>
-                </td>
-              </tr>
-            </tbody>
-          </table>
-        </div>
-      </div>
-    </div>
-  </body>
-</html>
-
diff --git a/plugins/base/src/test/resources/expect/functionWithReceiver/out/html/root/[jvm root]/fn.html b/plugins/base/src/test/resources/expect/functionWithReceiver/out/html/root/[jvm root]/fn.html
new file mode 100644
index 00000000..8d47a590
--- /dev/null
+++ b/plugins/base/src/test/resources/expect/functionWithReceiver/out/html/root/[jvm root]/fn.html	
@@ -0,0 +1,39 @@
+<html>
+  <head>
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <title>fn</title>
+    <link href="../../styles/style.css" rel="Stylesheet">
+    <script type="text/javascript" src="../../scripts/navigationLoader.js" async="async"></script>
+    <script type="text/javascript" src="../../scripts/platformContentHandler.js" async="async"></script>
+    <script>var pathToRoot = "../../";</script>
+  </head>
+  <body>
+    <div id="container">
+      <div id="leftColumn">
+        <div id="logo"></div>
+        <div id="sideMenu"></div>
+      </div>
+      <div id="main">
+        <div id="searchBar"></div>
+        <script type="text/javascript" src="../../scripts/pages.js"></script>
+        <script type="text/javascript" src="../../scripts/main.js"></script>
+        <div id="content" pageIds="//fn/kotlin.String#//">
+          <div class="breadcrumbs">//<a href="../index.html">root</a>/<a href="index.html">[jvm root]</a>/<a href="fn.html">fn</a></div>
+          <div class="cover ">
+            <h1>fn</h1>
+            <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm"><div class="symbol monospace">final fun <a href="">String</a>.<a href="fn.html">fn</a>()</div></div></div>
+          </div>
+          <h3>Description</h3>
+          <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm">Function with receiver</div></div>
+          <div class="cover ">
+            <h1>fn</h1>
+            <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm"><div class="symbol monospace">final fun <a href="">String</a>.<a href="fn.html">fn</a>(x: <a href="">Int</a>)</div></div></div>
+          </div>
+          <h3>Description</h3>
+          <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm">Function with receiver</div></div>
+        </div>
+      </div>
+    </div>
+  </body>
+</html>
+
diff --git a/plugins/base/src/test/resources/expect/functionWithReceiver/out/html/root/[jvm root]/index.html b/plugins/base/src/test/resources/expect/functionWithReceiver/out/html/root/[jvm root]/index.html
new file mode 100644
index 00000000..d60b6d9d
--- /dev/null
+++ b/plugins/base/src/test/resources/expect/functionWithReceiver/out/html/root/[jvm root]/index.html	
@@ -0,0 +1,56 @@
+<html>
+  <head>
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <title>[jvm root]</title>
+    <link href="../../styles/style.css" rel="Stylesheet">
+    <script type="text/javascript" src="../../scripts/navigationLoader.js" async="async"></script>
+    <script type="text/javascript" src="../../scripts/platformContentHandler.js" async="async"></script>
+    <script>var pathToRoot = "../../";</script>
+  </head>
+  <body>
+    <div id="container">
+      <div id="leftColumn">
+        <div id="logo"></div>
+        <div id="sideMenu"></div>
+      </div>
+      <div id="main">
+        <div id="searchBar"></div>
+        <script type="text/javascript" src="../../scripts/pages.js"></script>
+        <script type="text/javascript" src="../../scripts/main.js"></script>
+        <div id="content" pageIds="[jvm root]/////">
+          <div class="breadcrumbs">//<a href="../index.html">root</a>/<a href="index.html">[jvm root]</a></div>
+          <div class="cover ">
+            <h1>Package [jvm root]</h1>
+          </div>
+          <h2>Functions</h2>
+          <table>
+            <thead></thead>
+            <tbody>
+              <tr class="platform-tagged">
+                <td class="content"><a href="fn.html">fn</a></td>
+                <td class="content">
+                  <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm"><div class="symbol monospace">final fun <a href="">String</a>.<a href="fn.html">fn</a>()</div></div></div>
+                  <div class="brief "> </div>
+                </td>
+                <td class="platform-tagged">
+                  <div class="platform-tag jvm">JVM</div>
+                </td>
+              </tr>
+              <tr class="platform-tagged">
+                <td class="content"><a href="fn.html">fn</a></td>
+                <td class="content">
+                  <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm"><div class="symbol monospace">final fun <a href="">String</a>.<a href="fn.html">fn</a>(x: <a href="">Int</a>)</div></div></div>
+                  <div class="brief "> </div>
+                </td>
+                <td class="platform-tagged">
+                  <div class="platform-tag jvm">JVM</div>
+                </td>
+              </tr>
+            </tbody>
+          </table>
+        </div>
+      </div>
+    </div>
+  </body>
+</html>
+
diff --git a/plugins/base/src/test/resources/expect/functionWithReceiver/out/html/root/index.html b/plugins/base/src/test/resources/expect/functionWithReceiver/out/html/root/index.html
index a3211166..440758c2 100644
--- a/plugins/base/src/test/resources/expect/functionWithReceiver/out/html/root/index.html
+++ b/plugins/base/src/test/resources/expect/functionWithReceiver/out/html/root/index.html
@@ -27,7 +27,7 @@
             <thead></thead>
             <tbody>
               <tr class="platform-tagged">
-                <td class="content"><a href="&lt;jvm root&gt;/index.html">&lt;jvm root&gt;</a></td>
+                <td class="content"><a href="[jvm root]/index.html">[jvm root]</a></td>
                 <td class="platform-tagged">
                   <div class="platform-tag jvm">JVM</div>
                 </td>
diff --git a/plugins/base/src/test/resources/expect/functionWithReceiver/out/html/root/package-list b/plugins/base/src/test/resources/expect/functionWithReceiver/out/html/root/package-list
index 13dc2923..faeb244b 100644
--- a/plugins/base/src/test/resources/expect/functionWithReceiver/out/html/root/package-list
+++ b/plugins/base/src/test/resources/expect/functionWithReceiver/out/html/root/package-list
@@ -1,6 +1,6 @@
 $dokka.format:html
 $dokka.linkExtension:html
-$dokka.location://fn/kotlin.String#//root/<jvm root>/fn.html
-$dokka.location://fn/kotlin.String#kotlin.Int//root/<jvm root>/fn.html
-<jvm root>
+$dokka.location://fn/kotlin.String#//root/[jvm root]/fn.html
+$dokka.location://fn/kotlin.String#kotlin.Int//root/[jvm root]/fn.html
+[jvm root]
 
diff --git a/plugins/base/src/test/resources/expect/functionWithReceiver/out/html/scripts/pages.js b/plugins/base/src/test/resources/expect/functionWithReceiver/out/html/scripts/pages.js
index c6ec7c4b..8a0c4c55 100644
--- a/plugins/base/src/test/resources/expect/functionWithReceiver/out/html/scripts/pages.js
+++ b/plugins/base/src/test/resources/expect/functionWithReceiver/out/html/scripts/pages.js
@@ -1,5 +1,5 @@
 var pages = [
 { "name": "root",  "location": "root/index.html" },
-{ "name": "<jvm root>",  "location": "root/<jvm root>/index.html" },
-{ "name": "fn",  "location": "root/<jvm root>/fn.html" }
+{ "name": "[jvm root]",  "location": "root/[jvm root]/index.html" },
+{ "name": "fn",  "location": "root/[jvm root]/fn.html" }
 ]
diff --git a/plugins/base/src/test/resources/expect/genericFunction/out/html/navigation.html b/plugins/base/src/test/resources/expect/genericFunction/out/html/navigation.html
index 86a7862e..006a9e3e 100644
--- a/plugins/base/src/test/resources/expect/genericFunction/out/html/navigation.html
+++ b/plugins/base/src/test/resources/expect/genericFunction/out/html/navigation.html
@@ -1,9 +1,9 @@
 <div class="sideMenuPart" id="nav-submenu" pageId="/////">
   <div class="overview"><a href="root/index.html">root</a><span class="navButton" onclick="document.getElementById(&quot;nav-submenu&quot;).classList.toggle(&quot;hidden&quot;);"><span class="navButtonContent"></span></span></div>
-  <div class="sideMenuPart" id="nav-submenu-0" pageId="&lt;jvm root&gt;/////">
-    <div class="overview"><a href="root/&lt;jvm root&gt;/index.html">&lt;jvm root&gt;</a><span class="navButton" onclick="document.getElementById(&quot;nav-submenu-0&quot;).classList.toggle(&quot;hidden&quot;);"><span class="navButtonContent"></span></span></div>
+  <div class="sideMenuPart" id="nav-submenu-0" pageId="[jvm root]/////">
+    <div class="overview"><a href="root/[jvm root]/index.html">[jvm root]</a><span class="navButton" onclick="document.getElementById(&quot;nav-submenu-0&quot;).classList.toggle(&quot;hidden&quot;);"><span class="navButtonContent"></span></span></div>
     <div class="sideMenuPart" id="nav-submenu-0-0" pageId="//generic/#//">
-      <div class="overview"><a href="root/&lt;jvm root&gt;/generic.html">generic</a></div>
+      <div class="overview"><a href="root/[jvm root]/generic.html">generic</a></div>
     </div>
   </div>
 </div>
diff --git a/plugins/base/src/test/resources/expect/genericFunction/out/html/root/<jvm root>/generic.html b/plugins/base/src/test/resources/expect/genericFunction/out/html/root/<jvm root>/generic.html
deleted file mode 100644
index 2d8a5c7f..00000000
--- a/plugins/base/src/test/resources/expect/genericFunction/out/html/root/<jvm root>/generic.html	
+++ /dev/null
@@ -1,33 +0,0 @@
-<html>
-  <head>
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <title>generic</title>
-    <link href="../../styles/style.css" rel="Stylesheet">
-    <script type="text/javascript" src="../../scripts/navigationLoader.js" async="async"></script>
-    <script type="text/javascript" src="../../scripts/platformContentHandler.js" async="async"></script>
-    <script>var pathToRoot = "../../";</script>
-  </head>
-  <body>
-    <div id="container">
-      <div id="leftColumn">
-        <div id="logo"></div>
-        <div id="sideMenu"></div>
-      </div>
-      <div id="main">
-        <div id="searchBar"></div>
-        <script type="text/javascript" src="../../scripts/pages.js"></script>
-        <script type="text/javascript" src="../../scripts/main.js"></script>
-        <div id="content" pageIds="//generic/#//">
-          <div class="breadcrumbs">//<a href="../index.html">root</a>/<a href="index.html">&lt;jvm root&gt;</a>/<a href="generic.html">generic</a></div>
-          <div class="cover ">
-            <h1>generic</h1>
-            <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm"><div class="symbol monospace">private final fun &lt;<a href="generic.html">T</a> : <a href="">Any</a>&gt; <a href="generic.html">generic</a>()</div></div></div>
-          </div>
-          <h3>Description</h3>
-          <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm">generic function</div></div>
-        </div>
-      </div>
-    </div>
-  </body>
-</html>
-
diff --git a/plugins/base/src/test/resources/expect/genericFunction/out/html/root/<jvm root>/index.html b/plugins/base/src/test/resources/expect/genericFunction/out/html/root/<jvm root>/index.html
deleted file mode 100644
index 4cf172df..00000000
--- a/plugins/base/src/test/resources/expect/genericFunction/out/html/root/<jvm root>/index.html	
+++ /dev/null
@@ -1,46 +0,0 @@
-<html>
-  <head>
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <title>&lt;jvm root&gt;</title>
-    <link href="../../styles/style.css" rel="Stylesheet">
-    <script type="text/javascript" src="../../scripts/navigationLoader.js" async="async"></script>
-    <script type="text/javascript" src="../../scripts/platformContentHandler.js" async="async"></script>
-    <script>var pathToRoot = "../../";</script>
-  </head>
-  <body>
-    <div id="container">
-      <div id="leftColumn">
-        <div id="logo"></div>
-        <div id="sideMenu"></div>
-      </div>
-      <div id="main">
-        <div id="searchBar"></div>
-        <script type="text/javascript" src="../../scripts/pages.js"></script>
-        <script type="text/javascript" src="../../scripts/main.js"></script>
-        <div id="content" pageIds="&lt;jvm root&gt;/////">
-          <div class="breadcrumbs">//<a href="../index.html">root</a>/<a href="index.html">&lt;jvm root&gt;</a></div>
-          <div class="cover ">
-            <h1>Package &lt;jvm root&gt;</h1>
-          </div>
-          <h2>Functions</h2>
-          <table>
-            <thead></thead>
-            <tbody>
-              <tr class="platform-tagged">
-                <td class="content"><a href="generic.html">generic</a></td>
-                <td class="content">
-                  <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm"><div class="symbol monospace">private final fun &lt;<a href="generic.html">T</a> : <a href="">Any</a>&gt; <a href="generic.html">generic</a>()</div></div></div>
-                  <div class="brief "> </div>
-                </td>
-                <td class="platform-tagged">
-                  <div class="platform-tag jvm">JVM</div>
-                </td>
-              </tr>
-            </tbody>
-          </table>
-        </div>
-      </div>
-    </div>
-  </body>
-</html>
-
diff --git a/plugins/base/src/test/resources/expect/genericFunction/out/html/root/[jvm root]/generic.html b/plugins/base/src/test/resources/expect/genericFunction/out/html/root/[jvm root]/generic.html
new file mode 100644
index 00000000..a9efa176
--- /dev/null
+++ b/plugins/base/src/test/resources/expect/genericFunction/out/html/root/[jvm root]/generic.html	
@@ -0,0 +1,33 @@
+<html>
+  <head>
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <title>generic</title>
+    <link href="../../styles/style.css" rel="Stylesheet">
+    <script type="text/javascript" src="../../scripts/navigationLoader.js" async="async"></script>
+    <script type="text/javascript" src="../../scripts/platformContentHandler.js" async="async"></script>
+    <script>var pathToRoot = "../../";</script>
+  </head>
+  <body>
+    <div id="container">
+      <div id="leftColumn">
+        <div id="logo"></div>
+        <div id="sideMenu"></div>
+      </div>
+      <div id="main">
+        <div id="searchBar"></div>
+        <script type="text/javascript" src="../../scripts/pages.js"></script>
+        <script type="text/javascript" src="../../scripts/main.js"></script>
+        <div id="content" pageIds="//generic/#//">
+          <div class="breadcrumbs">//<a href="../index.html">root</a>/<a href="index.html">[jvm root]</a>/<a href="generic.html">generic</a></div>
+          <div class="cover ">
+            <h1>generic</h1>
+            <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm"><div class="symbol monospace">private final fun &lt;<a href="generic.html">T</a> : <a href="">Any</a>&gt; <a href="generic.html">generic</a>()</div></div></div>
+          </div>
+          <h3>Description</h3>
+          <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm">generic function</div></div>
+        </div>
+      </div>
+    </div>
+  </body>
+</html>
+
diff --git a/plugins/base/src/test/resources/expect/genericFunction/out/html/root/[jvm root]/index.html b/plugins/base/src/test/resources/expect/genericFunction/out/html/root/[jvm root]/index.html
new file mode 100644
index 00000000..3d9a7000
--- /dev/null
+++ b/plugins/base/src/test/resources/expect/genericFunction/out/html/root/[jvm root]/index.html	
@@ -0,0 +1,46 @@
+<html>
+  <head>
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <title>[jvm root]</title>
+    <link href="../../styles/style.css" rel="Stylesheet">
+    <script type="text/javascript" src="../../scripts/navigationLoader.js" async="async"></script>
+    <script type="text/javascript" src="../../scripts/platformContentHandler.js" async="async"></script>
+    <script>var pathToRoot = "../../";</script>
+  </head>
+  <body>
+    <div id="container">
+      <div id="leftColumn">
+        <div id="logo"></div>
+        <div id="sideMenu"></div>
+      </div>
+      <div id="main">
+        <div id="searchBar"></div>
+        <script type="text/javascript" src="../../scripts/pages.js"></script>
+        <script type="text/javascript" src="../../scripts/main.js"></script>
+        <div id="content" pageIds="[jvm root]/////">
+          <div class="breadcrumbs">//<a href="../index.html">root</a>/<a href="index.html">[jvm root]</a></div>
+          <div class="cover ">
+            <h1>Package [jvm root]</h1>
+          </div>
+          <h2>Functions</h2>
+          <table>
+            <thead></thead>
+            <tbody>
+              <tr class="platform-tagged">
+                <td class="content"><a href="generic.html">generic</a></td>
+                <td class="content">
+                  <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm"><div class="symbol monospace">private final fun &lt;<a href="generic.html">T</a> : <a href="">Any</a>&gt; <a href="generic.html">generic</a>()</div></div></div>
+                  <div class="brief "> </div>
+                </td>
+                <td class="platform-tagged">
+                  <div class="platform-tag jvm">JVM</div>
+                </td>
+              </tr>
+            </tbody>
+          </table>
+        </div>
+      </div>
+    </div>
+  </body>
+</html>
+
diff --git a/plugins/base/src/test/resources/expect/genericFunction/out/html/root/index.html b/plugins/base/src/test/resources/expect/genericFunction/out/html/root/index.html
index a3211166..440758c2 100644
--- a/plugins/base/src/test/resources/expect/genericFunction/out/html/root/index.html
+++ b/plugins/base/src/test/resources/expect/genericFunction/out/html/root/index.html
@@ -27,7 +27,7 @@
             <thead></thead>
             <tbody>
               <tr class="platform-tagged">
-                <td class="content"><a href="&lt;jvm root&gt;/index.html">&lt;jvm root&gt;</a></td>
+                <td class="content"><a href="[jvm root]/index.html">[jvm root]</a></td>
                 <td class="platform-tagged">
                   <div class="platform-tag jvm">JVM</div>
                 </td>
diff --git a/plugins/base/src/test/resources/expect/genericFunction/out/html/root/package-list b/plugins/base/src/test/resources/expect/genericFunction/out/html/root/package-list
index 30905d0f..468c6cb4 100644
--- a/plugins/base/src/test/resources/expect/genericFunction/out/html/root/package-list
+++ b/plugins/base/src/test/resources/expect/genericFunction/out/html/root/package-list
@@ -1,5 +1,5 @@
 $dokka.format:html
 $dokka.linkExtension:html
-$dokka.location://generic/#//root/<jvm root>/generic.html
-<jvm root>
+$dokka.location://generic/#//root/[jvm root]/generic.html
+[jvm root]
 
diff --git a/plugins/base/src/test/resources/expect/genericFunction/out/html/scripts/pages.js b/plugins/base/src/test/resources/expect/genericFunction/out/html/scripts/pages.js
index b8b18755..ee6a2f7a 100644
--- a/plugins/base/src/test/resources/expect/genericFunction/out/html/scripts/pages.js
+++ b/plugins/base/src/test/resources/expect/genericFunction/out/html/scripts/pages.js
@@ -1,5 +1,5 @@
 var pages = [
 { "name": "root",  "location": "root/index.html" },
-{ "name": "<jvm root>",  "location": "root/<jvm root>/index.html" },
-{ "name": "generic",  "location": "root/<jvm root>/generic.html" }
+{ "name": "[jvm root]",  "location": "root/[jvm root]/index.html" },
+{ "name": "generic",  "location": "root/[jvm root]/generic.html" }
 ]
diff --git a/plugins/base/src/test/resources/expect/genericFunctionWithConstraints/out/html/navigation.html b/plugins/base/src/test/resources/expect/genericFunctionWithConstraints/out/html/navigation.html
index 86a7862e..006a9e3e 100644
--- a/plugins/base/src/test/resources/expect/genericFunctionWithConstraints/out/html/navigation.html
+++ b/plugins/base/src/test/resources/expect/genericFunctionWithConstraints/out/html/navigation.html
@@ -1,9 +1,9 @@
 <div class="sideMenuPart" id="nav-submenu" pageId="/////">
   <div class="overview"><a href="root/index.html">root</a><span class="navButton" onclick="document.getElementById(&quot;nav-submenu&quot;).classList.toggle(&quot;hidden&quot;);"><span class="navButtonContent"></span></span></div>
-  <div class="sideMenuPart" id="nav-submenu-0" pageId="&lt;jvm root&gt;/////">
-    <div class="overview"><a href="root/&lt;jvm root&gt;/index.html">&lt;jvm root&gt;</a><span class="navButton" onclick="document.getElementById(&quot;nav-submenu-0&quot;).classList.toggle(&quot;hidden&quot;);"><span class="navButtonContent"></span></span></div>
+  <div class="sideMenuPart" id="nav-submenu-0" pageId="[jvm root]/////">
+    <div class="overview"><a href="root/[jvm root]/index.html">[jvm root]</a><span class="navButton" onclick="document.getElementById(&quot;nav-submenu-0&quot;).classList.toggle(&quot;hidden&quot;);"><span class="navButtonContent"></span></span></div>
     <div class="sideMenuPart" id="nav-submenu-0-0" pageId="//generic/#//">
-      <div class="overview"><a href="root/&lt;jvm root&gt;/generic.html">generic</a></div>
+      <div class="overview"><a href="root/[jvm root]/generic.html">generic</a></div>
     </div>
   </div>
 </div>
diff --git a/plugins/base/src/test/resources/expect/genericFunctionWithConstraints/out/html/root/<jvm root>/generic.html b/plugins/base/src/test/resources/expect/genericFunctionWithConstraints/out/html/root/<jvm root>/generic.html
deleted file mode 100644
index 0c00617f..00000000
--- a/plugins/base/src/test/resources/expect/genericFunctionWithConstraints/out/html/root/<jvm root>/generic.html	
+++ /dev/null
@@ -1,33 +0,0 @@
-<html>
-  <head>
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <title>generic</title>
-    <link href="../../styles/style.css" rel="Stylesheet">
-    <script type="text/javascript" src="../../scripts/navigationLoader.js" async="async"></script>
-    <script type="text/javascript" src="../../scripts/platformContentHandler.js" async="async"></script>
-    <script>var pathToRoot = "../../";</script>
-  </head>
-  <body>
-    <div id="container">
-      <div id="leftColumn">
-        <div id="logo"></div>
-        <div id="sideMenu"></div>
-      </div>
-      <div id="main">
-        <div id="searchBar"></div>
-        <script type="text/javascript" src="../../scripts/pages.js"></script>
-        <script type="text/javascript" src="../../scripts/main.js"></script>
-        <div id="content" pageIds="//generic/#//">
-          <div class="breadcrumbs">//<a href="../index.html">root</a>/<a href="index.html">&lt;jvm root&gt;</a>/<a href="generic.html">generic</a></div>
-          <div class="cover ">
-            <h1>generic</h1>
-            <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm"><div class="symbol monospace">final fun &lt;<a href="generic.html">T</a> : R, <a href="generic.html">R</a> : <a href="">Any</a>&gt; <a href="generic.html">generic</a>()</div></div></div>
-          </div>
-          <h3>Description</h3>
-          <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm">generic function</div></div>
-        </div>
-      </div>
-    </div>
-  </body>
-</html>
-
diff --git a/plugins/base/src/test/resources/expect/genericFunctionWithConstraints/out/html/root/<jvm root>/index.html b/plugins/base/src/test/resources/expect/genericFunctionWithConstraints/out/html/root/<jvm root>/index.html
deleted file mode 100644
index a59f1ad7..00000000
--- a/plugins/base/src/test/resources/expect/genericFunctionWithConstraints/out/html/root/<jvm root>/index.html	
+++ /dev/null
@@ -1,46 +0,0 @@
-<html>
-  <head>
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <title>&lt;jvm root&gt;</title>
-    <link href="../../styles/style.css" rel="Stylesheet">
-    <script type="text/javascript" src="../../scripts/navigationLoader.js" async="async"></script>
-    <script type="text/javascript" src="../../scripts/platformContentHandler.js" async="async"></script>
-    <script>var pathToRoot = "../../";</script>
-  </head>
-  <body>
-    <div id="container">
-      <div id="leftColumn">
-        <div id="logo"></div>
-        <div id="sideMenu"></div>
-      </div>
-      <div id="main">
-        <div id="searchBar"></div>
-        <script type="text/javascript" src="../../scripts/pages.js"></script>
-        <script type="text/javascript" src="../../scripts/main.js"></script>
-        <div id="content" pageIds="&lt;jvm root&gt;/////">
-          <div class="breadcrumbs">//<a href="../index.html">root</a>/<a href="index.html">&lt;jvm root&gt;</a></div>
-          <div class="cover ">
-            <h1>Package &lt;jvm root&gt;</h1>
-          </div>
-          <h2>Functions</h2>
-          <table>
-            <thead></thead>
-            <tbody>
-              <tr class="platform-tagged">
-                <td class="content"><a href="generic.html">generic</a></td>
-                <td class="content">
-                  <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm"><div class="symbol monospace">final fun &lt;<a href="generic.html">T</a> : R, <a href="generic.html">R</a> : <a href="">Any</a>&gt; <a href="generic.html">generic</a>()</div></div></div>
-                  <div class="brief "> </div>
-                </td>
-                <td class="platform-tagged">
-                  <div class="platform-tag jvm">JVM</div>
-                </td>
-              </tr>
-            </tbody>
-          </table>
-        </div>
-      </div>
-    </div>
-  </body>
-</html>
-
diff --git a/plugins/base/src/test/resources/expect/genericFunctionWithConstraints/out/html/root/[jvm root]/generic.html b/plugins/base/src/test/resources/expect/genericFunctionWithConstraints/out/html/root/[jvm root]/generic.html
new file mode 100644
index 00000000..360045a2
--- /dev/null
+++ b/plugins/base/src/test/resources/expect/genericFunctionWithConstraints/out/html/root/[jvm root]/generic.html	
@@ -0,0 +1,33 @@
+<html>
+  <head>
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <title>generic</title>
+    <link href="../../styles/style.css" rel="Stylesheet">
+    <script type="text/javascript" src="../../scripts/navigationLoader.js" async="async"></script>
+    <script type="text/javascript" src="../../scripts/platformContentHandler.js" async="async"></script>
+    <script>var pathToRoot = "../../";</script>
+  </head>
+  <body>
+    <div id="container">
+      <div id="leftColumn">
+        <div id="logo"></div>
+        <div id="sideMenu"></div>
+      </div>
+      <div id="main">
+        <div id="searchBar"></div>
+        <script type="text/javascript" src="../../scripts/pages.js"></script>
+        <script type="text/javascript" src="../../scripts/main.js"></script>
+        <div id="content" pageIds="//generic/#//">
+          <div class="breadcrumbs">//<a href="../index.html">root</a>/<a href="index.html">[jvm root]</a>/<a href="generic.html">generic</a></div>
+          <div class="cover ">
+            <h1>generic</h1>
+            <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm"><div class="symbol monospace">final fun &lt;<a href="generic.html">T</a> : R, <a href="generic.html">R</a> : <a href="">Any</a>&gt; <a href="generic.html">generic</a>()</div></div></div>
+          </div>
+          <h3>Description</h3>
+          <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm">generic function</div></div>
+        </div>
+      </div>
+    </div>
+  </body>
+</html>
+
diff --git a/plugins/base/src/test/resources/expect/genericFunctionWithConstraints/out/html/root/[jvm root]/index.html b/plugins/base/src/test/resources/expect/genericFunctionWithConstraints/out/html/root/[jvm root]/index.html
new file mode 100644
index 00000000..bc4888ba
--- /dev/null
+++ b/plugins/base/src/test/resources/expect/genericFunctionWithConstraints/out/html/root/[jvm root]/index.html	
@@ -0,0 +1,46 @@
+<html>
+  <head>
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <title>[jvm root]</title>
+    <link href="../../styles/style.css" rel="Stylesheet">
+    <script type="text/javascript" src="../../scripts/navigationLoader.js" async="async"></script>
+    <script type="text/javascript" src="../../scripts/platformContentHandler.js" async="async"></script>
+    <script>var pathToRoot = "../../";</script>
+  </head>
+  <body>
+    <div id="container">
+      <div id="leftColumn">
+        <div id="logo"></div>
+        <div id="sideMenu"></div>
+      </div>
+      <div id="main">
+        <div id="searchBar"></div>
+        <script type="text/javascript" src="../../scripts/pages.js"></script>
+        <script type="text/javascript" src="../../scripts/main.js"></script>
+        <div id="content" pageIds="[jvm root]/////">
+          <div class="breadcrumbs">//<a href="../index.html">root</a>/<a href="index.html">[jvm root]</a></div>
+          <div class="cover ">
+            <h1>Package [jvm root]</h1>
+          </div>
+          <h2>Functions</h2>
+          <table>
+            <thead></thead>
+            <tbody>
+              <tr class="platform-tagged">
+                <td class="content"><a href="generic.html">generic</a></td>
+                <td class="content">
+                  <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm"><div class="symbol monospace">final fun &lt;<a href="generic.html">T</a> : R, <a href="generic.html">R</a> : <a href="">Any</a>&gt; <a href="generic.html">generic</a>()</div></div></div>
+                  <div class="brief "> </div>
+                </td>
+                <td class="platform-tagged">
+                  <div class="platform-tag jvm">JVM</div>
+                </td>
+              </tr>
+            </tbody>
+          </table>
+        </div>
+      </div>
+    </div>
+  </body>
+</html>
+
diff --git a/plugins/base/src/test/resources/expect/genericFunctionWithConstraints/out/html/root/index.html b/plugins/base/src/test/resources/expect/genericFunctionWithConstraints/out/html/root/index.html
index a3211166..440758c2 100644
--- a/plugins/base/src/test/resources/expect/genericFunctionWithConstraints/out/html/root/index.html
+++ b/plugins/base/src/test/resources/expect/genericFunctionWithConstraints/out/html/root/index.html
@@ -27,7 +27,7 @@
             <thead></thead>
             <tbody>
               <tr class="platform-tagged">
-                <td class="content"><a href="&lt;jvm root&gt;/index.html">&lt;jvm root&gt;</a></td>
+                <td class="content"><a href="[jvm root]/index.html">[jvm root]</a></td>
                 <td class="platform-tagged">
                   <div class="platform-tag jvm">JVM</div>
                 </td>
diff --git a/plugins/base/src/test/resources/expect/genericFunctionWithConstraints/out/html/root/package-list b/plugins/base/src/test/resources/expect/genericFunctionWithConstraints/out/html/root/package-list
index 30905d0f..468c6cb4 100644
--- a/plugins/base/src/test/resources/expect/genericFunctionWithConstraints/out/html/root/package-list
+++ b/plugins/base/src/test/resources/expect/genericFunctionWithConstraints/out/html/root/package-list
@@ -1,5 +1,5 @@
 $dokka.format:html
 $dokka.linkExtension:html
-$dokka.location://generic/#//root/<jvm root>/generic.html
-<jvm root>
+$dokka.location://generic/#//root/[jvm root]/generic.html
+[jvm root]
 
diff --git a/plugins/base/src/test/resources/expect/genericFunctionWithConstraints/out/html/scripts/pages.js b/plugins/base/src/test/resources/expect/genericFunctionWithConstraints/out/html/scripts/pages.js
index b8b18755..ee6a2f7a 100644
--- a/plugins/base/src/test/resources/expect/genericFunctionWithConstraints/out/html/scripts/pages.js
+++ b/plugins/base/src/test/resources/expect/genericFunctionWithConstraints/out/html/scripts/pages.js
@@ -1,5 +1,5 @@
 var pages = [
 { "name": "root",  "location": "root/index.html" },
-{ "name": "<jvm root>",  "location": "root/<jvm root>/index.html" },
-{ "name": "generic",  "location": "root/<jvm root>/generic.html" }
+{ "name": "[jvm root]",  "location": "root/[jvm root]/index.html" },
+{ "name": "generic",  "location": "root/[jvm root]/generic.html" }
 ]
diff --git a/plugins/base/src/test/resources/expect/inlineFunction/out/html/navigation.html b/plugins/base/src/test/resources/expect/inlineFunction/out/html/navigation.html
index 8c279fe3..f949d074 100644
--- a/plugins/base/src/test/resources/expect/inlineFunction/out/html/navigation.html
+++ b/plugins/base/src/test/resources/expect/inlineFunction/out/html/navigation.html
@@ -1,9 +1,9 @@
 <div class="sideMenuPart" id="nav-submenu" pageId="/////">
   <div class="overview"><a href="root/index.html">root</a><span class="navButton" onclick="document.getElementById(&quot;nav-submenu&quot;).classList.toggle(&quot;hidden&quot;);"><span class="navButtonContent"></span></span></div>
-  <div class="sideMenuPart" id="nav-submenu-0" pageId="&lt;jvm root&gt;/////">
-    <div class="overview"><a href="root/&lt;jvm root&gt;/index.html">&lt;jvm root&gt;</a><span class="navButton" onclick="document.getElementById(&quot;nav-submenu-0&quot;).classList.toggle(&quot;hidden&quot;);"><span class="navButtonContent"></span></span></div>
+  <div class="sideMenuPart" id="nav-submenu-0" pageId="[jvm root]/////">
+    <div class="overview"><a href="root/[jvm root]/index.html">[jvm root]</a><span class="navButton" onclick="document.getElementById(&quot;nav-submenu-0&quot;).classList.toggle(&quot;hidden&quot;);"><span class="navButtonContent"></span></span></div>
     <div class="sideMenuPart" id="nav-submenu-0-0" pageId="//f/#kotlin.Function0[kotlin.String]//">
-      <div class="overview"><a href="root/&lt;jvm root&gt;/f.html">f</a></div>
+      <div class="overview"><a href="root/[jvm root]/f.html">f</a></div>
     </div>
   </div>
 </div>
diff --git a/plugins/base/src/test/resources/expect/inlineFunction/out/html/root/<jvm root>/f.html b/plugins/base/src/test/resources/expect/inlineFunction/out/html/root/<jvm root>/f.html
deleted file mode 100644
index 37795eb2..00000000
--- a/plugins/base/src/test/resources/expect/inlineFunction/out/html/root/<jvm root>/f.html	
+++ /dev/null
@@ -1,31 +0,0 @@
-<html>
-  <head>
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <title>f</title>
-    <link href="../../styles/style.css" rel="Stylesheet">
-    <script type="text/javascript" src="../../scripts/navigationLoader.js" async="async"></script>
-    <script type="text/javascript" src="../../scripts/platformContentHandler.js" async="async"></script>
-    <script>var pathToRoot = "../../";</script>
-  </head>
-  <body>
-    <div id="container">
-      <div id="leftColumn">
-        <div id="logo"></div>
-        <div id="sideMenu"></div>
-      </div>
-      <div id="main">
-        <div id="searchBar"></div>
-        <script type="text/javascript" src="../../scripts/pages.js"></script>
-        <script type="text/javascript" src="../../scripts/main.js"></script>
-        <div id="content" pageIds="//f/#kotlin.Function0[kotlin.String]//">
-          <div class="breadcrumbs">//<a href="../index.html">root</a>/<a href="index.html">&lt;jvm root&gt;</a>/<a href="f.html">f</a></div>
-          <div class="cover ">
-            <h1>f</h1>
-            <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm"><div class="symbol monospace">final fun <a href="f.html">f</a>(a: <div class="symbol monospace">() -&gt; <a href="">String</a></div>)</div></div></div>
-          </div>
-        </div>
-      </div>
-    </div>
-  </body>
-</html>
-
diff --git a/plugins/base/src/test/resources/expect/inlineFunction/out/html/root/<jvm root>/index.html b/plugins/base/src/test/resources/expect/inlineFunction/out/html/root/<jvm root>/index.html
deleted file mode 100644
index cfd0ab30..00000000
--- a/plugins/base/src/test/resources/expect/inlineFunction/out/html/root/<jvm root>/index.html	
+++ /dev/null
@@ -1,46 +0,0 @@
-<html>
-  <head>
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <title>&lt;jvm root&gt;</title>
-    <link href="../../styles/style.css" rel="Stylesheet">
-    <script type="text/javascript" src="../../scripts/navigationLoader.js" async="async"></script>
-    <script type="text/javascript" src="../../scripts/platformContentHandler.js" async="async"></script>
-    <script>var pathToRoot = "../../";</script>
-  </head>
-  <body>
-    <div id="container">
-      <div id="leftColumn">
-        <div id="logo"></div>
-        <div id="sideMenu"></div>
-      </div>
-      <div id="main">
-        <div id="searchBar"></div>
-        <script type="text/javascript" src="../../scripts/pages.js"></script>
-        <script type="text/javascript" src="../../scripts/main.js"></script>
-        <div id="content" pageIds="&lt;jvm root&gt;/////">
-          <div class="breadcrumbs">//<a href="../index.html">root</a>/<a href="index.html">&lt;jvm root&gt;</a></div>
-          <div class="cover ">
-            <h1>Package &lt;jvm root&gt;</h1>
-          </div>
-          <h2>Functions</h2>
-          <table>
-            <thead></thead>
-            <tbody>
-              <tr class="platform-tagged">
-                <td class="content"><a href="f.html">f</a></td>
-                <td class="content">
-                  <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm"><div class="symbol monospace">final fun <a href="f.html">f</a>(a: <div class="symbol monospace">() -&gt; <a href="">String</a></div>)</div></div></div>
-                  <div class="brief "> </div>
-                </td>
-                <td class="platform-tagged">
-                  <div class="platform-tag jvm">JVM</div>
-                </td>
-              </tr>
-            </tbody>
-          </table>
-        </div>
-      </div>
-    </div>
-  </body>
-</html>
-
diff --git a/plugins/base/src/test/resources/expect/inlineFunction/out/html/root/[jvm root]/f.html b/plugins/base/src/test/resources/expect/inlineFunction/out/html/root/[jvm root]/f.html
new file mode 100644
index 00000000..5b26e5a8
--- /dev/null
+++ b/plugins/base/src/test/resources/expect/inlineFunction/out/html/root/[jvm root]/f.html	
@@ -0,0 +1,31 @@
+<html>
+  <head>
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <title>f</title>
+    <link href="../../styles/style.css" rel="Stylesheet">
+    <script type="text/javascript" src="../../scripts/navigationLoader.js" async="async"></script>
+    <script type="text/javascript" src="../../scripts/platformContentHandler.js" async="async"></script>
+    <script>var pathToRoot = "../../";</script>
+  </head>
+  <body>
+    <div id="container">
+      <div id="leftColumn">
+        <div id="logo"></div>
+        <div id="sideMenu"></div>
+      </div>
+      <div id="main">
+        <div id="searchBar"></div>
+        <script type="text/javascript" src="../../scripts/pages.js"></script>
+        <script type="text/javascript" src="../../scripts/main.js"></script>
+        <div id="content" pageIds="//f/#kotlin.Function0[kotlin.String]//">
+          <div class="breadcrumbs">//<a href="../index.html">root</a>/<a href="index.html">[jvm root]</a>/<a href="f.html">f</a></div>
+          <div class="cover ">
+            <h1>f</h1>
+            <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm"><div class="symbol monospace">final fun <a href="f.html">f</a>(a: <div class="symbol monospace">() -&gt; <a href="">String</a></div>)</div></div></div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </body>
+</html>
+
diff --git a/plugins/base/src/test/resources/expect/inlineFunction/out/html/root/[jvm root]/index.html b/plugins/base/src/test/resources/expect/inlineFunction/out/html/root/[jvm root]/index.html
new file mode 100644
index 00000000..27fbc21c
--- /dev/null
+++ b/plugins/base/src/test/resources/expect/inlineFunction/out/html/root/[jvm root]/index.html	
@@ -0,0 +1,46 @@
+<html>
+  <head>
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <title>[jvm root]</title>
+    <link href="../../styles/style.css" rel="Stylesheet">
+    <script type="text/javascript" src="../../scripts/navigationLoader.js" async="async"></script>
+    <script type="text/javascript" src="../../scripts/platformContentHandler.js" async="async"></script>
+    <script>var pathToRoot = "../../";</script>
+  </head>
+  <body>
+    <div id="container">
+      <div id="leftColumn">
+        <div id="logo"></div>
+        <div id="sideMenu"></div>
+      </div>
+      <div id="main">
+        <div id="searchBar"></div>
+        <script type="text/javascript" src="../../scripts/pages.js"></script>
+        <script type="text/javascript" src="../../scripts/main.js"></script>
+        <div id="content" pageIds="[jvm root]/////">
+          <div class="breadcrumbs">//<a href="../index.html">root</a>/<a href="index.html">[jvm root]</a></div>
+          <div class="cover ">
+            <h1>Package [jvm root]</h1>
+          </div>
+          <h2>Functions</h2>
+          <table>
+            <thead></thead>
+            <tbody>
+              <tr class="platform-tagged">
+                <td class="content"><a href="f.html">f</a></td>
+                <td class="content">
+                  <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm"><div class="symbol monospace">final fun <a href="f.html">f</a>(a: <div class="symbol monospace">() -&gt; <a href="">String</a></div>)</div></div></div>
+                  <div class="brief "> </div>
+                </td>
+                <td class="platform-tagged">
+                  <div class="platform-tag jvm">JVM</div>
+                </td>
+              </tr>
+            </tbody>
+          </table>
+        </div>
+      </div>
+    </div>
+  </body>
+</html>
+
diff --git a/plugins/base/src/test/resources/expect/inlineFunction/out/html/root/index.html b/plugins/base/src/test/resources/expect/inlineFunction/out/html/root/index.html
index a3211166..440758c2 100644
--- a/plugins/base/src/test/resources/expect/inlineFunction/out/html/root/index.html
+++ b/plugins/base/src/test/resources/expect/inlineFunction/out/html/root/index.html
@@ -27,7 +27,7 @@
             <thead></thead>
             <tbody>
               <tr class="platform-tagged">
-                <td class="content"><a href="&lt;jvm root&gt;/index.html">&lt;jvm root&gt;</a></td>
+                <td class="content"><a href="[jvm root]/index.html">[jvm root]</a></td>
                 <td class="platform-tagged">
                   <div class="platform-tag jvm">JVM</div>
                 </td>
diff --git a/plugins/base/src/test/resources/expect/inlineFunction/out/html/root/package-list b/plugins/base/src/test/resources/expect/inlineFunction/out/html/root/package-list
index 60993388..ce137c16 100644
--- a/plugins/base/src/test/resources/expect/inlineFunction/out/html/root/package-list
+++ b/plugins/base/src/test/resources/expect/inlineFunction/out/html/root/package-list
@@ -1,5 +1,5 @@
 $dokka.format:html
 $dokka.linkExtension:html
-$dokka.location://f/#kotlin.Function0[kotlin.String]//root/<jvm root>/f.html
-<jvm root>
+$dokka.location://f/#kotlin.Function0[kotlin.String]//root/[jvm root]/f.html
+[jvm root]
 
diff --git a/plugins/base/src/test/resources/expect/inlineFunction/out/html/scripts/pages.js b/plugins/base/src/test/resources/expect/inlineFunction/out/html/scripts/pages.js
index 68e0c564..310827d1 100644
--- a/plugins/base/src/test/resources/expect/inlineFunction/out/html/scripts/pages.js
+++ b/plugins/base/src/test/resources/expect/inlineFunction/out/html/scripts/pages.js
@@ -1,5 +1,5 @@
 var pages = [
 { "name": "root",  "location": "root/index.html" },
-{ "name": "<jvm root>",  "location": "root/<jvm root>/index.html" },
-{ "name": "f",  "location": "root/<jvm root>/f.html" }
+{ "name": "[jvm root]",  "location": "root/[jvm root]/index.html" },
+{ "name": "f",  "location": "root/[jvm root]/f.html" }
 ]
diff --git a/plugins/base/src/test/resources/expect/inlineSuspendFunction/out/html/navigation.html b/plugins/base/src/test/resources/expect/inlineSuspendFunction/out/html/navigation.html
index 8c279fe3..f949d074 100644
--- a/plugins/base/src/test/resources/expect/inlineSuspendFunction/out/html/navigation.html
+++ b/plugins/base/src/test/resources/expect/inlineSuspendFunction/out/html/navigation.html
@@ -1,9 +1,9 @@
 <div class="sideMenuPart" id="nav-submenu" pageId="/////">
   <div class="overview"><a href="root/index.html">root</a><span class="navButton" onclick="document.getElementById(&quot;nav-submenu&quot;).classList.toggle(&quot;hidden&quot;);"><span class="navButtonContent"></span></span></div>
-  <div class="sideMenuPart" id="nav-submenu-0" pageId="&lt;jvm root&gt;/////">
-    <div class="overview"><a href="root/&lt;jvm root&gt;/index.html">&lt;jvm root&gt;</a><span class="navButton" onclick="document.getElementById(&quot;nav-submenu-0&quot;).classList.toggle(&quot;hidden&quot;);"><span class="navButtonContent"></span></span></div>
+  <div class="sideMenuPart" id="nav-submenu-0" pageId="[jvm root]/////">
+    <div class="overview"><a href="root/[jvm root]/index.html">[jvm root]</a><span class="navButton" onclick="document.getElementById(&quot;nav-submenu-0&quot;).classList.toggle(&quot;hidden&quot;);"><span class="navButtonContent"></span></span></div>
     <div class="sideMenuPart" id="nav-submenu-0-0" pageId="//f/#kotlin.Function0[kotlin.String]//">
-      <div class="overview"><a href="root/&lt;jvm root&gt;/f.html">f</a></div>
+      <div class="overview"><a href="root/[jvm root]/f.html">f</a></div>
     </div>
   </div>
 </div>
diff --git a/plugins/base/src/test/resources/expect/inlineSuspendFunction/out/html/root/<jvm root>/f.html b/plugins/base/src/test/resources/expect/inlineSuspendFunction/out/html/root/<jvm root>/f.html
deleted file mode 100644
index 37795eb2..00000000
--- a/plugins/base/src/test/resources/expect/inlineSuspendFunction/out/html/root/<jvm root>/f.html	
+++ /dev/null
@@ -1,31 +0,0 @@
-<html>
-  <head>
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <title>f</title>
-    <link href="../../styles/style.css" rel="Stylesheet">
-    <script type="text/javascript" src="../../scripts/navigationLoader.js" async="async"></script>
-    <script type="text/javascript" src="../../scripts/platformContentHandler.js" async="async"></script>
-    <script>var pathToRoot = "../../";</script>
-  </head>
-  <body>
-    <div id="container">
-      <div id="leftColumn">
-        <div id="logo"></div>
-        <div id="sideMenu"></div>
-      </div>
-      <div id="main">
-        <div id="searchBar"></div>
-        <script type="text/javascript" src="../../scripts/pages.js"></script>
-        <script type="text/javascript" src="../../scripts/main.js"></script>
-        <div id="content" pageIds="//f/#kotlin.Function0[kotlin.String]//">
-          <div class="breadcrumbs">//<a href="../index.html">root</a>/<a href="index.html">&lt;jvm root&gt;</a>/<a href="f.html">f</a></div>
-          <div class="cover ">
-            <h1>f</h1>
-            <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm"><div class="symbol monospace">final fun <a href="f.html">f</a>(a: <div class="symbol monospace">() -&gt; <a href="">String</a></div>)</div></div></div>
-          </div>
-        </div>
-      </div>
-    </div>
-  </body>
-</html>
-
diff --git a/plugins/base/src/test/resources/expect/inlineSuspendFunction/out/html/root/<jvm root>/index.html b/plugins/base/src/test/resources/expect/inlineSuspendFunction/out/html/root/<jvm root>/index.html
deleted file mode 100644
index cfd0ab30..00000000
--- a/plugins/base/src/test/resources/expect/inlineSuspendFunction/out/html/root/<jvm root>/index.html	
+++ /dev/null
@@ -1,46 +0,0 @@
-<html>
-  <head>
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <title>&lt;jvm root&gt;</title>
-    <link href="../../styles/style.css" rel="Stylesheet">
-    <script type="text/javascript" src="../../scripts/navigationLoader.js" async="async"></script>
-    <script type="text/javascript" src="../../scripts/platformContentHandler.js" async="async"></script>
-    <script>var pathToRoot = "../../";</script>
-  </head>
-  <body>
-    <div id="container">
-      <div id="leftColumn">
-        <div id="logo"></div>
-        <div id="sideMenu"></div>
-      </div>
-      <div id="main">
-        <div id="searchBar"></div>
-        <script type="text/javascript" src="../../scripts/pages.js"></script>
-        <script type="text/javascript" src="../../scripts/main.js"></script>
-        <div id="content" pageIds="&lt;jvm root&gt;/////">
-          <div class="breadcrumbs">//<a href="../index.html">root</a>/<a href="index.html">&lt;jvm root&gt;</a></div>
-          <div class="cover ">
-            <h1>Package &lt;jvm root&gt;</h1>
-          </div>
-          <h2>Functions</h2>
-          <table>
-            <thead></thead>
-            <tbody>
-              <tr class="platform-tagged">
-                <td class="content"><a href="f.html">f</a></td>
-                <td class="content">
-                  <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm"><div class="symbol monospace">final fun <a href="f.html">f</a>(a: <div class="symbol monospace">() -&gt; <a href="">String</a></div>)</div></div></div>
-                  <div class="brief "> </div>
-                </td>
-                <td class="platform-tagged">
-                  <div class="platform-tag jvm">JVM</div>
-                </td>
-              </tr>
-            </tbody>
-          </table>
-        </div>
-      </div>
-    </div>
-  </body>
-</html>
-
diff --git a/plugins/base/src/test/resources/expect/inlineSuspendFunction/out/html/root/[jvm root]/f.html b/plugins/base/src/test/resources/expect/inlineSuspendFunction/out/html/root/[jvm root]/f.html
new file mode 100644
index 00000000..5b26e5a8
--- /dev/null
+++ b/plugins/base/src/test/resources/expect/inlineSuspendFunction/out/html/root/[jvm root]/f.html	
@@ -0,0 +1,31 @@
+<html>
+  <head>
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <title>f</title>
+    <link href="../../styles/style.css" rel="Stylesheet">
+    <script type="text/javascript" src="../../scripts/navigationLoader.js" async="async"></script>
+    <script type="text/javascript" src="../../scripts/platformContentHandler.js" async="async"></script>
+    <script>var pathToRoot = "../../";</script>
+  </head>
+  <body>
+    <div id="container">
+      <div id="leftColumn">
+        <div id="logo"></div>
+        <div id="sideMenu"></div>
+      </div>
+      <div id="main">
+        <div id="searchBar"></div>
+        <script type="text/javascript" src="../../scripts/pages.js"></script>
+        <script type="text/javascript" src="../../scripts/main.js"></script>
+        <div id="content" pageIds="//f/#kotlin.Function0[kotlin.String]//">
+          <div class="breadcrumbs">//<a href="../index.html">root</a>/<a href="index.html">[jvm root]</a>/<a href="f.html">f</a></div>
+          <div class="cover ">
+            <h1>f</h1>
+            <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm"><div class="symbol monospace">final fun <a href="f.html">f</a>(a: <div class="symbol monospace">() -&gt; <a href="">String</a></div>)</div></div></div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </body>
+</html>
+
diff --git a/plugins/base/src/test/resources/expect/inlineSuspendFunction/out/html/root/[jvm root]/index.html b/plugins/base/src/test/resources/expect/inlineSuspendFunction/out/html/root/[jvm root]/index.html
new file mode 100644
index 00000000..27fbc21c
--- /dev/null
+++ b/plugins/base/src/test/resources/expect/inlineSuspendFunction/out/html/root/[jvm root]/index.html	
@@ -0,0 +1,46 @@
+<html>
+  <head>
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <title>[jvm root]</title>
+    <link href="../../styles/style.css" rel="Stylesheet">
+    <script type="text/javascript" src="../../scripts/navigationLoader.js" async="async"></script>
+    <script type="text/javascript" src="../../scripts/platformContentHandler.js" async="async"></script>
+    <script>var pathToRoot = "../../";</script>
+  </head>
+  <body>
+    <div id="container">
+      <div id="leftColumn">
+        <div id="logo"></div>
+        <div id="sideMenu"></div>
+      </div>
+      <div id="main">
+        <div id="searchBar"></div>
+        <script type="text/javascript" src="../../scripts/pages.js"></script>
+        <script type="text/javascript" src="../../scripts/main.js"></script>
+        <div id="content" pageIds="[jvm root]/////">
+          <div class="breadcrumbs">//<a href="../index.html">root</a>/<a href="index.html">[jvm root]</a></div>
+          <div class="cover ">
+            <h1>Package [jvm root]</h1>
+          </div>
+          <h2>Functions</h2>
+          <table>
+            <thead></thead>
+            <tbody>
+              <tr class="platform-tagged">
+                <td class="content"><a href="f.html">f</a></td>
+                <td class="content">
+                  <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm"><div class="symbol monospace">final fun <a href="f.html">f</a>(a: <div class="symbol monospace">() -&gt; <a href="">String</a></div>)</div></div></div>
+                  <div class="brief "> </div>
+                </td>
+                <td class="platform-tagged">
+                  <div class="platform-tag jvm">JVM</div>
+                </td>
+              </tr>
+            </tbody>
+          </table>
+        </div>
+      </div>
+    </div>
+  </body>
+</html>
+
diff --git a/plugins/base/src/test/resources/expect/inlineSuspendFunction/out/html/root/index.html b/plugins/base/src/test/resources/expect/inlineSuspendFunction/out/html/root/index.html
index a3211166..440758c2 100644
--- a/plugins/base/src/test/resources/expect/inlineSuspendFunction/out/html/root/index.html
+++ b/plugins/base/src/test/resources/expect/inlineSuspendFunction/out/html/root/index.html
@@ -27,7 +27,7 @@
             <thead></thead>
             <tbody>
               <tr class="platform-tagged">
-                <td class="content"><a href="&lt;jvm root&gt;/index.html">&lt;jvm root&gt;</a></td>
+                <td class="content"><a href="[jvm root]/index.html">[jvm root]</a></td>
                 <td class="platform-tagged">
                   <div class="platform-tag jvm">JVM</div>
                 </td>
diff --git a/plugins/base/src/test/resources/expect/inlineSuspendFunction/out/html/root/package-list b/plugins/base/src/test/resources/expect/inlineSuspendFunction/out/html/root/package-list
index 60993388..ce137c16 100644
--- a/plugins/base/src/test/resources/expect/inlineSuspendFunction/out/html/root/package-list
+++ b/plugins/base/src/test/resources/expect/inlineSuspendFunction/out/html/root/package-list
@@ -1,5 +1,5 @@
 $dokka.format:html
 $dokka.linkExtension:html
-$dokka.location://f/#kotlin.Function0[kotlin.String]//root/<jvm root>/f.html
-<jvm root>
+$dokka.location://f/#kotlin.Function0[kotlin.String]//root/[jvm root]/f.html
+[jvm root]
 
diff --git a/plugins/base/src/test/resources/expect/inlineSuspendFunction/out/html/scripts/pages.js b/plugins/base/src/test/resources/expect/inlineSuspendFunction/out/html/scripts/pages.js
index 68e0c564..310827d1 100644
--- a/plugins/base/src/test/resources/expect/inlineSuspendFunction/out/html/scripts/pages.js
+++ b/plugins/base/src/test/resources/expect/inlineSuspendFunction/out/html/scripts/pages.js
@@ -1,5 +1,5 @@
 var pages = [
 { "name": "root",  "location": "root/index.html" },
-{ "name": "<jvm root>",  "location": "root/<jvm root>/index.html" },
-{ "name": "f",  "location": "root/<jvm root>/f.html" }
+{ "name": "[jvm root]",  "location": "root/[jvm root]/index.html" },
+{ "name": "f",  "location": "root/[jvm root]/f.html" }
 ]
diff --git a/plugins/base/src/test/resources/expect/sinceKotlin/out/html/navigation.html b/plugins/base/src/test/resources/expect/sinceKotlin/out/html/navigation.html
index 96a19bec..ff1a753c 100644
--- a/plugins/base/src/test/resources/expect/sinceKotlin/out/html/navigation.html
+++ b/plugins/base/src/test/resources/expect/sinceKotlin/out/html/navigation.html
@@ -1,9 +1,9 @@
 <div class="sideMenuPart" id="nav-submenu" pageId="/////">
   <div class="overview"><a href="root/index.html">root</a><span class="navButton" onclick="document.getElementById(&quot;nav-submenu&quot;).classList.toggle(&quot;hidden&quot;);"><span class="navButtonContent"></span></span></div>
-  <div class="sideMenuPart" id="nav-submenu-0" pageId="&lt;jvm root&gt;/////">
-    <div class="overview"><a href="root/&lt;jvm root&gt;/index.html">&lt;jvm root&gt;</a><span class="navButton" onclick="document.getElementById(&quot;nav-submenu-0&quot;).classList.toggle(&quot;hidden&quot;);"><span class="navButtonContent"></span></span></div>
+  <div class="sideMenuPart" id="nav-submenu-0" pageId="[jvm root]/////">
+    <div class="overview"><a href="root/[jvm root]/index.html">[jvm root]</a><span class="navButton" onclick="document.getElementById(&quot;nav-submenu-0&quot;).classList.toggle(&quot;hidden&quot;);"><span class="navButtonContent"></span></span></div>
     <div class="sideMenuPart" id="nav-submenu-0-0" pageId="//availableSince1.1/#//">
-      <div class="overview"><a href="root/&lt;jvm root&gt;/available-since1.1.html">availableSince1.1</a></div>
+      <div class="overview"><a href="root/[jvm root]/available-since1.1.html">availableSince1.1</a></div>
     </div>
   </div>
 </div>
diff --git a/plugins/base/src/test/resources/expect/sinceKotlin/out/html/root/<jvm root>/available-since1.1.html b/plugins/base/src/test/resources/expect/sinceKotlin/out/html/root/<jvm root>/available-since1.1.html
deleted file mode 100644
index 628af947..00000000
--- a/plugins/base/src/test/resources/expect/sinceKotlin/out/html/root/<jvm root>/available-since1.1.html	
+++ /dev/null
@@ -1,33 +0,0 @@
-<html>
-  <head>
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <title>availableSince1.1</title>
-    <link href="../../styles/style.css" rel="Stylesheet">
-    <script type="text/javascript" src="../../scripts/navigationLoader.js" async="async"></script>
-    <script type="text/javascript" src="../../scripts/platformContentHandler.js" async="async"></script>
-    <script>var pathToRoot = "../../";</script>
-  </head>
-  <body>
-    <div id="container">
-      <div id="leftColumn">
-        <div id="logo"></div>
-        <div id="sideMenu"></div>
-      </div>
-      <div id="main">
-        <div id="searchBar"></div>
-        <script type="text/javascript" src="../../scripts/pages.js"></script>
-        <script type="text/javascript" src="../../scripts/main.js"></script>
-        <div id="content" pageIds="//availableSince1.1/#//">
-          <div class="breadcrumbs">//<a href="../index.html">root</a>/<a href="index.html">&lt;jvm root&gt;</a>/<a href="available-since1.1.html">availableSince1.1</a></div>
-          <div class="cover ">
-            <h1>availableSince1.1</h1>
-            <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm"><div class="symbol monospace">final fun <a href="available-since1.1.html">availableSince1.1</a>(): <a href="">String</a></div></div></div>
-          </div>
-          <h3>Description</h3>
-          <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm">Quite useful <a href="">String</a></div></div>
-        </div>
-      </div>
-    </div>
-  </body>
-</html>
-
diff --git a/plugins/base/src/test/resources/expect/sinceKotlin/out/html/root/<jvm root>/index.html b/plugins/base/src/test/resources/expect/sinceKotlin/out/html/root/<jvm root>/index.html
deleted file mode 100644
index 0f343034..00000000
--- a/plugins/base/src/test/resources/expect/sinceKotlin/out/html/root/<jvm root>/index.html	
+++ /dev/null
@@ -1,46 +0,0 @@
-<html>
-  <head>
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <title>&lt;jvm root&gt;</title>
-    <link href="../../styles/style.css" rel="Stylesheet">
-    <script type="text/javascript" src="../../scripts/navigationLoader.js" async="async"></script>
-    <script type="text/javascript" src="../../scripts/platformContentHandler.js" async="async"></script>
-    <script>var pathToRoot = "../../";</script>
-  </head>
-  <body>
-    <div id="container">
-      <div id="leftColumn">
-        <div id="logo"></div>
-        <div id="sideMenu"></div>
-      </div>
-      <div id="main">
-        <div id="searchBar"></div>
-        <script type="text/javascript" src="../../scripts/pages.js"></script>
-        <script type="text/javascript" src="../../scripts/main.js"></script>
-        <div id="content" pageIds="&lt;jvm root&gt;/////">
-          <div class="breadcrumbs">//<a href="../index.html">root</a>/<a href="index.html">&lt;jvm root&gt;</a></div>
-          <div class="cover ">
-            <h1>Package &lt;jvm root&gt;</h1>
-          </div>
-          <h2>Functions</h2>
-          <table>
-            <thead></thead>
-            <tbody>
-              <tr class="platform-tagged">
-                <td class="content"><a href="available-since1.1.html">availableSince1.1</a></td>
-                <td class="content">
-                  <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm"><div class="symbol monospace">final fun <a href="available-since1.1.html">availableSince1.1</a>(): <a href="">String</a></div></div></div>
-                  <div class="brief "> </div>
-                </td>
-                <td class="platform-tagged">
-                  <div class="platform-tag jvm">JVM</div>
-                </td>
-              </tr>
-            </tbody>
-          </table>
-        </div>
-      </div>
-    </div>
-  </body>
-</html>
-
diff --git a/plugins/base/src/test/resources/expect/sinceKotlin/out/html/root/[jvm root]/available-since1.1.html b/plugins/base/src/test/resources/expect/sinceKotlin/out/html/root/[jvm root]/available-since1.1.html
new file mode 100644
index 00000000..3c8a55a7
--- /dev/null
+++ b/plugins/base/src/test/resources/expect/sinceKotlin/out/html/root/[jvm root]/available-since1.1.html	
@@ -0,0 +1,33 @@
+<html>
+  <head>
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <title>availableSince1.1</title>
+    <link href="../../styles/style.css" rel="Stylesheet">
+    <script type="text/javascript" src="../../scripts/navigationLoader.js" async="async"></script>
+    <script type="text/javascript" src="../../scripts/platformContentHandler.js" async="async"></script>
+    <script>var pathToRoot = "../../";</script>
+  </head>
+  <body>
+    <div id="container">
+      <div id="leftColumn">
+        <div id="logo"></div>
+        <div id="sideMenu"></div>
+      </div>
+      <div id="main">
+        <div id="searchBar"></div>
+        <script type="text/javascript" src="../../scripts/pages.js"></script>
+        <script type="text/javascript" src="../../scripts/main.js"></script>
+        <div id="content" pageIds="//availableSince1.1/#//">
+          <div class="breadcrumbs">//<a href="../index.html">root</a>/<a href="index.html">[jvm root]</a>/<a href="available-since1.1.html">availableSince1.1</a></div>
+          <div class="cover ">
+            <h1>availableSince1.1</h1>
+            <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm"><div class="symbol monospace">final fun <a href="available-since1.1.html">availableSince1.1</a>(): <a href="">String</a></div></div></div>
+          </div>
+          <h3>Description</h3>
+          <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm">Quite useful <a href="">String</a></div></div>
+        </div>
+      </div>
+    </div>
+  </body>
+</html>
+
diff --git a/plugins/base/src/test/resources/expect/sinceKotlin/out/html/root/[jvm root]/index.html b/plugins/base/src/test/resources/expect/sinceKotlin/out/html/root/[jvm root]/index.html
new file mode 100644
index 00000000..9d7ae2e7
--- /dev/null
+++ b/plugins/base/src/test/resources/expect/sinceKotlin/out/html/root/[jvm root]/index.html	
@@ -0,0 +1,46 @@
+<html>
+  <head>
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <title>[jvm root]</title>
+    <link href="../../styles/style.css" rel="Stylesheet">
+    <script type="text/javascript" src="../../scripts/navigationLoader.js" async="async"></script>
+    <script type="text/javascript" src="../../scripts/platformContentHandler.js" async="async"></script>
+    <script>var pathToRoot = "../../";</script>
+  </head>
+  <body>
+    <div id="container">
+      <div id="leftColumn">
+        <div id="logo"></div>
+        <div id="sideMenu"></div>
+      </div>
+      <div id="main">
+        <div id="searchBar"></div>
+        <script type="text/javascript" src="../../scripts/pages.js"></script>
+        <script type="text/javascript" src="../../scripts/main.js"></script>
+        <div id="content" pageIds="[jvm root]/////">
+          <div class="breadcrumbs">//<a href="../index.html">root</a>/<a href="index.html">[jvm root]</a></div>
+          <div class="cover ">
+            <h1>Package [jvm root]</h1>
+          </div>
+          <h2>Functions</h2>
+          <table>
+            <thead></thead>
+            <tbody>
+              <tr class="platform-tagged">
+                <td class="content"><a href="available-since1.1.html">availableSince1.1</a></td>
+                <td class="content">
+                  <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm"><div class="symbol monospace">final fun <a href="available-since1.1.html">availableSince1.1</a>(): <a href="">String</a></div></div></div>
+                  <div class="brief "> </div>
+                </td>
+                <td class="platform-tagged">
+                  <div class="platform-tag jvm">JVM</div>
+                </td>
+              </tr>
+            </tbody>
+          </table>
+        </div>
+      </div>
+    </div>
+  </body>
+</html>
+
diff --git a/plugins/base/src/test/resources/expect/sinceKotlin/out/html/root/index.html b/plugins/base/src/test/resources/expect/sinceKotlin/out/html/root/index.html
index a3211166..440758c2 100644
--- a/plugins/base/src/test/resources/expect/sinceKotlin/out/html/root/index.html
+++ b/plugins/base/src/test/resources/expect/sinceKotlin/out/html/root/index.html
@@ -27,7 +27,7 @@
             <thead></thead>
             <tbody>
               <tr class="platform-tagged">
-                <td class="content"><a href="&lt;jvm root&gt;/index.html">&lt;jvm root&gt;</a></td>
+                <td class="content"><a href="[jvm root]/index.html">[jvm root]</a></td>
                 <td class="platform-tagged">
                   <div class="platform-tag jvm">JVM</div>
                 </td>
diff --git a/plugins/base/src/test/resources/expect/sinceKotlin/out/html/root/package-list b/plugins/base/src/test/resources/expect/sinceKotlin/out/html/root/package-list
index 8810ec13..adc667ec 100644
--- a/plugins/base/src/test/resources/expect/sinceKotlin/out/html/root/package-list
+++ b/plugins/base/src/test/resources/expect/sinceKotlin/out/html/root/package-list
@@ -1,5 +1,5 @@
 $dokka.format:html
 $dokka.linkExtension:html
-$dokka.location://availableSince1.1/#//root/<jvm root>/available-since1.1.html
-<jvm root>
+$dokka.location://availableSince1.1/#//root/[jvm root]/available-since1.1.html
+[jvm root]
 
diff --git a/plugins/base/src/test/resources/expect/sinceKotlin/out/html/scripts/pages.js b/plugins/base/src/test/resources/expect/sinceKotlin/out/html/scripts/pages.js
index 8af77c2e..de75fd20 100644
--- a/plugins/base/src/test/resources/expect/sinceKotlin/out/html/scripts/pages.js
+++ b/plugins/base/src/test/resources/expect/sinceKotlin/out/html/scripts/pages.js
@@ -1,5 +1,5 @@
 var pages = [
 { "name": "root",  "location": "root/index.html" },
-{ "name": "<jvm root>",  "location": "root/<jvm root>/index.html" },
-{ "name": "availableSince1.1",  "location": "root/<jvm root>/available-since1.1.html" }
+{ "name": "[jvm root]",  "location": "root/[jvm root]/index.html" },
+{ "name": "availableSince1.1",  "location": "root/[jvm root]/available-since1.1.html" }
 ]
diff --git a/plugins/base/src/test/resources/expect/suspendFunction/out/html/navigation.html b/plugins/base/src/test/resources/expect/suspendFunction/out/html/navigation.html
index 463b028f..35fe78dc 100644
--- a/plugins/base/src/test/resources/expect/suspendFunction/out/html/navigation.html
+++ b/plugins/base/src/test/resources/expect/suspendFunction/out/html/navigation.html
@@ -1,9 +1,9 @@
 <div class="sideMenuPart" id="nav-submenu" pageId="/////">
   <div class="overview"><a href="root/index.html">root</a><span class="navButton" onclick="document.getElementById(&quot;nav-submenu&quot;).classList.toggle(&quot;hidden&quot;);"><span class="navButtonContent"></span></span></div>
-  <div class="sideMenuPart" id="nav-submenu-0" pageId="&lt;jvm root&gt;/////">
-    <div class="overview"><a href="root/&lt;jvm root&gt;/index.html">&lt;jvm root&gt;</a><span class="navButton" onclick="document.getElementById(&quot;nav-submenu-0&quot;).classList.toggle(&quot;hidden&quot;);"><span class="navButtonContent"></span></span></div>
+  <div class="sideMenuPart" id="nav-submenu-0" pageId="[jvm root]/////">
+    <div class="overview"><a href="root/[jvm root]/index.html">[jvm root]</a><span class="navButton" onclick="document.getElementById(&quot;nav-submenu-0&quot;).classList.toggle(&quot;hidden&quot;);"><span class="navButtonContent"></span></span></div>
     <div class="sideMenuPart" id="nav-submenu-0-0" pageId="//f/#//">
-      <div class="overview"><a href="root/&lt;jvm root&gt;/f.html">f</a></div>
+      <div class="overview"><a href="root/[jvm root]/f.html">f</a></div>
     </div>
   </div>
 </div>
diff --git a/plugins/base/src/test/resources/expect/suspendFunction/out/html/root/<jvm root>/f.html b/plugins/base/src/test/resources/expect/suspendFunction/out/html/root/<jvm root>/f.html
deleted file mode 100644
index 9de96412..00000000
--- a/plugins/base/src/test/resources/expect/suspendFunction/out/html/root/<jvm root>/f.html	
+++ /dev/null
@@ -1,31 +0,0 @@
-<html>
-  <head>
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <title>f</title>
-    <link href="../../styles/style.css" rel="Stylesheet">
-    <script type="text/javascript" src="../../scripts/navigationLoader.js" async="async"></script>
-    <script type="text/javascript" src="../../scripts/platformContentHandler.js" async="async"></script>
-    <script>var pathToRoot = "../../";</script>
-  </head>
-  <body>
-    <div id="container">
-      <div id="leftColumn">
-        <div id="logo"></div>
-        <div id="sideMenu"></div>
-      </div>
-      <div id="main">
-        <div id="searchBar"></div>
-        <script type="text/javascript" src="../../scripts/pages.js"></script>
-        <script type="text/javascript" src="../../scripts/main.js"></script>
-        <div id="content" pageIds="//f/#//">
-          <div class="breadcrumbs">//<a href="../index.html">root</a>/<a href="index.html">&lt;jvm root&gt;</a>/<a href="f.html">f</a></div>
-          <div class="cover ">
-            <h1>f</h1>
-            <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm"><div class="symbol monospace">final fun <a href="f.html">f</a>()</div></div></div>
-          </div>
-        </div>
-      </div>
-    </div>
-  </body>
-</html>
-
diff --git a/plugins/base/src/test/resources/expect/suspendFunction/out/html/root/<jvm root>/index.html b/plugins/base/src/test/resources/expect/suspendFunction/out/html/root/<jvm root>/index.html
deleted file mode 100644
index 1ebe6dce..00000000
--- a/plugins/base/src/test/resources/expect/suspendFunction/out/html/root/<jvm root>/index.html	
+++ /dev/null
@@ -1,46 +0,0 @@
-<html>
-  <head>
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <title>&lt;jvm root&gt;</title>
-    <link href="../../styles/style.css" rel="Stylesheet">
-    <script type="text/javascript" src="../../scripts/navigationLoader.js" async="async"></script>
-    <script type="text/javascript" src="../../scripts/platformContentHandler.js" async="async"></script>
-    <script>var pathToRoot = "../../";</script>
-  </head>
-  <body>
-    <div id="container">
-      <div id="leftColumn">
-        <div id="logo"></div>
-        <div id="sideMenu"></div>
-      </div>
-      <div id="main">
-        <div id="searchBar"></div>
-        <script type="text/javascript" src="../../scripts/pages.js"></script>
-        <script type="text/javascript" src="../../scripts/main.js"></script>
-        <div id="content" pageIds="&lt;jvm root&gt;/////">
-          <div class="breadcrumbs">//<a href="../index.html">root</a>/<a href="index.html">&lt;jvm root&gt;</a></div>
-          <div class="cover ">
-            <h1>Package &lt;jvm root&gt;</h1>
-          </div>
-          <h2>Functions</h2>
-          <table>
-            <thead></thead>
-            <tbody>
-              <tr class="platform-tagged">
-                <td class="content"><a href="f.html">f</a></td>
-                <td class="content">
-                  <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm"><div class="symbol monospace">final fun <a href="f.html">f</a>()</div></div></div>
-                  <div class="brief "> </div>
-                </td>
-                <td class="platform-tagged">
-                  <div class="platform-tag jvm">JVM</div>
-                </td>
-              </tr>
-            </tbody>
-          </table>
-        </div>
-      </div>
-    </div>
-  </body>
-</html>
-
diff --git a/plugins/base/src/test/resources/expect/suspendFunction/out/html/root/[jvm root]/f.html b/plugins/base/src/test/resources/expect/suspendFunction/out/html/root/[jvm root]/f.html
new file mode 100644
index 00000000..6c049b35
--- /dev/null
+++ b/plugins/base/src/test/resources/expect/suspendFunction/out/html/root/[jvm root]/f.html	
@@ -0,0 +1,31 @@
+<html>
+  <head>
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <title>f</title>
+    <link href="../../styles/style.css" rel="Stylesheet">
+    <script type="text/javascript" src="../../scripts/navigationLoader.js" async="async"></script>
+    <script type="text/javascript" src="../../scripts/platformContentHandler.js" async="async"></script>
+    <script>var pathToRoot = "../../";</script>
+  </head>
+  <body>
+    <div id="container">
+      <div id="leftColumn">
+        <div id="logo"></div>
+        <div id="sideMenu"></div>
+      </div>
+      <div id="main">
+        <div id="searchBar"></div>
+        <script type="text/javascript" src="../../scripts/pages.js"></script>
+        <script type="text/javascript" src="../../scripts/main.js"></script>
+        <div id="content" pageIds="//f/#//">
+          <div class="breadcrumbs">//<a href="../index.html">root</a>/<a href="index.html">[jvm root]</a>/<a href="f.html">f</a></div>
+          <div class="cover ">
+            <h1>f</h1>
+            <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm"><div class="symbol monospace">final fun <a href="f.html">f</a>()</div></div></div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </body>
+</html>
+
diff --git a/plugins/base/src/test/resources/expect/suspendFunction/out/html/root/[jvm root]/index.html b/plugins/base/src/test/resources/expect/suspendFunction/out/html/root/[jvm root]/index.html
new file mode 100644
index 00000000..8ab1c93f
--- /dev/null
+++ b/plugins/base/src/test/resources/expect/suspendFunction/out/html/root/[jvm root]/index.html	
@@ -0,0 +1,46 @@
+<html>
+  <head>
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <title>[jvm root]</title>
+    <link href="../../styles/style.css" rel="Stylesheet">
+    <script type="text/javascript" src="../../scripts/navigationLoader.js" async="async"></script>
+    <script type="text/javascript" src="../../scripts/platformContentHandler.js" async="async"></script>
+    <script>var pathToRoot = "../../";</script>
+  </head>
+  <body>
+    <div id="container">
+      <div id="leftColumn">
+        <div id="logo"></div>
+        <div id="sideMenu"></div>
+      </div>
+      <div id="main">
+        <div id="searchBar"></div>
+        <script type="text/javascript" src="../../scripts/pages.js"></script>
+        <script type="text/javascript" src="../../scripts/main.js"></script>
+        <div id="content" pageIds="[jvm root]/////">
+          <div class="breadcrumbs">//<a href="../index.html">root</a>/<a href="index.html">[jvm root]</a></div>
+          <div class="cover ">
+            <h1>Package [jvm root]</h1>
+          </div>
+          <h2>Functions</h2>
+          <table>
+            <thead></thead>
+            <tbody>
+              <tr class="platform-tagged">
+                <td class="content"><a href="f.html">f</a></td>
+                <td class="content">
+                  <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm"><div class="symbol monospace">final fun <a href="f.html">f</a>()</div></div></div>
+                  <div class="brief "> </div>
+                </td>
+                <td class="platform-tagged">
+                  <div class="platform-tag jvm">JVM</div>
+                </td>
+              </tr>
+            </tbody>
+          </table>
+        </div>
+      </div>
+    </div>
+  </body>
+</html>
+
diff --git a/plugins/base/src/test/resources/expect/suspendFunction/out/html/root/index.html b/plugins/base/src/test/resources/expect/suspendFunction/out/html/root/index.html
index a3211166..440758c2 100644
--- a/plugins/base/src/test/resources/expect/suspendFunction/out/html/root/index.html
+++ b/plugins/base/src/test/resources/expect/suspendFunction/out/html/root/index.html
@@ -27,7 +27,7 @@
             <thead></thead>
             <tbody>
               <tr class="platform-tagged">
-                <td class="content"><a href="&lt;jvm root&gt;/index.html">&lt;jvm root&gt;</a></td>
+                <td class="content"><a href="[jvm root]/index.html">[jvm root]</a></td>
                 <td class="platform-tagged">
                   <div class="platform-tag jvm">JVM</div>
                 </td>
diff --git a/plugins/base/src/test/resources/expect/suspendFunction/out/html/root/package-list b/plugins/base/src/test/resources/expect/suspendFunction/out/html/root/package-list
index caf6273a..8f1c5fd9 100644
--- a/plugins/base/src/test/resources/expect/suspendFunction/out/html/root/package-list
+++ b/plugins/base/src/test/resources/expect/suspendFunction/out/html/root/package-list
@@ -1,5 +1,5 @@
 $dokka.format:html
 $dokka.linkExtension:html
-$dokka.location://f/#//root/<jvm root>/f.html
-<jvm root>
+$dokka.location://f/#//root/[jvm root]/f.html
+[jvm root]
 
diff --git a/plugins/base/src/test/resources/expect/suspendFunction/out/html/scripts/pages.js b/plugins/base/src/test/resources/expect/suspendFunction/out/html/scripts/pages.js
index 68e0c564..310827d1 100644
--- a/plugins/base/src/test/resources/expect/suspendFunction/out/html/scripts/pages.js
+++ b/plugins/base/src/test/resources/expect/suspendFunction/out/html/scripts/pages.js
@@ -1,5 +1,5 @@
 var pages = [
 { "name": "root",  "location": "root/index.html" },
-{ "name": "<jvm root>",  "location": "root/<jvm root>/index.html" },
-{ "name": "f",  "location": "root/<jvm root>/f.html" }
+{ "name": "[jvm root]",  "location": "root/[jvm root]/index.html" },
+{ "name": "f",  "location": "root/[jvm root]/f.html" }
 ]
diff --git a/plugins/base/src/test/resources/expect/suspendInlineFunction/out/html/navigation.html b/plugins/base/src/test/resources/expect/suspendInlineFunction/out/html/navigation.html
index 8c279fe3..f949d074 100644
--- a/plugins/base/src/test/resources/expect/suspendInlineFunction/out/html/navigation.html
+++ b/plugins/base/src/test/resources/expect/suspendInlineFunction/out/html/navigation.html
@@ -1,9 +1,9 @@
 <div class="sideMenuPart" id="nav-submenu" pageId="/////">
   <div class="overview"><a href="root/index.html">root</a><span class="navButton" onclick="document.getElementById(&quot;nav-submenu&quot;).classList.toggle(&quot;hidden&quot;);"><span class="navButtonContent"></span></span></div>
-  <div class="sideMenuPart" id="nav-submenu-0" pageId="&lt;jvm root&gt;/////">
-    <div class="overview"><a href="root/&lt;jvm root&gt;/index.html">&lt;jvm root&gt;</a><span class="navButton" onclick="document.getElementById(&quot;nav-submenu-0&quot;).classList.toggle(&quot;hidden&quot;);"><span class="navButtonContent"></span></span></div>
+  <div class="sideMenuPart" id="nav-submenu-0" pageId="[jvm root]/////">
+    <div class="overview"><a href="root/[jvm root]/index.html">[jvm root]</a><span class="navButton" onclick="document.getElementById(&quot;nav-submenu-0&quot;).classList.toggle(&quot;hidden&quot;);"><span class="navButtonContent"></span></span></div>
     <div class="sideMenuPart" id="nav-submenu-0-0" pageId="//f/#kotlin.Function0[kotlin.String]//">
-      <div class="overview"><a href="root/&lt;jvm root&gt;/f.html">f</a></div>
+      <div class="overview"><a href="root/[jvm root]/f.html">f</a></div>
     </div>
   </div>
 </div>
diff --git a/plugins/base/src/test/resources/expect/suspendInlineFunction/out/html/root/<jvm root>/f.html b/plugins/base/src/test/resources/expect/suspendInlineFunction/out/html/root/<jvm root>/f.html
deleted file mode 100644
index 37795eb2..00000000
--- a/plugins/base/src/test/resources/expect/suspendInlineFunction/out/html/root/<jvm root>/f.html	
+++ /dev/null
@@ -1,31 +0,0 @@
-<html>
-  <head>
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <title>f</title>
-    <link href="../../styles/style.css" rel="Stylesheet">
-    <script type="text/javascript" src="../../scripts/navigationLoader.js" async="async"></script>
-    <script type="text/javascript" src="../../scripts/platformContentHandler.js" async="async"></script>
-    <script>var pathToRoot = "../../";</script>
-  </head>
-  <body>
-    <div id="container">
-      <div id="leftColumn">
-        <div id="logo"></div>
-        <div id="sideMenu"></div>
-      </div>
-      <div id="main">
-        <div id="searchBar"></div>
-        <script type="text/javascript" src="../../scripts/pages.js"></script>
-        <script type="text/javascript" src="../../scripts/main.js"></script>
-        <div id="content" pageIds="//f/#kotlin.Function0[kotlin.String]//">
-          <div class="breadcrumbs">//<a href="../index.html">root</a>/<a href="index.html">&lt;jvm root&gt;</a>/<a href="f.html">f</a></div>
-          <div class="cover ">
-            <h1>f</h1>
-            <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm"><div class="symbol monospace">final fun <a href="f.html">f</a>(a: <div class="symbol monospace">() -&gt; <a href="">String</a></div>)</div></div></div>
-          </div>
-        </div>
-      </div>
-    </div>
-  </body>
-</html>
-
diff --git a/plugins/base/src/test/resources/expect/suspendInlineFunction/out/html/root/<jvm root>/index.html b/plugins/base/src/test/resources/expect/suspendInlineFunction/out/html/root/<jvm root>/index.html
deleted file mode 100644
index cfd0ab30..00000000
--- a/plugins/base/src/test/resources/expect/suspendInlineFunction/out/html/root/<jvm root>/index.html	
+++ /dev/null
@@ -1,46 +0,0 @@
-<html>
-  <head>
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <title>&lt;jvm root&gt;</title>
-    <link href="../../styles/style.css" rel="Stylesheet">
-    <script type="text/javascript" src="../../scripts/navigationLoader.js" async="async"></script>
-    <script type="text/javascript" src="../../scripts/platformContentHandler.js" async="async"></script>
-    <script>var pathToRoot = "../../";</script>
-  </head>
-  <body>
-    <div id="container">
-      <div id="leftColumn">
-        <div id="logo"></div>
-        <div id="sideMenu"></div>
-      </div>
-      <div id="main">
-        <div id="searchBar"></div>
-        <script type="text/javascript" src="../../scripts/pages.js"></script>
-        <script type="text/javascript" src="../../scripts/main.js"></script>
-        <div id="content" pageIds="&lt;jvm root&gt;/////">
-          <div class="breadcrumbs">//<a href="../index.html">root</a>/<a href="index.html">&lt;jvm root&gt;</a></div>
-          <div class="cover ">
-            <h1>Package &lt;jvm root&gt;</h1>
-          </div>
-          <h2>Functions</h2>
-          <table>
-            <thead></thead>
-            <tbody>
-              <tr class="platform-tagged">
-                <td class="content"><a href="f.html">f</a></td>
-                <td class="content">
-                  <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm"><div class="symbol monospace">final fun <a href="f.html">f</a>(a: <div class="symbol monospace">() -&gt; <a href="">String</a></div>)</div></div></div>
-                  <div class="brief "> </div>
-                </td>
-                <td class="platform-tagged">
-                  <div class="platform-tag jvm">JVM</div>
-                </td>
-              </tr>
-            </tbody>
-          </table>
-        </div>
-      </div>
-    </div>
-  </body>
-</html>
-
diff --git a/plugins/base/src/test/resources/expect/suspendInlineFunction/out/html/root/[jvm root]/f.html b/plugins/base/src/test/resources/expect/suspendInlineFunction/out/html/root/[jvm root]/f.html
new file mode 100644
index 00000000..5b26e5a8
--- /dev/null
+++ b/plugins/base/src/test/resources/expect/suspendInlineFunction/out/html/root/[jvm root]/f.html	
@@ -0,0 +1,31 @@
+<html>
+  <head>
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <title>f</title>
+    <link href="../../styles/style.css" rel="Stylesheet">
+    <script type="text/javascript" src="../../scripts/navigationLoader.js" async="async"></script>
+    <script type="text/javascript" src="../../scripts/platformContentHandler.js" async="async"></script>
+    <script>var pathToRoot = "../../";</script>
+  </head>
+  <body>
+    <div id="container">
+      <div id="leftColumn">
+        <div id="logo"></div>
+        <div id="sideMenu"></div>
+      </div>
+      <div id="main">
+        <div id="searchBar"></div>
+        <script type="text/javascript" src="../../scripts/pages.js"></script>
+        <script type="text/javascript" src="../../scripts/main.js"></script>
+        <div id="content" pageIds="//f/#kotlin.Function0[kotlin.String]//">
+          <div class="breadcrumbs">//<a href="../index.html">root</a>/<a href="index.html">[jvm root]</a>/<a href="f.html">f</a></div>
+          <div class="cover ">
+            <h1>f</h1>
+            <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm"><div class="symbol monospace">final fun <a href="f.html">f</a>(a: <div class="symbol monospace">() -&gt; <a href="">String</a></div>)</div></div></div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </body>
+</html>
+
diff --git a/plugins/base/src/test/resources/expect/suspendInlineFunction/out/html/root/[jvm root]/index.html b/plugins/base/src/test/resources/expect/suspendInlineFunction/out/html/root/[jvm root]/index.html
new file mode 100644
index 00000000..27fbc21c
--- /dev/null
+++ b/plugins/base/src/test/resources/expect/suspendInlineFunction/out/html/root/[jvm root]/index.html	
@@ -0,0 +1,46 @@
+<html>
+  <head>
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <title>[jvm root]</title>
+    <link href="../../styles/style.css" rel="Stylesheet">
+    <script type="text/javascript" src="../../scripts/navigationLoader.js" async="async"></script>
+    <script type="text/javascript" src="../../scripts/platformContentHandler.js" async="async"></script>
+    <script>var pathToRoot = "../../";</script>
+  </head>
+  <body>
+    <div id="container">
+      <div id="leftColumn">
+        <div id="logo"></div>
+        <div id="sideMenu"></div>
+      </div>
+      <div id="main">
+        <div id="searchBar"></div>
+        <script type="text/javascript" src="../../scripts/pages.js"></script>
+        <script type="text/javascript" src="../../scripts/main.js"></script>
+        <div id="content" pageIds="[jvm root]/////">
+          <div class="breadcrumbs">//<a href="../index.html">root</a>/<a href="index.html">[jvm root]</a></div>
+          <div class="cover ">
+            <h1>Package [jvm root]</h1>
+          </div>
+          <h2>Functions</h2>
+          <table>
+            <thead></thead>
+            <tbody>
+              <tr class="platform-tagged">
+                <td class="content"><a href="f.html">f</a></td>
+                <td class="content">
+                  <div class="platform-hinted" data-platform-hinted="data-platform-hinted"><div class="content" data-active="" data-togglable="jvm"><div class="symbol monospace">final fun <a href="f.html">f</a>(a: <div class="symbol monospace">() -&gt; <a href="">String</a></div>)</div></div></div>
+                  <div class="brief "> </div>
+                </td>
+                <td class="platform-tagged">
+                  <div class="platform-tag jvm">JVM</div>
+                </td>
+              </tr>
+            </tbody>
+          </table>
+        </div>
+      </div>
+    </div>
+  </body>
+</html>
+
diff --git a/plugins/base/src/test/resources/expect/suspendInlineFunction/out/html/root/index.html b/plugins/base/src/test/resources/expect/suspendInlineFunction/out/html/root/index.html
index a3211166..440758c2 100644
--- a/plugins/base/src/test/resources/expect/suspendInlineFunction/out/html/root/index.html
+++ b/plugins/base/src/test/resources/expect/suspendInlineFunction/out/html/root/index.html
@@ -27,7 +27,7 @@
             <thead></thead>
             <tbody>
               <tr class="platform-tagged">
-                <td class="content"><a href="&lt;jvm root&gt;/index.html">&lt;jvm root&gt;</a></td>
+                <td class="content"><a href="[jvm root]/index.html">[jvm root]</a></td>
                 <td class="platform-tagged">
                   <div class="platform-tag jvm">JVM</div>
                 </td>
diff --git a/plugins/base/src/test/resources/expect/suspendInlineFunction/out/html/root/package-list b/plugins/base/src/test/resources/expect/suspendInlineFunction/out/html/root/package-list
index 60993388..ce137c16 100644
--- a/plugins/base/src/test/resources/expect/suspendInlineFunction/out/html/root/package-list
+++ b/plugins/base/src/test/resources/expect/suspendInlineFunction/out/html/root/package-list
@@ -1,5 +1,5 @@
 $dokka.format:html
 $dokka.linkExtension:html
-$dokka.location://f/#kotlin.Function0[kotlin.String]//root/<jvm root>/f.html
-<jvm root>
+$dokka.location://f/#kotlin.Function0[kotlin.String]//root/[jvm root]/f.html
+[jvm root]
 
diff --git a/plugins/base/src/test/resources/expect/suspendInlineFunction/out/html/scripts/pages.js b/plugins/base/src/test/resources/expect/suspendInlineFunction/out/html/scripts/pages.js
index 68e0c564..310827d1 100644
--- a/plugins/base/src/test/resources/expect/suspendInlineFunction/out/html/scripts/pages.js
+++ b/plugins/base/src/test/resources/expect/suspendInlineFunction/out/html/scripts/pages.js
@@ -1,5 +1,5 @@
 var pages = [
 { "name": "root",  "location": "root/index.html" },
-{ "name": "<jvm root>",  "location": "root/<jvm root>/index.html" },
-{ "name": "f",  "location": "root/<jvm root>/f.html" }
+{ "name": "[jvm root]",  "location": "root/[jvm root]/index.html" },
+{ "name": "f",  "location": "root/[jvm root]/f.html" }
 ]
-- 
cgit