diff --git a/.phpcs.xml b/.phpcs.xml
index f189ea1e..c78cd9ff 100644
--- a/.phpcs.xml
+++ b/.phpcs.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0"?>
 <ruleset>
 	<rule ref="./vendor/mediawiki/mediawiki-codesniffer/MediaWiki">
-		<exclude name="MediaWiki.Commenting.FunctionComment.MissingParamComment" />
 		<exclude name="MediaWiki.Files.ClassMatchesFilename.NotMatch" />
 		<exclude name="MediaWiki.Commenting.FunctionComment.MissingDocumentationPublic" />
+		<exclude name="MediaWiki.Commenting.LicenseComment.InvalidLicenseTag" />
 	</rule>
 	<file>.</file>
 	<arg name="extensions" value="php,php5,inc" />
diff --git a/UniversalLanguageSelector.hooks.php b/UniversalLanguageSelector.hooks.php
index 53c8e26f..6bdc9450 100644
--- a/UniversalLanguageSelector.hooks.php
+++ b/UniversalLanguageSelector.hooks.php
@@ -14,8 +14,8 @@
  *
  * @file
  * @ingroup Extensions
- * @licence GNU General Public Licence 2.0 or later
- * @licence MIT License
+ * @license GNU General Public Licence 2.0 or later
+ * @license MIT License
  */
 
 class UniversalLanguageSelectorHooks {
diff --git a/UniversalLanguageSelector.php b/UniversalLanguageSelector.php
index 09752695..1094fea7 100644
--- a/UniversalLanguageSelector.php
+++ b/UniversalLanguageSelector.php
@@ -14,8 +14,8 @@
  *
  * @file
  * @ingroup Extensions
- * @licence GPL-2.0-or-later
- * @licence MIT
+ * @license GPL-2.0-or-later
+ * @license MIT
  */
 
 if ( function_exists( 'wfLoadExtension' ) ) {
diff --git a/api/ApiLanguageSearch.php b/api/ApiLanguageSearch.php
index 11aedb84..7f5374f2 100644
--- a/api/ApiLanguageSearch.php
+++ b/api/ApiLanguageSearch.php
@@ -14,8 +14,8 @@
  *
  * @file
  * @ingroup Extensions
- * @licence GNU General Public Licence 2.0 or later
- * @licence MIT License
+ * @license GNU General Public Licence 2.0 or later
+ * @license MIT License
  */
 
 /**
diff --git a/api/ApiULSLocalization.php b/api/ApiULSLocalization.php
index f3b2cc35..674aa283 100644
--- a/api/ApiULSLocalization.php
+++ b/api/ApiULSLocalization.php
@@ -14,8 +14,8 @@
  *
  * @file
  * @ingroup Extensions
- * @licence GNU General Public Licence 2.0 or later
- * @licence MIT License
+ * @license GNU General Public Licence 2.0 or later
+ * @license MIT License
  */
 
 /**
diff --git a/composer.json b/composer.json
index c4b66ac4..69436166 100644
--- a/composer.json
+++ b/composer.json
@@ -26,7 +26,7 @@
 	},
 	"require-dev": {
 		"jakub-onderka/php-parallel-lint": "1.0.0",
-		"mediawiki/mediawiki-codesniffer": "16.0.1",
+		"mediawiki/mediawiki-codesniffer": "17.0.0",
 		"jakub-onderka/php-console-highlighter": "0.3.2",
 		"mediawiki/minus-x": "0.3.1"
 	},
diff --git a/data/LanguageNameIndexer.php b/data/LanguageNameIndexer.php
index a5f2f732..e852ccf2 100644
--- a/data/LanguageNameIndexer.php
+++ b/data/LanguageNameIndexer.php
@@ -14,8 +14,8 @@
  *
  * @file
  * @ingroup Extensions
- * @licence GNU General Public Licence 2.0 or later
- * @licence MIT License
+ * @license GNU General Public Licence 2.0 or later
+ * @license MIT License
  */
 
 $IP = getenv( 'MW_INSTALL_PATH' );
diff --git a/data/LanguageNameSearch.php b/data/LanguageNameSearch.php
index ebb9acd6..f4510971 100644
--- a/data/LanguageNameSearch.php
+++ b/data/LanguageNameSearch.php
@@ -14,8 +14,8 @@
  *
  * @file
  * @ingroup Extensions
- * @licence GNU General Public Licence 2.0 or later
- * @licence MIT License
+ * @license GNU General Public Licence 2.0 or later
+ * @license MIT License
  */
 class LanguageNameSearch {
 	/**
diff --git a/includes/ResourceLoaderULSModule.php b/includes/ResourceLoaderULSModule.php
index e39d547d..1bd2b4dc 100644
--- a/includes/ResourceLoaderULSModule.php
+++ b/includes/ResourceLoaderULSModule.php
@@ -15,8 +15,8 @@
  * @file
  * @author Niklas Laxström
  * @ingroup Extensions
- * @licence GNU General Public Licence 2.0 or later
- * @licence MIT License
+ * @license GNU General Public Licence 2.0 or later
+ * @license MIT License
  */
 
 /**
diff --git a/includes/ULSJsonMessageLoader.php b/includes/ULSJsonMessageLoader.php
index da21a6b5..3d99ce52 100644
--- a/includes/ULSJsonMessageLoader.php
+++ b/includes/ULSJsonMessageLoader.php
@@ -14,8 +14,8 @@
  *
  * @file
  * @ingroup Extensions
- * @licence GNU General Public Licence 2.0 or later
- * @licence MIT License
+ * @license GNU General Public Licence 2.0 or later
+ * @license MIT License
  * @since 2013.11
  */
 
diff --git a/tests/phpunit/LanguageSearchTest.php b/tests/phpunit/LanguageSearchTest.php
index 042153f0..2884224e 100644
--- a/tests/phpunit/LanguageSearchTest.php
+++ b/tests/phpunit/LanguageSearchTest.php
@@ -14,8 +14,8 @@
  *
  * @file
  * @ingroup Extensions
- * @licence GNU General Public Licence 2.0 or later
- * @licence MIT License
+ * @license GNU General Public Licence 2.0 or later
+ * @license MIT License
  */
 
 /**