diff --git a/src/Form/FillPdfFormConfirmFormBase.php b/src/Form/FillPdfFormConfirmFormBase.php
index 99e7d167c9d75586e98af01f7d7f41fd8e66d4a7..44bcf27ae299c8aa386e104bd664f22b560dc552 100644
--- a/src/Form/FillPdfFormConfirmFormBase.php
+++ b/src/Form/FillPdfFormConfirmFormBase.php
@@ -19,8 +19,8 @@ abstract class FillPdfFormConfirmFormBase extends ContentEntityConfirmFormBase {
     // @todo This is a workaround by webform for Core issue #2582295
     // "Confirmation cancel links are incorrect if installed in a subdirectory".
     // Remove after a fix landed there.
-    // See: https://www.drupal.org/project/drupal/issues/2582295
-    // See: https://www.drupal.org/project/webform/issues/2899166
+    // @see https://www.drupal.org/project/drupal/issues/2582295
+    // @see https://www.drupal.org/project/webform/issues/2899166
     $request = $this->getRequest();
     $destination = $request->query->get('destination');
     if ($destination) {
diff --git a/src/Form/FillPdfFormForm.php b/src/Form/FillPdfFormForm.php
index 48bd90ceb8219918f414af8372c00cef69a1aa93..93dcba4da235c305fced6c8c01b269621a8bc965 100644
--- a/src/Form/FillPdfFormForm.php
+++ b/src/Form/FillPdfFormForm.php
@@ -328,7 +328,7 @@ class FillPdfFormForm extends ContentEntityForm {
       ];
 
       // @todo Check for empty value after Core issue is fixed.
-      // See: https://www.drupal.org/project/drupal/issues/1585930
+      // @see https://www.drupal.org/project/drupal/issues/1585930
       $states_no_scheme = [
         ':input[name="scheme"]' => ['value' => '_none'],
       ];
@@ -490,7 +490,7 @@ class FillPdfFormForm extends ContentEntityForm {
    * {@inheritdoc}
    *
    * @todo Remove this (imperfect) workaround once the Core issue is fixed.
-   *   See https://www.drupal.org/project/fillpdf/issues/3046178.
+   * @see https://www.drupal.org/project/fillpdf/issues/3046178
    */
   protected function actions(array $form, FormStateInterface $form_state) {
     $actions = parent::actions($form, $form_state);
diff --git a/src/Form/FillPdfSettingsForm.php b/src/Form/FillPdfSettingsForm.php
index 04d543b645df99d4947e1bc8b09544dd1438db09..b336ad32137ff4aad90064cfa70870e93c75fdfc 100644
--- a/src/Form/FillPdfSettingsForm.php
+++ b/src/Form/FillPdfSettingsForm.php
@@ -332,8 +332,8 @@ class FillPdfSettingsForm extends ConfigFormBase {
         '#default_value' => $config->get('shell_locale') ?: 'en_US.utf8',
       ];
       // @todo We're working around Core issue #2190333, resp. #2854166.
-      // Remove once one of these landed. See:
-      // https://www.drupal.org/project/drupal/issues/2854166.
+      // Remove once one of these landed.
+      // @see https://www.drupal.org/project/drupal/issues/2854166
       $form['shell_locale']['#process'][] = [
         'Drupal\Core\Render\Element\Select',
         'processGroup',
@@ -356,7 +356,7 @@ class FillPdfSettingsForm extends ConfigFormBase {
     switch ($values['backend']) {
       case 'fillpdf_service':
         // @todo Add validation for FillPDF Service.
-        // See https://www.drupal.org/project/fillpdf/issues/3040899.
+        // @see https://www.drupal.org/project/fillpdf/issues/3040899
         break;
 
       case 'local_service':
diff --git a/src/TokenResolver.php b/src/TokenResolver.php
index bbc6a02a84a6dfbb51c5658ce31d3b231a0066bd..59143046f7c3eb094974a59e79cad771bd2087d7 100644
--- a/src/TokenResolver.php
+++ b/src/TokenResolver.php
@@ -77,7 +77,7 @@ class TokenResolver implements TokenResolverInterface {
 
     // Content may be marked as either 'text', 'image' or '' (= unknown).
     // @todo Revisit when enforcing FillPdfFields to be one or the other.
-    // See: https://www.drupal.org/project/fillpdf/issues/3049368
+    // @see https://www.drupal.org/project/fillpdf/issues/3049368
     $maybe_image = ($options['content'] !== 'text');
     $maybe_text = ($options['content'] !== 'image');
 
diff --git a/tests/src/Functional/FillPdfUploadTestBase.php b/tests/src/Functional/FillPdfUploadTestBase.php
index d31332797142d3593e8db316a4082664712c2b3b..ebf1b0929e4ad5d4dcdea1444e4fff3140091ad5 100644
--- a/tests/src/Functional/FillPdfUploadTestBase.php
+++ b/tests/src/Functional/FillPdfUploadTestBase.php
@@ -144,7 +144,7 @@ abstract class FillPdfUploadTestBase extends FillPdfTestBase {
           $this->assertFileNotExists($new_file->getFileUri());
         }
         // @todo Simplify once Core bug gets fixed.
-        //   See: https://www.drupal.org/project/drupal/issues/3043127.
+        // @see https://www.drupal.org/project/drupal/issues/3043127
         $this->assertFileEntryNotExists($new_file, NULL);
         break;