diff --git a/admin/tool/task/classes/run_from_cli.php b/admin/tool/task/classes/run_from_cli.php
index 9b91a142384..35a722e3841 100644
--- a/admin/tool/task/classes/run_from_cli.php
+++ b/admin/tool/task/classes/run_from_cli.php
@@ -18,7 +18,7 @@
  * Form for scheduled tasks admin pages.
  *
  * @deprecated since Moodle 3.9 MDL-63580. Please use the \core\task\manager.
- * @todo final deprecation. To be removed in Moodle 4.3 MDL-63594.
+ * @todo final deprecation. To be removed in Moodle 4.1 MDL-63594.
  *
  * @package    tool_task
  * @copyright  2018 Toni Barbera <toni@moodle.com>
diff --git a/admin/tool/task/cli/adhoc_task.php b/admin/tool/task/cli/adhoc_task.php
index 07cded8889a..0c1135beffe 100644
--- a/admin/tool/task/cli/adhoc_task.php
+++ b/admin/tool/task/cli/adhoc_task.php
@@ -18,7 +18,7 @@
  * Task executor for adhoc tasks.
  *
  * @deprecated since Moodle 3.9 MDL-63580. Please use the admin/cli/adhoc_task.php.
- * @todo final deprecation. To be removed in Moodle 4.3 MDL-63594.
+ * @todo final deprecation. To be removed in Moodle 4.1 MDL-63594.
  *
  * @package    tool_task
  * @copyright  2018 Andrew Nicols <andrew@nicols.co.uk>
diff --git a/admin/tool/task/cli/schedule_task.php b/admin/tool/task/cli/schedule_task.php
index 073075e99fc..5b1038a8616 100644
--- a/admin/tool/task/cli/schedule_task.php
+++ b/admin/tool/task/cli/schedule_task.php
@@ -18,7 +18,7 @@
  * CLI task execution.
  *
  * @deprecated since Moodle 3.9 MDL-63580. Please use the admin/cli/schedule_task.php.
- * @todo final deprecation. To be removed in Moodle 4.3 MDL-63594.
+ * @todo final deprecation. To be removed in Moodle 4.1 MDL-63594.
  *
  * @package    tool_task
  * @copyright  2014 Petr Skoda
diff --git a/course/classes/local/repository/content_item_readonly_repository.php b/course/classes/local/repository/content_item_readonly_repository.php
index 3704b9765eb..aa876f3a175 100644
--- a/course/classes/local/repository/content_item_readonly_repository.php
+++ b/course/classes/local/repository/content_item_readonly_repository.php
@@ -298,7 +298,7 @@ class content_item_readonly_repository implements content_item_readonly_reposito
                 }
 
             } else if (component_callback_exists('mod_' . $mod->name, 'get_shortcuts')) {
-                // TODO: MDL-68011 this block needs to be removed in 4.3.
+                // TODO: MDL-68011 this block needs to be removed in 4.1.
                 debugging('The callback get_shortcuts has been deprecated. Please use get_course_content_items and
                     get_all_content_items instead. Some features of the activity chooser, such as favourites and recommendations
                     are not supported when providing content items via the deprecated callback.');
diff --git a/lib/adminlib.php b/lib/adminlib.php
index b91129b481b..3a7045d3880 100644
--- a/lib/adminlib.php
+++ b/lib/adminlib.php
@@ -7348,12 +7348,12 @@ class admin_setting_manageantiviruses extends admin_setting {
  *
  * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  * @deprecated since Moodle 3.9 MDL-45184. Please use \tool_licensemanager\manager instead.
- * @todo MDL-45184 This class will be deleted in Moodle 4.3.
+ * @todo MDL-45184 This class will be deleted in Moodle 4.1.
  */
 class admin_setting_managelicenses extends admin_setting {
     /**
      * @deprecated since Moodle 3.9 MDL-45184. Please use \tool_licensemanager\manager instead.
-     * @todo MDL-45184 This class will be deleted in Moodle 4.3
+     * @todo MDL-45184 This class will be deleted in Moodle 4.1
      */
     public function __construct() {
         global $ADMIN;
@@ -7375,7 +7375,7 @@ class admin_setting_managelicenses extends admin_setting {
      * Always returns true, does nothing
      *
      * @deprecated since Moodle 3.9 MDL-45184.
-     * @todo MDL-45184 This method will be deleted in Moodle 4.3
+     * @todo MDL-45184 This method will be deleted in Moodle 4.1
      *
      * @return true
      */
@@ -7390,7 +7390,7 @@ class admin_setting_managelicenses extends admin_setting {
      * Always returns true, does nothing
      *
      * @deprecated since Moodle 3.9 MDL-45184.
-     * @todo MDL-45184 This method will be deleted in Moodle 4.3
+     * @todo MDL-45184 This method will be deleted in Moodle 4.1
      *
      * @return true
      */
@@ -7405,7 +7405,7 @@ class admin_setting_managelicenses extends admin_setting {
      * Always returns '', does not write anything
      *
      * @deprecated since Moodle 3.9 MDL-45184.
-     * @todo MDL-45184 This method will be deleted in Moodle 4.3
+     * @todo MDL-45184 This method will be deleted in Moodle 4.1
      *
      * @return string Always returns ''
      */
@@ -7421,7 +7421,7 @@ class admin_setting_managelicenses extends admin_setting {
      * Builds the XHTML to display the control
      *
      * @deprecated since Moodle 3.9 MDL-45184. Please use \tool_licensemanager\manager instead.
-     * @todo MDL-45184 This method will be deleted in Moodle 4.3
+     * @todo MDL-45184 This method will be deleted in Moodle 4.1
      *
      * @param string $data Unused
      * @param string $query
diff --git a/lib/classes/task/legacy_plugin_cron_task.php b/lib/classes/task/legacy_plugin_cron_task.php
index 197dbd2e581..998a203eeb3 100644
--- a/lib/classes/task/legacy_plugin_cron_task.php
+++ b/lib/classes/task/legacy_plugin_cron_task.php
@@ -28,7 +28,7 @@ namespace core\task;
  * Note - this is only for plugins using the legacy cron method,
  * plugins can also now just add their own scheduled tasks which is the preferred method.
  * @deprecated since Moodle 3.9 MDL-52846. Please use new task API.
- * @todo MDL-61165 This will be deleted in Moodle 4.3
+ * @todo MDL-61165 This will be deleted in Moodle 4.1
  */
 class legacy_plugin_cron_task extends scheduled_task {
 
diff --git a/lib/deprecatedlib.php b/lib/deprecatedlib.php
index 8ae69cc1976..6ea7fbb48ab 100644
--- a/lib/deprecatedlib.php
+++ b/lib/deprecatedlib.php
@@ -2944,7 +2944,7 @@ function get_module_metadata($course, $modnames, $sectionreturn = null) {
  * with other processing (other than displaying the rest of the page) after using this function!
  *
  * @deprecated since Moodle 3.9 MDL-63580. Please use the \core\task\manager::run_from_cli($task).
- * @todo final deprecation. To be removed in Moodle 4.3 MDL-63594.
+ * @todo final deprecation. To be removed in Moodle 4.1 MDL-63594.
  * @param \core\task\scheduled_task $task Task to run
  * @return bool True if cron run successful
  */
@@ -2962,7 +2962,7 @@ function cron_run_single_task(\core\task\scheduled_task $task) {
  *   and 'Finished (whatever)' lines, otherwise does not display
  *
  * @deprecated since Moodle 3.9 MDL-52846. Please use new task API.
- * @todo MDL-61165 This will be deleted in Moodle 4.3.
+ * @todo MDL-61165 This will be deleted in Moodle 4.1.
  */
 function cron_execute_plugin_type($plugintype, $description = null) {
     global $DB;
@@ -3036,7 +3036,7 @@ function cron_execute_plugin_type($plugintype, $description = null) {
  *   looking in the older location
  *
  * @deprecated since Moodle 3.9 MDL-52846. Please use new task API.
- * @todo MDL-61165 This will be deleted in Moodle 4.3.
+ * @todo MDL-61165 This will be deleted in Moodle 4.1.
  */
 function cron_bc_hack_plugin_functions($plugintype, $plugins) {
     global $CFG; // Mandatory in case it is referenced by include()d PHP script.
diff --git a/lib/licenselib.php b/lib/licenselib.php
index 3010ef9b2dd..3d14013a3ec 100644
--- a/lib/licenselib.php
+++ b/lib/licenselib.php
@@ -96,7 +96,7 @@ class license_manager {
      * Adding a new license type
      *
      * @deprecated Since Moodle 3.9, MDL-45184.
-     * @todo MDL-67344 This will be deleted in Moodle 4.3.
+     * @todo MDL-67344 This will be deleted in Moodle 4.1.
      * @see license_manager::save()
      *
      * @param object $license the license record to add.
diff --git a/lib/plagiarismlib.php b/lib/plagiarismlib.php
index b711ac98860..7b5b1f4f1c9 100644
--- a/lib/plagiarismlib.php
+++ b/lib/plagiarismlib.php
@@ -79,7 +79,7 @@ function plagiarism_get_file_results($cmid, $userid, $file) {
  * saves/updates plagiarism settings from a modules config page - called by course/modedit.php
  *
  * @deprecated Since Moodle 3.9. MDL-65835 Please use {plugin name}_coursemodule_edit_post_actions() instead.
- * @todo MDL-67526 This is to be moved from here to deprecatedlib.php in Moodle 4.3
+ * @todo MDL-67526 This is to be moved from here to deprecatedlib.php in Moodle 4.1
  * @param object $data - form data
  */
 function plagiarism_save_form_elements($data) {
@@ -108,7 +108,7 @@ function plagiarism_save_form_elements($data) {
  * adds the list of plagiarism settings to a form - called inside modules that have enabled plagiarism
  *
  * @deprecated Since Moodle 3.9. MDL-65835 Please use {plugin name}_coursemodule_standard_elements() instead.
- * @todo MDL-67526 This is to be moved from here to deprecatedlib.php in Moodle 4.3
+ * @todo MDL-67526 This is to be moved from here to deprecatedlib.php in Moodle 4.1
  * @param object $mform - Moodle form object
  * @param object $context - context object
  * @param string $modulename - Name of the module
@@ -181,7 +181,7 @@ function plagiarism_print_disclosure($cmid) {
 /**
  * Helper function - also loads lib file of plagiarism plugin
  *
- * @todo MDL-67872 the deprecated code in this function to be removed in Moodle 4.3
+ * @todo MDL-67872 the deprecated code in this function to be removed in Moodle 4.1
  * @return array of available plugins
  */
 function plagiarism_load_available_plugins() {
diff --git a/lib/upgrade.txt b/lib/upgrade.txt
index a5f08be75b0..23c54ee256c 100644
--- a/lib/upgrade.txt
+++ b/lib/upgrade.txt
@@ -109,7 +109,7 @@ information provided here is intended especially for developers.
     - type: specifies the calendar type. Optional, defaults to Gregorian.
     - fixday: Whether to remove leading zero for day. Optional, defaults to 1.
     - fixhour: Whether to remove leading zero for hour. Optional, defaults to 1.
-* Legacy cron has been deprecated and will be removed in Moodle 4.3. This includes the functions:
+* Legacy cron has been deprecated and will be removed in Moodle 4.1. This includes the functions:
   - cron_execute_plugin_type()
   - cron_bc_hack_plugin_functions()
   Please, use the Task API instead: https://docs.moodle.org/dev/Task_API
diff --git a/mod/lti/lib.php b/mod/lti/lib.php
index 9c629a2873a..8bc6c6e5818 100644
--- a/mod/lti/lib.php
+++ b/mod/lti/lib.php
@@ -228,7 +228,7 @@ function lti_delete_instance($id) {
  * This is so you can add an external tool types directly to the activity chooser
  *
  * @deprecated since 3.9
- * @todo MDL-68011 This is to be moved from here to deprecatedlib.php in Moodle 4.3
+ * @todo MDL-68011 This is to be moved from here to deprecatedlib.php in Moodle 4.1
  * @param stdClass $defaultitem default item that would be added to the activity chooser if this callback was not present.
  *     It has properties: archetype, name, title, help, icon, link
  * @return array An array of aliases for this activity. Each element is an object with same list of properties as $defaultitem,