diff --git a/src/Core/BaseKernel.php b/src/Core/BaseKernel.php
index 903107731..aedef7161 100644
--- a/src/Core/BaseKernel.php
+++ b/src/Core/BaseKernel.php
@@ -378,7 +378,7 @@ abstract class BaseKernel implements Kernel
      * The purpose of this method is to avoid loading PHPUnit test files with incompatible definitions.
      *
      * @return string[] List of CI types to ignore as defined by `Module`.
-     * @deprecated 5.0.0
+     * @deprecated 5.0.0 Will be removed without equivalent functionality
      */
     protected function getIgnoredCIConfigs(): array
     {
diff --git a/src/Core/Manifest/ClassLoader.php b/src/Core/Manifest/ClassLoader.php
index bf266c26e..d131087fe 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.');
+        Deprecation::notice('4.0', 'Use ClassInfo::exists instead');
         return ClassInfo::exists($class);
     }
 }
diff --git a/src/Core/Startup/ErrorControlChain.php b/src/Core/Startup/ErrorControlChain.php
index 86b3a1aaa..db9c7d030 100644
--- a/src/Core/Startup/ErrorControlChain.php
+++ b/src/Core/Startup/ErrorControlChain.php
@@ -17,7 +17,7 @@ use Exception;
  *
  * @internal This class is designed specifically for use pre-startup and may change without warning
  *
- * @deprecated 5.0 To be removed in SilverStripe 5.0
+ * @deprecated 5.0 Will be removed without equivalent functionality
  */
 class ErrorControlChain
 {
diff --git a/src/Core/Startup/ErrorDirector.php b/src/Core/Startup/ErrorDirector.php
index f2ac67814..5917387b7 100644
--- a/src/Core/Startup/ErrorDirector.php
+++ b/src/Core/Startup/ErrorDirector.php
@@ -15,7 +15,7 @@ use SilverStripe\Security\Security;
  *
  * @internal This class is experimental API and may change without warning
  *
- * @deprecated 5.0 To be removed in SilverStripe 5.0
+ * @deprecated 5.0 Will be removed without equivalent functionality
  */
 class ErrorDirector extends Director
 {
diff --git a/src/Dev/CsvBulkLoader.php b/src/Dev/CsvBulkLoader.php
index 4bbba7251..fc6bda984 100644
--- a/src/Dev/CsvBulkLoader.php
+++ b/src/Dev/CsvBulkLoader.php
@@ -176,7 +176,7 @@ class CsvBulkLoader extends BulkLoader
      */
     protected function splitFile($path, $lines = null)
     {
-        Deprecation::notice('5.0', 'splitFile is deprecated, please process files using a stream');
+        Deprecation::notice('5.0', 'Process files using a stream instead');
 
         if (!is_int($lines)) {
             $lines = $this->config()->get("lines");
@@ -232,7 +232,7 @@ class CsvBulkLoader extends BulkLoader
      */
     protected function getNewSplitFileName()
     {
-        Deprecation::notice('5.0', 'getNewSplitFileName is deprecated, please name your files yourself');
+        Deprecation::notice('5.0', 'Name files yourself instead');
         return TEMP_PATH . DIRECTORY_SEPARATOR . uniqid(str_replace('\\', '_', static::class) ?? '', true) . '.csv';
     }
 
@@ -244,7 +244,7 @@ class CsvBulkLoader extends BulkLoader
      */
     protected function processChunk($filepath, $preview = false)
     {
-        Deprecation::notice('5.0', 'processChunk is deprecated, please process rows individually');
+        Deprecation::notice('5.0', 'Process rows individually instead');
         $results = BulkLoader_Result::create();
 
         $csv = new CSVParser(
diff --git a/src/Forms/GridField/GridFieldFilterHeader.php b/src/Forms/GridField/GridFieldFilterHeader.php
index df45f9efb..c7fd7f086 100755
--- a/src/Forms/GridField/GridFieldFilterHeader.php
+++ b/src/Forms/GridField/GridFieldFilterHeader.php
@@ -441,7 +441,7 @@ class GridFieldFilterHeader extends AbstractGridFieldComponent implements GridFi
      */
     public function getLegacyFilterHeader(GridField $gridField)
     {
-        Deprecation::notice('5.0', 'Table row based filter header will be removed in favor of search field in 5.0');
+        Deprecation::notice('5.0', 'Use search field instead');
 
         $list = $gridField->getList();
         if (!$this->checkDataType($list)) {
diff --git a/src/ORM/DataObject.php b/src/ORM/DataObject.php
index b3669febb..249badbae 100644
--- a/src/ORM/DataObject.php
+++ b/src/ORM/DataObject.php
@@ -1269,7 +1269,7 @@ class DataObject extends ViewableData implements DataObjectInterface, i18nEntity
      */
     public function doValidate()
     {
-        Deprecation::notice('5.0', 'Use validate');
+        Deprecation::notice('5.0', 'Use validate() instead');
         return $this->validate();
     }
 
diff --git a/src/Security/Group.php b/src/Security/Group.php
index 9b14a98d1..b5d0b6e70 100755
--- a/src/Security/Group.php
+++ b/src/Security/Group.php
@@ -721,7 +721,7 @@ class Group extends DataObject
      * Code needs to be unique as it is used to identify a specific group. Ensure no duplicate
      * codes are created.
      *
-     * @deprecated 5.0 Replaced with a validation error when a duplicate is found.
+     * @todo Replace with a validation error when a duplicate is found.
      */
     private function dedupeCode(): void
     {
diff --git a/src/Security/Member.php b/src/Security/Member.php
index 197001a04..a17fcf801 100644
--- a/src/Security/Member.php
+++ b/src/Security/Member.php
@@ -448,7 +448,7 @@ class Member extends DataObject
     }
 
     /**
-     * @deprecated 5.0.0 Use Security::setCurrentUser() or IdentityStore::logIn()
+     * @deprecated 5.0.0 Use Security::setCurrentUser() or IdentityStore::logIn() instead
      *
      */
     public function logIn()
@@ -509,7 +509,7 @@ class Member extends DataObject
      * has a database record of the same ID. If there is
      * no logged in user, FALSE is returned anyway.
      *
-     * @deprecated Not needed anymore, as it returns Security::getCurrentUser();
+     * @deprecated Use Security::getCurrentUser() instead
      *
      * @return boolean TRUE record found FALSE no record found
      */
@@ -770,7 +770,7 @@ class Member extends DataObject
     /**
      * Returns the current logged in user
      *
-     * @deprecated 5.0.0 use Security::getCurrentUser()
+     * @deprecated 5.0.0 Use Security::getCurrentUser() instead
      *
      * @return Member
      */
@@ -820,7 +820,7 @@ class Member extends DataObject
     /**
      * Get the ID of the current logged in user
      *
-     * @deprecated 5.0.0 use Security::getCurrentUser()
+     * @deprecated 5.0.0 Use Security::getCurrentUser() instead
      *
      * @return int Returns the ID of the current logged in user or 0.
      */