diff --git a/src/Core/Manifest/ClassLoader.php b/src/Core/Manifest/ClassLoader.php
index d131087fe..95f05be68 100644
--- a/src/Core/Manifest/ClassLoader.php
+++ b/src/Core/Manifest/ClassLoader.php
@@ -145,7 +145,7 @@ class ClassLoader
      */
     public function classExists($class)
     {
-        Deprecation::notice('4.0', 'Use ClassInfo::exists instead');
+        Deprecation::notice('4.0', 'Use ClassInfo::exists() instead');
         return ClassInfo::exists($class);
     }
 }
diff --git a/src/Forms/FieldList.php b/src/Forms/FieldList.php
index b42aa840e..494f800ef 100644
--- a/src/Forms/FieldList.php
+++ b/src/Forms/FieldList.php
@@ -186,7 +186,7 @@ class FieldList extends ArrayList
      */
     protected function collateDataFields(&$list, $saveableOnly = false)
     {
-        Deprecation::notice('5.0', 'Please use dataFields or SaveableFields');
+        Deprecation::notice('5.0', 'Please use dataFields() or SaveableFields()');
         if (!isset($list)) {
             $list = [];
         }
diff --git a/src/Forms/Form.php b/src/Forms/Form.php
index fcc633646..303da5ccf 100644
--- a/src/Forms/Form.php
+++ b/src/Forms/Form.php
@@ -1587,7 +1587,7 @@ class Form extends ViewableData implements HasRequestHandler
      * and _form_enctype.  These are the attributes of the form.  These fields
      * can be used to send the form to Ajax.
      *
-     * @deprecated 5.0
+     * @deprecated 5.0 Will be removed without equivalent functionality
      * @return string
      */
     public function formHtmlContent()
diff --git a/src/Forms/TextField.php b/src/Forms/TextField.php
index 06df1e20e..367da948d 100644
--- a/src/Forms/TextField.php
+++ b/src/Forms/TextField.php
@@ -124,7 +124,7 @@ class TextField extends FormField implements TippableFieldInterface
      */
     public function InternallyLabelledField()
     {
-        Deprecation::notice('4.0', 'Please use ->setValue() instead');
+        Deprecation::notice('4.0', 'Use setValue() instead');
 
         if (!$this->value) {
             $this->value = $this->Title();
diff --git a/src/ORM/DB.php b/src/ORM/DB.php
index 79f5aa547..d6b873cf6 100644
--- a/src/ORM/DB.php
+++ b/src/ORM/DB.php
@@ -112,12 +112,12 @@ class DB
     }
 
     /**
-     * @deprecated since version 4.0 Use DB::get_conn instead
+     * @deprecated Use DB::get_conn() instead
      * @todo PSR-2 standardisation will probably un-deprecate this
      */
     public static function getConn($name = 'default')
     {
-        Deprecation::notice('4.0', 'Use DB::get_conn instead');
+        Deprecation::notice('4.0', 'Use DB::get_conn() instead');
         return self::get_conn($name);
     }
 
diff --git a/src/ORM/DatabaseAdmin.php b/src/ORM/DatabaseAdmin.php
index c1bf74b8d..2b98a9cc7 100644
--- a/src/ORM/DatabaseAdmin.php
+++ b/src/ORM/DatabaseAdmin.php
@@ -376,7 +376,7 @@ class DatabaseAdmin extends Controller
      * @param string $fieldName    The field name to look in for obsolete class names
      * @param string $oldClassName The old class name
      * @param string $newClassName The new class name
-     * @deprecated 5.0 use updateLegacyClassNameField instead
+     * @deprecated 5.0 use updateLegacyClassNameField() instead
      */
     protected function updateLegacyClassNames($dataClass, $fieldName, $oldClassName, $newClassName)
     {
diff --git a/src/Security/RandomGenerator.php b/src/Security/RandomGenerator.php
index abaa7ddaf..96892eb06 100644
--- a/src/Security/RandomGenerator.php
+++ b/src/Security/RandomGenerator.php
@@ -14,7 +14,7 @@ class RandomGenerator
     /**
      * @return string A 128-character, randomly generated ASCII string
      * @throws Exception If no suitable CSPRNG is installed
-     * @deprecated 4.4.0:5.0.0
+     * @deprecated 4.4.0:5.0.0 Use native php function random_bytes() instead
      */
     public function generateEntropy()
     {
diff --git a/src/Security/Security.php b/src/Security/Security.php
index 646a350a0..6d01ff4b4 100644
--- a/src/Security/Security.php
+++ b/src/Security/Security.php
@@ -464,7 +464,7 @@ class Security extends Controller implements TemplateGlobalProvider
     /**
      * Get the login forms for all available authentication methods
      *
-     * @deprecated 5.0.0 Now handled by {@link static::delegateToMultipleHandlers}
+     * @deprecated 5.0.0 Use delegateToMultipleHandlers() instead
      *
      * @return array Returns an array of available login forms (array of Form
      *               objects).
@@ -1073,7 +1073,7 @@ class Security extends Controller implements TemplateGlobalProvider
      *
      * @return Member
      *
-     * @deprecated 4.0.0:5.0.0 Please use DefaultAdminService::findOrCreateDefaultAdmin()
+     * @deprecated 4.0.0:5.0.0 Use DefaultAdminService::findOrCreateDefaultAdmin()
      */
     public static function findAnAdministrator()
     {
@@ -1086,7 +1086,7 @@ class Security extends Controller implements TemplateGlobalProvider
     /**
      * Flush the default admin credentials
      *
-     * @deprecated 4.0.0:5.0.0 Please use DefaultAdminService::clearDefaultAdmin()
+     * @deprecated 4.0.0:5.0.0 Use DefaultAdminService::clearDefaultAdmin()
      */
     public static function clear_default_admin()
     {
@@ -1107,7 +1107,7 @@ class Security extends Controller implements TemplateGlobalProvider
      * @param string $password The password (in cleartext)
      * @return bool True if successfully set
      *
-     * @deprecated 4.0.0:5.0.0 Please use DefaultAdminService::setDefaultAdmin($username, $password)
+     * @deprecated 4.0.0:5.0.0 Use DefaultAdminService::setDefaultAdmin($username, $password)
      */
     public static function setDefaultAdmin($username, $password)
     {
diff --git a/src/View/SSViewer_BasicIteratorSupport.php b/src/View/SSViewer_BasicIteratorSupport.php
index d1de7b957..44dc8923d 100644
--- a/src/View/SSViewer_BasicIteratorSupport.php
+++ b/src/View/SSViewer_BasicIteratorSupport.php
@@ -67,7 +67,7 @@ class SSViewer_BasicIteratorSupport implements TemplateIteratorProvider
     }
 
     /**
-     * @deprecated 5.0.0 Use IsFirst() to avoid clashes with SS_Lists
+     * @deprecated 5.0.0 Use IsFirst() instead
      * @return bool
      */
     public function First()
@@ -87,7 +87,7 @@ class SSViewer_BasicIteratorSupport implements TemplateIteratorProvider
     }
 
     /**
-     * @deprecated 5.0.0 Use IsLast() to avoid clashes with SS_Lists
+     * @deprecated 5.0.0 Use IsLast() instead
      * @return bool
      */
     public function Last()