diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index dbfc33a..f1adef1 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -15,7 +15,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@master
+        uses: actions/checkout@v3
 
       - name: Install PHP
         uses: shivammathur/setup-php@v2
@@ -24,19 +24,8 @@ jobs:
         env:
           COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Get Composer cache directory
-        id: composer-cache
-        run: echo "::set-output name=dir::$(composer config cache-files-dir)"
-
-      - name: Set up Composer caching
-        uses: actions/cache@master
-        env:
-          cache-name: cache-composer-dependencies
-        with:
-          path: ${{ steps.composer-cache.outputs.dir }}
-          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-composer-
+      - name: Setup Composer caching
+        uses: ramsey/composer-install@v2
 
       - name: Install dependencies and update PHPUnit
         run: |
diff --git a/.github/workflows/deploy-readme-assets-to-wp-org.yml b/.github/workflows/deploy-readme-assets-to-wp-org.yml
index a6cf4fa..b171acb 100644
--- a/.github/workflows/deploy-readme-assets-to-wp-org.yml
+++ b/.github/workflows/deploy-readme-assets-to-wp-org.yml
@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@master
+        uses: actions/checkout@v3
 
       - name: WordPress.org plugin asset/readme update
         uses: 10up/action-wordpress-plugin-asset-update@stable
diff --git a/.github/workflows/deploy-to-wp-org.yml b/.github/workflows/deploy-to-wp-org.yml
index bf4ae90..3ed3d5e 100644
--- a/.github/workflows/deploy-to-wp-org.yml
+++ b/.github/workflows/deploy-to-wp-org.yml
@@ -10,21 +10,10 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@master
+        uses: actions/checkout@v3
 
-      - name: Get Composer cache directory
-        id: composer-cache
-        run: echo "::set-output name=dir::$(composer config cache-files-dir)"
-
-      - name: Set up Composer caching
-        uses: actions/cache@master
-        env:
-          cache-name: cache-composer-dependencies
-        with:
-          path: ${{ steps.composer-cache.outputs.dir }}
-          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-composer-
+      - name: Setup Composer caching
+        uses: ramsey/composer-install@v2
 
       - name: Install dependencies in prod version
         run: |
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 51b4c5c..34f2c33 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,6 @@
+## 6.0.4 (23.09.2023) ##
+* Fixed disappeared file descriptions on the Theme File Editor page.
+
 ## 6.0.3 (29.07.2023) ##
 * Fixed fatal error with Jetpack sync.
 
diff --git a/README.md b/README.md
index 16c5e4c..3b625ca 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 
 Converts Cyrillic characters in post, page and term slugs to Latin characters. Useful for creating human-readable URLs.
 
-![](./assets/banner-772x250.png)
+![Banner](./.wordpress-org/banner-772x250.png)
 
 ## Features
 
diff --git a/composer.json b/composer.json
index 9204abd..9f1fadd 100644
--- a/composer.json
+++ b/composer.json
@@ -36,6 +36,11 @@
   },
   "minimum-stability": "dev",
   "prefer-stable": true,
+  "config": {
+    "allow-plugins": {
+      "dealerdirect/phpcodesniffer-composer-installer": true
+    }
+  },
   "require": {
     "ext-json": "*"
   },
@@ -47,7 +52,7 @@
     "squizlabs/php_codesniffer": "^3.7.2",
     "phpcompatibility/php-compatibility": "^9.3.5",
     "phpcompatibility/phpcompatibility-wp": "^2.1.4",
-    "wp-coding-standards/wpcs": "^2.3.0",
+    "wp-coding-standards/wpcs": "^3.0.1",
     "php-coveralls/php-coveralls": "^v2.6.0"
   },
   "autoload": {
@@ -78,8 +83,6 @@
     "update-tests": "update-tests",
     "revert-tests": "update-tests revert",
     "phpcs": "vendor/bin/phpcs --colors --standard=phpcs.xml",
-    "acceptance": "codecept run acceptance -c .codeception.yml",
-    "integration": "codecept run integration -c .codeception.yml",
-    "unit": "codecept run unit -c .codeception.yml"
+    "unit": "vendor/bin/phpunit"
   }
 }
diff --git a/cyr-to-lat.php b/cyr-to-lat.php
index d9473d5..a756935 100644
--- a/cyr-to-lat.php
+++ b/cyr-to-lat.php
@@ -10,7 +10,7 @@
  * Plugin Name:       Cyr-To-Lat
  * Plugin URI:        https://wordpress.org/plugins/cyr2lat/
  * Description:       Convert Non-Latin characters in post and term slugs to Latin characters. Useful for creating human-readable URLs. Based on the original plugin by Anton Skorobogatov.
- * Version:           6.0.3
+ * Version:           6.0.4
  * Requires at least: 5.1
  * Requires PHP:      7.0.0
  * Author:            Sergey Biryukov, Mikhail Kobzarev, Igor Gergel
@@ -22,7 +22,7 @@
  *
  *
  * WC requires at least: 3.0
- * WC tested up to:      7.9
+ * WC tested up to:      8.1
  */
 
 // phpcs:ignore Generic.Commenting.DocComment.MissingShort
@@ -43,7 +43,7 @@
 /**
  * Plugin version.
  */
-define( 'CYR_TO_LAT_VERSION', '6.0.3' );
+define( 'CYR_TO_LAT_VERSION', '6.0.4' );
 
 /**
  * Path to the plugin dir.
diff --git a/phpcs.xml b/phpcs.xml
index 0e498d6..ea8ac57 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -22,7 +22,7 @@
 	<arg name="parallel" value="12"/><!-- Enables parallel processing when available for faster results. -->
 	<arg name="cache" value=".phpcs.cache"/>
 
-	<config name="installed_paths" value="vendor/phpcompatibility/php-compatibility,vendor/phpcompatibility/phpcompatibility-paragonie,vendor/phpcompatibility/phpcompatibility-wp,vendor/wp-coding-standards/wpcs"/>
+	<config name="installed_paths" value="vendor/phpcompatibility/php-compatibility,vendor/phpcompatibility/phpcompatibility-paragonie,vendor/phpcompatibility/phpcompatibility-wp,vendor/phpcsstandards/phpcsextra,vendor/phpcsstandards/phpcsutils,vendor/wp-coding-standards/wpcs"/>
 	<config name="testVersion" value="7.0-"/>
 
 	<!-- Rules: Check PHP version compatibility -->
@@ -30,25 +30,14 @@
 	<rule ref="PHPCompatibilityWP"/>
 
 	<!-- Rules: WordPress Coding Standards -->
-	<config name="minimum_supported_wp_version" value="5.1"/>
-	<rule ref="WordPress"/>
-
-	<!-- Allow only short array syntax -->
-	<rule ref="Generic.Arrays.DisallowShortArraySyntax.Found">
-		<severity>0</severity>
-	</rule>
-	<rule ref="Generic.Arrays.DisallowLongArraySyntax.Found"/>
-
-	<!-- Allow short ternary syntax -->
-	<rule ref="WordPress.PHP.DisallowShortTernary.Found">
-		<severity>0</severity>
-	</rule>
-
-	<!-- Rules to follow PSR4 -->
-	<rule ref="WordPress.Files.FileName.InvalidClassFileName">
-		<severity>0</severity>
-	</rule>
-	<rule ref="WordPress.Files.FileName.NotHyphenatedLowercase">
-		<severity>0</severity>
+	<config name="minimum_supported_wp_version" value="5.0"/>
+	<rule ref="WordPress">
+		<exclude name="Generic.CodeAnalysis.UnusedFunctionParameter.Found"/>
+		<exclude name="Generic.CodeAnalysis.UnusedFunctionParameter.FoundAfterLastUsed"/>
+		<exclude name="Universal.Arrays.DisallowShortArraySyntax.Found"/>
+		<exclude name="Universal.Operators.DisallowShortTernary.Found"/>
+		<!-- Rules to follow PSR4 -->
+		<exclude name="WordPress.Files.FileName.InvalidClassFileName"/>
+		<exclude name="WordPress.Files.FileName.NotHyphenatedLowercase"/>
 	</rule>
 </ruleset>
diff --git a/readme.txt b/readme.txt
index 9e05723..bbb68ee 100644
--- a/readme.txt
+++ b/readme.txt
@@ -3,7 +3,7 @@ Contributors: SergeyBiryukov, mihdan, karevn, webvitaly, kaggdesign
 Tags: cyrillic, belorussian, ukrainian, bulgarian, macedonian, georgian, kazakh, latin, l10n, russian, cyr-to-lat, cyr2lat, rustolat, slugs, translations, transliteration
 Requires at least: 5.1
 Tested up to: 6.3
-Stable tag: 6.0.3
+Stable tag: 6.0.4
 Requires PHP: 7.0.0
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
@@ -221,7 +221,10 @@ Yes you can!
 
 == Changelog ==
 
-= 6.0.3 (29.07.2023) =
+= 6.0.4 (23.09.2023) =
+* Fixed disappeared file descriptions on the Theme File Editor page.
+
+* = 6.0.3 (29.07.2023) =
 * Fixed fatal error with Jetpack sync.
 
 = 6.0.2 (26.07.2023) =
diff --git a/src/php/AdminNotices.php b/src/php/AdminNotices.php
index 4843a3f..4f76962 100644
--- a/src/php/AdminNotices.php
+++ b/src/php/AdminNotices.php
@@ -31,15 +31,15 @@ public function __construct() {
 	/**
 	 * Add admin notice.
 	 *
-	 * @param string $message Message to show.
-	 * @param string $class   Message class: notice notice-success notice-error notice-warning notice-info
-	 *                        is-dismissible.
-	 * @param array  $options Notice options.
+	 * @param string $message    Message to show.
+	 * @param string $class_name Message class: notice notice-success notice-error notice-warning notice-info
+	 *                           is-dismissible.
+	 * @param array  $options    Notice options.
 	 */
-	public function add_notice( string $message, string $class = 'notice', array $options = [] ) {
+	public function add_notice( string $message, string $class_name = 'notice', array $options = [] ) {
 		$this->notices[] = [
 			'message' => $message,
-			'class'   => $class,
+			'class'   => $class_name,
 			'options' => $options,
 		];
 	}
diff --git a/src/php/BackgroundProcesses/PostConversionProcess.php b/src/php/BackgroundProcesses/PostConversionProcess.php
index cea7f23..7c2ddfa 100644
--- a/src/php/BackgroundProcesses/PostConversionProcess.php
+++ b/src/php/BackgroundProcesses/PostConversionProcess.php
@@ -184,6 +184,7 @@ protected function rename_file( string $file, string $new_file ) {
 		$new_filename = $new_path['filename'];
 
 		if ( $new_filename !== $filename ) {
+			// phpcs:ignore WordPress.WP.AlternativeFunctions.rename_rename
 			return rename( $file, $new_file );
 		}
 
diff --git a/src/php/ConversionTables.php b/src/php/ConversionTables.php
index bc8d2ea..9e5b956 100644
--- a/src/php/ConversionTables.php
+++ b/src/php/ConversionTables.php
@@ -694,13 +694,13 @@ public static function get( string $locale = '' ): array {
 					'ש' => 'sh',
 					'ת' => 'th',
 				];
-				for ( $code = 0x0590; $code <= 0x05CF; $code ++ ) {
+				for ( $code = 0x0590; $code <= 0x05CF; $code++ ) {
 					$table[ Mbstring::mb_chr( $code ) ] = '';
 				}
-				for ( $code = 0x05F0; $code <= 0x05F5; $code ++ ) {
+				for ( $code = 0x05F0; $code <= 0x05F5; $code++ ) {
 					$table[ Mbstring::mb_chr( $code ) ] = '';
 				}
-				for ( $code = 0xFB1D; $code <= 0xFB4F; $code ++ ) {
+				for ( $code = 0xFB1D; $code <= 0xFB4F; $code++ ) {
 					$table[ Mbstring::mb_chr( $code ) ] = '';
 				}
 				break;
diff --git a/src/php/Main.php b/src/php/Main.php
index e34ec2c..0b2b5df 100644
--- a/src/php/Main.php
+++ b/src/php/Main.php
@@ -422,12 +422,12 @@ public function min_suffix(): string {
 	/**
 	 * Fix string encoding on macOS.
 	 *
-	 * @param string $string String.
-	 * @param array  $table  Conversion table.
+	 * @param string $str   String.
+	 * @param array  $table Conversion table.
 	 *
 	 * @return string
 	 */
-	private function fix_mac_string( string $string, array $table ): string {
+	private function fix_mac_string( string $str, array $table ): string {
 		$fix_table = ConversionTables::get_fix_table_for_mac();
 
 		$fix = [];
@@ -437,50 +437,50 @@ private function fix_mac_string( string $string, array $table ): string {
 			}
 		}
 
-		return strtr( $string, $fix );
+		return strtr( $str, $fix );
 	}
 
 	/**
 	 * Split Chinese string by hyphens.
 	 *
-	 * @param string $string String.
-	 * @param array  $table  Conversion table.
+	 * @param string $str   String.
+	 * @param array  $table Conversion table.
 	 *
 	 * @return string
 	 */
-	protected function split_chinese_string( string $string, array $table ): string {
-		if ( ! $this->settings->is_chinese_locale() || mb_strlen( $string ) < 4 ) {
-			return $string;
+	protected function split_chinese_string( string $str, array $table ): string {
+		if ( ! $this->settings->is_chinese_locale() || mb_strlen( $str ) < 4 ) {
+			return $str;
 		}
 
-		$chars  = Mbstring::mb_str_split( $string );
-		$string = '';
+		$chars = Mbstring::mb_str_split( $str );
+		$str   = '';
 
 		foreach ( $chars as $char ) {
 			if ( isset( $table[ $char ] ) ) {
-				$string .= '-' . $char . '-';
+				$str .= '-' . $char . '-';
 			} else {
-				$string .= $char;
+				$str .= $char;
 			}
 		}
 
-		return $string;
+		return $str;
 	}
 
 	/**
 	 * Transliterate string using a table.
 	 *
-	 * @param string $string String.
+	 * @param string $str String.
 	 *
 	 * @return string
 	 */
-	public function transliterate( string $string ): string {
+	public function transliterate( string $str ): string {
 		$table = (array) apply_filters( 'ctl_table', $this->settings->get_table() );
 
-		$string = $this->fix_mac_string( $string, $table );
-		$string = $this->split_chinese_string( $string, $table );
+		$str = $this->fix_mac_string( $str, $table );
+		$str = $this->split_chinese_string( $str, $table );
 
-		return strtr( $string, $table );
+		return strtr( $str, $table );
 	}
 
 	/**
diff --git a/src/php/Requirements.php b/src/php/Requirements.php
index 2fdc88a..362a08b 100644
--- a/src/php/Requirements.php
+++ b/src/php/Requirements.php
@@ -53,6 +53,8 @@ class Requirements {
 	 * @param Settings                  $settings      Settings.
 	 * @param AdminNotices              $admin_notices Admin notices.
 	 * @param WP_Filesystem_Direct|null $wp_filesystem File system.
+	 *
+	 * @noinspection PhpUnusedLocalVariableInspection
 	 */
 	public function __construct( Settings $settings, AdminNotices $admin_notices, WP_Filesystem_Direct $wp_filesystem = null ) {
 		$this->settings   = $settings;
@@ -62,6 +64,12 @@ public function __construct( Settings $settings, AdminNotices $admin_notices, WP
 
 		// @codeCoverageIgnoreStart
 		if ( ! function_exists( 'WP_Filesystem' ) ) {
+			/**
+			 * Make the scope of $wp_file_descriptions global,
+			 * so that when wp-admin/includes/file.php assigns to it, it is adjusting the global variable as intended.
+			 */
+			global $wp_file_descriptions;
+
 			require_once ABSPATH . 'wp-admin/includes/file.php';
 		}
 		// @codeCoverageIgnoreEnd
diff --git a/src/php/Settings/Abstracts/SettingsBase.php b/src/php/Settings/Abstracts/SettingsBase.php
index 9ccf837..0a11eb5 100644
--- a/src/php/Settings/Abstracts/SettingsBase.php
+++ b/src/php/Settings/Abstracts/SettingsBase.php
@@ -760,7 +760,7 @@ private function print_checkbox_field( array $arguments ) {
 		}
 
 		foreach ( $arguments['options'] as $key => $label ) {
-			$iterator ++;
+			++$iterator;
 			$options_markup .= sprintf(
 				'<label for="%2$s_%7$s">' .
 				'<input id="%2$s_%7$s" name="%1$s[%2$s][]" type="%3$s" value="%4$s" %5$s %8$s />' .
@@ -826,7 +826,7 @@ private function print_radio_field( array $arguments ) {
 		}
 
 		foreach ( $arguments['options'] as $key => $label ) {
-			$iterator ++;
+			++$iterator;
 			$options_markup .= sprintf(
 				'<label for="%2$s_%7$s">' .
 				'<input id="%2$s_%7$s" name="%1$s[%2$s]" type="%3$s" value="%4$s" %5$s %8$s />' .
@@ -1020,7 +1020,7 @@ private function print_table_field( array $arguments ) {
 			);
 			echo '</div>';
 
-			$iterator ++;
+			++$iterator;
 		}
 
 		echo '</fieldset>';
diff --git a/src/php/Settings/PluginSettingsBase.php b/src/php/Settings/PluginSettingsBase.php
index 9045031..5b0cb34 100644
--- a/src/php/Settings/PluginSettingsBase.php
+++ b/src/php/Settings/PluginSettingsBase.php
@@ -193,7 +193,7 @@ public function admin_footer_text( $text ) {
 		return wp_kses(
 			sprintf(
 			/* translators: 1: plugin name, 2: wp.org review link with stars, 3: wp.org review link with text. */
-				__( 'Please rate %1$s %2$s on %3$s</a>. Thank you!', 'cyr2lat' ),
+				__( 'Please rate %1$s %2$s on %3$s. Thank you!', 'cyr2lat' ),
 				'<strong>Cyr To Lat</strong>',
 				sprintf(
 					'<a href="%s" target="_blank" rel="noopener noreferrer">★★★★★</a>',
diff --git a/src/php/Settings/SystemInfo.php b/src/php/Settings/SystemInfo.php
index a846c2f..8df1f27 100644
--- a/src/php/Settings/SystemInfo.php
+++ b/src/php/Settings/SystemInfo.php
@@ -463,14 +463,14 @@ private function data( string $key, string $value, int $max_key_length = 0 ): st
 	/**
 	 * Get max key length.
 	 *
-	 * @param array  $array Array.
-	 * @param string $key   Key.
+	 * @param array  $arr Array.
+	 * @param string $key Key.
 	 *
 	 * @return int
 	 */
-	private function get_max_key_length( array $array, string $key ): int {
+	private function get_max_key_length( array $arr, string $key ): int {
 		return array_reduce(
-			$array,
+			$arr,
 			static function ( $carry, $item ) use ( $key ) {
 				$length = isset( $item[ $key ] ) ? mb_strlen( $item[ $key ] ) : 0;
 
@@ -483,17 +483,17 @@ static function ( $carry, $item ) use ( $key ) {
 	/**
 	 * Multibyte str_pad.
 	 *
-	 * @param string $string     A string.
+	 * @param string $str        A string.
 	 * @param int    $length     Desired length.
 	 * @param string $pad_string Padding character.
 	 *
 	 * @return string
 	 * @noinspection PhpSameParameterValueInspection
 	 */
-	private function mb_str_pad( string $string, int $length, string $pad_string = ' ' ): string {
+	private function mb_str_pad( string $str, int $length, string $pad_string = ' ' ): string {
 		$pad_string = mb_substr( $pad_string, 0, 1 );
-		$times      = max( 0, $length - mb_strlen( $string ) );
+		$times      = max( 0, $length - mb_strlen( $str ) );
 
-		return $string . str_repeat( $pad_string, $times );
+		return $str . str_repeat( $pad_string, $times );
 	}
 }
diff --git a/tests/unit/BackgroundProcesses/PostConversionProcessTest.php b/tests/unit/BackgroundProcesses/PostConversionProcessTest.php
index 6d527b9..60f7334 100644
--- a/tests/unit/BackgroundProcesses/PostConversionProcessTest.php
+++ b/tests/unit/BackgroundProcesses/PostConversionProcessTest.php
@@ -339,8 +339,8 @@ static function ( $name ) use ( $abspath ) {
 			}
 		);
 		WP_Mock::userFunction( 'untrailingslashit' )->with( $abspath )->andReturnUsing(
-			function ( $string ) {
-				return rtrim( $string, '/' );
+			function ( $str ) {
+				return rtrim( $str, '/' );
 			}
 		);
 
diff --git a/tests/unit/BackgroundProcesses/TermConversionProcessTest.php b/tests/unit/BackgroundProcesses/TermConversionProcessTest.php
index d424537..537d9c6 100644
--- a/tests/unit/BackgroundProcesses/TermConversionProcessTest.php
+++ b/tests/unit/BackgroundProcesses/TermConversionProcessTest.php
@@ -177,8 +177,8 @@ public function test_filter_term_locale_with_polylang( $pll_pll_get_term_languag
 
 		FunctionMocker::replace(
 			'class_exists',
-			static function ( $class ) {
-				return 'Polylang' === $class;
+			static function ( $class_name ) {
+				return 'Polylang' === $class_name;
 			}
 		);
 
diff --git a/tests/unit/ConverterTest.php b/tests/unit/ConverterTest.php
index 77b11b9..ee345c6 100644
--- a/tests/unit/ConverterTest.php
+++ b/tests/unit/ConverterTest.php
@@ -102,8 +102,10 @@ public function test_init_hooks() {
 	 * @dataProvider dp_test_conversion_notices
 	 */
 	public function test_conversion_notices(
-		bool $posts_process_running, bool $terms_process_running,
-		bool $posts_process_completed, bool $terms_process_completed
+		bool $posts_process_running,
+		bool $terms_process_running,
+		bool $posts_process_completed,
+		bool $terms_process_completed
 	) {
 		$main              = Mockery::mock( Main::class );
 		$settings          = Mockery::mock( Settings::class );
diff --git a/tests/unit/CyrToLatTestCase.php b/tests/unit/CyrToLatTestCase.php
index a11f5ae..e46331a 100644
--- a/tests/unit/CyrToLatTestCase.php
+++ b/tests/unit/CyrToLatTestCase.php
@@ -149,19 +149,19 @@ public function tearDown(): void {
 	/**
 	 * Get an object protected property.
 	 *
-	 * @param object $object        Object.
+	 * @param object $obj           Object.
 	 * @param string $property_name Property name.
 	 *
 	 * @return mixed
 	 *
 	 * @throws ReflectionException Reflection exception.
 	 */
-	protected function get_protected_property( $object, string $property_name ) {
-		$reflection_class = new ReflectionClass( $object );
+	protected function get_protected_property( $obj, string $property_name ) {
+		$reflection_class = new ReflectionClass( $obj );
 
 		$property = $reflection_class->getProperty( $property_name );
 		$property->setAccessible( true );
-		$value = $property->getValue( $object );
+		$value = $property->getValue( $obj );
 		$property->setAccessible( false );
 
 		return $value;
@@ -170,25 +170,25 @@ protected function get_protected_property( $object, string $property_name ) {
 	/**
 	 * Set an object protected property.
 	 *
-	 * @param object $object        Object.
+	 * @param object $obj           Object.
 	 * @param string $property_name Property name.
 	 * @param mixed  $value         Property vale.
 	 *
 	 * @throws ReflectionException Reflection exception.
 	 */
-	protected function set_protected_property( $object, string $property_name, $value ) {
-		$reflection_class = new ReflectionClass( $object );
+	protected function set_protected_property( $obj, string $property_name, $value ) {
+		$reflection_class = new ReflectionClass( $obj );
 
 		$property = $reflection_class->getProperty( $property_name );
 		$property->setAccessible( true );
-		$property->setValue( $object, $value );
+		$property->setValue( $obj, $value );
 		$property->setAccessible( false );
 	}
 
 	/**
 	 * Set an object protected method accessibility.
 	 *
-	 * @param object $object      Object.
+	 * @param object $obj         Object.
 	 * @param string $method_name Property name.
 	 * @param bool   $accessible  Property vale.
 	 *
@@ -196,8 +196,8 @@ protected function set_protected_property( $object, string $property_name, $valu
 	 *
 	 * @throws ReflectionException Reflection exception.
 	 */
-	protected function set_method_accessibility( $object, string $method_name, bool $accessible = true ): ReflectionMethod {
-		$reflection_class = new ReflectionClass( $object );
+	protected function set_method_accessibility( $obj, string $method_name, bool $accessible = true ): ReflectionMethod {
+		$reflection_class = new ReflectionClass( $obj );
 
 		$method = $reflection_class->getMethod( $method_name );
 		$method->setAccessible( $accessible );
@@ -640,13 +640,13 @@ protected function get_conversion_table( string $locale = '' ): array {
 					'ש' => 'sh',
 					'ת' => 'th',
 				];
-				for ( $code = 0x0590; $code <= 0x05CF; $code ++ ) {
+				for ( $code = 0x0590; $code <= 0x05CF; $code++ ) {
 					$table[ Mbstring::mb_chr( $code ) ] = '';
 				}
-				for ( $code = 0x05F0; $code <= 0x05F5; $code ++ ) {
+				for ( $code = 0x05F0; $code <= 0x05F5; $code++ ) {
 					$table[ Mbstring::mb_chr( $code ) ] = '';
 				}
-				for ( $code = 0xFB1D; $code <= 0xFB4F; $code ++ ) {
+				for ( $code = 0xFB1D; $code <= 0xFB4F; $code++ ) {
 					$table[ Mbstring::mb_chr( $code ) ] = '';
 				}
 				break;
@@ -1263,16 +1263,16 @@ protected static function get_test_settings(): array {
 	 */
 	protected function get_file_data( string $file, array $default_headers, string $context = '' ): array {
 		// We don't need to write to the file, so just open for reading.
-		// phpcs:ignore WordPress.WP.AlternativeFunctions.file_system_read_fopen
+		// phpcs:ignore WordPress.WP.AlternativeFunctions.file_system_operations_fopen
 		$fp = fopen( $file, 'rb' );
 
 		if ( $fp ) {
 			// Pull only the first 8 KB of the file in.
-			// phpcs:ignore WordPress.WP.AlternativeFunctions.file_system_read_fread
+			// phpcs:ignore WordPress.WP.AlternativeFunctions.file_system_operations_fread
 			$file_data = fread( $fp, 8 * KB_IN_BYTES );
 
 			// PHP will close file handle, but we are good citizens.
-			// phpcs:ignore WordPress.WP.AlternativeFunctions.file_system_read_fclose
+			// phpcs:ignore WordPress.WP.AlternativeFunctions.file_system_operations_fclose
 			fclose( $fp );
 		} else {
 			$file_data = '';
diff --git a/tests/unit/MainTest.php b/tests/unit/MainTest.php
index 66768cf..fb0b059 100644
--- a/tests/unit/MainTest.php
+++ b/tests/unit/MainTest.php
@@ -107,12 +107,12 @@ public function test_init_multilingual( bool $polylang, bool $sitepress ) {
 
 		FunctionMocker::replace(
 			'class_exists',
-			static function ( $class ) use ( $polylang, $sitepress ) {
-				if ( 'Polylang' === $class ) {
+			static function ( $class_name ) use ( $polylang, $sitepress ) {
+				if ( 'Polylang' === $class_name ) {
 					return $polylang;
 				}
 
-				if ( 'SitePress' === $class ) {
+				if ( 'SitePress' === $class_name ) {
 					return $sitepress;
 				}
 
@@ -351,8 +351,8 @@ public function test_init_hooks( bool $sitepress, bool $frontend ) {
 
 		FunctionMocker::replace(
 			'class_exists',
-			static function ( $class ) use ( $sitepress ) {
-				if ( 'SitePress' === $class ) {
+			static function ( $class_name ) use ( $sitepress ) {
+				if ( 'SitePress' === $class_name ) {
 					return $sitepress;
 				}
 
@@ -448,12 +448,12 @@ public function test_sanitize_title_pre_term_slug() {
 
 		FunctionMocker::replace(
 			'class_exists',
-			static function ( $class ) {
-				if ( 'Polylang' === $class ) {
+			static function ( $class_name ) {
+				if ( 'Polylang' === $class_name ) {
 					return false;
 				}
 
-				if ( 'SitePress' === $class ) {
+				if ( 'SitePress' === $class_name ) {
 					return false;
 				}
 
@@ -684,8 +684,8 @@ public function test_sanitize_title_for_frontend() {
 
 		FunctionMocker::replace(
 			'class_exists',
-			static function ( $class ) {
-				return 'SitePress' === $class;
+			static function ( $class_name ) {
+				return 'SitePress' === $class_name;
 			}
 		);
 
@@ -708,7 +708,10 @@ static function ( $class ) {
 	 * @noinspection PhpMissingParamTypeInspection
 	 */
 	public function test_sanitize_title_for_wc_attribute_taxonomy(
-		string $title, bool $is_wc, $attribute_taxonomies, int $expected
+		string $title,
+		bool $is_wc,
+		$attribute_taxonomies,
+		int $expected
 	) {
 		FunctionMocker::replace(
 			'function_exists',
@@ -718,7 +721,6 @@ static function ( $function_name ) use ( $is_wc ) {
 				}
 
 				return null;
-
 			}
 		);
 
@@ -796,13 +798,13 @@ public function test_woocommerce_after_template_part_filter() {
 	/**
 	 * Test transliterate()
 	 *
-	 * @param string $string   String to transliterate.
+	 * @param string $str      String to transliterate.
 	 * @param string $expected Expected result.
 	 *
 	 * @dataProvider dp_test_transliterate
 	 * @throws ReflectionException ReflectionException.
 	 */
-	public function test_transliterate( string $string, string $expected ) {
+	public function test_transliterate( string $str, string $expected ) {
 		$subject = $this->get_subject();
 
 		$settings = $this->get_protected_property( $subject, 'settings' );
@@ -814,7 +816,7 @@ class_exists( Version::class ) &&
 			WP_Mock::expectFilter( 'ctl_table', $settings->get_table() );
 		}
 
-		self::assertSame( $expected, $subject->transliterate( $string ) );
+		self::assertSame( $expected, $subject->transliterate( $str ) );
 	}
 
 	/**
@@ -845,13 +847,13 @@ public static function dp_test_transliterate(): array {
 	/**
 	 * Test split_chinese_string().
 	 *
-	 * @param string $string   String.
+	 * @param string $str      String.
 	 * @param string $expected Expected result.
 	 *
 	 * @throws ReflectionException ReflectionException.
 	 * @dataProvider dp_test_split_chinese_string
 	 */
-	public function test_split_chinese_string( string $string, string $expected ) {
+	public function test_split_chinese_string( string $str, string $expected ) {
 		$locale = 'zh_CN';
 		$table  = $this->get_conversion_table( $locale );
 		$table  = $this->transpose_chinese_table( $table );
@@ -865,7 +867,7 @@ public function test_split_chinese_string( string $string, string $expected ) {
 		$this->set_method_accessibility( $subject, $method );
 		$this->set_protected_property( $subject, 'settings', $settings );
 
-		self::assertSame( $expected, $subject->$method( $string, $table ) );
+		self::assertSame( $expected, $subject->$method( $str, $table ) );
 	}
 
 	/**
@@ -1000,7 +1002,7 @@ public function test_min_suffix( bool $defined, bool $script_debug, string $expe
 
 		FunctionMocker::replace(
 			'defined',
-			static function( $constant_name ) use ( $defined ) {
+			static function ( $constant_name ) use ( $defined ) {
 				if ( 'SCRIPT_DEBUG' === $constant_name ) {
 					return $defined;
 				}
@@ -1011,7 +1013,7 @@ static function( $constant_name ) use ( $defined ) {
 
 		FunctionMocker::replace(
 			'constant',
-			static function( $name ) use ( $script_debug ) {
+			static function ( $name ) use ( $script_debug ) {
 				if ( 'SCRIPT_DEBUG' === $name ) {
 					return $script_debug;
 				}
@@ -1672,8 +1674,8 @@ static function ( $name ) {
 
 		FunctionMocker::replace(
 			'class_exists',
-			static function ( $class ) use ( $feature_util ) {
-				if ( 'Automattic\WooCommerce\Utilities\FeaturesUtil' === $class ) {
+			static function ( $class_name ) use ( $feature_util ) {
+				if ( 'Automattic\WooCommerce\Utilities\FeaturesUtil' === $class_name ) {
 					return $feature_util;
 				}
 
diff --git a/tests/unit/RequestTest.php b/tests/unit/RequestTest.php
index 9c7c34a..46a007c 100644
--- a/tests/unit/RequestTest.php
+++ b/tests/unit/RequestTest.php
@@ -257,8 +257,8 @@ public function test_get_rest_route( string $current_path, string $expected ) {
 
 		WP_Mock::userFunction( 'rest_url' )->andReturn( $rest_url );
 		WP_Mock::userFunction( 'trailingslashit' )->andReturnUsing(
-			function ( $string ) {
-				return rtrim( $string, '/' ) . '/';
+			function ( $str ) {
+				return rtrim( $str, '/' ) . '/';
 			}
 		);
 		WP_Mock::userFunction( 'wp_parse_url' )->with( $rest_url, PHP_URL_PATH )->andReturn( $rest_path );
diff --git a/tests/unit/Settings/Abstracts/SettingsBaseTest.php b/tests/unit/Settings/Abstracts/SettingsBaseTest.php
index 2ed2f14..e326d02 100644
--- a/tests/unit/Settings/Abstracts/SettingsBaseTest.php
+++ b/tests/unit/Settings/Abstracts/SettingsBaseTest.php
@@ -1069,7 +1069,7 @@ public function test_field_callback( array $arguments, string $expected ) {
 		WP_Mock::passthruFunction( 'wp_kses' );
 
 		WP_Mock::userFunction( 'checked' )->andReturnUsing(
-			function ( $checked, $current, $echo ) {
+			function ( $checked, $current, $do_echo ) {
 				$result = '';
 				if ( (string) $checked === (string) $current ) {
 					$result = 'checked="checked"';
@@ -1080,7 +1080,7 @@ function ( $checked, $current, $echo ) {
 		);
 
 		WP_Mock::userFunction( 'selected' )->andReturnUsing(
-			function ( $checked, $current, $echo ) {
+			function ( $checked, $current, $do_echo ) {
 				$result = '';
 
 				if ( (string) $checked === (string) $current ) {
@@ -2119,8 +2119,8 @@ public static function dp_test_is_options_screen(): array {
 	public function test_is_options_screen_when_get_current_screen_does_not_exist() {
 		FunctionMocker::replace(
 			'function_exists',
-			static function ( $function ) {
-				return 'get_current_screen' !== $function;
+			static function ( $func ) {
+				return 'get_current_screen' !== $func;
 			}
 		);
 
diff --git a/tests/unit/Settings/SettingsTest.php b/tests/unit/Settings/SettingsTest.php
index 429d641..bb17dfa 100644
--- a/tests/unit/Settings/SettingsTest.php
+++ b/tests/unit/Settings/SettingsTest.php
@@ -100,7 +100,7 @@ public function test_get() {
 
 		$tables = Mockery::mock( Tables::class );
 		$tables->shouldReceive( 'get' )->andReturnUsing(
-			function( $key, $empty_value ) use ( $tables_key, &$tables_value ) {
+			function ( $key, $empty_value ) use ( $tables_key, &$tables_value ) {
 				if ( $key === $tables_key ) {
 					return $tables_value;
 				}
@@ -115,7 +115,7 @@ function( $key, $empty_value ) use ( $tables_key, &$tables_value ) {
 
 		$converter = Mockery::mock( Converter::class );
 		$converter->shouldReceive( 'get' )->andReturnUsing(
-			function( $key, $empty_value ) use ( $converter_key, $converter_value ) {
+			function ( $key, $empty_value ) use ( $converter_key, $converter_value ) {
 				if ( $key === $converter_key ) {
 					return $converter_value;
 				}
diff --git a/tests/unit/Stubs/WPCli.php b/tests/unit/Stubs/WPCli.php
index 22512ec..3e84cf7 100644
--- a/tests/unit/Stubs/WPCli.php
+++ b/tests/unit/Stubs/WPCli.php
@@ -28,8 +28,8 @@ public static function success( string $message ) {
 	 * Add command.
 	 *
 	 * @param string        $name     Name for the command (e.g. "post list" or "site empty").
-	 * @param callable|null $callable Command implementation as a class, function or closure.
+	 * @param callable|null $callback Command implementation as a class, function or closure.
 	 */
-	public static function add_command( string $name, $callable ) {
+	public static function add_command( string $name, $callback ) {
 	}
 }
diff --git a/tests/unit/bootstrap.php b/tests/unit/bootstrap.php
index 57e0113..4607b03 100644
--- a/tests/unit/bootstrap.php
+++ b/tests/unit/bootstrap.php
@@ -39,7 +39,7 @@
 /**
  * Plugin version.
  */
-const CYR_TO_LAT_TEST_VERSION = '6.0.3';
+const CYR_TO_LAT_TEST_VERSION = '6.0.4';
 
 /**
  * Path to the plugin dir.