diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index a7ced3c..abc0f4d 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -82,11 +82,11 @@ jobs:
       fail-fast: false
       matrix:
         command:
-          - "json:lint"
-          - "php:sniff"
-          - "php:codestyle"
-          - "php:stan"
           - "composer:normalize"
+          - "json:lint"
+          - "php:cs-fixer"
+          - "php:sniff"
+          - "php:stan"
         php-version:
           - 7.4
   code-quality-frontend:
diff --git a/README.md b/README.md
index 0ecbf29..841ae9a 100644
--- a/README.md
+++ b/README.md
@@ -25,15 +25,15 @@ All of those checks are available in Github Actions and in Gitlab CI.
 
 `composer ci:php:lint`
 
-### PHP CodeStyle check by [php-cs-fixer](https://github.com/FriendsOfPHP/PHP-CS-Fixer)
+### PHP code style fixer checks by [php-cs-fixer](https://github.com/FriendsOfPHP/PHP-CS-Fixer)
 
-`composer ci:php:codestyle`
+`composer ci:php:cs-fixer`
 
-### PHP Sniff by [phpcs](https://github.com/squizlabs/PHP_CodeSniffer)
+### PHP code sniffing by [phpcs](https://github.com/squizlabs/PHP_CodeSniffer)
 
 `composer ci:php:sniff`
 
-### PHP Copypaste check by [phpcpd](https://github.com/sebastianbergmann/phpcpd)
+### PHP copy'n'paste check by [phpcpd](https://github.com/sebastianbergmann/phpcpd)
 
 `composer ci:php:copypaste`
 
diff --git a/composer.json b/composer.json
index e7ddddf..61afbf5 100644
--- a/composer.json
+++ b/composer.json
@@ -81,11 +81,11 @@
 		],
 		"ci:json:lint": "find . ! -path '*.Build/*' -name '*.json' | xargs .Build/vendor/bin/jsonlint -q",
 		"ci:php": [
-			"@ci:php:codestyle",
+			"@ci:php:cs-fixer",
 			"@ci:php:sniff"
 		],
-		"ci:php:codestyle": "php ./tools/php-cs-fixer fix --config .php_cs.php -v --dry-run --using-cache false --diff --diff-format=udiff",
 		"ci:php:copypaste": "php ./tools/phpcpd Classes Configuration Tests",
+		"ci:php:cs-fixer": "php ./tools/php-cs-fixer fix --config .php_cs.php -v --dry-run --using-cache false --diff --diff-format=udiff",
 		"ci:php:lint": "find *.php Classes Configuration Tests -name '*.php' -print0 | xargs -0 -n 1 -P 4 php -l",
 		"ci:php:sniff": "php ./tools/phpcs Classes Configuration Tests",
 		"ci:php:stan": "php ./tools/phpstan analyse Classes",