Index: subprojects/docs/src/docs/userguide/cpp_application_plugin.adoc
===================================================================
diff -u -N -r7d0afae21f144a8292d9af416627b691b231928d -r7e6a8d9302e92ba1f06f71e95d0698c8963f440f
--- subprojects/docs/src/docs/userguide/cpp_application_plugin.adoc	(.../cpp_application_plugin.adoc)	(revision 7d0afae21f144a8292d9af416627b691b231928d)
+++ subprojects/docs/src/docs/userguide/cpp_application_plugin.adoc	(.../cpp_application_plugin.adoc)	(revision 7e6a8d9302e92ba1f06f71e95d0698c8963f440f)
@@ -213,7 +213,7 @@
 [[sec:cpp_application_link_task]]
 === `link__Variant__` Task
 
-The {cpp} Application Plugin adds a link:{groovyDslPath}/org.gradle.language.cpp.tasks.LinkExecutable.html[LinkExecutable] instance for each variant of the application - e.g. `linkDebug` and `linkRelease`.
+The {cpp} Application Plugin adds a link:{groovyDslPath}/org.gradle.language.tasks.LinkExecutable.html[LinkExecutable] instance for each variant of the application - e.g. `linkDebug` and `linkRelease`.
 Read the <<building_cpp_projects.adoc#sec:introducing_build_variants,introduction to build variants>> for more information.
 Some of the most common configuration options are shown below.
 
Index: subprojects/docs/src/docs/userguide/cpp_library_plugin.adoc
===================================================================
diff -u -N -r7d0afae21f144a8292d9af416627b691b231928d -r7e6a8d9302e92ba1f06f71e95d0698c8963f440f
--- subprojects/docs/src/docs/userguide/cpp_library_plugin.adoc	(.../cpp_library_plugin.adoc)	(revision 7d0afae21f144a8292d9af416627b691b231928d)
+++ subprojects/docs/src/docs/userguide/cpp_library_plugin.adoc	(.../cpp_library_plugin.adoc)	(revision 7e6a8d9302e92ba1f06f71e95d0698c8963f440f)
@@ -266,7 +266,7 @@
 [[sec:cpp_library_link_task]]
 === `link__Variant__` Task
 
-The {cpp} Library Plugin adds a link:{groovyDslPath}/org.gradle.language.cpp.tasks.LinkSharedLibrary.html[LinkSharedLibrary] instance for each variant of the library containing shared linkage as a dimension - e.g. `linkDebug` and `linkRelease`.
+The {cpp} Library Plugin adds a link:{groovyDslPath}/org.gradle.language.tasks.LinkSharedLibrary.html[LinkSharedLibrary] instance for each variant of the library containing shared linkage as a dimension - e.g. `linkDebug` and `linkRelease`.
 Read the <<building_cpp_projects.adoc#sec:introducing_build_variants,introduction to build variants>> for more information.
 Some of the most common configuration options are shown below.
 
@@ -288,7 +288,7 @@
 [[sec:cpp_library_create_task]]
 === `create__Variant__` Task
 
-The {cpp} Library Plugin adds a link:{groovyDslPath}/org.gradle.language.cpp.tasks.CreateStaticLibrary.html[CreateStaticLibrary] instance for each variant of the library containing static linkage as a dimension - e.g. `createDebug` and `createRelease`.
+The {cpp} Library Plugin adds a link:{groovyDslPath}/org.gradle.language.tasks.CreateStaticLibrary.html[CreateStaticLibrary] instance for each variant of the library containing static linkage as a dimension - e.g. `createDebug` and `createRelease`.
 Read the <<building_cpp_projects.adoc#sec:introducing_build_variants,introduction to build variants>> for more information.
 Some of the most common configuration options are shown below.
 
Index: subprojects/docs/src/docs/userguide/img/cpp-application-configurations.dot
===================================================================
diff -u -N -r1d69a75ff92cb3b7220fa79fb580c076ed18d572 -r7e6a8d9302e92ba1f06f71e95d0698c8963f440f
--- subprojects/docs/src/docs/userguide/img/cpp-application-configurations.dot	(.../cpp-application-configurations.dot)	(revision 1d69a75ff92cb3b7220fa79fb580c076ed18d572)
+++ subprojects/docs/src/docs/userguide/img/cpp-application-configurations.dot	(.../cpp-application-configurations.dot)	(revision 7e6a8d9302e92ba1f06f71e95d0698c8963f440f)
@@ -29,9 +29,9 @@
 
   subgraph left {
     node[style=filled, fillcolor="#cfe2f3"]
-    cppCompilerVariant -> nativeLinkVariant -> nativeRuntimeVariant [style=invis, weight=1000]
+    cppCompileVariant -> nativeLinkVariant -> nativeRuntimeVariant [style=invis, weight=1000]
 
-    cppCompilerVariant[label=<cppCompiler<i>Variant</i> (R)>]
+    cppCompileVariant[label=<cppCompile<i>Variant</i> (R)>]
     nativeLinkVariant[label=<nativeLink<i>Variant</i> (R)>]
     nativeRuntimeVariant[label=<nativeRuntime<i>Variant</i> (R)>]
   }
@@ -44,10 +44,10 @@
   }
 
   // Ensure the order is preserved
-  {rank=same cppCompilerVariant implementation}
+  {rank=same cppCompileVariant implementation}
   {rank=same mainVariantImplementation nativeLinkVariant variantRuntimeElements}
   nativeLinkVariant -> mainVariantImplementation -> variantRuntimeElements [style=invis]
 
-  {cppCompilerVariant, nativeLinkVariant, nativeRuntimeVariant} -> mainVariantImplementation [headport=w, tailport=e]
+  {cppCompileVariant, nativeLinkVariant, nativeRuntimeVariant} -> mainVariantImplementation [headport=w, tailport=e]
   variantRuntimeElements -> mainVariantImplementation [headport=e, tailport=w]
 }
\ No newline at end of file
Index: subprojects/docs/src/docs/userguide/img/cpp-application-configurations.png
===================================================================
diff -u -N -r1d69a75ff92cb3b7220fa79fb580c076ed18d572 -r7e6a8d9302e92ba1f06f71e95d0698c8963f440f
Binary files differ
Index: subprojects/docs/src/docs/userguide/img/cpp-library-configurations.dot
===================================================================
diff -u -N -r5737dd33393ff5a4a07d6141ce8532dc307bc7db -r7e6a8d9302e92ba1f06f71e95d0698c8963f440f
--- subprojects/docs/src/docs/userguide/img/cpp-library-configurations.dot	(.../cpp-library-configurations.dot)	(revision 5737dd33393ff5a4a07d6141ce8532dc307bc7db)
+++ subprojects/docs/src/docs/userguide/img/cpp-library-configurations.dot	(.../cpp-library-configurations.dot)	(revision 7e6a8d9302e92ba1f06f71e95d0698c8963f440f)
@@ -29,9 +29,9 @@
 
   subgraph left {
     node[style=filled, fillcolor="#cfe2f3"]
-    cppCompilerVariant -> nativeLinkVariant -> nativeRuntimeVariant [style=invis, weight=1000]
+    cppCompileVariant -> nativeLinkVariant -> nativeRuntimeVariant [style=invis, weight=1000]
 
-    cppCompilerVariant[label=<cppCompiler<i>Variant</i> (R)>]
+    cppCompileVariant[label=<cppCompile<i>Variant</i> (R)>]
     nativeLinkVariant[label=<nativeLink<i>Variant</i> (R)>]
     nativeRuntimeVariant[label=<nativeRuntime<i>Variant</i> (R)>]
   }
@@ -46,10 +46,10 @@
   }
 
   // Ensure the order is preserved
-  {rank=same cppCompilerVariant implementation cppApiElements}
+  {rank=same cppCompileVariant implementation cppApiElements}
   {rank=same variantLinkElements mainVariantImplementation nativeLinkVariant}
   nativeLinkVariant -> mainVariantImplementation -> variantLinkElements [style=invis]
 
-  {cppCompilerVariant, nativeLinkVariant, nativeRuntimeVariant} -> mainVariantImplementation [headport=w, tailport=e]
+  {cppCompileVariant, nativeLinkVariant, nativeRuntimeVariant} -> mainVariantImplementation [headport=w, tailport=e]
   {cppApiElements, variantLinkElements, variantRuntimeElements} -> mainVariantImplementation [headport=e, tailport=w]
 }
\ No newline at end of file
Index: subprojects/docs/src/docs/userguide/img/cpp-library-configurations.png
===================================================================
diff -u -N -r5737dd33393ff5a4a07d6141ce8532dc307bc7db -r7e6a8d9302e92ba1f06f71e95d0698c8963f440f
Binary files differ
Index: subprojects/docs/src/samples/userguide/cpp/cppLibrary/groovy/settings.gradle
===================================================================
diff -u -N -r5737dd33393ff5a4a07d6141ce8532dc307bc7db -r7e6a8d9302e92ba1f06f71e95d0698c8963f440f
--- subprojects/docs/src/samples/userguide/cpp/cppLibrary/groovy/settings.gradle	(.../settings.gradle)	(revision 5737dd33393ff5a4a07d6141ce8532dc307bc7db)
+++ subprojects/docs/src/samples/userguide/cpp/cppLibrary/groovy/settings.gradle	(.../settings.gradle)	(revision 7e6a8d9302e92ba1f06f71e95d0698c8963f440f)
@@ -14,6 +14,4 @@
  * limitations under the License.
  */
 
-rootProject.name = "basic-cpp"
-
-include 'common'
\ No newline at end of file
+rootProject.name = "basic-cpp"
\ No newline at end of file
Index: subprojects/docs/src/samples/userguide/cpp/cppLibrary/kotlin/settings.gradle.kts
===================================================================
diff -u -N -r5737dd33393ff5a4a07d6141ce8532dc307bc7db -r7e6a8d9302e92ba1f06f71e95d0698c8963f440f
--- subprojects/docs/src/samples/userguide/cpp/cppLibrary/kotlin/settings.gradle.kts	(.../settings.gradle.kts)	(revision 5737dd33393ff5a4a07d6141ce8532dc307bc7db)
+++ subprojects/docs/src/samples/userguide/cpp/cppLibrary/kotlin/settings.gradle.kts	(.../settings.gradle.kts)	(revision 7e6a8d9302e92ba1f06f71e95d0698c8963f440f)
@@ -1,3 +1 @@
-rootProject.name = "basic-cpp"
-
-include("common")
\ No newline at end of file
+rootProject.name = "basic-cpp"
\ No newline at end of file