diff --git a/cmake/org.eclipse.cdt.cmake.is.arm/help_content_extension.xml b/cmake/org.eclipse.cdt.cmake.is.arm/help_content_extension.xml
index 89a0db52ea1..1510752d6de 100644
--- a/cmake/org.eclipse.cdt.cmake.is.arm/help_content_extension.xml
+++ b/cmake/org.eclipse.cdt.cmake.is.arm/help_content_extension.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <contentExtension>
   <contribution content="doc/compiler.xhtml#lsp"
-    path="/de.marw.cdt.cmake.core/doc/html/languageSettingsProviders.xhtml#extra_lsp_detection_participant_list"/>
+    path="/de.marw.cdt.cmake.core/doc/html/languageSettingsProviders.xhtml#extra_detection_participant_list"/>
   <contribution content="doc/compiler.xhtml#builtins"
-    path="/de.marw.cdt.cmake.core/doc/html/builtins-detection.xhtml#extra_lsp_detection_participant_builtins_list"/>
+    path="/de.marw.cdt.cmake.core/doc/html/builtins-detection.xhtml#extra_detection_participant_builtins_list"/>
 </contentExtension>
\ No newline at end of file
diff --git a/cmake/org.eclipse.cdt.cmake.is.core.doc/doc/html/builtins-detection.xhtml b/cmake/org.eclipse.cdt.cmake.is.core.doc/doc/html/builtins-detection.xhtml
index f9eb219e7e2..da100237195 100644
--- a/cmake/org.eclipse.cdt.cmake.is.core.doc/doc/html/builtins-detection.xhtml
+++ b/cmake/org.eclipse.cdt.cmake.is.core.doc/doc/html/builtins-detection.xhtml
@@ -75,7 +75,7 @@ td {
 
       <h3>Compilers supported through separate plug-ins</h3>
       <!-- extra compilers go here -->
-      <anchor id="extra_lsp_detection_participant_builtins_list"/>
+      <anchor id="extra_detection_participant_builtins_list"/>
 
 	<h2>Enhanced Built-ins Detection Support</h2>
 	<p>Some compilers, mainly those of the GNU Compiler Collection and derivatives, report different built-ins
diff --git a/cmake/org.eclipse.cdt.cmake.is.core.doc/doc/html/languageSettingsProviders.xhtml b/cmake/org.eclipse.cdt.cmake.is.core.doc/doc/html/languageSettingsProviders.xhtml
index 3ae21f56596..85b5394fdd6 100644
--- a/cmake/org.eclipse.cdt.cmake.is.core.doc/doc/html/languageSettingsProviders.xhtml
+++ b/cmake/org.eclipse.cdt.cmake.is.core.doc/doc/html/languageSettingsProviders.xhtml
@@ -115,7 +115,7 @@ th, td {
 	</ul>
 	<h3>Compilers supported through separate plug-ins</h3>
 	<!-- extra compilers go here -->
-	<anchor id="extra_lsp_detection_participant_list"/>
+	<anchor id="extra_detection_participant_list"/>
 
 	<h2>CMAKE_EXPORT_COMPILE_COMMANDS Compiler Built-ins</h2>
 	<p>This provider works similar to <q>CMAKE_EXPORT_COMPILE_COMMANDS Parser</q>, but invokes 
diff --git a/cmake/org.eclipse.cdt.cmake.is.core/schema/participant.exsd b/cmake/org.eclipse.cdt.cmake.is.core/schema/participant.exsd
index 6b1e0026d1e..f8755b0f0f0 100644
--- a/cmake/org.eclipse.cdt.cmake.is.core/schema/participant.exsd
+++ b/cmake/org.eclipse.cdt.cmake.is.core/schema/participant.exsd
@@ -113,17 +113,17 @@ To provide online help that lists the supported compilers anlong with and the re
 the extension point &lt;code&gt;org.eclipse.help.contentExtension&lt;/code&gt; can be used.&lt;br/&gt;
 Plugin &lt;i&gt;de.marw.cdt.cmake.core&lt;/i&gt; provides predefined help-anchors that allow to integrate the online help:
 &lt;ol&gt;
-&lt;li&gt;&lt;i&gt;extra_lsp_detection_participant_list&lt;/i&gt; for the CMAKE_EXPORT_COMPILE_COMMANDS Parser,&lt;/li&gt; 
-&lt;li&gt;&lt;i&gt;extra_lsp_detection_participant_builtins_list&lt;/i&gt; and 
-&lt;i&gt;extra_lsp_detection_participant_builtins_enhanced_list&lt;/i&gt; for the CMAKE_EXPORT_COMPILE_COMMANDS Compiler Built-ins Parser.&lt;/li&gt;
+&lt;li&gt;&lt;i&gt;extra_detection_participant_list&lt;/i&gt; for the commandline parser,&lt;/li&gt; 
+&lt;li&gt;&lt;i&gt;extra_detection_participant_builtins_list&lt;/i&gt; and 
+&lt;i&gt;extra_lsp_detection_participant_builtins_enhanced_list&lt;/i&gt; for the compiler built-ins parser.&lt;/li&gt;
 &lt;/ol&gt;
 Example file &lt;code&gt;help_content_extension.xml&lt;/code&gt;:
 &lt;pre&gt;
 &lt;contentExtension&gt;
   &lt;contribution content=&quot;doc/compiler.xhtml#lsp&quot;
-    path=&quot;/de.marw.cdt.cmake.core/doc/html/languageSettingsProviders.xhtml#extra_lsp_detection_participant_list&quot;/&gt;
+    path=&quot;/de.marw.cdt.cmake.core/doc/html/languageSettingsProviders.xhtml#extra_detection_participant_list&quot;/&gt;
   &lt;contribution content=&quot;doc/compiler.xhtml#builtins&quot;
-    path=&quot;/de.marw.cdt.cmake.core/doc/html/builtins-detection.xhtml#extra_lsp_detection_participant_builtins_list&quot;/&gt;
+    path=&quot;/de.marw.cdt.cmake.core/doc/html/builtins-detection.xhtml#extra_detection_participant_builtins_list&quot;/&gt;
 &lt;/contentExtension&gt;
 &lt;/pre&gt;
 &lt;/p&gt;
@@ -142,8 +142,8 @@ Some predifined parsers for tool arguments can be found in the classes &lt;code&
          <meta.section type="implementation"/>
       </appinfo>
       <documentation>
-         The plugin org.eclipse.cdt.cmake.is.intel provides inplementations for various compiler made by Intel Corp.&lt;/br&gt;
-See, for example &lt;code&gt;de/marw/cmake/cdt/lsp/intel/IccToolDetectionParticipant.java&lt;/code&gt;.
+         The plugin org.eclipse.cdt.cmake.is.intel provides implementations for various compiler made by Intel Corp.&lt;/br&gt;
+See, for example &lt;code&gt;org/eclipse/cdt/cmake/is/intel/IcpcToolDetectionParticipant.java&lt;/code&gt;.
       </documentation>
    </annotation>
 
diff --git a/cmake/org.eclipse.cdt.cmake.is.hpenonstop/help_content_extension.xml b/cmake/org.eclipse.cdt.cmake.is.hpenonstop/help_content_extension.xml
index 89a0db52ea1..1510752d6de 100644
--- a/cmake/org.eclipse.cdt.cmake.is.hpenonstop/help_content_extension.xml
+++ b/cmake/org.eclipse.cdt.cmake.is.hpenonstop/help_content_extension.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <contentExtension>
   <contribution content="doc/compiler.xhtml#lsp"
-    path="/de.marw.cdt.cmake.core/doc/html/languageSettingsProviders.xhtml#extra_lsp_detection_participant_list"/>
+    path="/de.marw.cdt.cmake.core/doc/html/languageSettingsProviders.xhtml#extra_detection_participant_list"/>
   <contribution content="doc/compiler.xhtml#builtins"
-    path="/de.marw.cdt.cmake.core/doc/html/builtins-detection.xhtml#extra_lsp_detection_participant_builtins_list"/>
+    path="/de.marw.cdt.cmake.core/doc/html/builtins-detection.xhtml#extra_detection_participant_builtins_list"/>
 </contentExtension>
\ No newline at end of file
diff --git a/cmake/org.eclipse.cdt.cmake.is.intel/help_content_extension.xml b/cmake/org.eclipse.cdt.cmake.is.intel/help_content_extension.xml
index 854e96f8e44..e5867ed8de0 100644
--- a/cmake/org.eclipse.cdt.cmake.is.intel/help_content_extension.xml
+++ b/cmake/org.eclipse.cdt.cmake.is.intel/help_content_extension.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <contentExtension>
   <contribution content="doc/compiler.xhtml#lsp"
-    path="/de.marw.cdt.cmake.core/doc/html/languageSettingsProviders.xhtml#extra_lsp_detection_participant_list"/>
+    path="/de.marw.cdt.cmake.core/doc/html/languageSettingsProviders.xhtml#extra_detection_participant_list"/>
 <!-- built-ins detection is not supported 
   <contribution content="doc/compiler.xhtml#builtins"
-    path="/de.marw.cdt.cmake.core/doc/html/builtins-detection.xhtml#extra_lsp_detection_participant_builtins_list"/>
+    path="/de.marw.cdt.cmake.core/doc/html/builtins-detection.xhtml#extra_detection_participant_builtins_list"/>
 -->
 </contentExtension>
\ No newline at end of file
diff --git a/cmake/org.eclipse.cdt.cmake.is.microsoft/help_content_extension.xml b/cmake/org.eclipse.cdt.cmake.is.microsoft/help_content_extension.xml
index be5a1403f94..b03323ef425 100644
--- a/cmake/org.eclipse.cdt.cmake.is.microsoft/help_content_extension.xml
+++ b/cmake/org.eclipse.cdt.cmake.is.microsoft/help_content_extension.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <contentExtension>
   <contribution content="doc/compiler.xhtml#lsp"
-    path="/de.marw.cdt.cmake.core/doc/html/languageSettingsProviders.xhtml#extra_lsp_detection_participant_list"/>
+    path="/de.marw.cdt.cmake.core/doc/html/languageSettingsProviders.xhtml#extra_detection_participant_list"/>
 </contentExtension>
\ No newline at end of file
diff --git a/cmake/org.eclipse.cdt.cmake.is.nvidia/help_content_extension.xml b/cmake/org.eclipse.cdt.cmake.is.nvidia/help_content_extension.xml
index a66b5e68118..d7af548b41a 100644
--- a/cmake/org.eclipse.cdt.cmake.is.nvidia/help_content_extension.xml
+++ b/cmake/org.eclipse.cdt.cmake.is.nvidia/help_content_extension.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <contentExtension>
   <contribution content="doc/compiler.xhtml#lsp"
-    path="/de.marw.cdt.cmake.core/doc/html/languageSettingsProviders.xhtml#extra_lsp_detection_participant_list"/>
+    path="/de.marw.cdt.cmake.core/doc/html/languageSettingsProviders.xhtml#extra_detection_participant_list"/>
   <contribution content="doc/compiler.xhtml#builtins"
-    path="/de.marw.cdt.cmake.core/doc/html/builtins-detection.xhtml#extra_lsp_detection_participant_builtins_list"/>
+    path="/de.marw.cdt.cmake.core/doc/html/builtins-detection.xhtml#extra_detection_participant_builtins_list"/>
   <contribution content="doc/compiler.xhtml#builtins_enhanced"
     path="/de.marw.cdt.cmake.core/doc/html/builtins-detection.xhtml#extra_lsp_detection_participant_builtins_enhanced_list"/>
 </contentExtension>
\ No newline at end of file