diff --git a/_config.php b/_config.php
index febd562..07d962b 100644
--- a/_config.php
+++ b/_config.php
@@ -8,4 +8,7 @@
  *
  * @package spamprotection
  */
-Deprecation::notification_version('1.1', 'spamprotection');
+
+use SilverStripe\Dev\Deprecation;
+
+Deprecation::notification_version('3.0', 'spamprotection');
diff --git a/_config/spamprotection.yml b/_config/spamprotection.yml
index 8c755d1..b48c4bb 100644
--- a/_config/spamprotection.yml
+++ b/_config/spamprotection.yml
@@ -1,6 +1,6 @@
 ---
 name: spamprotection
 ---
-Form:
+SilverStripe\Forms\Form:
   extensions:
-    - FormSpamProtectionExtension
\ No newline at end of file
+    - SilverStripe\Spamprotection\FormSpamProtectionExtension
\ No newline at end of file
diff --git a/code/EditableSpamProtectionField.php b/code/EditableSpamProtectionField.php
index 8993f28..34a4b9f 100644
--- a/code/EditableSpamProtectionField.php
+++ b/code/EditableSpamProtectionField.php
@@ -1,4 +1,5 @@
 <?php
+namespace SilverStripe\Spamprotection;
 
 /**
  * Editable Spam Protecter Field. Used with the User Defined Forms module (if
diff --git a/code/SpamProtectorManager.php b/code/SpamProtectorManager.php
index 00eb646..df0bd9f 100644
--- a/code/SpamProtectorManager.php
+++ b/code/SpamProtectorManager.php
@@ -1,4 +1,7 @@
 <?php
+namespace SilverStripe\Spamprotection;
+
+use SilverStripe\Dev\Deprecation;
 
 /**
  * @package spamprotection
@@ -18,7 +21,7 @@ class SpamProtectorManager
             'Use the new config system. FormSpamProtectorExtension.default_spam_protector'
         );
 
-        self::$spam_protector = $protector;
+        static::$spam_protector = $protector;
     }
 
     public static function get_spam_protector()
@@ -29,7 +32,7 @@ class SpamProtectorManager
             'Use the new config system. FormSpamProtectorExtension.default_spam_protector'
         );
 
-        return self::$spam_protector;
+        return static::$spam_protector;
     }
     
     public static function update_form($form, $before = null, $fieldsToSpamServiceMapping = array(), $title = null, $rightTitle = null)
diff --git a/code/extensions/CommentSpamProtection.php b/code/extensions/CommentSpamProtection.php
index 453707d..ca96702 100644
--- a/code/extensions/CommentSpamProtection.php
+++ b/code/extensions/CommentSpamProtection.php
@@ -1,5 +1,9 @@
 <?php
 
+namespace SilverStripe\Spamprotection;
+
+use SilverStripe\Core\Extension;
+
 /**
  * Apply the spam protection to the comments module if it is installed.
  *
diff --git a/code/extensions/FormSpamProtectionExtension.php b/code/extensions/FormSpamProtectionExtension.php
index dfca9ea..ff53b26 100644
--- a/code/extensions/FormSpamProtectionExtension.php
+++ b/code/extensions/FormSpamProtectionExtension.php
@@ -1,4 +1,9 @@
 <?php
+namespace SilverStripe\Spamprotection;
+
+use SilverStripe\Core\Config\Config;
+use SilverStripe\Core\Extension;
+use SilverStripe\Core\Injector\Injector;
 
 /**
  * An extension to the {@link Form} class which provides the method
@@ -76,6 +81,7 @@ class FormSpamProtectionExtension extends Extension
      * Activates the spam protection module.
      *
      * @param array $options
+     * @return Object
      */
     public function enableSpamProtection($options = array())
     {
diff --git a/code/interfaces/SpamProtector.php b/code/interfaces/SpamProtector.php
index 5369a02..f9bd3b3 100644
--- a/code/interfaces/SpamProtector.php
+++ b/code/interfaces/SpamProtector.php
@@ -1,4 +1,7 @@
 <?php
+namespace SilverStripe\Spamprotection;
+
+use SilverStripe\Forms\FormField;
 
 /**
  * SpamProtector base interface.
diff --git a/composer.json b/composer.json
index 7d78702..393f809 100644
--- a/composer.json
+++ b/composer.json
@@ -11,15 +11,18 @@
         "email": "will@fullscreen.io"
     }],
     "require": {
-        "silverstripe/framework": "~3.1"
+        "silverstripe/framework": "^4@dev"
     },
     "require-dev": {
-        "phpunit/PHPUnit": "~3.7@stable"
+        "phpunit/phpunit": "^5.7",
+        "squizlabs/php_codesniffer": "^3.0"
     },
     "extra": {
         "branch-alias": {
             "dev-master": "3.0.x-dev"
         }
     },
-    "license": "BSD-3-Clause"
+    "license": "BSD-3-Clause",
+    "minimum-stability": "dev",
+    "prefer-stable": true
 }