diff --git a/plugins/base/src/main/kotlin/translators/documentables/DefaultPageCreator.kt b/plugins/base/src/main/kotlin/translators/documentables/DefaultPageCreator.kt
index 35ebd93eff..a9c6dcca2d 100644
--- a/plugins/base/src/main/kotlin/translators/documentables/DefaultPageCreator.kt
+++ b/plugins/base/src/main/kotlin/translators/documentables/DefaultPageCreator.kt
@@ -597,18 +597,19 @@ open class DefaultPageCreator(
                             val isExtension = elementNameAndIsExtension.isExtension
                             val rowExtra =
                                 if (isExtension) extra + TabbedContentTypeExtra(if(isFunctions) BasicTabbedContentType.EXTENSION_FUNCTION else BasicTabbedContentType.EXTENSION_PROPERTY) else extra
+                            val rowKind = if (isExtension) ContentKind.Extensions else kind
                             val sortedElements = sortDivergentElementsDeterministically(elements)
                             row(
                                 dri = sortedElements.map { it.dri }.toSet(),
                                 sourceSets = sortedElements.flatMap { it.sourceSets }.toSet(),
-                                kind = kind,
+                                kind = rowKind,
                                 styles = emptySet(),
                                 extra = elementName?.let { name -> rowExtra + SymbolAnchorHint(name, kind) } ?: rowExtra
                             ) {
                                 link(
                                     text = elementName.orEmpty(),
                                     address = sortedElements.first().dri,
-                                    kind = kind,
+                                    kind = rowKind,
                                     styles = setOf(ContentStyle.RowTitle),
                                     sourceSets = sortedElements.sourceSets.toSet(),
                                     extra = extra
@@ -616,7 +617,7 @@ open class DefaultPageCreator(
                                 divergentGroup(
                                     ContentDivergentGroup.GroupID(name),
                                     sortedElements.map { it.dri }.toSet(),
-                                    kind = kind,
+                                    kind = rowKind,
                                     extra = extra
                                 ) {
                                     sortedElements.map { element ->
@@ -624,7 +625,7 @@ open class DefaultPageCreator(
                                             setOf(element.dri),
                                             element.sourceSets.toSet(),
                                             extra = PropertyContainer.withAll(
-                                                SymbolAnchorHint(element.name ?: "", kind)
+                                                SymbolAnchorHint(element.name ?: "", rowKind)
                                             )
                                         ) {
                                             divergent(extra = PropertyContainer.empty()) {
diff --git a/plugins/base/src/test/kotlin/enums/KotlinEnumsTest.kt b/plugins/base/src/test/kotlin/enums/KotlinEnumsTest.kt
index 55691419d3..3b2720c9a3 100644
--- a/plugins/base/src/test/kotlin/enums/KotlinEnumsTest.kt
+++ b/plugins/base/src/test/kotlin/enums/KotlinEnumsTest.kt
@@ -168,7 +168,7 @@ class KotlinEnumsTest : BaseAbstractTest() {
         ) {
             renderingStage = { _, _ ->
                 val enumEntriesOnPage = writerPlugin.writer.renderedContent("root/testpackage/-test-enum/index.html")
-                    .select("div.table[data-togglable=ENTRY]")
+                    .select("div[data-togglable=ENTRY] .table")
                     .select("div.table-row")
                     .select("div.keyValue")
                     .select("div.title")
diff --git a/plugins/base/src/test/kotlin/pageMerger/PageNodeMergerTest.kt b/plugins/base/src/test/kotlin/pageMerger/PageNodeMergerTest.kt
index 00fc57ad88..6e85fe01a1 100644
--- a/plugins/base/src/test/kotlin/pageMerger/PageNodeMergerTest.kt
+++ b/plugins/base/src/test/kotlin/pageMerger/PageNodeMergerTest.kt
@@ -190,7 +190,7 @@ class PageNodeMergerTest : BaseAbstractTest() {
             defaultConfiguration
         ) {
             renderingStage = { rootPageNode, _ ->
-                val extensions = rootPageNode.findDivergencesOfClass("ExtensionReceiver", ContentKind.Properties)
+                val extensions = rootPageNode.findDivergencesOfClass("ExtensionReceiver", ContentKind.Extensions)
 
                 extensions.assertContainsKDocsInOrder(
                     "Top level val extension",
@@ -238,7 +238,7 @@ class PageNodeMergerTest : BaseAbstractTest() {
             defaultConfiguration
         ) {
             renderingStage = { rootPageNode, _ ->
-                val extensions = rootPageNode.findDivergencesOfClass("ExtensionReceiver", ContentKind.Functions)
+                val extensions = rootPageNode.findDivergencesOfClass("ExtensionReceiver", ContentKind.Extensions)
                 extensions.assertContainsKDocsInOrder(
                     "Top level fun extension",
                     "Companion fun extension",
@@ -300,7 +300,7 @@ class PageNodeMergerTest : BaseAbstractTest() {
             defaultConfiguration
         ) {
             renderingStage = { rootPageNode, _ ->
-                val extensions = rootPageNode.findDivergencesOfClass("ExtensionReceiver", ContentKind.Functions)
+                val extensions = rootPageNode.findDivergencesOfClass("ExtensionReceiver", ContentKind.Extensions)
                 extensions.assertContainsKDocsInOrder(
                     "Top level fun extension with one int param",
                     "Top level fun extension with one string param",
diff --git a/plugins/base/src/test/kotlin/signatures/ObviousTypeSkippingTest.kt b/plugins/base/src/test/kotlin/signatures/ObviousTypeSkippingTest.kt
index 839fb7fe91..5a6d95eb22 100644
--- a/plugins/base/src/test/kotlin/signatures/ObviousTypeSkippingTest.kt
+++ b/plugins/base/src/test/kotlin/signatures/ObviousTypeSkippingTest.kt
@@ -62,12 +62,12 @@ class ObviousTypeSkippingTest : BaseAbstractTest(
             forProperty("val underTest = if (true) println(5) else null", "val underTest: Unit?"),
             forProperty("val underTest: Any = if (true) println(5) else 5", "val underTest: Any"),
             forProperty("val underTest = if (true) println(5) else 5", "val underTest: Any"),
-            forFunction("fun <T: Iterable<Any>> T.underTest() {}", "fun <T : Iterable<Any>> T.underTest()"),
-            forFunction("fun <T: Iterable<Any?>> T.underTest() {}", "fun <T : Iterable<Any?>> T.underTest()"),
-            forFunction("fun <T: Iterable<Any?>?> T.underTest() {}", "fun <T : Iterable<Any?>?> T.underTest()"),
-            forFunction("fun <T: Any> T.underTest() {}", "fun <T : Any> T.underTest()"),
-            forFunction("fun <T: Any?> T.underTest() {}", "fun <T> T.underTest()"),
-            forFunction("fun <T> T.underTest() {}", "fun <T> T.underTest()"),
+            forExtension("fun <T: Iterable<Any>> T.underTest() {}", "fun <T : Iterable<Any>> T.underTest()"),
+            forExtension("fun <T: Iterable<Any?>> T.underTest() {}", "fun <T : Iterable<Any?>> T.underTest()"),
+            forExtension("fun <T: Iterable<Any?>?> T.underTest() {}", "fun <T : Iterable<Any?>?> T.underTest()"),
+            forExtension("fun <T: Any> T.underTest() {}", "fun <T : Any> T.underTest()"),
+            forExtension("fun <T: Any?> T.underTest() {}", "fun <T> T.underTest()"),
+            forExtension("fun <T> T.underTest() {}", "fun <T> T.underTest()"),
             forClass("class Testable<T: Any>", "class Testable<T : Any>"),
             forClass("class Testable<T: Any?>", "class Testable<T>"),
             forClass("class Testable<T: Any?>(t: T)", "class Testable<T>(t: T)"),
@@ -167,6 +167,13 @@ private fun forFunction(codeFragment: String, expectedSignature: String, functio
         OnOwnPage(functionName)
     )
 
+private fun forExtension(codeFragment: String, expectedSignature: String, functionName: String = "underTest") =
+    TestData(
+        codeFragment,
+        expectedSignature,
+        OnParentPage(PackagePageNode::class, ContentKind.Extensions),
+        OnOwnPage(functionName)
+    )
 private fun forMethod(
     codeFragment: String,
     expectedSignature: String,