diff --git a/src/Plugin/HelpSection/ConfigHelpSection.php b/src/Plugin/HelpSection/ConfigHelpSection.php
index 4e9f362..f6a4dc8 100644
--- a/src/Plugin/HelpSection/ConfigHelpSection.php
+++ b/src/Plugin/HelpSection/ConfigHelpSection.php
@@ -2,6 +2,7 @@
 
 namespace Drupal\config_help\Plugin\HelpSection;
 
+use Drupal\config_help\Entity\HelpTopic;
 use Drupal\Core\Entity\EntityTypeManagerInterface;
 use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
 use Drupal\help\Plugin\HelpSection\HelpSectionPluginBase;
@@ -80,7 +81,7 @@ class ConfigHelpSection extends HelpSectionPluginBase implements ContainerFactor
     $help_storage = $this->entityTypeManager->getStorage('help_topic');
     /** @var \Drupal\config_help\Entity\HelpTopic[] $entities */
     $entities = $help_storage->loadMultiple();
-    uasort($entities, ['Drupal\config_help\Entity\HelpTopic', 'sort']);
+    uasort($entities, [HelpTopic::class, 'sort']);
 
     $topics = [];
     foreach ($entities as $entity) {
diff --git a/src/Plugin/TextSection/DescriptionName.php b/src/Plugin/TextSection/DescriptionName.php
index 91f132d..70e8362 100644
--- a/src/Plugin/TextSection/DescriptionName.php
+++ b/src/Plugin/TextSection/DescriptionName.php
@@ -7,7 +7,7 @@ namespace Drupal\config_help\Plugin\TextSection;
  *
  * This is normally rendered as a DT element in a DL list, in HTML.
  *
- * @see Drupal\config_help\Plugin\DescriptionValue
+ * @see \Drupal\config_help\Plugin\TextSection\DescriptionValue
  *
  * @TextSection(
  *   id = "description_name",
diff --git a/src/Plugin/TextSection/DescriptionValue.php b/src/Plugin/TextSection/DescriptionValue.php
index 64fd7dc..0f6986c 100644
--- a/src/Plugin/TextSection/DescriptionValue.php
+++ b/src/Plugin/TextSection/DescriptionValue.php
@@ -7,7 +7,7 @@ namespace Drupal\config_help\Plugin\TextSection;
  *
  * This is normally rendered as a DD element in a DL list, in HTML.
  *
- * @see Drupal\config_help\Plugin\DescriptionName
+ * @see \Drupal\config_help\Plugin\TextSection\DescriptionName
  *
  * @TextSection(
  *   id = "description_value",
diff --git a/src/TextSectionManager.php b/src/TextSectionManager.php
index cb6d0d1..bbda01a 100644
--- a/src/TextSectionManager.php
+++ b/src/TextSectionManager.php
@@ -2,6 +2,7 @@
 
 namespace Drupal\config_help;
 
+use Drupal\config_help\Annotation\TextSection;
 use Drupal\Core\Cache\CacheBackendInterface;
 use Drupal\Core\Extension\ModuleHandlerInterface;
 use Drupal\Core\Plugin\DefaultPluginManager;
@@ -28,7 +29,7 @@ class TextSectionManager extends DefaultPluginManager {
    *   The module handler for the alter hook.
    */
   public function __construct(\Traversable $namespaces, CacheBackendInterface $cache_backend, ModuleHandlerInterface $module_handler) {
-    parent::__construct('Plugin/TextSection', $namespaces, $module_handler, 'Drupal\config_help\TextSectionPluginInterface', 'Drupal\config_help\Annotation\TextSection');
+    parent::__construct('Plugin/TextSection', $namespaces, $module_handler, TextSectionPluginInterface::class, TextSection::class);
 
     $this->alterInfo('text_section_info');
     $this->setCacheBackend($cache_backend, 'text_section_plugins');