diff --git a/.phpcs.xml b/.phpcs.xml
index 4124126..9e23c39 100644
--- a/.phpcs.xml
+++ b/.phpcs.xml
@@ -4,7 +4,6 @@
 		<exclude name="Generic.Files.OneObjectStructurePerFile.MultipleFound" />
 		<exclude name="MediaWiki.NamingConventions.LowerCamelFunctionsName.FunctionName"/>
 		<exclude name="MediaWiki.WhiteSpace.SpaceBeforeSingleLineComment.NewLineComment"/>
-		<exclude name="MediaWiki.Files.ClassMatchesFilename.NotMatch" />
 	</rule>
 	<file>.</file>
 	<arg name="extensions" value="php,php5,inc"/>
diff --git a/includes/Minerva.hooks.php b/includes/MinervaHooks.php
similarity index 100%
rename from includes/Minerva.hooks.php
rename to includes/MinervaHooks.php
diff --git a/skin.json b/skin.json
index 99f52c4..078e628 100644
--- a/skin.json
+++ b/skin.json
@@ -2,7 +2,7 @@
 	"AutoloadClasses": {
 		"MinervaResourceLoaderParsedMessageModule": "includes/MinervaResourceLoaderParsedMessageModule.php",
 		"MinervaUI": "includes/MinervaUI.php",
-		"MinervaHooks": "includes/Minerva.hooks.php",
+		"MinervaHooks": "includes/MinervaHooks.php",
 		"MinervaTemplate": "includes/skins/MinervaTemplate.php",
 		"SkinMinerva": "includes/skins/SkinMinerva.php",
 		"SkinMinervaNeue": "includes/skins/SkinMinerva.php",
diff --git a/tests/phpunit/MenuBuilderTest.php b/tests/phpunit/MenuBuilderTest.php
index 1b30651..2f3bc96 100644
--- a/tests/phpunit/MenuBuilderTest.php
+++ b/tests/phpunit/MenuBuilderTest.php
@@ -8,7 +8,7 @@ use MediaWiki\Minerva\MenuEntry;
 /**
  * @group MinervaNeue
  */
-class MenuTest extends \PHPUnit\Framework\TestCase {
+class MenuBuilderTest extends \PHPUnit\Framework\TestCase {
 	private $homeComponent = [
 		'text' => 'Home',
 		'href' => '/Main_page',
diff --git a/tests/phpunit/skins/SkinMinervaPageActionsTest.php b/tests/phpunit/skins/SkinMinervaPageActionsTest.php
index 14bdc66..4582cfa 100644
--- a/tests/phpunit/skins/SkinMinervaPageActionsTest.php
+++ b/tests/phpunit/skins/SkinMinervaPageActionsTest.php
@@ -10,6 +10,7 @@ use ContentHandler;
 
 // FIXME: That this class exists is an indicator that at least SkinMinerva#isAllowedPageAction
 // should be extracted from SkinMinerva.
+// phpcs:ignore MediaWiki.Files.ClassMatchesFilename.NotMatch
 class TestSkinMinerva extends SkinMinerva {
 	public function isAllowedPageAction( $action ) {
 		return parent::isAllowedPageAction( $action );
diff --git a/tests/phpunit/skins/SkinMinervaTest.php b/tests/phpunit/skins/SkinMinervaTest.php
index 5ce3aca..9b5b3f9 100644
--- a/tests/phpunit/skins/SkinMinervaTest.php
+++ b/tests/phpunit/skins/SkinMinervaTest.php
@@ -14,6 +14,7 @@ use Title;
 use User;
 use Wikimedia\TestingAccessWrapper;
 
+// phpcs:ignore MediaWiki.Files.ClassMatchesFilename.NotMatch
 class EchoNotifUser {
 	public function __construct(
 		$lastUnreadAlertTime, $lastUnreadMessageTime, $echoNotificationCount