diff --git a/code/Controllers/CMSMain.php b/code/Controllers/CMSMain.php
index d582c25e..64367236 100644
--- a/code/Controllers/CMSMain.php
+++ b/code/Controllers/CMSMain.php
@@ -2163,7 +2163,7 @@ class CMSMain extends LeftAndMain implements CurrentPageIdentifier, PermissionPr
     }
 
     /**
-     * @deprecated 5.0 Please use custom logic for this
+     * @deprecated 5.0 Use custom logic instead
      * @param $request
      * @return HTTPResponse|string|void
      */
diff --git a/code/Controllers/CMSPageHistoryController.php b/code/Controllers/CMSPageHistoryController.php
index eba00f31..5a12f8c6 100644
--- a/code/Controllers/CMSPageHistoryController.php
+++ b/code/Controllers/CMSPageHistoryController.php
@@ -24,7 +24,7 @@ use SilverStripe\View\ViewableData;
 /**
  * Legacy CMS History controller. This functionality has been moved to the `silverstripe/versioned-admin` module and
  * this class will be removed completly in SilverStripe 5.0.0.
- * @deprecated 4.3.0:5.0.0
+ * @deprecated 4.3.0:5.0.0 Use silverstripe/versioned-admin instead
  */
 class CMSPageHistoryController extends CMSMain
 {
diff --git a/code/Model/SiteTree.php b/code/Model/SiteTree.php
index 4e6f0e7a..1206dcec 100755
--- a/code/Model/SiteTree.php
+++ b/code/Model/SiteTree.php
@@ -2751,7 +2751,7 @@ class SiteTree extends DataObject implements PermissionProvider, i18nEntityProvi
     }
 
     /**
-     * @deprecated 5.0 use creatableChildPages instead
+     * @deprecated 5.0 Use creatableChildPages() instead
      *
      * Gets a list of the page types that can be created under this specific page
      *
diff --git a/code/Model/SiteTreeFileExtension.php b/code/Model/SiteTreeFileExtension.php
index fd617533..2b554513 100644
--- a/code/Model/SiteTreeFileExtension.php
+++ b/code/Model/SiteTreeFileExtension.php
@@ -7,7 +7,7 @@ use SilverStripe\ORM\DataExtension;
 use SilverStripe\View\SSViewer;
 
 /**
- * @deprecated 4.2..5.0 Link tracking is baked into File class now
+ * @deprecated 4.2..5.0 Use FileLinkTracking instead
  * @property File $owner
  */
 class SiteTreeFileExtension extends DataExtension
diff --git a/code/Model/SiteTreeFileFormFactoryExtension.php b/code/Model/SiteTreeFileFormFactoryExtension.php
index f03c8c49..b3d39a0f 100644
--- a/code/Model/SiteTreeFileFormFactoryExtension.php
+++ b/code/Model/SiteTreeFileFormFactoryExtension.php
@@ -12,8 +12,7 @@ use SilverStripe\Admin\Forms\UsedOnTable;
 use SilverStripe\Versioned\RecursivePublishable;
 
 /**
- * @deprecated 5.0
- * No longer required - superceded by {@see UsedOnTable}
+ * @deprecated 5.0 Use UsedOnTable instead
  *
  * Extension applied to {@see FileFormFactory} to decorate with a "Used on:" information area.
  * Uses tracking provided by {@see SiteTreeFileExtension} to generate this.
@@ -29,8 +28,7 @@ class SiteTreeFileFormFactoryExtension extends DataExtension
         if (!$tabset) {
             return;
         }
-        $class = UsedOnTable::class;
-        Deprecation::notice('5.0', "Use the $class to show this table");
+        Deprecation::notice('5.0', "Use UsedOnTable instead");
 
         $usedOnField = UsedOnTable::create('UsedOnTableReplacement');
         $usedOnField->setRecord($context['Record']);
diff --git a/code/Model/SiteTreeFolderExtension.php b/code/Model/SiteTreeFolderExtension.php
index 164b6660..35a990cd 100644
--- a/code/Model/SiteTreeFolderExtension.php
+++ b/code/Model/SiteTreeFolderExtension.php
@@ -15,7 +15,7 @@ use SilverStripe\ORM\DataList;
 use SilverStripe\ORM\DataObject;
 
 /**
- * @deprecated 4.2..5.0 Will be removed in cms 5.0
+ * @deprecated 4.2..5.0 Will be removed without equivalent functionality to replace it
  */
 class SiteTreeFolderExtension extends DataExtension
 {
@@ -29,7 +29,7 @@ class SiteTreeFolderExtension extends DataExtension
     /**
      * Looks for files used in system and create where clause which contains all ID's of files.
      *
-     * @deprecated 4.2..5.0
+     * @deprecated 4.2..5.0 Will be removed without equivalent functionality to replace it
      * @returns string where clause which will work as filter.
      */
     public function getUnusedFilesListFilter()
diff --git a/code/Model/VirtualPage.php b/code/Model/VirtualPage.php
index dd4187cc..e377c924 100644
--- a/code/Model/VirtualPage.php
+++ b/code/Model/VirtualPage.php
@@ -361,7 +361,7 @@ class VirtualPage extends Page
     }
 
     /**
-     * @deprecated 4.2..5.0
+     * @deprecated 4.2..5.0 Will be removed without equivalent functionality to replace it
      */
     public function updateImageTracking()
     {