diff --git a/data/LanguageNameIndexer.php b/data/LanguageNameIndexer.php
index b0eb56a6..8a3713c7 100644
--- a/data/LanguageNameIndexer.php
+++ b/data/LanguageNameIndexer.php
@@ -38,6 +38,9 @@ class LanguageNameIndexer extends Maintenance {
 			$translations = LanguageNames::getNames( $sourceLanguage, 0, 2 );
 			foreach ( $translations as $targetLanguage => $translation ) {
 				$translation = mb_strtolower( $translation );
+				// Remove directionality markers used in Names.php: users are not
+				// going to type these.
+				$translation = str_replace( "\xE2\x80\x8E", '', $translation );
 				$bucket = LanguageNameSearch::getIndex( $translation );
 				$buckets[$bucket][$translation] = $targetLanguage;
 			}
diff --git a/data/LanguageNameSearchData.php b/data/LanguageNameSearchData.php
index 755ea5b6..948a0f53 100644
--- a/data/LanguageNameSearchData.php
+++ b/data/LanguageNameSearchData.php
@@ -5,11 +5,11 @@ class LanguageNameSearchData {
 		113 => [
 			'qafar' => 'aa',
 			'qırımtatarca' => 'crh',
-			'qırımtatarca (latin)‎' => 'crh-latn',
+			'qırımtatarca (latin)' => 'crh-latn',
 			'qaraqalpaqsha' => 'kaa',
 			'qabardjajəbza' => 'kbd-latn',
-			'qazaqşa (latın)‎' => 'kk-latn',
-			'qazaqşa (türkïya)‎' => 'kk-tr',
+			'qazaqşa (latın)' => 'kk-latn',
+			'qazaqşa (türkïya)' => 'kk-tr',
 			'qafár af' => 'aa',
 			'quechua' => 'qu',
 			'quichua del altiplanu de chimborazo' => 'qug',
@@ -2665,7 +2665,7 @@ class LanguageNameSearchData {
 			'kinaray-a' => 'krj',
 			'karjala' => 'krl',
 			'kurdî' => 'ku',
-			'kurdî (latînî)‎' => 'ku-latn',
+			'kurdî (latînî)' => 'ku-latn',
 			'kernowek' => 'kw',
 			'kapampangan' => 'pam',
 			'kreol réyoné' => 'rcf',
@@ -9063,7 +9063,7 @@ class LanguageNameSearchData {
 		73 => [
 			'башҡортса' => 'ba',
 			'беларуская' => 'be',
-			'беларуская (тарашкевіца)‎' => 'be-x-old',
+			'беларуская (тарашкевіца)' => 'be-x-old',
 			'български' => 'bg',
 			'буряад' => 'bxr',
 			'башкірская' => 'ba',
@@ -9080,7 +9080,6 @@ class LanguageNameSearchData {
 			'бода' => 'brx',
 			'бурацкая' => 'bxr',
 			'баварская' => 'bar',
-			'беларуская (тарашкевіца)' => 'be-x-old',
 			'баўгарская' => 'bg',
 			'бэнгальская' => 'bn',
 			'басьнійская' => 'bs',
@@ -13480,7 +13479,7 @@ class LanguageNameSearchData {
 			'niuē' => 'niu',
 			'nederlands' => 'nl',
 			'nl-be' => 'nl-be',
-			'nederlands (informeel)‎' => 'nl-informal',
+			'nederlands (informeel)' => 'nl-informal',
 			'norsk nynorsk' => 'nn',
 			'novial' => 'nov',
 			'nouormand' => 'nrm',
@@ -14187,7 +14186,7 @@ class LanguageNameSearchData {
 			'ngôn ngữ không xác định' => 'und',
 		],
 		82 => [
-			'къырымтатарджа (кирилл)‎' => 'crh-cyrl',
+			'къырымтатарджа (кирилл)' => 'crh-cyrl',
 			'къарачай-малкъар' => 'krc',
 			'коми' => 'kv',
 			'кыргызча' => 'ky',
@@ -14662,7 +14661,7 @@ class LanguageNameSearchData {
 			'словѣньскъ / ⰔⰎⰑⰂⰡⰐⰠⰔⰍⰟ' => 'cu',
 			'саха тыла' => 'sah',
 			'српски / srpski' => 'sr',
-			'српски (ћирилица)‎' => 'sr-ec',
+			'српски (ћирилица)' => 'sr-ec',
 			'стараанглійская' => 'ang',
 			'старагрэцкая' => 'grc',
 			'сычуань і' => 'ii',
@@ -15077,7 +15076,7 @@ class LanguageNameSearchData {
 		100 => [
 			'dansk' => 'da',
 			'deutsch' => 'de',
-			'deutsch (sie-form)‎' => 'de-formal',
+			'deutsch (sie-form)' => 'de-formal',
 			'dolnoserbski' => 'dsb',
 			'dusun bundu-liwan' => 'dtp',
 			'dari-e mazdeyasnā' => 'gbz',
@@ -15445,7 +15444,7 @@ class LanguageNameSearchData {
 			'salırça' => 'slr',
 			'soomaaliga' => 'so',
 			'shqip' => 'sq',
-			'srpski (latinica)‎' => 'sr-el',
+			'srpski (latinica)' => 'sr-el',
 			'sranantongo' => 'srn',
 			'siswati' => 'ss',
 			'sesotho' => 'st',
@@ -19101,7 +19100,7 @@ class LanguageNameSearchData {
 		],
 		123 => [
 			'贛語' => 'gan',
-			'贛語（繁體）‎' => 'gan-hant',
+			'贛語（繁體）' => 'gan-hant',
 			'ᐃᓄᒃᑎᑐᑦ/inuktitut' => 'ike',
 			'ᐃᓄᒃᑎᑐᑦ' => 'ike-cans',
 			'ရခိုင်' => 'rki',
@@ -19120,7 +19119,7 @@ class LanguageNameSearchData {
 			'ရွမ်ဘို' => 'rof',
 		],
 		195 => [
-			'赣语（简体）‎' => 'gan-hans',
+			'赣语（简体）' => 'gan-hans',
 			'広東語' => 'zh-yue',
 		],
 		711 => [
@@ -21586,8 +21585,8 @@ class LanguageNameSearchData {
 		],
 		179 => [
 			'қазақша' => 'kk',
-			'қазақша (кирил)‎' => 'kk-cyrl',
-			'қазақша (қазақстан)‎' => 'kk-kz',
+			'қазақша (кирил)' => 'kk-cyrl',
+			'қазақша (қазақстан)' => 'kk-kz',
 			'қазақ тілі' => 'kk',
 			'қырғыз тілі' => 'ky',
 			'қытай тілі' => 'zh',
@@ -22625,7 +22624,7 @@ class LanguageNameSearchData {
 			'剛果文' => 'kg',
 		],
 		604 => [
-			'لەکی‎' => 'lki',
+			'لەکی' => 'lki',
 			'لۊری شومالی' => 'lrc',
 			'لئری دوٙمینی' => 'luz',
 			'لغة تتار القرم' => 'crh',
@@ -25190,14 +25189,14 @@ class LanguageNameSearchData {
 		],
 		13 => [
 			'中文' => 'zh',
-			'中文（中国大陆）‎' => 'zh-cn',
-			'中文（简体）‎' => 'zh-hans',
-			'中文（繁體）‎' => 'zh-hant',
-			'中文（香港）‎' => 'zh-hk',
-			'中文（澳門）‎' => 'zh-mo',
-			'中文（马来西亚）‎' => 'zh-my',
-			'中文（新加坡）‎' => 'zh-sg',
-			'中文（台灣）‎' => 'zh-tw',
+			'中文（中国大陆）' => 'zh-cn',
+			'中文（简体）' => 'zh-hans',
+			'中文（繁體）' => 'zh-hant',
+			'中文（香港）' => 'zh-hk',
+			'中文（澳門）' => 'zh-mo',
+			'中文（马来西亚）' => 'zh-my',
+			'中文（新加坡）' => 'zh-sg',
+			'中文（台灣）' => 'zh-tw',
 			'中央ドゥスン語' => 'dtp',
 			'中央アラスカ・ユピック語' => 'esu',
 			'中央アトラス・タマジクト語' => 'tzm',