diff --git a/src/EditableSpamProtectionField.php b/src/EditableSpamProtectionField.php
index 0331f1c..323a47a 100644
--- a/src/EditableSpamProtectionField.php
+++ b/src/EditableSpamProtectionField.php
@@ -98,7 +98,7 @@ public function setFormField(FormField $field)
     /**
      * Gets the list of all candidate spam detectable fields on this field's form
      *
-     * @return DataList
+     * @return DataList<EditableFormField>
      */
     protected function getCandidateFields()
     {
@@ -151,7 +151,6 @@ public function onBeforeWrite()
      */
     public function getCMSFields()
     {
-        /** @var FieldList $fields */
         $fields = parent::getCMSFields();
 
         // Get protector
diff --git a/src/Extension/CommentSpamProtection.php b/src/Extension/CommentSpamProtection.php
index fc5f8c9..9b31976 100644
--- a/src/Extension/CommentSpamProtection.php
+++ b/src/Extension/CommentSpamProtection.php
@@ -2,14 +2,14 @@
 
 namespace SilverStripe\SpamProtection\Extension;
 
+use SilverStripe\Comments\Controllers\CommentingController;
 use SilverStripe\Core\Extension;
 
 /**
  * Apply the spam protection to the comments module if it is installed.
  *
- * @package spamprotection
+ * @extends Extension<CommentingController>
  */
-
 class CommentSpamProtection extends Extension
 {
     public function alterCommentForm(&$form)
diff --git a/src/Extension/FormSpamProtectionExtension.php b/src/Extension/FormSpamProtectionExtension.php
index 07de263..921fb99 100644
--- a/src/Extension/FormSpamProtectionExtension.php
+++ b/src/Extension/FormSpamProtectionExtension.php
@@ -6,14 +6,14 @@
 use SilverStripe\Core\Config\Configurable;
 use SilverStripe\Core\Extension;
 use SilverStripe\Core\Injector\Injector;
+use SilverStripe\Forms\Form;
 
 /**
  * An extension to the {@link Form} class which provides the method
  * {@link enableSpamProtection()} helper.
  *
- * @package spamprotection
+ * @extends Extension<Form>
  */
-
 class FormSpamProtectionExtension extends Extension
 {
     use Configurable;
@@ -86,7 +86,7 @@ public static function get_protector($options = null)
      *
      * @param array $options
      * @throws LogicException when get_protector method returns NULL.
-     * @return Object
+     * @return Form
      */
     public function enableSpamProtection($options = [])
     {