diff --git a/data/LanguageNameSearch.php b/data/LanguageNameSearch.php
index 10115516..56b9ad22 100644
--- a/data/LanguageNameSearch.php
+++ b/data/LanguageNameSearch.php
@@ -1,5 +1,6 @@
 <?php
 
+use MediaWiki\Languages\LanguageNameUtils;
 use MediaWiki\MediaWikiServices;
 
 /**
@@ -82,7 +83,7 @@ class LanguageNameSearch {
 				// If $userLanguage is not provided (null), it is the same as autonym
 				$candidates = [
 					mb_strtolower( $languageNameUtils->getLanguageName( $code, $userLanguage ) ),
-					mb_strtolower( $languageNameUtils->getLanguageName( $code, null ) ),
+					mb_strtolower( $languageNameUtils->getLanguageName( $code, LanguageNameUtils::AUTONYMS ) ),
 					$name
 				];
 
diff --git a/includes/Hooks.php b/includes/Hooks.php
index bd879490..5f2bf575 100644
--- a/includes/Hooks.php
+++ b/includes/Hooks.php
@@ -270,7 +270,8 @@ class Hooks implements
 	 * @return string
 	 */
 	protected function getDefaultLanguage( array $preferred ) {
-		$supported = $this->languageNameUtils->getLanguageNames( LanguageNameUtils::AUTONYMS, 'mwfile' );
+		$supported = $this->languageNameUtils
+			->getLanguageNames( LanguageNameUtils::AUTONYMS, LanguageNameUtils::SUPPORTED );
 
 		// look for a language that is acceptable to the client
 		// and known to the wiki.