diff --git a/.upgrade.yml b/.upgrade.yml
index 36977c4d..d01b13da 100644
--- a/.upgrade.yml
+++ b/.upgrade.yml
@@ -3,7 +3,6 @@ mappings:
   CMSBatchAction_Unpublish: SilverStripe\CMS\BatchActions\CMSBatchAction_Unpublish
   CMSBatchAction_Archive: SilverStripe\CMS\BatchActions\CMSBatchAction_Archive
   CMSBatchAction_Restore: SilverStripe\CMS\BatchActions\CMSBatchAction_Restore
-  CMSBatchAction_Delete: SilverStripe\CMS\BatchActions\CMSBatchAction_Delete
   CMSMain: SilverStripe\CMS\Controllers\CMSMain
   CMSPageAddController: SilverStripe\CMS\Controllers\CMSPageAddController
   CMSPageEditController: SilverStripe\CMS\Controllers\CMSPageEditController
@@ -46,23 +45,22 @@ mappings:
   SiteTreeLinkTracking_Parser: SilverStripe\CMS\Model\SiteTreeLinkTracking_Parser
   VirtualPage: SilverStripe\CMS\Model\VirtualPage
   BrokenFilesReport: SilverStripe\CMS\Reports\BrokenFilesReport
-  SideReport_BrokenFiles: SilverStripe\CMS\Reports\SideReport_BrokenFiles
+  SideReport_BrokenFiles: SilverStripe\CMS\Reports\BrokenFilesReport
   BrokenLinksReport: SilverStripe\CMS\Reports\BrokenLinksReport
-  SideReport_BrokenLinks: SilverStripe\CMS\Reports\SideReport_BrokenLinks
+  SideReport_BrokenLinks: SilverStripe\CMS\Reports\BrokenLinksReport
   BrokenRedirectorPagesReport: SilverStripe\CMS\Reports\BrokenRedirectorPagesReport
-  SideReport_BrokenRedirectorPages: SilverStripe\CMS\Reports\SideReport_BrokenRedirectorPages
+  SideReport_BrokenRedirectorPages: SilverStripe\CMS\Reports\BrokenRedirectorPagesReport
   BrokenVirtualPagesReport: SilverStripe\CMS\Reports\BrokenVirtualPagesReport
-  SideReport_BrokenVirtualPages: SilverStripe\CMS\Reports\SideReport_BrokenVirtualPages
+  SideReport_BrokenVirtualPages: SilverStripe\CMS\Reports\BrokenVirtualPagesReport
   EmptyPagesReport: SilverStripe\CMS\Reports\EmptyPagesReport
-  SideReport_EmptyPages: SilverStripe\CMS\Reports\SideReport_EmptyPages
+  SideReport_EmptyPages: SilverStripe\CMS\Reports\EmptyPagesReport
   RecentlyEditedReport: SilverStripe\CMS\Reports\RecentlyEditedReport
-  SideReport_RecentlyEdited: SilverStripe\CMS\Reports\SideReport_RecentlyEdited
+  SideReport_RecentlyEdited: SilverStripe\CMS\Reports\RecentlyEditedReport
   ContentControllerSearchExtension: SilverStripe\CMS\Search\ContentControllerSearchExtension
   SearchForm: SilverStripe\CMS\Search\SearchForm
   MigrateSiteTreeLinkingTask: SilverStripe\CMS\Tasks\MigrateSiteTreeLinkingTask
   RemoveOrphanedPagesTask: SilverStripe\CMS\Tasks\RemoveOrphanedPagesTask
   SiteTreeMaintenanceTask: SilverStripe\CMS\Tasks\SiteTreeMaintenanceTask
-  LeftAndMain_TreeNode: SilverStripe\CMS\Controllers\CMSTreeNode
   AssetAdmin: SilverStripe\AssetAdmin\Controller\AssetAdmin
   AssetTableField: SilverStripe\AssetAdmin\Controller\AssetAdmin
   CMSAddPageController: SilverStripe\CMS\Controllers\CMSPageAddController
@@ -71,7 +69,6 @@ mappings:
   ContentControl: SilverStripe\CMS\Controllers\ContentController
   Permissions: SilverStripe\Security\Permission
   SITETREE: SilverStripe\CMS\Model\SiteTree
-  SideReport: SilverStripe\Reports\SideReport
   CMSMain_left_ss: SilverStripe\CMS\Controllers\CMSMain
   CMSPageHistoryController_versions_ss: SilverStripe\CMS\Controllers\CMSPageHistoryController
   CMSPagesController_ContentToolbar_ss: SilverStripe\CMS\Controllers\CMSPageHistoryController