diff --git a/CategoryTree.alias.php b/CategoryTree.alias.php
index 05cdf241..4317cefc 100644
--- a/CategoryTree.alias.php
+++ b/CategoryTree.alias.php
@@ -271,6 +271,11 @@ $specialPageAliases['myv'] = array(
 	'CategoryTree' => array( 'КатегорияньЧувто' ),
 );
 
+/** Norwegian Bokmål (‪Norsk (bokmål)‬) */
+$specialPageAliases['nb'] = array(
+	'CategoryTree' => array( 'Kategoritre' ),
+);
+
 /** Low German (Plattdüütsch) */
 $specialPageAliases['nds'] = array(
 	'CategoryTree' => array( 'Kategorieboom' ),
@@ -291,11 +296,6 @@ $specialPageAliases['nn'] = array(
 	'CategoryTree' => array( 'Kategoritre' ),
 );
 
-/** Norwegian (bokmål)‬ (‪Norsk (bokmål)‬) */
-$specialPageAliases['nb'] = array(
-	'CategoryTree' => array( 'Kategoritre' ),
-);
-
 /** Occitan (Occitan) */
 $specialPageAliases['oc'] = array(
 	'CategoryTree' => array( 'ArbreCategoria', 'Arbre_categoria' ),
@@ -326,7 +326,7 @@ $specialPageAliases['ro'] = array(
 	'CategoryTree' => array( 'Arborele_categoriilor' ),
 );
 
-/** Sanskrit (संस्कृत) */
+/** Sanskrit (संस्कृतम्) */
 $specialPageAliases['sa'] = array(
 	'CategoryTree' => array( 'वर्गवृक्ष:' ),
 );
@@ -376,7 +376,7 @@ $specialPageAliases['vec'] = array(
 	'CategoryTree' => array( 'ÀlbaroCategorie' ),
 );
 
-/** Veps (Vepsan kel') */
+/** Veps (Vepsän kel') */
 $specialPageAliases['vep'] = array(
 	'CategoryTree' => array( 'KategorijoidenPu' ),
 );
@@ -404,9 +404,4 @@ $specialPageAliases['zh-hant'] = array(
 /** Chinese (Taiwan) (‪中文(台灣)‬) */
 $specialPageAliases['zh-tw'] = array(
 	'CategoryTree' => array( '分類樹' ),
-);
-
-/**
- * For backwards compatibility with MediaWiki 1.15 and earlier.
- */
-$aliases =& $specialPageAliases;
\ No newline at end of file
+);
\ No newline at end of file
diff --git a/CategoryTree.i18n.magic.php b/CategoryTree.i18n.magic.php
index c6d2ccb8..cecea6a9 100644
--- a/CategoryTree.i18n.magic.php
+++ b/CategoryTree.i18n.magic.php
@@ -53,7 +53,7 @@ $magicWords['eo'] = array(
 
 /** Spanish (Español) */
 $magicWords['es'] = array(
-	'categorytree' => array( 0, 'árboldecategorías', 'arboldecategorias', 'categorytree' ),
+	'categorytree' => array( 0, 'árboldecategorías', 'arboldecategorias' ),
 );
 
 /** Estonian (Eesti) */
@@ -111,6 +111,11 @@ $magicWords['mr'] = array(
 	'categorytree' => array( 0, 'वर्गवृक्ष', 'categorytree' ),
 );
 
+/** Norwegian Bokmål (‪Norsk (bokmål)‬) */
+$magicWords['nb'] = array(
+	'categorytree' => array( 0, 'kategoritre' ),
+);
+
 /** Nedersaksisch (Nedersaksisch) */
 $magicWords['nds-nl'] = array(
 	'categorytree' => array( 0, 'kategorieboom', 'categorieboom' ),
@@ -121,11 +126,6 @@ $magicWords['nl'] = array(
 	'categorytree' => array( 0, 'categorieboom' ),
 );
 
-/** Norwegian (bokmål)‬ (‪Norsk (bokmål)‬) */
-$magicWords['nb'] = array(
-	'categorytree' => array( 0, 'kategoritre' ),
-);
-
 /** Polish (Polski) */
 $magicWords['pl'] = array(
 	'categorytree' => array( 0, 'drzewokategorii' ),
@@ -141,6 +141,11 @@ $magicWords['sr-ec'] = array(
 	'categorytree' => array( 0, 'стаблокатегорије', 'стабло_категорије' ),
 );
 
+/** Serbian (Latin script) (‪Srpski (latinica)‬) */
+$magicWords['sr-el'] = array(
+	'categorytree' => array( 0, 'stablokategorije', 'stablo_kategorije' ),
+);
+
 /** Swedish (Svenska) */
 $magicWords['sv'] = array(
 	'categorytree' => array( 0, 'kategoriträd', 'categorytree' ),
@@ -148,7 +153,7 @@ $magicWords['sv'] = array(
 
 /** Turkish (Türkçe) */
 $magicWords['tr'] = array(
-	'categorytree' => array( 0, 'kategorihiyerarşisi' ),
+	'categorytree' => array( 0, 'kategorihiyerarşisi', 'kategoriağacı', 'ulamhiyerarşisi', 'ulamağacı' ),
 );
 
 /** Tatar (Cyrillic script) (Татарча) */