diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 597ac25..79a18d3 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -13,10 +13,10 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-version: ['8.1', '8.2', '8.3', '8.4']
+        php-version: ['8.2', '8.3', '8.4']
         prefer-lowest: ['']
         include:
-          - php-version: '8.1'
+          - php-version: '8.2'
             prefer-lowest: 'prefer-lowest'
 
     steps:
@@ -47,19 +47,19 @@ jobs:
       run: |
         if ${{ matrix.prefer-lowest == 'prefer-lowest' }}; then
           make install-dev-lowest
-        elif ${{ matrix.php-version == '8.1' }}; then
+        elif ${{ matrix.php-version == '8.2' }}; then
           make install-dev-ignore-reqs
         else
           make install-dev
         fi
 
     - name: Setup problem matchers for PHPUnit
-      if: matrix.php-version == '8.1'
+      if: matrix.php-version == '8.2'
       run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
 
     - name: Run PHPUnit
       run: |
-        if [[ "${{ matrix.php-version }}" == "8.1" && "${{ matrix.prefer-lowest }}" != "prefer-lowest" ]]; then
+        if [[ "${{ matrix.php-version }}" == "8.2" && "${{ matrix.prefer-lowest }}" != "prefer-lowest" ]]; then
           export CODECOVERAGE=1
           vendor/bin/phpunit --display-incomplete --display-skipped --coverage-clover=coverage.xml
         else
@@ -67,7 +67,7 @@ jobs:
         fi
 
     - name: Submit code coverage
-      if: matrix.php-version == '8.1' && matrix.prefer-lowest != 'prefer-lowest'
+      if: matrix.php-version == '8.2' && matrix.prefer-lowest != 'prefer-lowest'
       uses: codecov/codecov-action@v5
 
   cs-stan:
@@ -80,7 +80,7 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: '8.1'
+          php-version: '8.2'
           extensions: mbstring, intl
           tools: cs2pr
           coverage: none
diff --git a/config/rector/sets/cakephp60.php b/config/rector/sets/cakephp60.php
index e194966..0c82410 100644
--- a/config/rector/sets/cakephp60.php
+++ b/config/rector/sets/cakephp60.php
@@ -103,6 +103,7 @@
         'Controller' => [
             'Cake\Controller\ComponentRegistry' => ['_Controller'],
             'Cake\Controller\Controller' => ['_components'],
+            'Cake\Controller\Component' => ['_registry'],
         ],
         'Core' => [
             'Cake\Core\Configure\Engine\IniConfig' => ['_extension', '_section'],
@@ -234,6 +235,20 @@
             'Cake\Http\Session\CacheSession' => ['_options'],
         ],
 
+        'I18n' => [
+            'Cake\I18n\MessagesFileLoader' => ['_name', '_plugin', '_locale', '_extension'],
+            'Cake\I18n\ChainMessagesLoader' => ['_loaders'],
+            // Can't rename _toStringFormat as it conflicts with ChronosDate::toStringFormat
+            'Cake\I18n\Date' => ['_jsonEncodeFormat'],
+            // Can't rename _toStringFormat as it conflicts with Chronos::toStringFormat
+            'Cake\I18n\DateTime' => ['_jsonEncodeFormat'],
+            // Can't rename _toStringFormat as it conflicts with ChronosTime::toStringFormat
+            'Cake\I18n\Time' => ['_jsonEncodeFormat'],
+            'Cake\I18n\I18n' => ['_collection', '_defaultLocale'],
+            'Cake\I18n\Number' => ['_formatters', '_defaultCurrency', '_defaultCurrencyFormat'],
+            'Cake\I18n\TranslatorRegistry' => ['_loaders', '_defaultFormatter', '_useFallback', '_cacher'],
+        ],
+
         'ORM' => [
             'Cake\ORM\Association' => [
                 '_name', '_className', '_bindingKey', '_foreignKey', '_conditions',