tz: Upgrade default_timezone_id to default_timezone

include/upgrader/streams/core/b26f29a6-1ee831c8.cleanup.sql

@@ -19,4 +19,5 @@ ALTER TABLE `%TABLE_PREFIX%user_account`
     DROP `dst`;
 
 DELETE FROM `%TABLE_PREFIX%config`
-    WHERE `key` = 'enable_daylight_saving' AND `namespace` = 'core';
+    WHERE `key` = IN ('enable_daylight_saving', 'default_timezone_id')
+      AND `namespace` = 'core';

include/upgrader/streams/core/b26f29a6-1ee831c8.patch.sql

@@ -167,6 +167,11 @@ UPDATE `%TABLE_PREFIX%config` A1
     WHERE A1.`key` = 'default_timezone_id'
       AND A1.`namespace` = 'core';
 
+UPDATE `%TABLE_PREFIX%config` A1
+    SET A1.`key` = 'default_timezone'
+    WHERE A1.`key` = 'default_timezone_id'
+      AND A1.`namespace` = 'core';
+
 DROP TABLE %TABLE_PREFIX%_timezones;
 
 ALTER TABLE `%TABLE_PREFIX%ticket`