diff --git a/dokka-runners/cli/build.gradle.kts b/dokka-runners/cli/build.gradle.kts
index 8a42754246..91fd85a6b6 100644
--- a/dokka-runners/cli/build.gradle.kts
+++ b/dokka-runners/cli/build.gradle.kts
@@ -15,8 +15,7 @@ plugins {
 }
 
 dependencies {
-    // TODO [structure-refactoring] the name of the artifact should be `dokka-core`. Add substitution
-    implementation("org.jetbrains.dokka:core")
+    implementation("org.jetbrains.dokka:dokka-core")
     implementation(libs.kotlinx.cli)
 
     testImplementation(kotlin("test"))
diff --git a/dokka-runners/gradle-plugin-classic/build.gradle.kts b/dokka-runners/gradle-plugin-classic/build.gradle.kts
index a9a766dfc2..d29258d6ec 100644
--- a/dokka-runners/gradle-plugin-classic/build.gradle.kts
+++ b/dokka-runners/gradle-plugin-classic/build.gradle.kts
@@ -9,8 +9,7 @@ plugins {
 }
 
 dependencies {
-    // TODO [structure-refactoring] the name of the artifact should be `dokka-core`. Add substitution
-    api("org.jetbrains.dokka:core")
+    api("org.jetbrains.dokka:dokka-core")
 
     compileOnly(libs.gradlePlugin.kotlin)
     compileOnly(libs.gradlePlugin.kotlin.klibCommonizerApi)
diff --git a/dokka-runners/maven-plugin/build.gradle.kts b/dokka-runners/maven-plugin/build.gradle.kts
index 0c53b51dc8..f2cc3cb4e5 100644
--- a/dokka-runners/maven-plugin/build.gradle.kts
+++ b/dokka-runners/maven-plugin/build.gradle.kts
@@ -11,8 +11,7 @@ plugins {
 }
 
 dependencies {
-    // TODO [structure-refactoring] the name of the artifact should be `dokka-core`. Add substitution
-    implementation("org.jetbrains.dokka:core")
+    implementation("org.jetbrains.dokka:dokka-core")
 
     implementation(libs.apacheMaven.core)
     implementation(libs.apacheMaven.pluginApi)
diff --git a/dokka-subprojects/analysis-java-psi/build.gradle.kts b/dokka-subprojects/analysis-java-psi/build.gradle.kts
index 99d6f68d07..dc3de9308c 100644
--- a/dokka-subprojects/analysis-java-psi/build.gradle.kts
+++ b/dokka-subprojects/analysis-java-psi/build.gradle.kts
@@ -7,7 +7,7 @@ plugins {
 }
 
 dependencies {
-    compileOnly(projects.core)
+    compileOnly(projects.dokkaCore)
 
     api(libs.intellij.java.psi.api)
 
diff --git a/dokka-subprojects/analysis-kotlin-api/build.gradle.kts b/dokka-subprojects/analysis-kotlin-api/build.gradle.kts
index 58247479e5..561e76ab43 100644
--- a/dokka-subprojects/analysis-kotlin-api/build.gradle.kts
+++ b/dokka-subprojects/analysis-kotlin-api/build.gradle.kts
@@ -10,7 +10,7 @@ plugins {
 }
 
 dependencies {
-    compileOnly(projects.core)
+    compileOnly(projects.dokkaCore)
 }
 
 registerDokkaArtifactPublication("analysisKotlinApi") {
diff --git a/dokka-subprojects/analysis-kotlin-descriptors-compiler/build.gradle.kts b/dokka-subprojects/analysis-kotlin-descriptors-compiler/build.gradle.kts
index 2fa1868688..0ca5a0ebde 100644
--- a/dokka-subprojects/analysis-kotlin-descriptors-compiler/build.gradle.kts
+++ b/dokka-subprojects/analysis-kotlin-descriptors-compiler/build.gradle.kts
@@ -7,7 +7,7 @@ plugins {
 }
 
 dependencies {
-    compileOnly(projects.core)
+    compileOnly(projects.dokkaCore)
     compileOnly(projects.analysisKotlinApi)
 
     api(libs.kotlin.compiler)
diff --git a/dokka-subprojects/analysis-kotlin-descriptors-ide/build.gradle.kts b/dokka-subprojects/analysis-kotlin-descriptors-ide/build.gradle.kts
index 062bc4cf26..4a4186d41e 100644
--- a/dokka-subprojects/analysis-kotlin-descriptors-ide/build.gradle.kts
+++ b/dokka-subprojects/analysis-kotlin-descriptors-ide/build.gradle.kts
@@ -7,7 +7,7 @@ plugins {
 }
 
 dependencies {
-    compileOnly(projects.core)
+    compileOnly(projects.dokkaCore)
     compileOnly(projects.analysisKotlinApi)
 
     implementation(projects.analysisKotlinDescriptorsCompiler)
diff --git a/dokka-subprojects/analysis-kotlin-symbols/build.gradle.kts b/dokka-subprojects/analysis-kotlin-symbols/build.gradle.kts
index 5dc1d72e9d..2cf075a174 100644
--- a/dokka-subprojects/analysis-kotlin-symbols/build.gradle.kts
+++ b/dokka-subprojects/analysis-kotlin-symbols/build.gradle.kts
@@ -12,7 +12,7 @@ plugins {
 }
 
 dependencies {
-    compileOnly(projects.core)
+    compileOnly(projects.dokkaCore)
     compileOnly(projects.analysisKotlinApi)
 
     implementation(projects.analysisMarkdownJb)
diff --git a/dokka-subprojects/analysis-markdown-jb/build.gradle.kts b/dokka-subprojects/analysis-markdown-jb/build.gradle.kts
index 96b72a8592..1cc5262ab5 100644
--- a/dokka-subprojects/analysis-markdown-jb/build.gradle.kts
+++ b/dokka-subprojects/analysis-markdown-jb/build.gradle.kts
@@ -10,7 +10,7 @@ plugins {
 }
 
 dependencies {
-    compileOnly(projects.core)
+    compileOnly(projects.dokkaCore)
 
     implementation(libs.jsoup)
     implementation(libs.jetbrains.markdown)
diff --git a/dokka-subprojects/core-test-api/build.gradle.kts b/dokka-subprojects/core-test-api/build.gradle.kts
index 7a067d1e6b..e1792c52d9 100644
--- a/dokka-subprojects/core-test-api/build.gradle.kts
+++ b/dokka-subprojects/core-test-api/build.gradle.kts
@@ -10,7 +10,7 @@ plugins {
 }
 
 dependencies {
-    api(projects.core)
+    api(projects.dokkaCore)
 
     implementation(kotlin("reflect"))
 }
diff --git a/dokka-subprojects/plugin-all-modules-page/build.gradle.kts b/dokka-subprojects/plugin-all-modules-page/build.gradle.kts
index 79e102fc88..d26ffc191a 100644
--- a/dokka-subprojects/plugin-all-modules-page/build.gradle.kts
+++ b/dokka-subprojects/plugin-all-modules-page/build.gradle.kts
@@ -14,7 +14,7 @@ registerDokkaArtifactPublication("dokkaAllModulesPage") {
 }
 
 dependencies {
-    compileOnly(projects.core)
+    compileOnly(projects.dokkaCore)
     compileOnly(projects.analysisKotlinApi)
 
     implementation(projects.pluginBase)
diff --git a/dokka-subprojects/plugin-android-documentation/build.gradle.kts b/dokka-subprojects/plugin-android-documentation/build.gradle.kts
index d032defbe4..f03f254818 100644
--- a/dokka-subprojects/plugin-android-documentation/build.gradle.kts
+++ b/dokka-subprojects/plugin-android-documentation/build.gradle.kts
@@ -11,7 +11,7 @@ plugins {
 }
 
 dependencies {
-    compileOnly(projects.core)
+    compileOnly(projects.dokkaCore)
 
     implementation(projects.pluginBase)
 
diff --git a/dokka-subprojects/plugin-base-test-utils/build.gradle.kts b/dokka-subprojects/plugin-base-test-utils/build.gradle.kts
index 5f8285dc04..e0df7c0c09 100644
--- a/dokka-subprojects/plugin-base-test-utils/build.gradle.kts
+++ b/dokka-subprojects/plugin-base-test-utils/build.gradle.kts
@@ -10,7 +10,7 @@ plugins {
 }
 
 dependencies {
-    compileOnly(projects.core)
+    compileOnly(projects.dokkaCore)
     compileOnly(projects.pluginBase)
 
     api(projects.analysisKotlinApi)
diff --git a/dokka-subprojects/plugin-base/build.gradle.kts b/dokka-subprojects/plugin-base/build.gradle.kts
index ddae98ca39..e4831a6d22 100644
--- a/dokka-subprojects/plugin-base/build.gradle.kts
+++ b/dokka-subprojects/plugin-base/build.gradle.kts
@@ -12,7 +12,7 @@ plugins {
 }
 
 dependencies {
-    compileOnly(projects.core)
+    compileOnly(projects.dokkaCore)
     compileOnly(projects.analysisKotlinApi)
 
     implementation(projects.analysisMarkdownJb)
diff --git a/dokka-subprojects/plugin-gfm-template-processing/build.gradle.kts b/dokka-subprojects/plugin-gfm-template-processing/build.gradle.kts
index db7675c8af..665a03eedd 100644
--- a/dokka-subprojects/plugin-gfm-template-processing/build.gradle.kts
+++ b/dokka-subprojects/plugin-gfm-template-processing/build.gradle.kts
@@ -10,7 +10,7 @@ plugins {
 }
 
 dependencies {
-    compileOnly(projects.core)
+    compileOnly(projects.dokkaCore)
 
     implementation(projects.pluginBase)
     implementation(projects.pluginGfm)
diff --git a/dokka-subprojects/plugin-gfm/build.gradle.kts b/dokka-subprojects/plugin-gfm/build.gradle.kts
index c8763f0975..2e7e1f93f6 100644
--- a/dokka-subprojects/plugin-gfm/build.gradle.kts
+++ b/dokka-subprojects/plugin-gfm/build.gradle.kts
@@ -10,7 +10,7 @@ plugins {
 }
 
 dependencies {
-    compileOnly(projects.core)
+    compileOnly(projects.dokkaCore)
 
     implementation(projects.pluginBase)
 
diff --git a/dokka-subprojects/plugin-javadoc/build.gradle.kts b/dokka-subprojects/plugin-javadoc/build.gradle.kts
index 541de7d1d1..e63c4f362d 100644
--- a/dokka-subprojects/plugin-javadoc/build.gradle.kts
+++ b/dokka-subprojects/plugin-javadoc/build.gradle.kts
@@ -10,7 +10,7 @@ plugins {
 }
 
 dependencies {
-    compileOnly(projects.core)
+    compileOnly(projects.dokkaCore)
     compileOnly(projects.analysisKotlinApi)
 
     implementation(projects.pluginBase)
diff --git a/dokka-subprojects/plugin-jekyll-template-processing/build.gradle.kts b/dokka-subprojects/plugin-jekyll-template-processing/build.gradle.kts
index 7dc67741e3..95d6db9a10 100644
--- a/dokka-subprojects/plugin-jekyll-template-processing/build.gradle.kts
+++ b/dokka-subprojects/plugin-jekyll-template-processing/build.gradle.kts
@@ -10,7 +10,7 @@ plugins {
 }
 
 dependencies {
-    compileOnly(projects.core)
+    compileOnly(projects.dokkaCore)
 
     implementation(projects.pluginBase)
     implementation(projects.pluginJekyll)
diff --git a/dokka-subprojects/plugin-jekyll/build.gradle.kts b/dokka-subprojects/plugin-jekyll/build.gradle.kts
index c753d07259..72abe4ddf7 100644
--- a/dokka-subprojects/plugin-jekyll/build.gradle.kts
+++ b/dokka-subprojects/plugin-jekyll/build.gradle.kts
@@ -10,7 +10,7 @@ plugins {
 }
 
 dependencies {
-    compileOnly(projects.core)
+    compileOnly(projects.dokkaCore)
 
     implementation(projects.pluginBase)
     implementation(projects.pluginGfm)
diff --git a/dokka-subprojects/plugin-kotlin-as-java/build.gradle.kts b/dokka-subprojects/plugin-kotlin-as-java/build.gradle.kts
index 02af9c57c2..32dc534fb1 100644
--- a/dokka-subprojects/plugin-kotlin-as-java/build.gradle.kts
+++ b/dokka-subprojects/plugin-kotlin-as-java/build.gradle.kts
@@ -10,7 +10,7 @@ plugins {
 }
 
 dependencies {
-    compileOnly(projects.core)
+    compileOnly(projects.dokkaCore)
     compileOnly(projects.analysisKotlinApi)
 
     implementation(projects.pluginBase)
diff --git a/dokka-subprojects/plugin-mathjax/build.gradle.kts b/dokka-subprojects/plugin-mathjax/build.gradle.kts
index 505e8bdc35..6f112d8168 100644
--- a/dokka-subprojects/plugin-mathjax/build.gradle.kts
+++ b/dokka-subprojects/plugin-mathjax/build.gradle.kts
@@ -11,7 +11,7 @@ plugins {
 }
 
 dependencies {
-    compileOnly(projects.core)
+    compileOnly(projects.dokkaCore)
 
     implementation(projects.pluginBase)
 
diff --git a/dokka-subprojects/plugin-templating/build.gradle.kts b/dokka-subprojects/plugin-templating/build.gradle.kts
index e5c49bb51d..1be594edf5 100644
--- a/dokka-subprojects/plugin-templating/build.gradle.kts
+++ b/dokka-subprojects/plugin-templating/build.gradle.kts
@@ -14,7 +14,7 @@ registerDokkaArtifactPublication("templating-plugin") {
 }
 
 dependencies {
-    compileOnly(projects.core)
+    compileOnly(projects.dokkaCore)
 
     api(libs.jsoup)
 
diff --git a/dokka-subprojects/plugin-versioning/build.gradle.kts b/dokka-subprojects/plugin-versioning/build.gradle.kts
index 837a54fbca..1816f58eba 100644
--- a/dokka-subprojects/plugin-versioning/build.gradle.kts
+++ b/dokka-subprojects/plugin-versioning/build.gradle.kts
@@ -14,7 +14,7 @@ registerDokkaArtifactPublication("versioning-plugin") {
 }
 
 dependencies {
-    compileOnly(projects.core)
+    compileOnly(projects.dokkaCore)
 
     implementation(projects.pluginBase)
     implementation(projects.pluginTemplating)
diff --git a/dokka-subprojects/settings.gradle.kts b/dokka-subprojects/settings.gradle.kts
index 1f85622f7c..626ef8ac61 100644
--- a/dokka-subprojects/settings.gradle.kts
+++ b/dokka-subprojects/settings.gradle.kts
@@ -88,3 +88,12 @@ include(
     ":plugin-templating",
     ":plugin-versioning",
 )
+
+// TODO [structure-refactoring]
+//  this is required for included build support
+//  the name of the artifact published now is `dokka-core`, but module named `core`
+//  dependency substitution in this case doesn't work for some reason
+//  may be we fall here in one of the unsupported cases:
+//  https://docs.gradle.org/current/userguide/composite_builds.html#included_build_substitution_limitations
+//  may be we need to find some other solution for this
+project(":core").name = "dokka-core"