From 34fb6297cdd897542647d4281bd4ec969367ee53 Mon Sep 17 00:00:00 2001
From: Ilmari Karonen <vyznev@users.mediawiki.org>
Date: Mon, 1 Dec 2008 17:14:30 +0000
Subject: [PATCH] Step 2 in NS_IMAGE -> NS_FILE transition (bug 44) (WARNING:
 huge commit).

This is a global search and replace of NS_IMAGE and NS_IMAGE_TALK with NS_FILE and NS_FILE_TALK respectively in all core files, excluding those already updated in step 1 (r44004).
---
 RELEASE-NOTES                                 |  3 ++-
 img_auth.php                                  |  2 +-
 includes/Article.php                          |  6 +++---
 includes/Category.php                         |  2 +-
 includes/CategoryPage.php                     |  2 +-
 includes/DefaultSettings.php                  |  2 +-
 includes/EditPage.php                         |  4 ++--
 includes/ImageGallery.php                     |  2 +-
 includes/ImagePage.php                        | 14 ++++++-------
 includes/ImageQueryPage.php                   |  4 ++--
 includes/Linker.php                           |  4 ++--
 includes/LinksUpdate.php                      |  2 +-
 includes/Namespace.php                        |  6 +++---
 includes/PrefixSearch.php                     |  2 +-
 includes/SearchEngine.php                     |  8 ++++----
 includes/Setup.php                            |  4 ++--
 includes/Skin.php                             |  4 ++--
 includes/SkinTemplate.php                     |  2 +-
 includes/Title.php                            | 20 +++++++++----------
 includes/UploadBase.php                       |  4 ++--
 includes/Wiki.php                             |  6 +++---
 includes/api/ApiDelete.php                    |  2 +-
 includes/api/ApiQueryAllimages.php            |  2 +-
 includes/api/ApiQueryBacklinks.php            |  6 +++---
 includes/api/ApiQueryDuplicateFiles.php       |  6 +++---
 includes/api/ApiQueryImageInfo.php            | 12 +++++------
 includes/api/ApiQueryImages.php               |  4 ++--
 includes/api/ApiQueryInfo.php                 |  8 ++++----
 includes/filerepo/ArchivedFile.php            |  4 ++--
 includes/filerepo/File.php                    |  2 +-
 includes/filerepo/FileRepo.php                | 12 +++++------
 includes/filerepo/ForeignDBFile.php           |  2 +-
 includes/filerepo/Image.php                   |  2 +-
 includes/filerepo/LocalFile.php               |  2 +-
 includes/filerepo/LocalRepo.php               |  2 +-
 includes/filerepo/OldLocalFile.php            |  2 +-
 includes/filerepo/RepoGroup.php               |  2 +-
 includes/filerepo/UnregisteredLocalFile.php   |  2 +-
 includes/parser/Parser.php                    | 10 +++++-----
 includes/specials/SpecialExport.php           |  2 +-
 .../specials/SpecialFileDuplicateSearch.php   |  2 +-
 includes/specials/SpecialFilepath.php         |  4 ++--
 includes/specials/SpecialImagelist.php        |  2 +-
 includes/specials/SpecialMIMEsearch.php       |  2 +-
 includes/specials/SpecialMostimages.php       |  2 +-
 includes/specials/SpecialNewimages.php        |  2 +-
 .../specials/SpecialRecentchangeslinked.php   |  6 +++---
 includes/specials/SpecialSearch.php           | 12 +++++------
 .../specials/SpecialUncategorizedimages.php   |  2 +-
 includes/specials/SpecialUndelete.php         |  6 +++---
 includes/specials/SpecialUnusedimages.php     |  2 +-
 includes/specials/SpecialUpload.php           | 10 +++++-----
 includes/specials/SpecialWantedfiles.php      |  4 ++--
 includes/specials/SpecialWhatlinkshere.php    |  4 ++--
 languages/classes/LanguageKk.php              |  2 +-
 languages/classes/LanguageKu.php              |  2 +-
 languages/classes/LanguageSr.php              |  2 +-
 languages/messages/MessagesAf.php             |  8 ++++----
 languages/messages/MessagesAm.php             |  4 ++--
 languages/messages/MessagesAn.php             |  4 ++--
 languages/messages/MessagesAng.php            |  4 ++--
 languages/messages/MessagesAr.php             |  8 ++++----
 languages/messages/MessagesArz.php            |  8 ++++----
 languages/messages/MessagesAs.php             |  8 ++++----
 languages/messages/MessagesAst.php            | 12 +++++------
 languages/messages/MessagesAvk.php            |  4 ++--
 languages/messages/MessagesAz.php             |  4 ++--
 languages/messages/MessagesBa.php             |  4 ++--
 languages/messages/MessagesBat_smg.php        |  8 ++++----
 languages/messages/MessagesBcc.php            |  8 ++++----
 languages/messages/MessagesBcl.php            |  4 ++--
 languages/messages/MessagesBe.php             |  4 ++--
 languages/messages/MessagesBe_tarask.php      |  8 ++++----
 languages/messages/MessagesBg.php             |  8 ++++----
 languages/messages/MessagesBn.php             |  8 ++++----
 languages/messages/MessagesBpy.php            |  4 ++--
 languages/messages/MessagesBr.php             |  4 ++--
 languages/messages/MessagesBs.php             |  8 ++++----
 languages/messages/MessagesCa.php             |  8 ++++----
 languages/messages/MessagesCe.php             |  4 ++--
 languages/messages/MessagesCeb.php            |  4 ++--
 languages/messages/MessagesCh.php             |  4 ++--
 languages/messages/MessagesCrh_cyrl.php       |  8 ++++----
 languages/messages/MessagesCrh_latn.php       |  8 ++++----
 languages/messages/MessagesCs.php             |  4 ++--
 languages/messages/MessagesCsb.php            |  4 ++--
 languages/messages/MessagesCu.php             | 12 +++++------
 languages/messages/MessagesCv.php             |  4 ++--
 languages/messages/MessagesCy.php             |  4 ++--
 languages/messages/MessagesDa.php             |  4 ++--
 languages/messages/MessagesDe.php             |  8 ++++----
 languages/messages/MessagesDsb.php            |  8 ++++----
 languages/messages/MessagesEl.php             |  4 ++--
 languages/messages/MessagesEn.php             |  4 ++--
 languages/messages/MessagesEo.php             |  4 ++--
 languages/messages/MessagesEs.php             |  8 ++++----
 languages/messages/MessagesEt.php             |  4 ++--
 languages/messages/MessagesEu.php             |  8 ++++----
 languages/messages/MessagesFa.php             |  8 ++++----
 languages/messages/MessagesFi.php             |  8 ++++----
 languages/messages/MessagesFiu_vro.php        |  4 ++--
 languages/messages/MessagesFo.php             |  6 +++---
 languages/messages/MessagesFr.php             |  4 ++--
 languages/messages/MessagesFrp.php            |  4 ++--
 languages/messages/MessagesFur.php            |  4 ++--
 languages/messages/MessagesFy.php             |  4 ++--
 languages/messages/MessagesGa.php             |  6 +++---
 languages/messages/MessagesGl.php             |  8 ++++----
 languages/messages/MessagesGn.php             |  4 ++--
 languages/messages/MessagesGu.php             |  4 ++--
 languages/messages/MessagesGv.php             |  4 ++--
 languages/messages/MessagesHaw.php            |  4 ++--
 languages/messages/MessagesHe.php             |  8 ++++----
 languages/messages/MessagesHi.php             |  4 ++--
 languages/messages/MessagesHr.php             |  8 ++++----
 languages/messages/MessagesHsb.php            |  8 ++++----
 languages/messages/MessagesHt.php             |  4 ++--
 languages/messages/MessagesHu.php             | 10 +++++-----
 languages/messages/MessagesHy.php             |  4 ++--
 languages/messages/MessagesIa.php             |  8 ++++----
 languages/messages/MessagesId.php             | 10 +++++-----
 languages/messages/MessagesIo.php             |  4 ++--
 languages/messages/MessagesIs.php             |  8 ++++----
 languages/messages/MessagesIt.php             |  8 ++++----
 languages/messages/MessagesJa.php             |  8 ++++----
 languages/messages/MessagesJv.php             |  6 +++---
 languages/messages/MessagesKa.php             |  8 ++++----
 languages/messages/MessagesKaa.php            |  4 ++--
 languages/messages/MessagesKab.php            |  4 ++--
 languages/messages/MessagesKk_arab.php        | 12 +++++------
 languages/messages/MessagesKk_cyrl.php        | 12 +++++------
 languages/messages/MessagesKk_latn.php        | 12 +++++------
 languages/messages/MessagesKm.php             | 10 +++++-----
 languages/messages/MessagesKn.php             |  4 ++--
 languages/messages/MessagesKo.php             |  8 ++++----
 languages/messages/MessagesKsh.php            | 12 +++++------
 languages/messages/MessagesKu_latn.php        |  4 ++--
 languages/messages/MessagesLa.php             |  8 ++++----
 languages/messages/MessagesLb.php             |  8 ++++----
 languages/messages/MessagesLbe.php            |  4 ++--
 languages/messages/MessagesLfn.php            |  4 ++--
 languages/messages/MessagesLi.php             |  8 ++++----
 languages/messages/MessagesLij.php            |  8 ++++----
 languages/messages/MessagesLo.php             |  4 ++--
 languages/messages/MessagesLt.php             |  4 ++--
 languages/messages/MessagesLv.php             |  4 ++--
 languages/messages/MessagesMdf.php            |  8 ++++----
 languages/messages/MessagesMg.php             |  4 ++--
 languages/messages/MessagesMk.php             |  8 ++++----
 languages/messages/MessagesMl.php             |  8 ++++----
 languages/messages/MessagesMn.php             |  4 ++--
 languages/messages/MessagesMr.php             |  4 ++--
 languages/messages/MessagesMs.php             | 10 +++++-----
 languages/messages/MessagesMt.php             |  4 ++--
 languages/messages/MessagesMyv.php            |  4 ++--
 languages/messages/MessagesNah.php            |  8 ++++----
 languages/messages/MessagesNap.php            |  8 ++++----
 languages/messages/MessagesNds.php            | 12 +++++------
 languages/messages/MessagesNds_nl.php         |  4 ++--
 languages/messages/MessagesNew.php            |  4 ++--
 languages/messages/MessagesNl.php             |  8 ++++----
 languages/messages/MessagesNn.php             |  4 ++--
 languages/messages/MessagesNo.php             |  8 ++++----
 languages/messages/MessagesNso.php            |  4 ++--
 languages/messages/MessagesNv.php             |  4 ++--
 languages/messages/MessagesOc.php             |  6 +++---
 languages/messages/MessagesOs.php             |  4 ++--
 languages/messages/MessagesPa.php             |  4 ++--
 languages/messages/MessagesPl.php             |  8 ++++----
 languages/messages/MessagesPms.php            |  4 ++--
 languages/messages/MessagesPnt.php            |  4 ++--
 languages/messages/MessagesPs.php             |  4 ++--
 languages/messages/MessagesPt.php             |  8 ++++----
 languages/messages/MessagesPt_br.php          |  8 ++++----
 languages/messages/MessagesQu.php             |  4 ++--
 languages/messages/MessagesRmy.php            |  4 ++--
 languages/messages/MessagesRo.php             |  8 ++++----
 languages/messages/MessagesRu.php             |  8 ++++----
 languages/messages/MessagesSa.php             |  4 ++--
 languages/messages/MessagesSah.php            |  4 ++--
 languages/messages/MessagesSc.php             |  4 ++--
 languages/messages/MessagesScn.php            |  8 ++++----
 languages/messages/MessagesSd.php             |  4 ++--
 languages/messages/MessagesSdc.php            |  4 ++--
 languages/messages/MessagesSi.php             |  8 ++++----
 languages/messages/MessagesSk.php             | 10 +++++-----
 languages/messages/MessagesSl.php             |  4 ++--
 languages/messages/MessagesSq.php             |  4 ++--
 languages/messages/MessagesSr_ec.php          |  8 ++++----
 languages/messages/MessagesSr_el.php          |  8 ++++----
 languages/messages/MessagesSrn.php            |  8 ++++----
 languages/messages/MessagesStq.php            |  4 ++--
 languages/messages/MessagesSu.php             |  4 ++--
 languages/messages/MessagesSv.php             |  8 ++++----
 languages/messages/MessagesTa.php             |  6 +++---
 languages/messages/MessagesTe.php             | 10 +++++-----
 languages/messages/MessagesTet.php            |  4 ++--
 languages/messages/MessagesTg_cyrl.php        |  4 ++--
 languages/messages/MessagesTh.php             |  8 ++++----
 languages/messages/MessagesTl.php             |  4 ++--
 languages/messages/MessagesTlh.php            |  4 ++--
 languages/messages/MessagesTr.php             |  4 ++--
 languages/messages/MessagesTt_latn.php        |  4 ++--
 languages/messages/MessagesTyv.php            |  4 ++--
 languages/messages/MessagesUdm.php            |  4 ++--
 languages/messages/MessagesUk.php             |  8 ++++----
 languages/messages/MessagesUr.php             |  4 ++--
 languages/messages/MessagesUz.php             |  4 ++--
 languages/messages/MessagesVec.php            |  8 ++++----
 languages/messages/MessagesVi.php             |  8 ++++----
 languages/messages/MessagesVls.php            |  4 ++--
 languages/messages/MessagesVo.php             |  8 ++++----
 languages/messages/MessagesWa.php             |  4 ++--
 languages/messages/MessagesWo.php             |  6 +++---
 languages/messages/MessagesXal.php            |  4 ++--
 languages/messages/MessagesYi.php             |  8 ++++----
 languages/messages/MessagesYo.php             |  4 ++--
 languages/messages/MessagesYue.php            | 20 +++++++++----------
 languages/messages/MessagesZea.php            |  4 ++--
 languages/messages/MessagesZh.php             |  8 ++++----
 languages/messages/MessagesZh_hans.php        |  8 ++++----
 languages/messages/MessagesZh_hant.php        |  8 ++++----
 languages/messages/MessagesZh_tw.php          |  4 ++--
 maintenance/FiveUpgrade.inc                   |  2 +-
 maintenance/archives/patch-linktables.sql     |  2 +-
 maintenance/cleanupImages.php                 |  8 ++++----
 maintenance/deleteBatch.php                   |  2 +-
 maintenance/generateSitemap.php               |  4 ++--
 maintenance/importImages.php                  |  2 +-
 maintenance/tables.sql                        |  4 ++--
 skins/Standard.php                            |  4 ++--
 thumb.php                                     |  2 +-
 232 files changed, 654 insertions(+), 653 deletions(-)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index d8315158aa..428e567d14 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -64,7 +64,8 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
   For backward compatibility purposes, Image still works. External tools may
   need to be updated.
 * The constants NS_FILE and NS_FILE_TALK can now be used instead of NS_IMAGE and
-  NS_IMAGE_TALK.  The old constants are retained as aliases for compatibility.
+  NS_IMAGE_TALK.  The old constants are retained as aliases for compatibility,
+  and should still be used in code meant to be compatible with v1.13 or older.
 * MediaWiki can be forced to use private IPs forwarded by a proxy server by
   using $wgUsePrivateIPs.
 
diff --git a/img_auth.php b/img_auth.php
index 4b625e3972..9141018103 100644
--- a/img_auth.php
+++ b/img_auth.php
@@ -48,7 +48,7 @@ if( preg_match( '!\d+px-(.*)!i', $name, $m ) )
 	$name = $m[1];
 wfDebugLog( 'img_auth', "\$name is {$name}" );
 
-$title = Title::makeTitleSafe( NS_IMAGE, $name );
+$title = Title::makeTitleSafe( NS_FILE, $name );
 if( !$title instanceof Title ) {
 	wfDebugLog( 'img_auth', "Unable to construct a valid Title from `{$name}`" );
 	wfForbidden();
diff --git a/includes/Article.php b/includes/Article.php
index fba1f82485..262806e26c 100644
--- a/includes/Article.php
+++ b/includes/Article.php
@@ -1219,7 +1219,7 @@ class Article {
 				$where = array( 'rd_from' => $this->getId() );
 				$dbw->delete( 'redirect', $where, __METHOD__);
 			}
-			if( $this->getTitle()->getNamespace() == NS_IMAGE ) {
+			if( $this->getTitle()->getNamespace() == NS_FILE ) {
 				RepoGroup::singleton()->getLocalRepo()->invalidateImageRedirect( $this->getTitle() );
 			}
 			wfProfileOut( __METHOD__ );
@@ -3172,7 +3172,7 @@ class Article {
 			$wgMessageCache->replace( $title->getDBkey(), false );
 		}
 		# Images
-		if( $title->getNamespace() == NS_IMAGE ) {
+		if( $title->getNamespace() == NS_FILE ) {
 			$update = new HTMLCacheUpdate( $title, 'imagelinks' );
 			$update->doUpdate();
 		}
@@ -3518,7 +3518,7 @@ class Article {
 		if( $ns == NS_CATEGORY ) {
 			$addFields[]    = 'cat_subcats = cat_subcats + 1';
 			$removeFields[] = 'cat_subcats = cat_subcats - 1';
-		} elseif( $ns == NS_IMAGE ) {
+		} elseif( $ns == NS_FILE ) {
 			$addFields[]    = 'cat_files = cat_files + 1';
 			$removeFields[] = 'cat_files = cat_files - 1';
 		}
diff --git a/includes/Category.php b/includes/Category.php
index ff4643c24c..78567adddc 100644
--- a/includes/Category.php
+++ b/includes/Category.php
@@ -257,7 +257,7 @@ class Category {
 		}
 
 		$cond1 = $dbw->conditional( 'page_namespace='.NS_CATEGORY, 1, 'NULL' );
-		$cond2 = $dbw->conditional( 'page_namespace='.NS_IMAGE, 1, 'NULL' );
+		$cond2 = $dbw->conditional( 'page_namespace='.NS_FILE, 1, 'NULL' );
 		$result = $dbw->selectRow(
 			array( 'categorylinks', 'page' ),
 			array( 'COUNT(*) AS pages',
diff --git a/includes/CategoryPage.php b/includes/CategoryPage.php
index 47393e5711..f150e372e9 100644
--- a/includes/CategoryPage.php
+++ b/includes/CategoryPage.php
@@ -234,7 +234,7 @@ class CategoryViewer {
 			if( $title->getNamespace() == NS_CATEGORY ) {
 				$cat = Category::newFromRow( $x, $title );
 				$this->addSubcategoryObject( $cat, $x->cl_sortkey, $x->page_len );
-			} elseif( $this->showGallery && $title->getNamespace() == NS_IMAGE ) {
+			} elseif( $this->showGallery && $title->getNamespace() == NS_FILE ) {
 				$this->addImage( $title, $x->cl_sortkey, $x->page_len, $x->page_is_redirect );
 			} else {
 				$this->addPage( $title, $x->cl_sortkey, $x->page_len, $x->page_is_redirect );
diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 3c9de2a7c9..6f48361595 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -1915,7 +1915,7 @@ $wgNamespacesWithSubpages = array(
 	NS_USER           => true,
 	NS_USER_TALK      => true,
 	NS_PROJECT_TALK   => true,
-	NS_IMAGE_TALK     => true,
+	NS_FILE_TALK      => true,
 	NS_MEDIAWIKI_TALK => true,
 	NS_TEMPLATE_TALK  => true,
 	NS_HELP_TALK      => true,
diff --git a/includes/EditPage.php b/includes/EditPage.php
index a974ca7aac..ea4c056e27 100644
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -738,7 +738,7 @@ class EditPage {
 		}
 
 		# Check image redirect
-		if ( $this->mTitle->getNamespace() == NS_IMAGE &&
+		if ( $this->mTitle->getNamespace() == NS_FILE &&
 			Title::newFromRedirect( $this->textbox1 ) instanceof Title &&
 			!$wgUser->isAllowed( 'upload' ) ) {
 				if ( $wgUser->isAnon() ) {
@@ -1971,7 +1971,7 @@ END
 			array(
 				'image'  => $wgLang->getImageFile('button-image'),
 				'id'     => 'mw-editbutton-image',
-				'open'   => '[['.$wgContLang->getNsText(NS_IMAGE).':',
+				'open'   => '[['.$wgContLang->getNsText(NS_FILE).':',
 				'close'  => ']]',
 				'sample' => wfMsg('image_sample'),
 				'tip'    => wfMsg('image_tip'),
diff --git a/includes/ImageGallery.php b/includes/ImageGallery.php
index 492a3e06e9..f3f525c11d 100644
--- a/includes/ImageGallery.php
+++ b/includes/ImageGallery.php
@@ -244,7 +244,7 @@ class ImageGallery
 
 			$img = wfFindFile( $nt, $time );
 
-			if( $nt->getNamespace() != NS_IMAGE || !$img ) {
+			if( $nt->getNamespace() != NS_FILE || !$img ) {
 				# We're dealing with a non-image, spit out the name and be done with it.
 				$thumbhtml = "\n\t\t\t".'<div style="height: '.($this->mHeights*1.25+2).'px;">'
 					. htmlspecialchars( $nt->getText() ) . '</div>';
diff --git a/includes/ImagePage.php b/includes/ImagePage.php
index cd0ef0aae4..0638a5b869 100644
--- a/includes/ImagePage.php
+++ b/includes/ImagePage.php
@@ -57,7 +57,7 @@ class ImagePage extends Article {
 		global $wgOut, $wgShowEXIF, $wgRequest, $wgUser;
 		$this->loadFile();
 
-		if( $this->mTitle->getNamespace() == NS_IMAGE && $this->img->getRedirected() ) {
+		if( $this->mTitle->getNamespace() == NS_FILE && $this->img->getRedirected() ) {
 			if( $this->mTitle->getDBkey() == $this->img->getName() ) {
 				// mTitle is the same as the redirect target so ask Article
 				// to perform the redirect for us.
@@ -66,7 +66,7 @@ class ImagePage extends Article {
 				// mTitle is not the same as the redirect target so it is 
 				// probably the redirect page itself. Fake the redirect symbol
 				$wgOut->setPageTitle( $this->mTitle->getPrefixedText() );
-				$wgOut->addHTML( $this->viewRedirect( Title::makeTitle( NS_IMAGE, $this->img->getName() ),
+				$wgOut->addHTML( $this->viewRedirect( Title::makeTitle( NS_FILE, $this->img->getName() ),
 					/* $appendSubtitle */ true, /* $forceKnown */ true ) );
 				$this->viewUpdates();
 				return;
@@ -76,7 +76,7 @@ class ImagePage extends Article {
 		$diff = $wgRequest->getVal( 'diff' );
 		$diffOnly = $wgRequest->getBool( 'diffonly', $wgUser->getOption( 'diffonly' ) );
 
-		if( $this->mTitle->getNamespace() != NS_IMAGE || ( isset( $diff ) && $diffOnly ) )
+		if( $this->mTitle->getNamespace() != NS_FILE || ( isset( $diff ) && $diffOnly ) )
 			return Article::view();
 
 		if( $wgShowEXIF && $this->displayImg->exists() ) {
@@ -152,7 +152,7 @@ class ImagePage extends Article {
 		if( $from == $to ) {
 			return null; 
 		}
-		return $this->mRedirectTarget = Title::makeTitle( NS_IMAGE, $to );
+		return $this->mRedirectTarget = Title::makeTitle( NS_FILE, $to );
 	}
 	public function followRedirect() {
 		$this->loadFile();
@@ -164,7 +164,7 @@ class ImagePage extends Article {
 		if( $from == $to ) {
 			return false; 
 		}
-		return Title::makeTitle( NS_IMAGE, $to );	
+		return Title::makeTitle( NS_FILE, $to );	
 	}
 	public function isRedirect( $text = false ) {
 		$this->loadFile();
@@ -222,7 +222,7 @@ class ImagePage extends Article {
 	protected function showTOC( $metadata ) {
 		global $wgLang;
 		$r = '<ul id="filetoc">
-			<li><a href="#file">' . $wgLang->getNsText( NS_IMAGE ) . '</a></li>
+			<li><a href="#file">' . $wgLang->getNsText( NS_FILE ) . '</a></li>
 			<li><a href="#filehistory">' . wfMsgHtml( 'filehist' ) . '</a></li>
 			<li><a href="#filelinks">' . wfMsgHtml( 'imagelinks' ) . '</a></li>' .
 			($metadata ? ' <li><a href="#metadata">' . wfMsgHtml( 'metadata' ) . '</a></li>' : '') . '
@@ -674,7 +674,7 @@ EOT
 	protected function imageRedirects() {
 		global $wgUser, $wgOut, $wgLang;
 
-		$redirects = $this->getTitle()->getRedirectsHere( NS_IMAGE );
+		$redirects = $this->getTitle()->getRedirectsHere( NS_FILE );
 		if( count( $redirects ) == 0 ) return;
 
 		$wgOut->addHTML( "<div id='mw-imagepage-section-redirectstofile'>\n" );
diff --git a/includes/ImageQueryPage.php b/includes/ImageQueryPage.php
index f4c8b2ad5e..3ab0b858a5 100644
--- a/includes/ImageQueryPage.php
+++ b/includes/ImageQueryPage.php
@@ -45,9 +45,9 @@ class ImageQueryPage extends QueryPage {
 	 * @return Image
 	 */
 	private function prepareImage( $row ) {
-		$namespace = isset( $row->namespace ) ? $row->namespace : NS_IMAGE;
+		$namespace = isset( $row->namespace ) ? $row->namespace : NS_FILE;
 		$title = Title::makeTitleSafe( $namespace, $row->title );
-		return ( $title instanceof Title && $title->getNamespace() == NS_IMAGE )
+		return ( $title instanceof Title && $title->getNamespace() == NS_FILE )
 			? wfFindFile( $title )
 			: null;
 	}
diff --git a/includes/Linker.php b/includes/Linker.php
index e07eb75e87..a68d48cd8d 100644
--- a/includes/Linker.php
+++ b/includes/Linker.php
@@ -861,7 +861,7 @@ class Linker {
 		} else {
 			if ( isset( $fp['manualthumb'] ) ) {
 				# Use manually specified thumbnail
-				$manual_title = Title::makeTitleSafe( NS_IMAGE, $fp['manualthumb'] );
+				$manual_title = Title::makeTitleSafe( NS_FILE, $fp['manualthumb'] );
 				if( $manual_title ) {
 					$manual_img = wfFindFile( $manual_title );
 					if ( $manual_img ) {
@@ -967,7 +967,7 @@ class Linker {
 
 	/** @deprecated use Linker::makeMediaLinkObj() */
 	function makeMediaLink( $name, $unused = '', $text = '', $time = false ) {
-		$nt = Title::makeTitleSafe( NS_IMAGE, $name );
+		$nt = Title::makeTitleSafe( NS_FILE, $name );
 		return $this->makeMediaLinkObj( $nt, $text, $time );
 	}
 
diff --git a/includes/LinksUpdate.php b/includes/LinksUpdate.php
index 4b8f6d6f1d..13f35b5a45 100644
--- a/includes/LinksUpdate.php
+++ b/includes/LinksUpdate.php
@@ -317,7 +317,7 @@ class LinksUpdate {
 	}
 
 	function invalidateImageDescriptions( $images ) {
-		$this->invalidatePages( NS_IMAGE, array_keys( $images ) );
+		$this->invalidatePages( NS_FILE, array_keys( $images ) );
 	}
 
 	function dumbTableUpdate( $table, $insertions, $fromField ) {
diff --git a/includes/Namespace.php b/includes/Namespace.php
index e310a96209..011fc949e2 100644
--- a/includes/Namespace.php
+++ b/includes/Namespace.php
@@ -16,8 +16,8 @@ $wgCanonicalNamespaceNames = array(
 	NS_USER_TALK        => 'User_talk',
 	NS_PROJECT          => 'Project',
 	NS_PROJECT_TALK     => 'Project_talk',
-	NS_IMAGE            => 'File',
-	NS_IMAGE_TALK       => 'File_talk',
+	NS_FILE             => 'File',
+	NS_FILE_TALK        => 'File_talk',
 	NS_MEDIAWIKI        => 'MediaWiki',
 	NS_MEDIAWIKI_TALK   => 'MediaWiki_talk',
 	NS_TEMPLATE         => 'Template',
@@ -53,7 +53,7 @@ class MWNamespace {
 	 */
 	public static function isMovable( $index ) {
 		global $wgAllowImageMoving;
-		return !( $index < NS_MAIN || ($index == NS_IMAGE && !$wgAllowImageMoving)  || $index == NS_CATEGORY );
+		return !( $index < NS_MAIN || ($index == NS_FILE && !$wgAllowImageMoving)  || $index == NS_CATEGORY );
 	}
 
 	/**
diff --git a/includes/PrefixSearch.php b/includes/PrefixSearch.php
index 3df8e669a8..af5691125f 100644
--- a/includes/PrefixSearch.php
+++ b/includes/PrefixSearch.php
@@ -55,7 +55,7 @@ class PrefixSearch {
 		if( count($namespaces) == 1 ){
 			$ns = $namespaces[0];
 			if( $ns == NS_MEDIA ) {
-				$namespaces = array(NS_IMAGE);
+				$namespaces = array(NS_FILE);
 			} elseif( $ns == NS_SPECIAL ) {
 				return self::specialSearch( $search, $limit );
 			}
diff --git a/includes/SearchEngine.php b/includes/SearchEngine.php
index 7eef6c798f..66e8d9bb8a 100644
--- a/includes/SearchEngine.php
+++ b/includes/SearchEngine.php
@@ -127,7 +127,7 @@ class SearchEngine {
 		# Go to images that exist even if there's no local page.
 		# There may have been a funny upload, or it may be on a shared
 		# file repository such as Wikimedia Commons.
-		if( $title->getNamespace() == NS_IMAGE ) {
+		if( $title->getNamespace() == NS_FILE ) {
 			$image = wfFindFile( $title );
 			if( $image ) {
 				return $title;
@@ -538,7 +538,7 @@ class SearchResult {
 		$this->mTitle = Title::makeTitle( $row->page_namespace, $row->page_title );
 		if( !is_null($this->mTitle) ){
 			$this->mRevision = Revision::newFromTitle( $this->mTitle );
-			if( $this->mTitle->getNamespace() === NS_IMAGE )
+			if( $this->mTitle->getNamespace() === NS_FILE )
 				$this->mImage = wfFindFile( $this->mTitle );
 		}
 	}
@@ -745,7 +745,7 @@ class SearchHighlighter {
 						if($key == 2){
 							// see if this is an image link
 							$ns = substr($val[0],2,-1);
-							if( $wgContLang->getNsIndex($ns) != NS_IMAGE )
+							if( $wgContLang->getNsIndex($ns) != NS_FILE )
 								break;
 							
 						}
@@ -1115,7 +1115,7 @@ class SearchHighlighter {
 		global $wgContLang;
 		$ns = substr( $matches[1], 0, $colon );
 		$index = $wgContLang->getNsIndex($ns);
-		if( $index !== false && ($index == NS_IMAGE || $index == NS_CATEGORY) )
+		if( $index !== false && ($index == NS_FILE || $index == NS_CATEGORY) )
 			return $matches[0]; // return the whole thing 
 		else
 			return $matches[2];
diff --git a/includes/Setup.php b/includes/Setup.php
index cfb6a73a97..506c370890 100644
--- a/includes/Setup.php
+++ b/includes/Setup.php
@@ -72,8 +72,8 @@ $wgNamespaceProtection[NS_MEDIAWIKI] = 'editinterface';
  * and "File_talk".  The old names "Image" and "Image_talk" are
  * retained as aliases for backwards compatibility.
  */
-$wgNamespaceAliases['Image'] = NS_IMAGE;
-$wgNamespaceAliases['Image_talk'] = NS_IMAGE_TALK;
+$wgNamespaceAliases['Image'] = NS_FILE;
+$wgNamespaceAliases['Image_talk'] = NS_FILE_TALK;
 
 /**
  * Initialise $wgLocalFileRepo from backwards-compatible settings
diff --git a/includes/Skin.php b/includes/Skin.php
index 1da33ec2f6..90a6b77c69 100644
--- a/includes/Skin.php
+++ b/includes/Skin.php
@@ -942,7 +942,7 @@ END;
 		}
 
 		if ( $wgOut->isArticleRelated() ) {
-			if ( $wgTitle->getNamespace() == NS_IMAGE ) {
+			if ( $wgTitle->getNamespace() == NS_FILE ) {
 				$name = $wgTitle->getDBkey();
 				$image = wfFindFile( $wgTitle );
 				if( $image ) {
@@ -1678,7 +1678,7 @@ END;
 				case NS_PROJECT:
 					$text = wfMsg( 'projectpage' );
 					break;
-				case NS_IMAGE:
+				case NS_FILE:
 					$text = wfMsg( 'imagepage' );
 					# Make link known if image exists, even if the desc. page doesn't.
 					if( wfFindFile( $link ) )
diff --git a/includes/SkinTemplate.php b/includes/SkinTemplate.php
index 33307e3133..7aef3f1de4 100644
--- a/includes/SkinTemplate.php
+++ b/includes/SkinTemplate.php
@@ -595,7 +595,7 @@ class SkinTemplate extends Skin {
 			$classes[] = 'selected';
 		}
 		if( $checkEdit && !$title->isAlwaysKnown() && $title->getArticleId() == 0 &&
-			!($title->getNamespace() == NS_IMAGE && wfFindFile( $title )) ) {
+			!($title->getNamespace() == NS_FILE && wfFindFile( $title )) ) {
 			$classes[] = 'new';
 			$query = 'action=edit';
 		}
diff --git a/includes/Title.php b/includes/Title.php
index 88118fdefa..9149fd1c06 100644
--- a/includes/Title.php
+++ b/includes/Title.php
@@ -383,7 +383,7 @@ class Title {
 
 		$t = preg_replace( "/\\s+/", ' ', $t );
 
-		if ( $ns == NS_IMAGE ) {
+		if ( $ns == NS_FILE ) {
 			$t = preg_replace( "/ (png|gif|jpg|jpeg|ogg)$/", "", $t );
 		}
 		return trim( $t );
@@ -1626,7 +1626,7 @@ class Title {
 
 		$dbr = wfGetDB( DB_SLAVE );
 
-		if ( $this->getNamespace() == NS_IMAGE ) {
+		if ( $this->getNamespace() == NS_FILE ) {
 			$tables = array ('imagelinks', 'page_restrictions');
 			$where_clauses = array(
 				'il_to' => $this->getDBkey(),
@@ -1863,7 +1863,7 @@ class Title {
 			$dbr = wfGetDB( DB_SLAVE );
 			$n = $dbr->selectField( 'archive', 'COUNT(*)', array( 'ar_namespace' => $this->getNamespace(),
 				'ar_title' => $this->getDBkey() ), $fname );
-			if( $this->getNamespace() == NS_IMAGE ) {
+			if( $this->getNamespace() == NS_FILE ) {
 				$n += $dbr->selectField( 'filearchive', 'COUNT(*)',
 					array( 'fa_name' => $this->getDBkey() ), $fname );
 			}
@@ -2444,10 +2444,10 @@ class Title {
 		}
 
 		// Image-specific checks
-		if( $this->getNamespace() == NS_IMAGE ) {
+		if( $this->getNamespace() == NS_FILE ) {
 			$file = wfLocalFile( $this );
 			if( $file->exists() ) {
-				if( $nt->getNamespace() != NS_IMAGE ) {
+				if( $nt->getNamespace() != NS_FILE ) {
 					$errors[] = array('imagenocrossnamespace');
 				}
 				if( $nt->getText() != wfStripIllegalFilenameChars( $nt->getText() ) ) {
@@ -2714,7 +2714,7 @@ class Title {
 		}
 		
 		# Move an image if this is a file
-		if( $this->getNamespace() == NS_IMAGE ) {
+		if( $this->getNamespace() == NS_FILE ) {
 			$file = wfLocalFile( $this );
 			if( $file->exists() ) {
 				$status = $file->move( $nt );
@@ -2809,7 +2809,7 @@ class Title {
 		}
 		
 		# Move an image if this is a file
-		if( $this->getNamespace() == NS_IMAGE ) {
+		if( $this->getNamespace() == NS_FILE ) {
 			$file = wfLocalFile( $this );
 			if( $file->exists() ) {
 				$status = $file->move( $nt );
@@ -2880,7 +2880,7 @@ class Title {
 	public function isValidMoveTarget( $nt ) {
 		$dbw = wfGetDB( DB_MASTER );
 		# Is it an existsing file?
-		if( $nt->getNamespace() == NS_IMAGE ) {
+		if( $nt->getNamespace() == NS_FILE ) {
 			$file = wfLocalFile( $nt );
 			if( $file->exists() ) {
 				wfDebug( __METHOD__ . ": file exists\n" );
@@ -3243,8 +3243,8 @@ class Title {
 			case NS_PROJECT:
 			case NS_PROJECT_TALK:
 				return 'nstab-project';
-			case NS_IMAGE:
-			case NS_IMAGE_TALK:
+			case NS_FILE:
+			case NS_FILE_TALK:
 				return 'nstab-image';
 			case NS_MEDIAWIKI:
 			case NS_MEDIAWIKI_TALK:
diff --git a/includes/UploadBase.php b/includes/UploadBase.php
index 219ab4effc..91155a1ba2 100644
--- a/includes/UploadBase.php
+++ b/includes/UploadBase.php
@@ -349,7 +349,7 @@ class UploadBase {
 			return $this->mTitle = null;
 		}
 		
-		$nt = Title::makeTitleSafe( NS_IMAGE, $this->mFilteredName );
+		$nt = Title::makeTitleSafe( NS_FILE, $this->mFilteredName );
 		if( is_null( $nt ) ) {
 			$this->mTitleError = self::ILLEGAL_FILENAME;
 			return $this->mTitle = null;
@@ -808,7 +808,7 @@ class UploadBase {
 			// extensions (eg 'jpg' rather than 'JPEG').
 			//
 			// Check for another file using the normalized form...
-			$nt_lc = Title::makeTitle( NS_IMAGE, $partname . '.' . $file->getExtension() );
+			$nt_lc = Title::makeTitle( NS_FILE, $partname . '.' . $file->getExtension() );
 			$file_lc = wfLocalFile( $nt_lc );
 			
 			if( $file_lc->exists() )
diff --git a/includes/Wiki.php b/includes/Wiki.php
index 31d1ebfef0..5d53a35378 100644
--- a/includes/Wiki.php
+++ b/includes/Wiki.php
@@ -242,7 +242,7 @@ class MediaWiki {
 	static function articleFromTitle( &$title ) {
 		if( NS_MEDIA == $title->getNamespace() ) {
 			// FIXME: where should this go?
-			$title = Title::makeTitle( NS_IMAGE, $title->getDBkey() );
+			$title = Title::makeTitle( NS_FILE, $title->getDBkey() );
 		}
 
 		$article = null;
@@ -252,7 +252,7 @@ class MediaWiki {
 		}
 
 		switch( $title->getNamespace() ) {
-			case NS_IMAGE:
+			case NS_FILE:
 				return new ImagePage( $title );
 			case NS_CATEGORY:
 				return new CategoryPage( $title );
@@ -277,7 +277,7 @@ class MediaWiki {
 		
 		// Namespace might change when using redirects
 		// Check for redirects ...
-		$file = $title->getNamespace() == NS_IMAGE ? $article->getFile() : null;
+		$file = $title->getNamespace() == NS_FILE ? $article->getFile() : null;
 		if( ( $action == 'view' || $action == 'render' ) 	// ... for actions that show content
 					&& !$request->getVal( 'oldid' ) &&    // ... and are not old revisions
 					$request->getVal( 'redirect' ) != 'no' &&	// ... unless explicitly told not to
diff --git a/includes/api/ApiDelete.php b/includes/api/ApiDelete.php
index ae1d94dbd7..16cae5b358 100644
--- a/includes/api/ApiDelete.php
+++ b/includes/api/ApiDelete.php
@@ -72,7 +72,7 @@ class ApiDelete extends ApiBase {
 			$this->dieUsageMsg(array('notanarticle'));
 
 		$reason = (isset($params['reason']) ? $params['reason'] : NULL);
-		if ($titleObj->getNamespace() == NS_IMAGE) {
+		if ($titleObj->getNamespace() == NS_FILE) {
 			$retval = self::deleteFile($params['token'], $titleObj, $params['oldimage'], $reason, false);
 			if(count($retval))
 				// We don't care about multiple errors, just report one of them
diff --git a/includes/api/ApiQueryAllimages.php b/includes/api/ApiQueryAllimages.php
index 93009b360c..040457e126 100644
--- a/includes/api/ApiQueryAllimages.php
+++ b/includes/api/ApiQueryAllimages.php
@@ -113,7 +113,7 @@ class ApiQueryAllimages extends ApiQueryGeneratorBase {
 				$data[] = array_merge(array('name' => $row->img_name),
 					ApiQueryImageInfo::getInfo($file, $prop, $result));
 			} else {
-				$data[] = Title::makeTitle(NS_IMAGE, $row->img_name);
+				$data[] = Title::makeTitle(NS_FILE, $row->img_name);
 			}
 		}
 		$db->freeResult($res);
diff --git a/includes/api/ApiQueryBacklinks.php b/includes/api/ApiQueryBacklinks.php
index 6533e8bbfc..315cae9c23 100644
--- a/includes/api/ApiQueryBacklinks.php
+++ b/includes/api/ApiQueryBacklinks.php
@@ -226,7 +226,7 @@ class ApiQueryBacklinks extends ApiQueryGeneratorBase {
 					if($this->hasNS)
 						$contTitle = Title::makeTitle($row->{$this->bl_ns}, $row->{$this->bl_title});
 					else
-						$contTitle = Title::makeTitle(NS_IMAGE, $row->{$this->bl_title});
+						$contTitle = Title::makeTitle(NS_FILE, $row->{$this->bl_title});
 					$this->continueStr = $this->getContinueRedirStr($contTitle->getArticleID(), $row->page_id);
 					break;
 				}
@@ -270,7 +270,7 @@ class ApiQueryBacklinks extends ApiQueryGeneratorBase {
 		ApiQueryBase::addTitleInfo($a, Title::makeTitle($row->page_namespace, $row->page_title));
 		if($row->page_is_redirect)
 			$a['redirect'] = '';
-		$ns = $this->hasNS ? $row->{$this->bl_ns} : NS_IMAGE;
+		$ns = $this->hasNS ? $row->{$this->bl_ns} : NS_FILE;
 		$this->data[$ns][$row->{$this->bl_title}]['redirlinks'][] = $a;
 		$this->getResult()->setIndexedTagName($this->data[$ns][$row->{$this->bl_title}]['redirlinks'], $this->bl_code);
 	}
@@ -292,7 +292,7 @@ class ApiQueryBacklinks extends ApiQueryGeneratorBase {
 		}
 
 		// only image titles are allowed for the root in imageinfo mode
-		if (!$this->hasNS && $this->rootTitle->getNamespace() !== NS_IMAGE)
+		if (!$this->hasNS && $this->rootTitle->getNamespace() !== NS_FILE)
 			$this->dieUsage("The title for {$this->getModuleName()} query must be an image", 'bad_image_title');
 	}
 
diff --git a/includes/api/ApiQueryDuplicateFiles.php b/includes/api/ApiQueryDuplicateFiles.php
index 3d201d3eec..f7171b8948 100644
--- a/includes/api/ApiQueryDuplicateFiles.php
+++ b/includes/api/ApiQueryDuplicateFiles.php
@@ -50,10 +50,10 @@ class ApiQueryDuplicateFiles extends ApiQueryGeneratorBase {
 	private function run($resultPageSet = null) {
 		$params = $this->extractRequestParams();
 		$namespaces = $this->getPageSet()->getAllTitlesByNamespace();
-		if ( empty( $namespaces[NS_IMAGE] ) ) {
+		if ( empty( $namespaces[NS_FILE] ) ) {
 			return;
 		}
-		$images = $namespaces[NS_IMAGE];
+		$images = $namespaces[NS_FILE];
 		
 		$this->addTables('image', 'i1');
 		$this->addTables('image', 'i2');
@@ -101,7 +101,7 @@ class ApiQueryDuplicateFiles extends ApiQueryGeneratorBase {
 				break;
 			}
 			if(!is_null($resultPageSet))
-				$titles[] = Title::makeTitle(NS_IMAGE, $row->dup_name);
+				$titles[] = Title::makeTitle(NS_FILE, $row->dup_name);
 			else
 			{
 				if($row->orig_name != $lastName)
diff --git a/includes/api/ApiQueryImageInfo.php b/includes/api/ApiQueryImageInfo.php
index 6f5c5e22e7..0924be6a85 100644
--- a/includes/api/ApiQueryImageInfo.php
+++ b/includes/api/ApiQueryImageInfo.php
@@ -56,10 +56,10 @@ class ApiQueryImageInfo extends ApiQueryBase {
 		}
 
 		$pageIds = $this->getPageSet()->getAllTitlesByNamespace();
-		if (!empty($pageIds[NS_IMAGE])) {
+		if (!empty($pageIds[NS_FILE])) {
 			
 			$result = $this->getResult();
-			$images = RepoGroup::singleton()->findFiles( array_keys( $pageIds[NS_IMAGE] ) );
+			$images = RepoGroup::singleton()->findFiles( array_keys( $pageIds[NS_FILE] ) );
 			foreach ( $images as $img ) {
 				$data = array();
 				
@@ -78,14 +78,14 @@ class ApiQueryImageInfo extends ApiQueryBase {
 					if(++$count > $params['limit']) {
 						// We've reached the extra one which shows that there are additional pages to be had. Stop here...
 						// Only set a query-continue if there was only one title
-						if(count($pageIds[NS_IMAGE]) == 1)
+						if(count($pageIds[NS_FILE]) == 1)
 							$this->setContinueEnumParameter('start', $oldie->getTimestamp());
 						break;
 					}
 					$data[] = self::getInfo( $oldie, $prop, $result );
 				}
 
-				$pageId = $pageIds[NS_IMAGE][ $img->getOriginalTitle()->getDBkey() ];
+				$pageId = $pageIds[NS_FILE][ $img->getOriginalTitle()->getDBkey() ];
 				$result->addValue(
 					array( 'query', 'pages', intval( $pageId ) ),
 					'imagerepository', $img->getRepoName()
@@ -93,10 +93,10 @@ class ApiQueryImageInfo extends ApiQueryBase {
 				$this->addPageSubItems($pageId, $data);
 			}
 			
-			$missing = array_diff( array_keys( $pageIds[NS_IMAGE] ), array_keys( $images ) );
+			$missing = array_diff( array_keys( $pageIds[NS_FILE] ), array_keys( $images ) );
 			foreach ( $missing as $title )
 				$result->addValue(
-					array( 'query', 'pages', intval( $pageIds[NS_IMAGE][$title] ) ),
+					array( 'query', 'pages', intval( $pageIds[NS_FILE][$title] ) ),
 					'imagerepository', ''
 				);
 		}
diff --git a/includes/api/ApiQueryImages.php b/includes/api/ApiQueryImages.php
index 1f89f6219c..4bee288b93 100644
--- a/includes/api/ApiQueryImages.php
+++ b/includes/api/ApiQueryImages.php
@@ -103,7 +103,7 @@ class ApiQueryImages extends ApiQueryGeneratorBase {
 				}
 
 				$vals = array();
-				ApiQueryBase :: addTitleInfo($vals, Title :: makeTitle(NS_IMAGE, $row->il_to));
+				ApiQueryBase :: addTitleInfo($vals, Title :: makeTitle(NS_FILE, $row->il_to));
 				$data[] = $vals;
 			}
 
@@ -123,7 +123,7 @@ class ApiQueryImages extends ApiQueryGeneratorBase {
 							'|' . $this->keyToTitle($row->il_to));
 					break;
 				}
-				$titles[] = Title :: makeTitle(NS_IMAGE, $row->il_to);
+				$titles[] = Title :: makeTitle(NS_FILE, $row->il_to);
 			}
 			$resultPageSet->populateFromTitles($titles);
 		}
diff --git a/includes/api/ApiQueryInfo.php b/includes/api/ApiQueryInfo.php
index 624058cea2..fe90f4c93b 100644
--- a/includes/api/ApiQueryInfo.php
+++ b/includes/api/ApiQueryInfo.php
@@ -217,7 +217,7 @@ class ApiQueryInfo extends ApiQueryBase {
 			
 			$imageIds = array();
 			foreach ($titles as $id => $title)
-				if ($title->getNamespace() == NS_IMAGE)
+				if ($title->getNamespace() == NS_FILE)
 					$imageIds[] = $id;
 			// To avoid code duplication
 			$cascadeTypes = array(
@@ -231,7 +231,7 @@ class ApiQueryInfo extends ApiQueryBase {
 				array(
 				 	'prefix' => 'il',
 				 	'table' => 'imagelinks',
-				 	'ns' => NS_IMAGE,
+				 	'ns' => NS_FILE,
 				 	'title' => 'il_to',
 				 	'ids' => $imageIds
 				)
@@ -295,7 +295,7 @@ class ApiQueryInfo extends ApiQueryBase {
 			$images = array();
 			$others = array();
 			foreach ($missing as $title)
-				if ($title->getNamespace() == NS_IMAGE)
+				if ($title->getNamespace() == NS_FILE)
 					$images[] = $title->getDBKey();
 				else
 					$others[] = $title;					
@@ -345,7 +345,7 @@ class ApiQueryInfo extends ApiQueryBase {
 						'expiry' => Block::decodeExpiry( $row->pr_expiry, TS_ISO_8601 ),
 						'source' => $source->getPrefixedText()
 					);
-					$prottitles[NS_IMAGE][$row->il_to][] = $a;
+					$prottitles[NS_FILE][$row->il_to][] = $a;
 				}
 				$db->freeResult($res);
 			}
diff --git a/includes/filerepo/ArchivedFile.php b/includes/filerepo/ArchivedFile.php
index 16b939f830..3919cfbcf1 100644
--- a/includes/filerepo/ArchivedFile.php
+++ b/includes/filerepo/ArchivedFile.php
@@ -84,7 +84,7 @@ class ArchivedFile
 		if (!count($conds))
 			throw new MWException( "No specific information for retrieving archived file" );
 		
-		if( !$this->title || $this->title->getNamespace() == NS_IMAGE ) {
+		if( !$this->title || $this->title->getNamespace() == NS_FILE ) {
 			$dbr = wfGetDB( DB_SLAVE );
 			$res = $dbr->select( 'filearchive',
 				array(
@@ -149,7 +149,7 @@ class ArchivedFile
 	 * @return ResultWrapper
 	 */
 	public static function newFromRow( $row ) {
-		$file = new ArchivedFile( Title::makeTitle( NS_IMAGE, $row->fa_name ) );
+		$file = new ArchivedFile( Title::makeTitle( NS_FILE, $row->fa_name ) );
 
 		$file->id = intval($row->fa_id);
 		$file->name = $row->fa_name;
diff --git a/includes/filerepo/File.php b/includes/filerepo/File.php
index 29b63c69f0..4969647e82 100644
--- a/includes/filerepo/File.php
+++ b/includes/filerepo/File.php
@@ -1246,7 +1246,7 @@ abstract class File {
 	function getRedirectedTitle() {
 		if ( $this->redirected ) {
 			if ( !$this->redirectTitle )
-				$this->redirectTitle = Title::makeTitle( NS_IMAGE, $this->redirected );
+				$this->redirectTitle = Title::makeTitle( NS_FILE, $this->redirected );
 			return $this->redirectTitle;
 		}
 	}
diff --git a/includes/filerepo/FileRepo.php b/includes/filerepo/FileRepo.php
index 729e38d86f..6208976c93 100644
--- a/includes/filerepo/FileRepo.php
+++ b/includes/filerepo/FileRepo.php
@@ -59,7 +59,7 @@ abstract class FileRepo {
 	 */
 	function newFile( $title, $time = false ) {
 		if ( !($title instanceof Title) ) {
-			$title = Title::makeTitleSafe( NS_IMAGE, $title );
+			$title = Title::makeTitleSafe( NS_FILE, $title );
 			if ( !is_object( $title ) ) {
 				return null;
 			}
@@ -85,7 +85,7 @@ abstract class FileRepo {
 	 */
 	function findFile( $title, $time = false, $flags = 0 ) {
 		if ( !($title instanceof Title) ) {
-			$title = Title::makeTitleSafe( NS_IMAGE, $title );
+			$title = Title::makeTitleSafe( NS_FILE, $title );
 			if ( !is_object( $title ) ) {
 				return false;
 			}
@@ -115,7 +115,7 @@ abstract class FileRepo {
 			return false;
 		}
 		$redir = $this->checkRedirect( $title );		
-		if( $redir && $redir->getNamespace() == NS_IMAGE) {
+		if( $redir && $redir->getNamespace() == NS_FILE) {
 			$img = $this->newFile( $redir );
 			if( !$img ) {
 				return false;
@@ -262,10 +262,10 @@ abstract class FileRepo {
 		if ( is_null( $this->descBaseUrl ) ) {
 			if ( !is_null( $this->articleUrl ) ) {
 				$this->descBaseUrl = str_replace( '$1',
-					wfUrlencode( MWNamespace::getCanonicalName( NS_IMAGE ) ) . ':', $this->articleUrl );
+					wfUrlencode( MWNamespace::getCanonicalName( NS_FILE ) ) . ':', $this->articleUrl );
 			} elseif ( !is_null( $this->scriptDirUrl ) ) {
 				$this->descBaseUrl = $this->scriptDirUrl . '/index.php?title=' .
-					wfUrlencode( MWNamespace::getCanonicalName( NS_IMAGE ) ) . ':';
+					wfUrlencode( MWNamespace::getCanonicalName( NS_FILE ) ) . ':';
 			} else {
 				$this->descBaseUrl = false;
 			}
@@ -300,7 +300,7 @@ abstract class FileRepo {
 	function getDescriptionRenderUrl( $name ) {
 		if ( isset( $this->scriptDirUrl ) ) {
 			return $this->scriptDirUrl . '/index.php?title=' .
-				wfUrlencode( MWNamespace::getCanonicalName( NS_IMAGE ) . ':' . $name ) .
+				wfUrlencode( MWNamespace::getCanonicalName( NS_FILE ) . ':' . $name ) .
 				'&action=render';
 		} else {
 			$descBase = $this->getDescBaseUrl();
diff --git a/includes/filerepo/ForeignDBFile.php b/includes/filerepo/ForeignDBFile.php
index eed2604842..5fb432c8bb 100644
--- a/includes/filerepo/ForeignDBFile.php
+++ b/includes/filerepo/ForeignDBFile.php
@@ -13,7 +13,7 @@ class ForeignDBFile extends LocalFile {
 	 * Do not call this except from inside a repo class.
 	 */
 	static function newFromRow( $row, $repo ) {
-		$title = Title::makeTitle( NS_IMAGE, $row->img_name );
+		$title = Title::makeTitle( NS_FILE, $row->img_name );
 		$file = new self( $title, $repo );
 		$file->loadFromRow( $row );
 		return $file;
diff --git a/includes/filerepo/Image.php b/includes/filerepo/Image.php
index 665dd4bffa..5207bb4bff 100644
--- a/includes/filerepo/Image.php
+++ b/includes/filerepo/Image.php
@@ -36,7 +36,7 @@ class Image extends LocalFile {
 	 */
 	static function newFromName( $name ) {
 		wfDeprecated( __METHOD__ );
-		$title = Title::makeTitleSafe( NS_IMAGE, $name );
+		$title = Title::makeTitleSafe( NS_FILE, $name );
 		if ( is_object( $title ) ) {
 			$img = wfFindFile( $title );
 			if ( !$img ) {
diff --git a/includes/filerepo/LocalFile.php b/includes/filerepo/LocalFile.php
index b0bdb429db..ea92fe5085 100644
--- a/includes/filerepo/LocalFile.php
+++ b/includes/filerepo/LocalFile.php
@@ -68,7 +68,7 @@ class LocalFile extends File
 	 * Do not call this except from inside a repo class.
 	 */
 	static function newFromRow( $row, $repo ) {
-		$title = Title::makeTitle( NS_IMAGE, $row->img_name );
+		$title = Title::makeTitle( NS_FILE, $row->img_name );
 		$file = new self( $title, $repo );
 		$file->loadFromRow( $row );
 		return $file;
diff --git a/includes/filerepo/LocalRepo.php b/includes/filerepo/LocalRepo.php
index 612fef9993..ee03e32de9 100644
--- a/includes/filerepo/LocalRepo.php
+++ b/includes/filerepo/LocalRepo.php
@@ -108,7 +108,7 @@ class LocalRepo extends FSRepo {
 			$title = Title::newFromTitle( $title );
 		}
 		if( $title instanceof Title && $title->getNamespace() == NS_MEDIA ) {
-			$title = Title::makeTitle( NS_IMAGE, $title->getText() );
+			$title = Title::makeTitle( NS_FILE, $title->getText() );
 		}
 
 		$memcKey = $this->getMemcKey( "image_redirect:" . md5( $title->getPrefixedDBkey() ) );
diff --git a/includes/filerepo/OldLocalFile.php b/includes/filerepo/OldLocalFile.php
index bacae009a0..46c35bd950 100644
--- a/includes/filerepo/OldLocalFile.php
+++ b/includes/filerepo/OldLocalFile.php
@@ -23,7 +23,7 @@ class OldLocalFile extends LocalFile {
 	}
 
 	static function newFromRow( $row, $repo ) {
-		$title = Title::makeTitle( NS_IMAGE, $row->oi_name );
+		$title = Title::makeTitle( NS_FILE, $row->oi_name );
 		$file = new self( $title, $repo, null, $row->oi_archive_name );
 		$file->loadFromRow( $row, 'oi_' );
 		return $file;
diff --git a/includes/filerepo/RepoGroup.php b/includes/filerepo/RepoGroup.php
index 3f3181370e..54c40ccd04 100644
--- a/includes/filerepo/RepoGroup.php
+++ b/includes/filerepo/RepoGroup.php
@@ -90,7 +90,7 @@ class RepoGroup {
 		$titleObjs = array();
 		foreach ( $titles as $title ) {
 			if ( !( $title instanceof Title ) )
-				$title = Title::makeTitleSafe( NS_IMAGE, $title );
+				$title = Title::makeTitleSafe( NS_FILE, $title );
 			$titleObjs[$title->getDBkey()] = $title;
 		}
 
diff --git a/includes/filerepo/UnregisteredLocalFile.php b/includes/filerepo/UnregisteredLocalFile.php
index c687ef6e8e..6f63cb0bca 100644
--- a/includes/filerepo/UnregisteredLocalFile.php
+++ b/includes/filerepo/UnregisteredLocalFile.php
@@ -32,7 +32,7 @@ class UnregisteredLocalFile extends File {
 			$this->name = $repo->getNameFromTitle( $title );
 		} else {
 			$this->name = basename( $path );
-			$this->title = Title::makeTitleSafe( NS_IMAGE, $this->name );
+			$this->title = Title::makeTitleSafe( NS_FILE, $this->name );
 		}
 		$this->repo = $repo;
 		if ( $path ) {
diff --git a/includes/parser/Parser.php b/includes/parser/Parser.php
index fe016a8412..3323e859f0 100644
--- a/includes/parser/Parser.php
+++ b/includes/parser/Parser.php
@@ -1709,7 +1709,7 @@ class Parser
 
 			if ($might_be_img) { # if this is actually an invalid link
 				wfProfileIn( __METHOD__."-might_be_img" );
-				if ($ns == NS_IMAGE && $noforce) { #but might be an image
+				if ($ns == NS_FILE && $noforce) { #but might be an image
 					$found = false;
 					while ( true ) {
 						#look at the next 'line' to see if we can close it there
@@ -1769,7 +1769,7 @@ class Parser
 				}
 				wfProfileOut( __METHOD__."-interwiki" );
 
-				if ( $ns == NS_IMAGE ) {
+				if ( $ns == NS_FILE ) {
 					wfProfileIn( __METHOD__."-image" );
 					if ( !wfIsBadImage( $nt->getDBkey(), $this->mTitle ) ) {
 						# recursively parse links inside the image caption
@@ -1841,7 +1841,7 @@ class Parser
 					$s .= $holders->makeHolder( $nt, $text, '', $trail, $prefix );
 				}
 				continue;
-			} elseif( $ns == NS_IMAGE ) {
+			} elseif( $ns == NS_FILE ) {
 				$img = wfFindFile( $nt );
 				if( $img ) {
 					// Force a blue link if the file exists; may be a remote
@@ -4163,7 +4163,7 @@ class Parser
 			
 			if ( strpos( $matches[0], '%' ) !== false )
 				$matches[1] = urldecode( $matches[1] );
-			$tp = Title::newFromText( $matches[1]/*, NS_IMAGE*/ );
+			$tp = Title::newFromText( $matches[1]/*, NS_FILE*/ );
 			$nt =& $tp;
 			if( is_null( $nt ) ) {
 				# Bogus title. Ignore these so we don't bomb out later.
@@ -4180,7 +4180,7 @@ class Parser
 			$ig->add( $nt, $html );
 
 			# Only add real images (bug #5586)
-			if ( $nt->getNamespace() == NS_IMAGE ) {
+			if ( $nt->getNamespace() == NS_FILE ) {
 				$this->mOutput->addImage( $nt->getDBkey() );
 			}
 		}
diff --git a/includes/specials/SpecialExport.php b/includes/specials/SpecialExport.php
index b99c84d8e1..898b5a7851 100644
--- a/includes/specials/SpecialExport.php
+++ b/includes/specials/SpecialExport.php
@@ -71,7 +71,7 @@ function wfExportGetTemplates( $inputPages, $pageSet ) {
 function wfExportGetImages( $inputPages, $pageSet ) {
 	return wfExportGetLinks( $inputPages, $pageSet,
 		'imagelinks',
-		array( NS_IMAGE . ' AS namespace', 'il_to AS title' ),
+		array( NS_FILE . ' AS namespace', 'il_to AS title' ),
 		array( 'page_id=il_from' ) );
 }
 
diff --git a/includes/specials/SpecialFileDuplicateSearch.php b/includes/specials/SpecialFileDuplicateSearch.php
index bf4b3d2580..49a218c8a1 100644
--- a/includes/specials/SpecialFileDuplicateSearch.php
+++ b/includes/specials/SpecialFileDuplicateSearch.php
@@ -49,7 +49,7 @@ class FileDuplicateSearchPage extends QueryPage {
 	function formatResult( $skin, $result ) {
 		global $wgContLang, $wgLang;
 
-		$nt = Title::makeTitle( NS_IMAGE, $result->title );
+		$nt = Title::makeTitle( NS_FILE, $result->title );
 		$text = $wgContLang->convert( $nt->getText() );
 		$plink = $skin->makeLink( $nt->getPrefixedText(), $text );
 
diff --git a/includes/specials/SpecialFilepath.php b/includes/specials/SpecialFilepath.php
index af80e2f6f2..4a724b1f35 100644
--- a/includes/specials/SpecialFilepath.php
+++ b/includes/specials/SpecialFilepath.php
@@ -9,9 +9,9 @@ function wfSpecialFilepath( $par ) {
 
 	$file = isset( $par ) ? $par : $wgRequest->getText( 'file' );
 
-	$title = Title::makeTitleSafe( NS_IMAGE, $file );
+	$title = Title::makeTitleSafe( NS_FILE, $file );
 
-	if ( ! $title instanceof Title || $title->getNamespace() != NS_IMAGE ) {
+	if ( ! $title instanceof Title || $title->getNamespace() != NS_FILE ) {
 		$cform = new FilepathForm( $title );
 		$cform->execute();
 	} else {
diff --git a/includes/specials/SpecialImagelist.php b/includes/specials/SpecialImagelist.php
index 3d449b5484..35966319c4 100644
--- a/includes/specials/SpecialImagelist.php
+++ b/includes/specials/SpecialImagelist.php
@@ -106,7 +106,7 @@ class ImageListPager extends TablePager {
 				if ( $imgfile === null ) $imgfile = wfMsg( 'imgfile' );
 
 				$name = $this->mCurrentRow->img_name;
-				$link = $this->getSkin()->makeKnownLinkObj( Title::makeTitle( NS_IMAGE, $name ), $value );
+				$link = $this->getSkin()->makeKnownLinkObj( Title::makeTitle( NS_FILE, $name ), $value );
 				$image = wfLocalFile( $value );
 				$url = $image->getURL();
 				$download = Xml::element('a', array( 'href' => $url ), $imgfile );
diff --git a/includes/specials/SpecialMIMEsearch.php b/includes/specials/SpecialMIMEsearch.php
index 82ee4be6e1..cdfde24ea5 100644
--- a/includes/specials/SpecialMIMEsearch.php
+++ b/includes/specials/SpecialMIMEsearch.php
@@ -46,7 +46,7 @@ class MIMEsearchPage extends QueryPage {
 
 		return
 			"SELECT 'MIMEsearch' AS type,
-				" . NS_IMAGE . " AS namespace,
+				" . NS_FILE . " AS namespace,
 				img_name AS title,
 				img_major_mime AS value,
 
diff --git a/includes/specials/SpecialMostimages.php b/includes/specials/SpecialMostimages.php
index 6cfeb7adce..5cc100baba 100644
--- a/includes/specials/SpecialMostimages.php
+++ b/includes/specials/SpecialMostimages.php
@@ -25,7 +25,7 @@ class MostimagesPage extends ImageQueryPage {
 			"
 			SELECT
 				'Mostimages' as type,
-				" . NS_IMAGE . " as namespace,
+				" . NS_FILE . " as namespace,
 				il_to as title,
 				COUNT(*) as value
 			FROM $imagelinks
diff --git a/includes/specials/SpecialNewimages.php b/includes/specials/SpecialNewimages.php
index 953efad320..65d4f1d651 100644
--- a/includes/specials/SpecialNewimages.php
+++ b/includes/specials/SpecialNewimages.php
@@ -124,7 +124,7 @@ function wfSpecialNewimages( $par, $specialPage ) {
 		$name = $s->img_name;
 		$ut = $s->img_user_text;
 
-		$nt = Title::newFromText( $name, NS_IMAGE );
+		$nt = Title::newFromText( $name, NS_FILE );
 		$ul = $sk->makeLinkObj( Title::makeTitle( NS_USER, $ut ), $ut );
 
 		$gallery->add( $nt, "$ul<br />\n<i>".$wgLang->timeanddate( $s->img_timestamp, true )."</i><br />\n" );
diff --git a/includes/specials/SpecialRecentchangeslinked.php b/includes/specials/SpecialRecentchangeslinked.php
index e58256adbd..c07343540a 100644
--- a/includes/specials/SpecialRecentchangeslinked.php
+++ b/includes/specials/SpecialRecentchangeslinked.php
@@ -93,8 +93,8 @@ class SpecialRecentchangeslinked extends SpecialRecentchanges {
 		} else {
 			// for now, always join on these tables; really should be configurable as in whatlinkshere
 			$link_tables = array( 'pagelinks', 'templatelinks' );
-			// imagelinks only contains links to pages in NS_IMAGE
-			if( $ns == NS_IMAGE || !$showlinkedto ) $link_tables[] = 'imagelinks';
+			// imagelinks only contains links to pages in NS_FILE
+			if( $ns == NS_FILE || !$showlinkedto ) $link_tables[] = 'imagelinks';
 		}
 
 		if( $id == 0 && !$showlinkedto )
@@ -109,7 +109,7 @@ class SpecialRecentchangeslinked extends SpecialRecentchanges {
 			$pfx = $prefix[$link_table];
 
 			// imagelinks and categorylinks tables have no xx_namespace field, and have xx_to instead of xx_title
-			if( $link_table == 'imagelinks' ) $link_ns = NS_IMAGE;
+			if( $link_table == 'imagelinks' ) $link_ns = NS_FILE;
 			else if( $link_table == 'categorylinks' ) $link_ns = NS_CATEGORY;
 			else $link_ns = 0;
 
diff --git a/includes/specials/SpecialSearch.php b/includes/specials/SpecialSearch.php
index d586749eeb..1930cbb254 100644
--- a/includes/specials/SpecialSearch.php
+++ b/includes/specials/SpecialSearch.php
@@ -284,7 +284,7 @@ class SpecialSearch {
 		$nsAllSet = array_keys( SearchEngine::searchableNamespaces() );
 		if( $this->searchAdvanced )
 			$this->active = 'advanced';
-		else if( $this->namespaces === NS_IMAGE || $this->startsWithImage( $term ) )
+		else if( $this->namespaces === NS_FILE || $this->startsWithImage( $term ) )
 			$this->active = 'images';
 		elseif( $this->namespaces === $nsAllSet )
 			$this->active = 'all';
@@ -450,7 +450,7 @@ class SpecialSearch {
 		}
 
 		// Include a thumbnail for media files...
-		if( $t->getNamespace() == NS_IMAGE ) {
+		if( $t->getNamespace() == NS_FILE ) {
 			$img = wfFindFile( $t );
 			if( $img ) {
 				$thumb = $img->transform( array( 'width' => 120, 'height' => 120 ) );
@@ -661,8 +661,8 @@ class SpecialSearch {
 		if( $this->active == 'images' ) {
 			$out .= Xml::element( 'strong', array( 'title'=>$tt ), $m );	
 		} else {
-			$imageTextForm = $wgContLang->getFormattedNsText(NS_IMAGE).':'.$bareterm;
-			$out .= $this->makeSearchLink( $imageTextForm, array( NS_IMAGE ) , $m, $tt );
+			$imageTextForm = $wgContLang->getFormattedNsText(NS_FILE).':'.$bareterm;
+			$out .= $this->makeSearchLink( $imageTextForm, array( NS_FILE ) , $m, $tt );
 		}
 		$out .= $sep;
 		
@@ -769,7 +769,7 @@ class SpecialSearch {
 		
 		$p = explode( ':', $term );
 		if( count( $p ) > 1 ) {
-			return $wgContLang->getNsIndex( $p[0] ) == NS_IMAGE;
+			return $wgContLang->getNsIndex( $p[0] ) == NS_FILE;
 		}
 		return false;
 	}
@@ -1209,7 +1209,7 @@ class SpecialSearchOld {
 		}
 				
 		// Include a thumbnail for media files...
-		if( $t->getNamespace() == NS_IMAGE ) {
+		if( $t->getNamespace() == NS_FILE ) {
 			$img = wfFindFile( $t );
 			if( $img ) {
 				$thumb = $img->transform( array( 'width' => 120, 'height' => 120 ) );
diff --git a/includes/specials/SpecialUncategorizedimages.php b/includes/specials/SpecialUncategorizedimages.php
index 986ec967e6..25310081f4 100644
--- a/includes/specials/SpecialUncategorizedimages.php
+++ b/includes/specials/SpecialUncategorizedimages.php
@@ -31,7 +31,7 @@ class UncategorizedImagesPage extends ImageQueryPage {
 	function getSQL() {
 		$dbr = wfGetDB( DB_SLAVE );
 		list( $page, $categorylinks ) = $dbr->tableNamesN( 'page', 'categorylinks' );
-		$ns = NS_IMAGE;
+		$ns = NS_FILE;
 
 		return "SELECT 'Uncategorizedimages' AS type, page_namespace AS namespace,
 				page_title AS title, page_title AS value
diff --git a/includes/specials/SpecialUndelete.php b/includes/specials/SpecialUndelete.php
index 872ff21c05..7217ce8e3f 100644
--- a/includes/specials/SpecialUndelete.php
+++ b/includes/specials/SpecialUndelete.php
@@ -119,7 +119,7 @@ class PageArchive {
 	 * @todo Does this belong in Image for fuller encapsulation?
 	 */
 	function listFiles() {
-		if( $this->title->getNamespace() == NS_IMAGE ) {
+		if( $this->title->getNamespace() == NS_FILE ) {
 			$dbr = wfGetDB( DB_SLAVE );
 			$res = $dbr->select( 'filearchive',
 				array(
@@ -336,7 +336,7 @@ class PageArchive {
 		$restoreText = $restoreAll || !empty( $timestamps );
 		$restoreFiles = $restoreAll || !empty( $fileVersions );
 
-		if( $restoreFiles && $this->title->getNamespace() == NS_IMAGE ) {
+		if( $restoreFiles && $this->title->getNamespace() == NS_FILE ) {
 			$img = wfLocalFile( $this->title );
 			$this->fileStatus = $img->restore( $fileVersions, $unsuppress );
 			$filesRestored = $this->fileStatus->successCount;
@@ -547,7 +547,7 @@ class PageArchive {
 				Article::onArticleEdit( $this->title );
 			}
 
-			if( $this->title->getNamespace() == NS_IMAGE ) {
+			if( $this->title->getNamespace() == NS_FILE ) {
 				$update = new HTMLCacheUpdate( $this->title, 'imagelinks' );
 				$update->doUpdate();
 			}
diff --git a/includes/specials/SpecialUnusedimages.php b/includes/specials/SpecialUnusedimages.php
index d71b638fa5..4adf405d3e 100644
--- a/includes/specials/SpecialUnusedimages.php
+++ b/includes/specials/SpecialUnusedimages.php
@@ -33,7 +33,7 @@ class UnusedimagesPage extends ImageQueryPage {
 					FROM ((($page AS I LEFT JOIN $categorylinks AS L ON I.page_id = L.cl_from)
 						LEFT JOIN $imagelinks AS P ON I.page_title = P.il_to)
 						INNER JOIN $image AS G ON I.page_title = G.img_name)
-					WHERE I.page_namespace = ".NS_IMAGE." AND L.cl_from IS NULL AND P.il_to IS NULL";
+					WHERE I.page_namespace = ".NS_FILE." AND L.cl_from IS NULL AND P.il_to IS NULL";
 		} else {
 			list( $image, $imagelinks ) = $dbr->tableNamesN( 'image','imagelinks' );
 
diff --git a/includes/specials/SpecialUpload.php b/includes/specials/SpecialUpload.php
index 303ff6916b..db950f9c68 100644
--- a/includes/specials/SpecialUpload.php
+++ b/includes/specials/SpecialUpload.php
@@ -423,7 +423,7 @@ class UploadForm {
 			return self::MIN_LENGHT_PARTNAME;
 		}
 
-		$nt = Title::makeTitleSafe( NS_IMAGE, $filtered );
+		$nt = Title::makeTitleSafe( NS_FILE, $filtered );
 		if( is_null( $nt ) ) {
 			$resultDetails = array( 'filtered' => $filtered );
 			return self::ILLEGAL_FILENAME;
@@ -604,7 +604,7 @@ class UploadForm {
 			// extensions (eg 'jpg' rather than 'JPEG').
 			//
 			// Check for another file using the normalized form...
-			$nt_lc = Title::makeTitle( NS_IMAGE, $partname . '.' . $file->getExtension() );
+			$nt_lc = Title::makeTitle( NS_FILE, $partname . '.' . $file->getExtension() );
 			$file_lc = wfLocalFile( $nt_lc );
 		} else {
 			$file_lc = false;
@@ -731,7 +731,7 @@ class UploadForm {
 	public static function ajaxGetLicensePreview( $license ) {
 		global $wgParser, $wgUser;
 		$text = '{{' . $license . '}}';
-		$title = Title::makeTitle( NS_IMAGE, 'Sample.jpg' );
+		$title = Title::makeTitle( NS_FILE, 'Sample.jpg' );
 		$options = ParserOptions::newFromUser( $wgUser );
 
 		// Expand subst: first, then live templates...
@@ -764,7 +764,7 @@ class UploadForm {
 				"</li>\n";
 		} elseif ( $archivedImage->getID() > 0 ) {
 			global $wgOut;
-			$name = Title::makeTitle( NS_IMAGE, $archivedImage->getName() )->getPrefixedText();
+			$name = Title::makeTitle( NS_FILE, $archivedImage->getName() )->getPrefixedText();
 			return Xml::tags( 'li', null, wfMsgExt( 'file-deleted-duplicate', array( 'parseinline' ), array( $name ) ) );
 		} else {
 			return '';
@@ -960,7 +960,7 @@ wgUploadAutoFill = {$autofill};
 		}
 
 		if( $this->mDesiredDestName ) {
-			$title = Title::makeTitleSafe( NS_IMAGE, $this->mDesiredDestName );
+			$title = Title::makeTitleSafe( NS_FILE, $this->mDesiredDestName );
 			// Show a subtitle link to deleted revisions (to sysops et al only)
 			if( $title instanceof Title && ( $count = $title->isDeleted() ) > 0 && $wgUser->isAllowed( 'deletedhistory' ) ) {
 				$link = wfMsgExt(
diff --git a/includes/specials/SpecialWantedfiles.php b/includes/specials/SpecialWantedfiles.php
index 28f17ae1b8..c2731fa9ac 100644
--- a/includes/specials/SpecialWantedfiles.php
+++ b/includes/specials/SpecialWantedfiles.php
@@ -35,11 +35,11 @@ class WantedFilesPage extends QueryPage {
 			"
 			SELECT
 				$name as type,
-				" . NS_IMAGE . " as namespace,
+				" . NS_FILE . " as namespace,
 				il_to as title,
 				COUNT(*) as value
 			FROM $imagelinks
-			LEFT JOIN $page ON il_to = page_title AND page_namespace = ". NS_IMAGE ."
+			LEFT JOIN $page ON il_to = page_title AND page_namespace = ". NS_FILE ."
 			WHERE page_title IS NULL
 			GROUP BY il_to
 			";
diff --git a/includes/specials/SpecialWhatlinkshere.php b/includes/specials/SpecialWhatlinkshere.php
index 2ae0427441..151697716d 100644
--- a/includes/specials/SpecialWhatlinkshere.php
+++ b/includes/specials/SpecialWhatlinkshere.php
@@ -96,7 +96,7 @@ class WhatLinksHerePage {
 		$hidelinks = $this->opts->getValue( 'hidelinks' );
 		$hideredirs = $this->opts->getValue( 'hideredirs' );
 		$hidetrans = $this->opts->getValue( 'hidetrans' );
-		$hideimages = $target->getNamespace() != NS_IMAGE || $this->opts->getValue( 'hideimages' );
+		$hideimages = $target->getNamespace() != NS_FILE || $this->opts->getValue( 'hideimages' );
 
 		$fetchlinks = (!$hidelinks || !$hideredirs);
 
@@ -397,7 +397,7 @@ class WhatLinksHerePage {
 
 		$links = array();
 		$types = array( 'hidetrans', 'hidelinks', 'hideredirs' );
-		if( $this->target->getNamespace() == NS_IMAGE )
+		if( $this->target->getNamespace() == NS_FILE )
 			$types[] = 'hideimages';
 		foreach( $types as $type ) {
 			$chosen = $this->opts->getValue( $type );
diff --git a/languages/classes/LanguageKk.php b/languages/classes/LanguageKk.php
index 40beca67e5..73f0a1f944 100644
--- a/languages/classes/LanguageKk.php
+++ b/languages/classes/LanguageKk.php
@@ -245,7 +245,7 @@ class KkConverter extends LanguageConverter {
 	 */
 	function autoConvert($text, $toVariant=false) {
 		global $wgTitle;
-		if(is_object($wgTitle) && $wgTitle->getNameSpace()==NS_IMAGE){
+		if(is_object($wgTitle) && $wgTitle->getNameSpace()==NS_FILE){
 			$imagename = $wgTitle->getNsText();
 			if(preg_match("/^$imagename:/",$text)) return $text;
 		}
diff --git a/languages/classes/LanguageKu.php b/languages/classes/LanguageKu.php
index a1e0ccb535..3137c7e865 100644
--- a/languages/classes/LanguageKu.php
+++ b/languages/classes/LanguageKu.php
@@ -178,7 +178,7 @@ class KuConverter extends LanguageConverter {
 	 */
 	function autoConvert($text, $toVariant=false) {
 		global $wgTitle;
-		if(is_object($wgTitle) && $wgTitle->getNameSpace()==NS_IMAGE){
+		if(is_object($wgTitle) && $wgTitle->getNameSpace()==NS_FILE){
 			$imagename = $wgTitle->getNsText();
 			if(preg_match("/^$imagename:/",$text)) return $text;
 		}
diff --git a/languages/classes/LanguageSr.php b/languages/classes/LanguageSr.php
index 781218ca0e..cac82ce7f9 100644
--- a/languages/classes/LanguageSr.php
+++ b/languages/classes/LanguageSr.php
@@ -122,7 +122,7 @@ class SrConverter extends LanguageConverter {
 	 */
 	function autoConvert($text, $toVariant=false) {
 		global $wgTitle;
-		if(is_object($wgTitle) && $wgTitle->getNameSpace()==NS_IMAGE){
+		if(is_object($wgTitle) && $wgTitle->getNameSpace()==NS_FILE){
 			$imagename = $wgTitle->getNsText();
 			if(preg_match("/^$imagename:/",$text)) return $text;
 		}
diff --git a/languages/messages/MessagesAf.php b/languages/messages/MessagesAf.php
index 488b950295..81baf8b2c4 100644
--- a/languages/messages/MessagesAf.php
+++ b/languages/messages/MessagesAf.php
@@ -26,8 +26,8 @@ $namespaceNames = array(
 	NS_USER             => 'Gebruiker',
 	NS_USER_TALK        => 'Gebruikerbespreking',
 	NS_PROJECT_TALK     => '$1bespreking',
-	NS_IMAGE            => 'Lêer',
-	NS_IMAGE_TALK       => 'Lêerbespreking',
+	NS_FILE             => 'Lêer',
+	NS_FILE_TALK        => 'Lêerbespreking',
 	NS_MEDIAWIKI        => 'MediaWiki',
 	NS_MEDIAWIKI_TALK   => 'MediaWikibespreking',
 	NS_TEMPLATE         => 'Sjabloon',
@@ -39,8 +39,8 @@ $namespaceNames = array(
 );
 
 $namespaceAliases = array(
-	'Beeld' => NS_IMAGE,
-	'Beeldbespreking' => NS_IMAGE_TALK,
+	'Beeld' => NS_FILE,
+	'Beeldbespreking' => NS_FILE_TALK,
 );
 
 $specialPageAliases = array(
diff --git a/languages/messages/MessagesAm.php b/languages/messages/MessagesAm.php
index dd8deddf3e..9d713029f1 100644
--- a/languages/messages/MessagesAm.php
+++ b/languages/messages/MessagesAm.php
@@ -16,8 +16,8 @@ $namespaceNames = array(
 	NS_USER             => 'አባል',
 	NS_USER_TALK        => 'አባል_ውይይት',
 	NS_PROJECT_TALK     => '$1_ውይይት',
-	NS_IMAGE            => 'ስዕል',
-	NS_IMAGE_TALK       => 'ስዕል_ውይይት',
+	NS_FILE             => 'ስዕል',
+	NS_FILE_TALK        => 'ስዕል_ውይይት',
 	NS_MEDIAWIKI        => 'መልዕክት',
 	NS_MEDIAWIKI_TALK   => 'መልዕክት_ውይይት',
 	NS_TEMPLATE         => 'መልጠፊያ',
diff --git a/languages/messages/MessagesAn.php b/languages/messages/MessagesAn.php
index 31f267ee46..efe73ab3c8 100644
--- a/languages/messages/MessagesAn.php
+++ b/languages/messages/MessagesAn.php
@@ -30,8 +30,8 @@ $namespaceNames = array(
 	NS_USER_TALK      => 'Descusión_usuario',
 	# NS_PROJECT set by \$wgMetaNamespace
 	NS_PROJECT_TALK   => 'Descusión_$1',
-	NS_IMAGE          => 'Imachen',
-	NS_IMAGE_TALK     => 'Descusión_imachen',
+	NS_FILE           => 'Imachen',
+	NS_FILE_TALK      => 'Descusión_imachen',
 	NS_MEDIAWIKI      => 'MediaWiki',
 	NS_MEDIAWIKI_TALK => 'Descusión_MediaWiki',
 	NS_TEMPLATE       => 'Plantilla',
diff --git a/languages/messages/MessagesAng.php b/languages/messages/MessagesAng.php
index c833590504..3103ac33f9 100644
--- a/languages/messages/MessagesAng.php
+++ b/languages/messages/MessagesAng.php
@@ -12,8 +12,8 @@
 $namespaceNames = array(
 	NS_SPECIAL          => 'Syndrig',
 	NS_TALK             => 'Gesprec',
-	NS_IMAGE            => 'Biliþ',
-	NS_IMAGE_TALK       => 'Biliþgesprec',
+	NS_FILE             => 'Biliþ',
+	NS_FILE_TALK        => 'Biliþgesprec',
 	NS_TEMPLATE         => 'Bysen',
 	NS_TEMPLATE_TALK    => 'Bysengesprec',
 	NS_HELP             => 'Help',
diff --git a/languages/messages/MessagesAr.php b/languages/messages/MessagesAr.php
index 6dcd20884b..9c97cb9dcc 100644
--- a/languages/messages/MessagesAr.php
+++ b/languages/messages/MessagesAr.php
@@ -121,8 +121,8 @@ $namespaceNames = array(
 	NS_USER             => 'مستخدم',
 	NS_USER_TALK        => 'نقاش_المستخدم',
 	NS_PROJECT_TALK     => 'نقاش_$1',
-	NS_IMAGE            => 'ملف',
-	NS_IMAGE_TALK       => 'نقاش_الملف',
+	NS_FILE             => 'ملف',
+	NS_FILE_TALK        => 'نقاش_الملف',
 	NS_MEDIAWIKI        => 'ميدياويكي',
 	NS_MEDIAWIKI_TALK   => 'نقاش_ميدياويكي',
 	NS_TEMPLATE         => 'قالب',
@@ -135,8 +135,8 @@ $namespaceNames = array(
 
 $namespaceAliases = array(
 	'وسائط' => NS_MEDIA,
-	'صورة' => NS_IMAGE,
-	'نقاش_الصورة' => NS_IMAGE_TALK,
+	'صورة' => NS_FILE,
+	'نقاش_الصورة' => NS_FILE_TALK,
 );
 
 $skinNames = array(
diff --git a/languages/messages/MessagesArz.php b/languages/messages/MessagesArz.php
index 5735681286..bfbb398bbf 100644
--- a/languages/messages/MessagesArz.php
+++ b/languages/messages/MessagesArz.php
@@ -19,8 +19,8 @@ $namespaceNames = array(
 	NS_USER             => 'مستخدم',
 	NS_USER_TALK        => 'نقاش_المستخدم',
 	NS_PROJECT_TALK     => 'نقاش_$1',
-	NS_IMAGE            => 'ملف',
-	NS_IMAGE_TALK       => 'نقاش_الملف',
+	NS_FILE             => 'ملف',
+	NS_FILE_TALK        => 'نقاش_الملف',
 	NS_MEDIAWIKI        => 'ميدياويكى',
 	NS_MEDIAWIKI_TALK   => 'نقاش_ميدياويكى',
 	NS_TEMPLATE         => 'قالب',
@@ -33,8 +33,8 @@ $namespaceNames = array(
 
 $namespaceAliases = array(
 	'وسائط' => NS_MEDIA,
-	'صورة' => NS_IMAGE,
-	'نقاش_الصورة' => NS_IMAGE_TALK,
+	'صورة' => NS_FILE,
+	'نقاش_الصورة' => NS_FILE_TALK,
 );
 
 $skinNames = array(
diff --git a/languages/messages/MessagesAs.php b/languages/messages/MessagesAs.php
index e1be0e6d72..33985e95bc 100644
--- a/languages/messages/MessagesAs.php
+++ b/languages/messages/MessagesAs.php
@@ -20,8 +20,8 @@ $namespaceNames = array(
 	NS_USER             => 'সদস্য',
 	NS_USER_TALK        => 'সদস্য বার্তা',
 	NS_PROJECT_TALK     => '$1 বার্তা',
-	NS_IMAGE            => 'চিত্র',
-	NS_IMAGE_TALK       => 'চিত্র বার্তা',
+	NS_FILE             => 'চিত্র',
+	NS_FILE_TALK        => 'চিত্র বার্তা',
 	NS_MEDIAWIKI        => 'MediaWiki',
 	NS_MEDIAWIKI_TALK   => 'MediaWiki বার্তা',
 	NS_TEMPLATE         => 'সাঁচ',
@@ -38,8 +38,8 @@ $namespaceAliases = array(
 	'सदस्य' => NS_USER,
 	'सदस्य_वार्ता' => NS_USER_TALK,
 	'$1_वार्ता' => NS_PROJECT_TALK,
-	'चित्र' => NS_IMAGE,
-	'चित्र_वार्ता' => NS_IMAGE_TALK,
+	'चित्र' => NS_FILE,
+	'चित्र_वार्ता' => NS_FILE_TALK,
 	'साँचा' => NS_TEMPLATE,
 	'साँचा_वार्ता' => NS_TEMPLATE_TALK,
 	'श्रेणी' => NS_CATEGORY,
diff --git a/languages/messages/MessagesAst.php b/languages/messages/MessagesAst.php
index cf7959383a..6f5904c3c2 100644
--- a/languages/messages/MessagesAst.php
+++ b/languages/messages/MessagesAst.php
@@ -17,8 +17,8 @@ $namespaceNames = array(
 	NS_USER             => 'Usuariu',
 	NS_USER_TALK        => 'Usuariu_alderique',
 	NS_PROJECT_TALK     => '$1_alderique',
-	NS_IMAGE            => 'Archivu',
-	NS_IMAGE_TALK       => 'Archivu_alderique',
+	NS_FILE             => 'Archivu',
+	NS_FILE_TALK        => 'Archivu_alderique',
 	NS_MEDIAWIKI        => 'MediaWiki',
 	NS_MEDIAWIKI_TALK   => 'MediaWiki_alderique',
 	NS_TEMPLATE         => 'Plantía',
@@ -30,16 +30,16 @@ $namespaceNames = array(
 );
 
 $namespaceAliases = array(
-	'Imaxe' => NS_IMAGE,
-	'Imaxe alderique' => NS_IMAGE_TALK,
+	'Imaxe' => NS_FILE,
+	'Imaxe alderique' => NS_FILE_TALK,
 );
 
 $namespaceAliases = array(
 	'Discusión'           => NS_TALK,
 	'Usuariu_discusión'   => NS_USER_TALK,
 	'$1_discusión'        => NS_PROJECT_TALK,
-	'Imaxen'              => NS_IMAGE,
-	'Imaxen_discusión'    => NS_IMAGE_TALK,
+	'Imaxen'              => NS_FILE,
+	'Imaxen_discusión'    => NS_FILE_TALK,
 	'MediaWiki_discusión' => NS_MEDIAWIKI_TALK,
 	'Plantilla'           => NS_TEMPLATE,
 	'Plantilla_discusión' => NS_TEMPLATE_TALK,
diff --git a/languages/messages/MessagesAvk.php b/languages/messages/MessagesAvk.php
index 7f76c3e3c7..1847c22890 100644
--- a/languages/messages/MessagesAvk.php
+++ b/languages/messages/MessagesAvk.php
@@ -16,8 +16,8 @@ $namespaceNames = array(
 	NS_USER             => 'Favesik',
 	NS_USER_TALK        => 'Favesikprilara',
 	NS_PROJECT_TALK     => '$1 prilara',
-	NS_IMAGE            => 'Ewava',
-	NS_IMAGE_TALK       => 'Ewavaprilara',
+	NS_FILE             => 'Ewava',
+	NS_FILE_TALK        => 'Ewavaprilara',
 	NS_MEDIAWIKI        => 'MediaWiki',
 	NS_MEDIAWIKI_TALK   => 'MediaWiki prilara',
 	NS_TEMPLATE         => 'Teza',
diff --git a/languages/messages/MessagesAz.php b/languages/messages/MessagesAz.php
index fe83c4555e..7ff27e2c44 100644
--- a/languages/messages/MessagesAz.php
+++ b/languages/messages/MessagesAz.php
@@ -18,8 +18,8 @@ $namespaceNames = array(
 	NS_USER_TALK        => 'İstifadəçi_müzakirəsi',
 	# NS_PROJECT set by $wgMetaNamespace
 	NS_PROJECT_TALK     => '$1_müzakirəsi',
-	NS_IMAGE            => 'Şəkil',
-	NS_IMAGE_TALK       => 'Şəkil_müzakirəsi',
+	NS_FILE             => 'Şəkil',
+	NS_FILE_TALK        => 'Şəkil_müzakirəsi',
 	NS_MEDIAWIKI        => 'MediyaViki',
 	NS_MEDIAWIKI_TALK   => 'MediyaViki_müzakirəsi',
 	NS_TEMPLATE         => 'Şablon',
diff --git a/languages/messages/MessagesBa.php b/languages/messages/MessagesBa.php
index 8aa8d09a9c..f8a44eb7d5 100644
--- a/languages/messages/MessagesBa.php
+++ b/languages/messages/MessagesBa.php
@@ -18,8 +18,8 @@ $namespaceNames = array(
 	NS_USER_TALK        => 'Ҡатнашыусы_м-н_фекер_алышыу', 
 	#NS_PROJECT set by $wgMetaNamespace
 	NS_PROJECT_TALK     => '$1_б-са_фекер_алышыу',
-	NS_IMAGE            => 'Рәсем',
-	NS_IMAGE_TALK       => 'Рәсем_б-са_фекер_алышыу',
+	NS_FILE             => 'Рәсем',
+	NS_FILE_TALK        => 'Рәсем_б-са_фекер_алышыу',
 	NS_MEDIAWIKI        => 'MediaWiki',
 	NS_MEDIAWIKI_TALK   => 'MediaWiki_б-са_фекер_алышыу',
 	NS_TEMPLATE         => 'Ҡалып',
diff --git a/languages/messages/MessagesBat_smg.php b/languages/messages/MessagesBat_smg.php
index c27ca3ab21..a9925b4c2f 100644
--- a/languages/messages/MessagesBat_smg.php
+++ b/languages/messages/MessagesBat_smg.php
@@ -19,8 +19,8 @@ $namespaceNames = array(
 	NS_USER             => 'Nauduotuos',
 	NS_USER_TALK        => 'Nauduotuojė_aptarėms',
 	NS_PROJECT_TALK     => '$1_aptarėms',
-	NS_IMAGE            => 'Abruozdielis',
-	NS_IMAGE_TALK       => 'Abruozdielė_aptarėms',
+	NS_FILE             => 'Abruozdielis',
+	NS_FILE_TALK        => 'Abruozdielė_aptarėms',
 	NS_MEDIAWIKI        => 'MediaWiki',
 	NS_MEDIAWIKI_TALK   => 'MediaWiki_aptarėms',
 	NS_TEMPLATE         => 'Å abluons',
@@ -41,8 +41,8 @@ $namespaceAliases = array(
 	'Naudotojas'            => NS_USER,
 	'Naudotojo_aptarimas'   => NS_USER_TALK,
 	'$1_aptarimas'          => NS_PROJECT_TALK,
-	'Vaizdas'               => NS_IMAGE,
-	'Vaizdo_aptarimas'      => NS_IMAGE_TALK,
+	'Vaizdas'               => NS_FILE,
+	'Vaizdo_aptarimas'      => NS_FILE_TALK,
 	'MediaWiki_aptarimas'   => NS_MEDIAWIKI_TALK,
 	'Å ablonas'              => NS_TEMPLATE,
 	'Å ablono_aptarimas'     => NS_TEMPLATE_TALK,
diff --git a/languages/messages/MessagesBcc.php b/languages/messages/MessagesBcc.php
index ac6a9792d1..b1d3b2c067 100644
--- a/languages/messages/MessagesBcc.php
+++ b/languages/messages/MessagesBcc.php
@@ -27,8 +27,8 @@ $namespaceNames = array(
 	NS_USER             => 'کاربر',
 	NS_USER_TALK        => 'گپ_کاربر',
 	NS_PROJECT_TALK     => 'Ú¯Ù¾_$1',
-	NS_IMAGE            => 'عکس',
-	NS_IMAGE_TALK       => 'گپ_عکس',
+	NS_FILE             => 'عکس',
+	NS_FILE_TALK        => 'گپ_عکس',
 	NS_MEDIAWIKI        => 'مدیاویکی',
 	NS_MEDIAWIKI_TALK   => 'گپ_مدیاویکی',
 	NS_TEMPLATE         => 'تمپلت',
@@ -46,8 +46,8 @@ $namespaceAliases = array(
 	'کاربر' => NS_USER,
 	'بحث_کاربر' => NS_USER_TALK,
 	'بحث_$1' => NS_PROJECT_TALK,
-	'تصویر' => NS_IMAGE,
-	'بحث_تصویر' => NS_IMAGE_TALK,
+	'تصویر' => NS_FILE,
+	'بحث_تصویر' => NS_FILE_TALK,
 	'مدیاویکی' => NS_MEDIAWIKI,
 	'بحث_مدیاویکی' => NS_MEDIAWIKI_TALK,
 	'الگو' => NS_TEMPLATE,
diff --git a/languages/messages/MessagesBcl.php b/languages/messages/MessagesBcl.php
index 054ea34fe7..35b6726761 100644
--- a/languages/messages/MessagesBcl.php
+++ b/languages/messages/MessagesBcl.php
@@ -22,8 +22,8 @@ $namespaceNames = array(
 	NS_USER           => 'Paragamit',
 	NS_USER_TALK      => 'Olay_kan_paragamit',
 	NS_PROJECT_TALK   => 'Olay_sa_$1',
-	NS_IMAGE          => 'Ladawan',
-	NS_IMAGE_TALK     => 'Olay_sa_ladawan',
+	NS_FILE           => 'Ladawan',
+	NS_FILE_TALK      => 'Olay_sa_ladawan',
 	NS_MEDIAWIKI      => 'MediaWiki',
 	NS_MEDIAWIKI_TALK => 'Olay_sa_MediaWiki',
 	NS_TEMPLATE       => 'Plantilya',
diff --git a/languages/messages/MessagesBe.php b/languages/messages/MessagesBe.php
index 0238c86f68..c8eb576511 100644
--- a/languages/messages/MessagesBe.php
+++ b/languages/messages/MessagesBe.php
@@ -47,8 +47,8 @@ $namespaceNames = array(
         NS_USER_TALK        => 'Размовы_з_удзельнікам',
 	# NS_PROJECT set by $wgMetaNamespace
         NS_PROJECT_TALK     => '$1_размовы',
-        NS_IMAGE            => 'Выява',
-        NS_IMAGE_TALK       => 'Размовы_пра_выяву',
+        NS_FILE             => 'Выява',
+        NS_FILE_TALK        => 'Размовы_пра_выяву',
         NS_MEDIAWIKI        => 'MediaWiki',
         NS_MEDIAWIKI_TALK   => 'Размовы_пра_MediaWiki',
         NS_TEMPLATE         => 'Шаблон',
diff --git a/languages/messages/MessagesBe_tarask.php b/languages/messages/MessagesBe_tarask.php
index b5f8bbaaca..fd011319be 100644
--- a/languages/messages/MessagesBe_tarask.php
+++ b/languages/messages/MessagesBe_tarask.php
@@ -160,8 +160,8 @@ $namespaceNames = array(
 	NS_USER             => 'Удзельнік',
 	NS_USER_TALK        => 'Гутаркі_ўдзельніка',
 	NS_PROJECT_TALK     => 'Абмеркаваньне_$1',
-	NS_IMAGE            => 'Файл',
-	NS_IMAGE_TALK       => 'Абмеркаваньне_файла',
+	NS_FILE             => 'Файл',
+	NS_FILE_TALK        => 'Абмеркаваньне_файла',
 	NS_MEDIAWIKI        => 'MediaWiki',
 	NS_MEDIAWIKI_TALK   => 'Абмеркаваньне_MediaWiki',
 	NS_TEMPLATE         => 'Шаблён',
@@ -175,8 +175,8 @@ $namespaceNames = array(
 $namespaceAliases = array(
 	'Удзельніца' => NS_USER,
 	'Гутаркі ўдзельніцы' => NS_USER_TALK,
-	'Выява' => NS_IMAGE,
-	'Абмеркаваньне выявы' => NS_IMAGE_TALK,
+	'Выява' => NS_FILE,
+	'Абмеркаваньне выявы' => NS_FILE_TALK,
 );
 
 $specialPageAliases = array(
diff --git a/languages/messages/MessagesBg.php b/languages/messages/MessagesBg.php
index 234308b1a0..dbf2f6cc4f 100644
--- a/languages/messages/MessagesBg.php
+++ b/languages/messages/MessagesBg.php
@@ -23,8 +23,8 @@ $namespaceNames = array(
 	NS_USER             => 'Потребител',
 	NS_USER_TALK        => 'Потребител_беседа',
 	NS_PROJECT_TALK     => '$1_беседа',
-	NS_IMAGE            => 'Файл',
-	NS_IMAGE_TALK       => 'Файл_беседа',
+	NS_FILE             => 'Файл',
+	NS_FILE_TALK        => 'Файл_беседа',
 	NS_MEDIAWIKI        => 'МедияУики',
 	NS_MEDIAWIKI_TALK   => 'МедияУики_беседа',
 	NS_TEMPLATE         => 'Шаблон',
@@ -36,8 +36,8 @@ $namespaceNames = array(
 );
 
 $namespaceAliases = array(
-	'Картинка' => NS_IMAGE,
-	'Картинка беседа' => NS_IMAGE_TALK,
+	'Картинка' => NS_FILE,
+	'Картинка беседа' => NS_FILE_TALK,
 );
 
 $skinNames = array(
diff --git a/languages/messages/MessagesBn.php b/languages/messages/MessagesBn.php
index 925ee8c226..abbbcfec8d 100644
--- a/languages/messages/MessagesBn.php
+++ b/languages/messages/MessagesBn.php
@@ -16,8 +16,8 @@ $namespaceNames = array(
 	NS_USER             => 'ব্যবহারকারী',
 	NS_USER_TALK        => 'ব্যবহারকারী_আলাপ',
 	NS_PROJECT_TALK     => '$1_আলোচনা',
-	NS_IMAGE            => 'চিত্র',
-	NS_IMAGE_TALK       => 'চিত্র_আলোচনা',
+	NS_FILE             => 'চিত্র',
+	NS_FILE_TALK        => 'চিত্র_আলোচনা',
 	NS_MEDIAWIKI        => 'মিডিয়াউইকি',
 	NS_MEDIAWIKI_TALK   => 'মিডিয়াউইকি_আলোচনা',
 	NS_TEMPLATE         => 'টেমপ্লেট',
@@ -30,8 +30,8 @@ $namespaceNames = array(
 
 $namespaceAliases = array(
 	'$1_আলাপ' => NS_PROJECT_TALK,
-	'চিত্র_আলাপ' => NS_IMAGE_TALK,
-	'MediaWiki_আলাপ' => NS_IMAGE_TALK,
+	'চিত্র_আলাপ' => NS_FILE_TALK,
+	'MediaWiki_আলাপ' => NS_FILE_TALK,
 );
 
 $datePreferences = false;
diff --git a/languages/messages/MessagesBpy.php b/languages/messages/MessagesBpy.php
index 091d4d7c70..3df714eba9 100644
--- a/languages/messages/MessagesBpy.php
+++ b/languages/messages/MessagesBpy.php
@@ -32,8 +32,8 @@ $namespaceNames = array(
 	NS_USER_TALK      => 'আতাকুরার_য়্যারী',
 	# NS_PROJECT set by $wgMetaNamespace
 	NS_PROJECT_TALK   => '$1_য়্যারী',
-	NS_IMAGE          => 'ছবি',
-	NS_IMAGE_TALK     => 'ছবি_য়্যারী',
+	NS_FILE           => 'ছবি',
+	NS_FILE_TALK      => 'ছবি_য়্যারী',
 	NS_MEDIAWIKI      => 'মিডিয়াউইকি',
 	NS_MEDIAWIKI_TALK => 'মিডিয়াউইকির_য়্যারী',
 	NS_TEMPLATE       => 'মডেল',
diff --git a/languages/messages/MessagesBr.php b/languages/messages/MessagesBr.php
index aa802b02cb..44cff7703b 100644
--- a/languages/messages/MessagesBr.php
+++ b/languages/messages/MessagesBr.php
@@ -17,8 +17,8 @@ $namespaceNames = array(
 	NS_USER_TALK      => 'Kaozeadenn_Implijer',
 	# NS_PROJECT set by $wgMetaNamespace
 	NS_PROJECT_TALK   => 'Kaozeadenn_$1',
-	NS_IMAGE          => 'Skeudenn',
-	NS_IMAGE_TALK     => 'Kaozeadenn_Skeudenn',
+	NS_FILE           => 'Skeudenn',
+	NS_FILE_TALK      => 'Kaozeadenn_Skeudenn',
 	NS_MEDIAWIKI      => 'MediaWiki',
 	NS_MEDIAWIKI_TALK => 'Kaozeadenn_MediaWiki',
 	NS_TEMPLATE       => 'Patrom',
diff --git a/languages/messages/MessagesBs.php b/languages/messages/MessagesBs.php
index 49263cb887..0b3cb87167 100644
--- a/languages/messages/MessagesBs.php
+++ b/languages/messages/MessagesBs.php
@@ -19,8 +19,8 @@ $namespaceNames = array(
 	NS_USER             => 'Korisnik',
 	NS_USER_TALK        => 'Razgovor_sa_korisnikom',
 	NS_PROJECT_TALK     => 'Razgovor_{{grammar:instrumental|$1}}',
-	NS_IMAGE            => 'Datoteka',
-	NS_IMAGE_TALK       => 'Razgovor_o_datoteci',
+	NS_FILE             => 'Datoteka',
+	NS_FILE_TALK        => 'Razgovor_o_datoteci',
 	NS_MEDIAWIKI        => 'MedijaViki',
 	NS_MEDIAWIKI_TALK   => 'Razgovor_o_MedijaVikiju',
 	NS_TEMPLATE         => 'Å ablon',
@@ -32,8 +32,8 @@ $namespaceNames = array(
 );
 
 $namespaceAliases = array(
-	'Slika' => NS_IMAGE,
-	'Razgovor_o_datoteci' => NS_IMAGE_TALK,
+	'Slika' => NS_FILE,
+	'Razgovor_o_datoteci' => NS_FILE_TALK,
 );
 
 $skinNames = array(
diff --git a/languages/messages/MessagesCa.php b/languages/messages/MessagesCa.php
index b08ea03112..b5b9538800 100644
--- a/languages/messages/MessagesCa.php
+++ b/languages/messages/MessagesCa.php
@@ -40,8 +40,8 @@ $namespaceNames = array(
 	NS_USER             => 'Usuari',
 	NS_USER_TALK        => 'Usuari_Discussió',
 	NS_PROJECT_TALK     => '$1_Discussió',
-	NS_IMAGE            => 'Fitxer',
-	NS_IMAGE_TALK       => 'Fitxer_Discussió',
+	NS_FILE             => 'Fitxer',
+	NS_FILE_TALK        => 'Fitxer_Discussió',
 	NS_MEDIAWIKI        => 'MediaWiki',
 	NS_MEDIAWIKI_TALK   => 'MediaWiki_Discussió',
 	NS_TEMPLATE         => 'Plantilla',
@@ -53,8 +53,8 @@ $namespaceNames = array(
 );
 
 $namespaceAliases = array(
-	'Imatge' => NS_IMAGE,
-	'Imatge_Discussió' => NS_IMAGE_TALK,
+	'Imatge' => NS_FILE,
+	'Imatge_Discussió' => NS_FILE_TALK,
 );
 
 $separatorTransformTable = array(',' => '.', '.' => ',' );
diff --git a/languages/messages/MessagesCe.php b/languages/messages/MessagesCe.php
index 579264782f..c8d591084a 100644
--- a/languages/messages/MessagesCe.php
+++ b/languages/messages/MessagesCe.php
@@ -18,8 +18,8 @@ $namespaceNames = array(
 	NS_USER           => 'Юзер',
 	NS_USER_TALK      => 'Юзери_дийца',
 	NS_PROJECT_TALK   => '$1_Дийца',
-	NS_IMAGE          => 'Сурт',
-	NS_IMAGE_TALK     => 'Сурти_дийца',
+	NS_FILE           => 'Сурт',
+	NS_FILE_TALK      => 'Сурти_дийца',
 	NS_MEDIAWIKI      => 'МедйаВики',
 	NS_MEDIAWIKI_TALK => 'МедйаВики_дийца',
 	NS_TEMPLATE       => 'Дакъа',
diff --git a/languages/messages/MessagesCeb.php b/languages/messages/MessagesCeb.php
index cb51f2b281..a0bd46e602 100644
--- a/languages/messages/MessagesCeb.php
+++ b/languages/messages/MessagesCeb.php
@@ -17,8 +17,8 @@ $namespaceNames = array(
 	NS_USER             => 'Gumagamit',
 	NS_USER_TALK        => 'Hisgot_sa_Gumagamit',
 	NS_PROJECT_TALK     => 'Hisgot_sa$1',
-	NS_IMAGE            => 'Imahen',
-	NS_IMAGE_TALK       => 'Hisgot_sa_Imahen',
+	NS_FILE             => 'Imahen',
+	NS_FILE_TALK        => 'Hisgot_sa_Imahen',
 	NS_MEDIAWIKI        => 'MediaWiki',
 	NS_MEDIAWIKI_TALK   => 'Hisgot_sa_MediaWiki',
 	NS_TEMPLATE         => 'Plantilya',
diff --git a/languages/messages/MessagesCh.php b/languages/messages/MessagesCh.php
index 7bf5d99fe7..7b9b65800d 100644
--- a/languages/messages/MessagesCh.php
+++ b/languages/messages/MessagesCh.php
@@ -16,8 +16,8 @@ $namespaceNames = array(
 	NS_USER             => 'Muna\'sesetbi',
 	NS_USER_TALK        => 'Kombetsasion_ni_muna\'sesetbi',
 	NS_PROJECT_TALK     => 'Kombetsasion_nu_$1',
-	NS_IMAGE            => 'Litratu',
-	NS_IMAGE_TALK       => 'Kombetsasion_ni_litratu',
+	NS_FILE             => 'Litratu',
+	NS_FILE_TALK        => 'Kombetsasion_ni_litratu',
 	NS_HELP             => 'Ayudo',
 	NS_HELP_TALK        => 'Kombetsasion_ni_ayudo',
 	NS_CATEGORY         => 'Katigoria',
diff --git a/languages/messages/MessagesCrh_cyrl.php b/languages/messages/MessagesCrh_cyrl.php
index c8b5e76a9d..04e1ed76ef 100644
--- a/languages/messages/MessagesCrh_cyrl.php
+++ b/languages/messages/MessagesCrh_cyrl.php
@@ -26,8 +26,8 @@ $namespaceNames = array(
     NS_USER_TALK                 => 'Къулланыджы_музакереси',
     # NS_PROJECT set by $wgMetaNamespace
     NS_PROJECT_TALK              => '$1_музакереси',
-    NS_IMAGE                     => 'Ресим',
-    NS_IMAGE_TALK                => 'Ресим_музакереси',
+    NS_FILE                      => 'Ресим',
+    NS_FILE_TALK                 => 'Ресим_музакереси',
     NS_MEDIAWIKI                 => 'МедиаВики',
     NS_MEDIAWIKI_TALK            => 'МедиаВики_музакереси',
     NS_TEMPLATE                  => 'Шаблон',
@@ -46,8 +46,8 @@ $namespaceAliases = array(
 	"Qullanıcı"             => NS_USER,
 	"Qullanıcı_muzakeresi"  => NS_USER_TALK,
 	"$1_muzakeresi"         => NS_PROJECT_TALK,
-	"Resim"                 => NS_IMAGE,
-	"Resim_muzakeresi"      => NS_IMAGE_TALK,
+	"Resim"                 => NS_FILE,
+	"Resim_muzakeresi"      => NS_FILE_TALK,
 	"MediaViki"             => NS_MEDIAWIKI,
 	"MediaViki_muzakeresi"  => NS_MEDIAWIKI_TALK,
 	'Şablon'                => NS_TEMPLATE,
diff --git a/languages/messages/MessagesCrh_latn.php b/languages/messages/MessagesCrh_latn.php
index 5541a12a42..319d52b7e2 100644
--- a/languages/messages/MessagesCrh_latn.php
+++ b/languages/messages/MessagesCrh_latn.php
@@ -22,8 +22,8 @@ $namespaceNames = array(
     NS_USER_TALK                 => 'Qullanıcı_muzakeresi',
     # NS_PROJECT set by $wgMetaNamespace
     NS_PROJECT_TALK              => '$1_muzakeresi',
-    NS_IMAGE                     => 'Resim',
-    NS_IMAGE_TALK                => 'Resim_muzakeresi',
+    NS_FILE                      => 'Resim',
+    NS_FILE_TALK                 => 'Resim_muzakeresi',
     NS_MEDIAWIKI                 => 'MediaViki',
     NS_MEDIAWIKI_TALK            => 'MediaViki_muzakeresi',
     NS_TEMPLATE                  => 'Şablon',
@@ -42,8 +42,8 @@ $namespaceAliases = array(
 	"Къулланыджы"            => NS_USER,
 	"Къулланыджы_музакереси" => NS_USER_TALK,
 	"$1_музакереси"          => NS_PROJECT_TALK,
-	"Ресим"                  => NS_IMAGE,
-	"Ресим_музакереси"       => NS_IMAGE_TALK,
+	"Ресим"                  => NS_FILE,
+	"Ресим_музакереси"       => NS_FILE_TALK,
 	"МедиаВики"              => NS_MEDIAWIKI,
 	"МедиаВики_музакереси"   => NS_MEDIAWIKI_TALK,
 	'Шаблон'                 => NS_TEMPLATE,
diff --git a/languages/messages/MessagesCs.php b/languages/messages/MessagesCs.php
index 76d601d8b8..a89fc4321d 100644
--- a/languages/messages/MessagesCs.php
+++ b/languages/messages/MessagesCs.php
@@ -27,8 +27,8 @@ $namespaceNames = array(
 	NS_USER_TALK      => 'Uživatel_diskuse',
 	# NS_PROJECT set by \$wgMetaNamespace
 	NS_PROJECT_TALK   => '$1_diskuse',
-	NS_IMAGE          => 'Soubor',
-	NS_IMAGE_TALK     => 'Soubor_diskuse',
+	NS_FILE           => 'Soubor',
+	NS_FILE_TALK      => 'Soubor_diskuse',
 	NS_MEDIAWIKI      => 'MediaWiki',
 	NS_MEDIAWIKI_TALK => 'MediaWiki_diskuse',
 	NS_TEMPLATE       => 'Å ablona',
diff --git a/languages/messages/MessagesCsb.php b/languages/messages/MessagesCsb.php
index 5abc24778c..1f7c8218f0 100644
--- a/languages/messages/MessagesCsb.php
+++ b/languages/messages/MessagesCsb.php
@@ -18,8 +18,8 @@ $namespaceNames = array(
 	NS_USER_TALK        => 'Diskùsëjô_brëkòwnika',
 	# NS_PROJECT set by $wgMetaNamespace
 	NS_PROJECT_TALK     => 'Diskùsëjô_$1',
-	NS_IMAGE            => 'Òbrôzk',
-	NS_IMAGE_TALK       => 'Diskùsëjô_òbrôzków',
+	NS_FILE             => 'Òbrôzk',
+	NS_FILE_TALK        => 'Diskùsëjô_òbrôzków',
 	NS_MEDIAWIKI        => 'MediaWiki',
 	NS_MEDIAWIKI_TALK   => 'Diskùsëjô_MediaWiki',
 	NS_TEMPLATE         => 'Szablóna',
diff --git a/languages/messages/MessagesCu.php b/languages/messages/MessagesCu.php
index 362ba29799..7ff20e58f2 100644
--- a/languages/messages/MessagesCu.php
+++ b/languages/messages/MessagesCu.php
@@ -23,8 +23,8 @@ $namespaceNames = array(
 	NS_USER             => 'По́льꙃєватєл҄ь',
 	NS_USER_TALK        => 'По́льꙃєватєлꙗ_бєсѣ́да',
 	NS_PROJECT_TALK     => '{{grammar:genitive|$1}}_бєсѣ́да',
-	NS_IMAGE            => 'Дѣ́ло',
-	NS_IMAGE_TALK       => 'Дѣ́ла_бєсѣ́да',
+	NS_FILE             => 'Дѣ́ло',
+	NS_FILE_TALK        => 'Дѣ́ла_бєсѣ́да',
 	NS_MEDIAWIKI        => 'MediaWiki',
 	NS_MEDIAWIKI_TALK   => 'MediaWiki_бєсѣ́да',
 	NS_TEMPLATE         => 'Обраꙁь́ць',
@@ -42,10 +42,10 @@ $namespaceAliases = array(
 	'Польѕевател҄ь'                  => NS_USER,
 	'Польѕевател_бесѣда'             => NS_USER_TALK,
 	'{{grammar:genitive|$1}}_бесѣда' => NS_PROJECT_TALK,
-	'Ви́дъ'                          => NS_IMAGE,
-	'Видъ'                           => NS_IMAGE,
-	'Ви́да_бєсѣ́да'                   => NS_IMAGE_TALK,
-	'Вида_бесѣда'                    => NS_IMAGE_TALK,
+	'Ви́дъ'                          => NS_FILE,
+	'Видъ'                           => NS_FILE,
+	'Ви́да_бєсѣ́да'                   => NS_FILE_TALK,
+	'Вида_бесѣда'                    => NS_FILE_TALK,
 	'MediaWiki_бесѣда'               => NS_MEDIAWIKI_TALK,
 	'Образьць'                       => NS_TEMPLATE,
 	'Образьца_бесѣда'                => NS_TEMPLATE_TALK,
diff --git a/languages/messages/MessagesCv.php b/languages/messages/MessagesCv.php
index 4ca45f6eea..10e682aac6 100644
--- a/languages/messages/MessagesCv.php
+++ b/languages/messages/MessagesCv.php
@@ -22,8 +22,8 @@ $namespaceNames = array(
 	NS_USER_TALK        => 'Хутшăнаканăн_канашлу_страници',
 	# NS_PROJECT set by $wgMetaNamespace
 	NS_PROJECT_TALK     => '$1_сӳтсе_явмалли',
-	NS_IMAGE            => 'Ӳкерчĕк',
-	NS_IMAGE_TALK       => 'Ӳкерчĕке_сӳтсе_явмалли',
+	NS_FILE             => 'Ӳкерчĕк',
+	NS_FILE_TALK        => 'Ӳкерчĕке_сӳтсе_явмалли',
 	NS_MEDIAWIKI        => 'MediaWiki',
 	NS_MEDIAWIKI_TALK   => 'MediaWiki_сӳтсе_явмалли',
 	NS_TEMPLATE         => 'Шаблон',
diff --git a/languages/messages/MessagesCy.php b/languages/messages/MessagesCy.php
index 1c36fef165..e5e1c6c93c 100644
--- a/languages/messages/MessagesCy.php
+++ b/languages/messages/MessagesCy.php
@@ -19,8 +19,8 @@ $namespaceNames = array(
 	NS_USER_TALK      => "Sgwrs_Defnyddiwr",
 	# NS_PROJECT set by $wgMetaNamespace
 	NS_PROJECT_TALK   => "Sgwrs_$1",
-	NS_IMAGE          => "Delwedd",
-	NS_IMAGE_TALK     => "Sgwrs_Delwedd",
+	NS_FILE           => "Delwedd",
+	NS_FILE_TALK      => "Sgwrs_Delwedd",
 	NS_MEDIAWIKI      => "MediaWici",
 	NS_MEDIAWIKI_TALK => "Sgwrs_MediaWici",
 	NS_TEMPLATE       => "Nodyn",
diff --git a/languages/messages/MessagesDa.php b/languages/messages/MessagesDa.php
index ef7b4c8a1d..4d2fbca40f 100644
--- a/languages/messages/MessagesDa.php
+++ b/languages/messages/MessagesDa.php
@@ -28,8 +28,8 @@ $namespaceNames = array(
 	NS_USER_TALK      => 'Brugerdiskussion',
 	# NS_PROJECT set by $wgMetaNamespace
 	NS_PROJECT_TALK   => '$1-diskussion',
-	NS_IMAGE          => 'Billede',
-	NS_IMAGE_TALK     => 'Billeddiskussion',
+	NS_FILE           => 'Billede',
+	NS_FILE_TALK      => 'Billeddiskussion',
 	NS_MEDIAWIKI      => 'MediaWiki',
 	NS_MEDIAWIKI_TALK => 'MediaWiki-diskussion',
 	NS_TEMPLATE       => 'Skabelon',
diff --git a/languages/messages/MessagesDe.php b/languages/messages/MessagesDe.php
index 2c3291832d..61c8221362 100644
--- a/languages/messages/MessagesDe.php
+++ b/languages/messages/MessagesDe.php
@@ -32,8 +32,8 @@ $namespaceNames = array(
 	NS_USER             => 'Benutzer',
 	NS_USER_TALK        => 'Benutzer_Diskussion',
 	NS_PROJECT_TALK     => '$1_Diskussion',
-	NS_IMAGE            => 'Datei',
-	NS_IMAGE_TALK       => 'Datei_Diskussion',
+	NS_FILE             => 'Datei',
+	NS_FILE_TALK        => 'Datei_Diskussion',
 	NS_MEDIAWIKI        => 'MediaWiki',
 	NS_MEDIAWIKI_TALK   => 'MediaWiki_Diskussion',
 	NS_TEMPLATE         => 'Vorlage',
@@ -45,8 +45,8 @@ $namespaceNames = array(
 );
 
 $namespaceAliases = array(
-	'Bild' => NS_IMAGE,
-	'Bild_Diskussion' => NS_IMAGE_TALK,
+	'Bild' => NS_FILE,
+	'Bild_Diskussion' => NS_FILE_TALK,
 );
 
 $skinNames = array(
diff --git a/languages/messages/MessagesDsb.php b/languages/messages/MessagesDsb.php
index b1195939a9..c5b0ff0d07 100644
--- a/languages/messages/MessagesDsb.php
+++ b/languages/messages/MessagesDsb.php
@@ -34,8 +34,8 @@ $namespaceNames = array(
 	NS_USER             => 'Wužywaŕ',
 	NS_USER_TALK        => 'Diskusija_wužywarja',
 	NS_PROJECT_TALK     => '$1 diskusija',
-	NS_IMAGE            => 'Dataja',
-	NS_IMAGE_TALK       => 'Diskusija wó dataji',
+	NS_FILE             => 'Dataja',
+	NS_FILE_TALK        => 'Diskusija wó dataji',
 	NS_MEDIAWIKI        => 'MediaWiki',
 	NS_MEDIAWIKI_TALK   => 'MediaWiki_diskusija',
 	NS_TEMPLATE         => 'Pśedłoga',
@@ -47,8 +47,8 @@ $namespaceNames = array(
 );
 
 $namespaceAliases = array(
-	'Wobraz' => NS_IMAGE,
-	'Diskusija_wó_wobrazu' => NS_IMAGE_TALK,
+	'Wobraz' => NS_FILE,
+	'Diskusija_wó_wobrazu' => NS_FILE_TALK,
 );
 
 $datePreferences = array(
diff --git a/languages/messages/MessagesEl.php b/languages/messages/MessagesEl.php
index b5a547c0c1..0e85d5a18a 100644
--- a/languages/messages/MessagesEl.php
+++ b/languages/messages/MessagesEl.php
@@ -53,8 +53,8 @@ $namespaceNames = array(
 	NS_USER             => 'Χρήστης',
 	NS_USER_TALK        => 'Συζήτηση_χρήστη',
 	NS_PROJECT_TALK     => '$1_συζήτηση',
-	NS_IMAGE            => 'Εικόνα',
-	NS_IMAGE_TALK       => 'Συζήτηση_εικόνας',
+	NS_FILE             => 'Εικόνα',
+	NS_FILE_TALK        => 'Συζήτηση_εικόνας',
 	NS_MEDIAWIKI        => 'MediaWiki',
 	NS_MEDIAWIKI_TALK   => 'Συζήτηση_MediaWiki',
 	NS_TEMPLATE         => 'Πρότυπο',
diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index 146314db21..44b22d272a 100644
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -86,8 +86,8 @@ $namespaceNames = array(
 	NS_USER_TALK        => 'User_talk',
 	# NS_PROJECT set by $wgMetaNamespace
 	NS_PROJECT_TALK     => '$1_talk',
-	NS_IMAGE            => 'File',
-	NS_IMAGE_TALK       => 'File_talk',
+	NS_FILE             => 'File',
+	NS_FILE_TALK        => 'File_talk',
 	NS_MEDIAWIKI        => 'MediaWiki',
 	NS_MEDIAWIKI_TALK   => 'MediaWiki_talk',
 	NS_TEMPLATE         => 'Template',
diff --git a/languages/messages/MessagesEo.php b/languages/messages/MessagesEo.php
index 8b6b7ab9ba..b90e76a919 100644
--- a/languages/messages/MessagesEo.php
+++ b/languages/messages/MessagesEo.php
@@ -24,8 +24,8 @@ $namespaceNames = array(
 	NS_USER_TALK      => 'Vikipediista_diskuto',
 	# NS_PROJECT set by $wgMetaNamespace
 	NS_PROJECT_TALK   => '$1_diskuto',
-	NS_IMAGE          => 'Dosiero', #FIXME: Check the magic for Image: and Media:
-	NS_IMAGE_TALK     => 'Dosiera_diskuto',
+	NS_FILE           => 'Dosiero', #FIXME: Check the magic for Image: and Media:
+	NS_FILE_TALK      => 'Dosiera_diskuto',
 	NS_MEDIAWIKI      => 'MediaWiki',
 	NS_MEDIAWIKI_TALK => 'MediaWiki_diskuto',
 	NS_TEMPLATE       => 'Ŝablono',
diff --git a/languages/messages/MessagesEs.php b/languages/messages/MessagesEs.php
index bafb3db068..e35abe3926 100644
--- a/languages/messages/MessagesEs.php
+++ b/languages/messages/MessagesEs.php
@@ -51,8 +51,8 @@ $namespaceNames = array(
 	NS_USER             => 'Usuario',
 	NS_USER_TALK        => 'Usuario_Discusión',
 	NS_PROJECT_TALK     => '$1_Discusión',
-	NS_IMAGE            => 'Archivo',
-	NS_IMAGE_TALK       => 'Archivo_Discusión',
+	NS_FILE             => 'Archivo',
+	NS_FILE_TALK        => 'Archivo_Discusión',
 	NS_MEDIAWIKI        => 'MediaWiki',
 	NS_MEDIAWIKI_TALK   => 'MediaWiki_Discusión',
 	NS_TEMPLATE         => 'Plantilla',
@@ -64,8 +64,8 @@ $namespaceNames = array(
 );
 
 $namespaceAliases = array(
-	'Imagen' => NS_IMAGE,
-	'Imagen_Discusión' => NS_IMAGE_TALK,
+	'Imagen' => NS_FILE,
+	'Imagen_Discusión' => NS_FILE_TALK,
 );
 
 $specialPageAliases = array(
diff --git a/languages/messages/MessagesEt.php b/languages/messages/MessagesEt.php
index cce96685b6..603f2753f1 100644
--- a/languages/messages/MessagesEt.php
+++ b/languages/messages/MessagesEt.php
@@ -21,8 +21,8 @@ $namespaceNames = array(
 	NS_USER_TALK        => 'Kasutaja_arutelu',
 	# NS_PROJECT set by $wgMetaNamespace
 	NS_PROJECT_TALK     => '$1_arutelu',
-	NS_IMAGE            => 'Pilt',
-	NS_IMAGE_TALK       => 'Pildi_arutelu',
+	NS_FILE             => 'Pilt',
+	NS_FILE_TALK        => 'Pildi_arutelu',
 	NS_MEDIAWIKI        => 'MediaWiki',
 	NS_MEDIAWIKI_TALK   => 'MediaWiki_arutelu',
 	NS_TEMPLATE         => 'Mall',
diff --git a/languages/messages/MessagesEu.php b/languages/messages/MessagesEu.php
index af65dd62b4..569c4f4be5 100644
--- a/languages/messages/MessagesEu.php
+++ b/languages/messages/MessagesEu.php
@@ -27,8 +27,8 @@ $namespaceNames = array(
 	NS_USER             => 'Lankide',
 	NS_USER_TALK        => 'Lankide_eztabaida',
 	NS_PROJECT_TALK     => '$1_eztabaida',
-	NS_IMAGE            => 'Fitxategi',
-	NS_IMAGE_TALK       => 'Fitxategi_eztabaida',
+	NS_FILE             => 'Fitxategi',
+	NS_FILE_TALK        => 'Fitxategi_eztabaida',
 	NS_MEDIAWIKI        => 'MediaWiki',
 	NS_MEDIAWIKI_TALK   => 'MediaWiki_eztabaida',
 	NS_TEMPLATE         => 'Txantiloi',
@@ -41,8 +41,8 @@ $namespaceNames = array(
 
 $namespaceAliases = array(
 	'Aparteko' => NS_SPECIAL,
-	'Irudi' => NS_IMAGE,
-	'Irudi_eztabaida' => NS_IMAGE_TALK,
+	'Irudi' => NS_FILE,
+	'Irudi_eztabaida' => NS_FILE_TALK,
 );
 
 $specialPageAliases = array(
diff --git a/languages/messages/MessagesFa.php b/languages/messages/MessagesFa.php
index 0d8ab72b4a..6642ee05f3 100644
--- a/languages/messages/MessagesFa.php
+++ b/languages/messages/MessagesFa.php
@@ -31,8 +31,8 @@ $namespaceNames = array(
 	NS_USER             => 'کاربر',
 	NS_USER_TALK        => 'بحث_کاربر',
 	NS_PROJECT_TALK     => 'بحث_$1',
-	NS_IMAGE            => 'پرونده',
-	NS_IMAGE_TALK       => 'بحث_پرونده',
+	NS_FILE             => 'پرونده',
+	NS_FILE_TALK        => 'بحث_پرونده',
 	NS_MEDIAWIKI        => 'مدیاویکی',
 	NS_MEDIAWIKI_TALK   => 'بحث_مدیاویکی',
 	NS_TEMPLATE         => 'الگو',
@@ -44,8 +44,8 @@ $namespaceNames = array(
 );
 
 $namespaceAliases = array(
-	'تصویر' => NS_IMAGE,
-	'بحث_تصویر' => NS_IMAGE_TALK,
+	'تصویر' => NS_FILE,
+	'بحث_تصویر' => NS_FILE_TALK,
 );
 
 $specialPageAliases = array(
diff --git a/languages/messages/MessagesFi.php b/languages/messages/MessagesFi.php
index 4a288541b1..eccadd1817 100644
--- a/languages/messages/MessagesFi.php
+++ b/languages/messages/MessagesFi.php
@@ -24,8 +24,8 @@ $namespaceNames = array(
 	NS_USER             => 'Käyttäjä',
 	NS_USER_TALK        => 'Keskustelu_käyttäjästä',
 	NS_PROJECT_TALK     => 'Keskustelu_{{GRAMMAR:elative|$1}}',
-	NS_IMAGE            => 'Tiedosto',
-	NS_IMAGE_TALK       => 'Keskustelu_tiedostosta',
+	NS_FILE             => 'Tiedosto',
+	NS_FILE_TALK        => 'Keskustelu_tiedostosta',
 	NS_MEDIAWIKI        => 'Järjestelmäviesti',
 	NS_MEDIAWIKI_TALK   => 'Keskustelu_järjestelmäviestistä',
 	NS_TEMPLATE         => 'Malline',
@@ -37,8 +37,8 @@ $namespaceNames = array(
 );
 
 $namespaceAliases = array(
-	'Kuva' => NS_IMAGE,
-	'Keskustelu_kuvasta' => NS_IMAGE_TALK,
+	'Kuva' => NS_FILE,
+	'Keskustelu_kuvasta' => NS_FILE_TALK,
 );
 
 $skinNames = array(
diff --git a/languages/messages/MessagesFiu_vro.php b/languages/messages/MessagesFiu_vro.php
index a2011a006b..7395c6998c 100644
--- a/languages/messages/MessagesFiu_vro.php
+++ b/languages/messages/MessagesFiu_vro.php
@@ -18,8 +18,8 @@ $namespaceNames = array(
 	NS_USER             => 'Pruukja',
 	NS_USER_TALK        => 'Pruukja_arotus',
 	NS_PROJECT_TALK     => '$1_arotus',
-	NS_IMAGE            => 'Pilt',
-	NS_IMAGE_TALK       => 'Pildi_arotus',
+	NS_FILE             => 'Pilt',
+	NS_FILE_TALK        => 'Pildi_arotus',
 	NS_MEDIAWIKI        => 'MediaWiki',
 	NS_MEDIAWIKI_TALK   => 'MediaWiki_arotus',
 	NS_TEMPLATE         => 'Näüdüs',
diff --git a/languages/messages/MessagesFo.php b/languages/messages/MessagesFo.php
index b12214add9..0d041debd6 100644
--- a/languages/messages/MessagesFo.php
+++ b/languages/messages/MessagesFo.php
@@ -30,8 +30,8 @@ $namespaceNames = array(
 	NS_USER             => 'Brúkari',
 	NS_USER_TALK        => 'Brúkarakjak',
 	NS_PROJECT_TALK     => '$1-kjak',
-	NS_IMAGE            => 'Mynd',
-	NS_IMAGE_TALK       => 'Myndakjak',
+	NS_FILE             => 'Mynd',
+	NS_FILE_TALK        => 'Myndakjak',
 	NS_MEDIAWIKI        => 'MediaWiki',
 	NS_MEDIAWIKI_TALK   => 'MediaWiki-kjak',
 	NS_TEMPLATE         => 'Fyrimynd',
@@ -46,7 +46,7 @@ $namespaceAliases = array(
 	'Serstakur' => NS_SPECIAL,
 	'Brúkari_kjak' => NS_USER_TALK,
 	'$1_kjak' => NS_PROJECT_TALK,
-	'Mynd_kjak' => NS_IMAGE_TALK,
+	'Mynd_kjak' => NS_FILE_TALK,
 	'MidiaWiki' => NS_MEDIAWIKI,
 	'MidiaWiki_kjak' => NS_MEDIAWIKI_TALK,
 	'Fyrimynd_kjak' => NS_TEMPLATE_TALK,
diff --git a/languages/messages/MessagesFr.php b/languages/messages/MessagesFr.php
index 9c8addd2aa..b566915da1 100644
--- a/languages/messages/MessagesFr.php
+++ b/languages/messages/MessagesFr.php
@@ -56,8 +56,8 @@ $namespaceNames = array(
 	NS_USER           => 'Utilisateur',
 	NS_USER_TALK      => 'Discussion_Utilisateur',
 	NS_PROJECT_TALK   => 'Discussion_$1',
-	NS_IMAGE          => 'Image',
-	NS_IMAGE_TALK     => 'Discussion_Image',
+	NS_FILE           => 'Image',
+	NS_FILE_TALK      => 'Discussion_Image',
 	NS_MEDIAWIKI      => 'MediaWiki',
 	NS_MEDIAWIKI_TALK => 'Discussion_MediaWiki',
 	NS_TEMPLATE       => 'Modèle',
diff --git a/languages/messages/MessagesFrp.php b/languages/messages/MessagesFrp.php
index 87119020ca..f58b93efd4 100644
--- a/languages/messages/MessagesFrp.php
+++ b/languages/messages/MessagesFrp.php
@@ -32,8 +32,8 @@ $namespaceNames = array(
 	NS_USER             => 'Utilisator',
 	NS_USER_TALK        => 'Discussion_Utilisator',
 	NS_PROJECT_TALK     => 'Discussion_$1',
-	NS_IMAGE            => 'Émâge',
-	NS_IMAGE_TALK       => 'Discussion_Émâge',
+	NS_FILE             => 'Émâge',
+	NS_FILE_TALK        => 'Discussion_Émâge',
 	NS_MEDIAWIKI        => 'MediaWiki',
 	NS_MEDIAWIKI_TALK   => 'Discussion_MediaWiki',
 	NS_TEMPLATE         => 'Modèlo',
diff --git a/languages/messages/MessagesFur.php b/languages/messages/MessagesFur.php
index 2e42c9718e..68c98394bc 100644
--- a/languages/messages/MessagesFur.php
+++ b/languages/messages/MessagesFur.php
@@ -28,8 +28,8 @@ $namespaceNames = array(
 	NS_USER_TALK      => 'Discussion_utent',
 	# NS_PROJECT set by $wgMetaNamespace
 	NS_PROJECT_TALK   => 'Discussion_$1',
-	NS_IMAGE          => 'Figure',
-	NS_IMAGE_TALK     => 'Discussion_figure',
+	NS_FILE           => 'Figure',
+	NS_FILE_TALK      => 'Discussion_figure',
 	NS_MEDIAWIKI      => 'MediaWiki',
 	NS_MEDIAWIKI_TALK => 'Discussion_MediaWiki',
 	NS_TEMPLATE       => 'Model',
diff --git a/languages/messages/MessagesFy.php b/languages/messages/MessagesFy.php
index aefaef56ac..204f78f78c 100644
--- a/languages/messages/MessagesFy.php
+++ b/languages/messages/MessagesFy.php
@@ -46,8 +46,8 @@ $namespaceNames = array(
 	NS_USER_TALK      => 'Meidogger_oerlis',
 	# NS_PROJECT set by $wgMetaNamespace
 	NS_PROJECT_TALK   => '$1_oerlis',
-	NS_IMAGE          => 'Ofbyld',
-	NS_IMAGE_TALK     => 'Ofbyld_oerlis',
+	NS_FILE           => 'Ofbyld',
+	NS_FILE_TALK      => 'Ofbyld_oerlis',
 	NS_MEDIAWIKI      => 'MediaWiki',
 	NS_MEDIAWIKI_TALK => 'MediaWiki_oerlis',
 	NS_TEMPLATE       => 'Berjocht',
diff --git a/languages/messages/MessagesGa.php b/languages/messages/MessagesGa.php
index f92b257460..b3c3455b0d 100644
--- a/languages/messages/MessagesGa.php
+++ b/languages/messages/MessagesGa.php
@@ -75,8 +75,8 @@ $namespaceNames = array(
 	NS_USER_TALK        => 'Plé_úsáideora',
 	# NS_PROJECT set by $wgMetaNamespace
 	NS_PROJECT_TALK     => 'Plé_{{grammar:genitive|$1}}',
-	NS_IMAGE            => 'Íomhá',
-	NS_IMAGE_TALK       => 'Plé_íomhá',
+	NS_FILE             => 'Íomhá',
+	NS_FILE_TALK        => 'Plé_íomhá',
 	NS_MEDIAWIKI        => 'MediaWiki',
 	NS_MEDIAWIKI_TALK   => 'Plé_MediaWiki',
 	NS_TEMPLATE         => 'Teimpléad',
@@ -88,7 +88,7 @@ $namespaceNames = array(
 );
 
 $namespaceAliases = array(
-	'Plé_í­omhá' => NS_IMAGE_TALK,
+	'Plé_í­omhá' => NS_FILE_TALK,
 	'Múnla' => NS_TEMPLATE,
 	'Plé_múnla' => NS_TEMPLATE_TALK,
 	'Rang' => NS_CATEGORY
diff --git a/languages/messages/MessagesGl.php b/languages/messages/MessagesGl.php
index 34b2acd1f3..9f5236b777 100644
--- a/languages/messages/MessagesGl.php
+++ b/languages/messages/MessagesGl.php
@@ -19,8 +19,8 @@ $namespaceNames = array(
 	NS_USER             => 'Usuario',
 	NS_USER_TALK        => 'Conversa_usuario',
 	NS_PROJECT_TALK     => 'Conversa_$1',
-	NS_IMAGE            => 'Ficheiro',
-	NS_IMAGE_TALK       => 'Conversa_ficheiro',
+	NS_FILE             => 'Ficheiro',
+	NS_FILE_TALK        => 'Conversa_ficheiro',
 	NS_MEDIAWIKI        => 'MediaWiki',
 	NS_MEDIAWIKI_TALK   => 'Conversa_MediaWiki',
 	NS_TEMPLATE         => 'Modelo',
@@ -33,8 +33,8 @@ $namespaceNames = array(
 
 $namespaceAliases = array(
 	'Conversa_Usuario' => NS_USER_TALK,
-	'Imaxe' => NS_IMAGE,
-	'Conversa_Imaxe' => NS_IMAGE_TALK,
+	'Imaxe' => NS_FILE,
+	'Conversa_Imaxe' => NS_FILE_TALK,
 	'Conversa_Modelo' => NS_TEMPLATE_TALK,
 	'Conversa_Axuda' => NS_HELP_TALK,
 	'Conversa_Categoría' => NS_CATEGORY_TALK,
diff --git a/languages/messages/MessagesGn.php b/languages/messages/MessagesGn.php
index 77bf11a4bd..88775b23ad 100644
--- a/languages/messages/MessagesGn.php
+++ b/languages/messages/MessagesGn.php
@@ -18,8 +18,8 @@ $namespaceNames = array(
 	NS_USER_TALK        => 'Puruhára_myangekõi',
 	# NS_PROJECT set by $wgMetaNamespace
 	NS_PROJECT_TALK     => '$1_myangekõi',
-	NS_IMAGE            => 'Ta\'ãnga',
-	NS_IMAGE_TALK       => 'Ta\'ãnga_myangekõi',
+	NS_FILE             => 'Ta\'ãnga',
+	NS_FILE_TALK        => 'Ta\'ãnga_myangekõi',
 	NS_MEDIAWIKI        => 'MediaWiki',
 	NS_MEDIAWIKI_TALK   => 'MediaWiki_myangekõi',
 	NS_TEMPLATE         => 'Tembiecharã',
diff --git a/languages/messages/MessagesGu.php b/languages/messages/MessagesGu.php
index c9311467df..a957222205 100644
--- a/languages/messages/MessagesGu.php
+++ b/languages/messages/MessagesGu.php
@@ -16,8 +16,8 @@ $namespaceNames = array(
 	NS_USER             => 'સભ્ય',
 	NS_USER_TALK        => 'સભ્યની_ચર્ચા',
 	NS_PROJECT_TALK     => '$1_ચર્ચા',
-	NS_IMAGE            => 'ચિત્ર',
-	NS_IMAGE_TALK       => 'ચિત્રની_ચર્ચા',
+	NS_FILE             => 'ચિત્ર',
+	NS_FILE_TALK        => 'ચિત્રની_ચર્ચા',
 	NS_MEDIAWIKI        => 'મીડિયાવિકિ',
 	NS_MEDIAWIKI_TALK   => 'મીડિયાવિકિ_ચર્ચા',
 	NS_TEMPLATE         => 'ઢાંચો',
diff --git a/languages/messages/MessagesGv.php b/languages/messages/MessagesGv.php
index d8885275f2..ba0bf35d5b 100644
--- a/languages/messages/MessagesGv.php
+++ b/languages/messages/MessagesGv.php
@@ -16,8 +16,8 @@ $namespaceNames = array(
 	NS_USER             => 'Ymmydeyr',
 	NS_USER_TALK        => 'Resooney_ymmydeyr',
 	NS_PROJECT_TALK     => 'Resooney_$1',
-	NS_IMAGE            => 'Coadan',
-	NS_IMAGE_TALK       => 'Resooney_coadan',
+	NS_FILE             => 'Coadan',
+	NS_FILE_TALK        => 'Resooney_coadan',
 	NS_MEDIAWIKI        => 'MediaWiki',
 	NS_MEDIAWIKI_TALK   => 'Resooney_MediaWiki',
 	NS_TEMPLATE         => 'Clowan',
diff --git a/languages/messages/MessagesHaw.php b/languages/messages/MessagesHaw.php
index 15a4fd4478..60c544f669 100644
--- a/languages/messages/MessagesHaw.php
+++ b/languages/messages/MessagesHaw.php
@@ -16,8 +16,8 @@ $namespaceNames = array(
 	NS_USER             => 'Mea_hoʻohana',
 	NS_USER_TALK        => 'Kūkākūkā_o_mea_hoʻohana',
 	NS_PROJECT_TALK     => 'Kūkākūkā_o_Wikipikia',
-	NS_IMAGE            => 'Kiʻi',
-	NS_IMAGE_TALK       => 'Kūkākūkā_o_kiʻi',
+	NS_FILE             => 'Kiʻi',
+	NS_FILE_TALK        => 'Kūkākūkā_o_kiʻi',
 	NS_MEDIAWIKI        => 'MediaWiki',
 	NS_MEDIAWIKI_TALK   => 'Kūkākūkā_o_MediaWiki',
 	NS_TEMPLATE         => 'Anakuhi',
diff --git a/languages/messages/MessagesHe.php b/languages/messages/MessagesHe.php
index 9cea50ba75..f12040a919 100644
--- a/languages/messages/MessagesHe.php
+++ b/languages/messages/MessagesHe.php
@@ -300,8 +300,8 @@ $namespaceNames = array(
 	NS_USER_TALK      => 'שיחת_משתמש',
 	# NS_PROJECT set by $wgMetaNamespace
 	NS_PROJECT_TALK   => 'שיחת_$1',
-	NS_IMAGE          => 'קובץ',
-	NS_IMAGE_TALK     => 'שיחת_קובץ',
+	NS_FILE           => 'קובץ',
+	NS_FILE_TALK      => 'שיחת_קובץ',
 	NS_MEDIAWIKI      => 'מדיה_ויקי',
 	NS_MEDIAWIKI_TALK => 'שיחת_מדיה_ויקי',
 	NS_TEMPLATE       => 'תבנית',
@@ -312,8 +312,8 @@ $namespaceNames = array(
 	NS_CATEGORY_TALK  => 'שיחת_קטגוריה',
 );
 $namespaceAliases = array(
-	'תמונה'      => NS_IMAGE,
-	'שיחת_תמונה' => NS_IMAGE_TALK,
+	'תמונה'      => NS_FILE,
+	'שיחת_תמונה' => NS_FILE_TALK,
 );
 
 $messages = array(
diff --git a/languages/messages/MessagesHi.php b/languages/messages/MessagesHi.php
index 3814c45d2e..f4f55e153f 100644
--- a/languages/messages/MessagesHi.php
+++ b/languages/messages/MessagesHi.php
@@ -19,8 +19,8 @@ $namespaceNames = array(
 	NS_USER             => 'सदस्य',
 	NS_USER_TALK        => 'सदस्य_वार्ता',
 	NS_PROJECT_TALK     => '$1_वार्ता',
-	NS_IMAGE            => 'चित्र',
-	NS_IMAGE_TALK       => 'चित्र_वार्ता',
+	NS_FILE             => 'चित्र',
+	NS_FILE_TALK        => 'चित्र_वार्ता',
 	NS_MEDIAWIKI        => 'मीडियाविकि',
 	NS_MEDIAWIKI_TALK   => 'मीडियाविकि_वार्ता',
 	NS_TEMPLATE         => 'साँचा',
diff --git a/languages/messages/MessagesHr.php b/languages/messages/MessagesHr.php
index 4250091218..361fbf8cc1 100644
--- a/languages/messages/MessagesHr.php
+++ b/languages/messages/MessagesHr.php
@@ -34,8 +34,8 @@ $namespaceNames = array(
 	NS_USER             => 'Suradnik',
 	NS_USER_TALK        => 'Razgovor_sa_suradnikom',
 	NS_PROJECT_TALK     => 'Razgovor_$1',
-	NS_IMAGE            => 'Datoteka',
-	NS_IMAGE_TALK       => 'Razgovor_o_datoteci',
+	NS_FILE             => 'Datoteka',
+	NS_FILE_TALK        => 'Razgovor_o_datoteci',
 	NS_MEDIAWIKI        => 'MediaWiki',
 	NS_MEDIAWIKI_TALK   => 'MediaWiki_razgovor',
 	NS_TEMPLATE         => 'Predložak',
@@ -47,8 +47,8 @@ $namespaceNames = array(
 );
 
 $namespaceAliases = array(
-	'Slika' => NS_IMAGE,
-	'Razgovor_o_slici' => NS_IMAGE_TALK,
+	'Slika' => NS_FILE,
+	'Razgovor_o_slici' => NS_FILE_TALK,
 );
 
 $specialPageAliases = array(
diff --git a/languages/messages/MessagesHsb.php b/languages/messages/MessagesHsb.php
index c53cee640f..1251381943 100644
--- a/languages/messages/MessagesHsb.php
+++ b/languages/messages/MessagesHsb.php
@@ -19,8 +19,8 @@ $namespaceNames = array(
 	NS_USER             => 'Wužiwar',
 	NS_USER_TALK        => 'Diskusija_z_wužiwarjom',
 	NS_PROJECT_TALK     => '$1_diskusija',
-	NS_IMAGE            => 'Dataja',
-	NS_IMAGE_TALK       => 'Diskusija_k_dataji',
+	NS_FILE             => 'Dataja',
+	NS_FILE_TALK        => 'Diskusija_k_dataji',
 	NS_MEDIAWIKI        => 'MediaWiki',
 	NS_MEDIAWIKI_TALK   => 'MediaWiki_diskusija',
 	NS_TEMPLATE         => 'Předłoha',
@@ -32,8 +32,8 @@ $namespaceNames = array(
 );
 
 $namespaceAliases = array(
-	'Wobraz' => NS_IMAGE,
-	'Diskusija_k_wobrazej' => NS_IMAGE_TALK,
+	'Wobraz' => NS_FILE,
+	'Diskusija_k_wobrazej' => NS_FILE_TALK,
 );
 
 $specialPageAliases = array(
diff --git a/languages/messages/MessagesHt.php b/languages/messages/MessagesHt.php
index 1019541a52..a088f0f44f 100644
--- a/languages/messages/MessagesHt.php
+++ b/languages/messages/MessagesHt.php
@@ -20,8 +20,8 @@ $namespaceNames = array(
 	NS_USER_TALK      => 'Diskisyon_Itilizatè',
 	# NS_PROJECT set by $wgMetaNamespace
 	NS_PROJECT_TALK   => 'Diskisyon_$1',
-	NS_IMAGE          => 'Imaj',
-	NS_IMAGE_TALK     => 'Diskisyon_Imaj',
+	NS_FILE           => 'Imaj',
+	NS_FILE_TALK      => 'Diskisyon_Imaj',
 	NS_MEDIAWIKI      => 'MedyaWiki',
 	NS_MEDIAWIKI_TALK => 'Diskisyon_MedyaWiki',
 	NS_TEMPLATE       => 'Modèl',
diff --git a/languages/messages/MessagesHu.php b/languages/messages/MessagesHu.php
index 2ab8e2aa64..c210b28e14 100644
--- a/languages/messages/MessagesHu.php
+++ b/languages/messages/MessagesHu.php
@@ -25,8 +25,8 @@ $namespaceNames = array(
 	NS_USER             => 'Szerkesztő',
 	NS_USER_TALK        => 'Szerkesztővita',
 	NS_PROJECT_TALK     => '$1-vita',
-	NS_IMAGE            => 'Fájl',
-	NS_IMAGE_TALK       => 'Fájlvita',
+	NS_FILE             => 'Fájl',
+	NS_FILE_TALK        => 'Fájlvita',
 	NS_MEDIAWIKI        => 'MediaWiki',
 	NS_MEDIAWIKI_TALK   => 'MediaWiki-vita',
 	NS_TEMPLATE         => 'Sablon',
@@ -38,14 +38,14 @@ $namespaceNames = array(
 );
 
 $namespaceAliases = array(
-	'Kép' => NS_IMAGE,
-	'Képvita' => NS_IMAGE_TALK,
+	'Kép' => NS_FILE,
+	'Képvita' => NS_FILE_TALK,
 );
 
 $namespaceAliases = array(
 	'User_vita'      => NS_USER_TALK,
 	'$1_vita'        => NS_PROJECT_TALK,
-	'Kép_vita'       => NS_IMAGE_TALK,
+	'Kép_vita'       => NS_FILE_TALK,
 	'MediaWiki_vita' => NS_MEDIAWIKI_TALK,
 	'Sablon_vita'    => NS_TEMPLATE_TALK,
 	'Segítség_vita'  => NS_HELP_TALK,
diff --git a/languages/messages/MessagesHy.php b/languages/messages/MessagesHy.php
index b2fab9ed98..597e6f0a17 100644
--- a/languages/messages/MessagesHy.php
+++ b/languages/messages/MessagesHy.php
@@ -26,8 +26,8 @@ $namespaceNames = array(
 	NS_USER           => 'Մասնակից',
 	NS_USER_TALK      => 'Մասնակցի_քննարկում',
 	NS_PROJECT_TALK   => '{{GRAMMAR:genitive|$1}}_քննարկում',
-	NS_IMAGE          => 'Պատկեր',
-	NS_IMAGE_TALK     => 'Պատկերի_քննարկում',
+	NS_FILE           => 'Պատկեր',
+	NS_FILE_TALK      => 'Պատկերի_քննարկում',
 	NS_MEDIAWIKI      => 'MediaWiki',
 	NS_MEDIAWIKI_TALK => 'MediaWiki_քննարկում',
 	NS_TEMPLATE       => 'Կաղապար',
diff --git a/languages/messages/MessagesIa.php b/languages/messages/MessagesIa.php
index 20f051961c..e5455c695a 100644
--- a/languages/messages/MessagesIa.php
+++ b/languages/messages/MessagesIa.php
@@ -23,8 +23,8 @@ $namespaceNames = array(
 	NS_USER             => 'Usator',
 	NS_USER_TALK        => 'Discussion_Usator',
 	NS_PROJECT_TALK     => 'Discussion_$1',
-	NS_IMAGE            => 'File',
-	NS_IMAGE_TALK       => 'Discussion_File',
+	NS_FILE             => 'File',
+	NS_FILE_TALK        => 'Discussion_File',
 	NS_MEDIAWIKI        => 'MediaWiki',
 	NS_MEDIAWIKI_TALK   => 'Discussion_MediaWiki',
 	NS_TEMPLATE         => 'Patrono',
@@ -36,8 +36,8 @@ $namespaceNames = array(
 );
 
 $namespaceAliases = array(
-	'Imagine' => NS_IMAGE,
-	'Discussion_Imagine' => NS_IMAGE_TALK,
+	'Imagine' => NS_FILE,
+	'Discussion_Imagine' => NS_FILE_TALK,
 );
 
 $specialPageAliases = array(
diff --git a/languages/messages/MessagesId.php b/languages/messages/MessagesId.php
index 32fd246edd..a82b28f11e 100644
--- a/languages/messages/MessagesId.php
+++ b/languages/messages/MessagesId.php
@@ -32,8 +32,8 @@ $namespaceNames = array(
 	NS_USER_TALK        => 'Pembicaraan_Pengguna',
 	# NS_PROJECT set by $wgMetaNamespace
 	NS_PROJECT_TALK     => 'Pembicaraan_$1',
-	NS_IMAGE            => 'Berkas',
-	NS_IMAGE_TALK       => 'Pembicaraan_Berkas',
+	NS_FILE             => 'Berkas',
+	NS_FILE_TALK        => 'Pembicaraan_Berkas',
 	NS_MEDIAWIKI        => 'MediaWiki',
 	NS_MEDIAWIKI_TALK   => 'Pembicaraan_MediaWiki',
 	NS_TEMPLATE         => 'Templat',
@@ -48,13 +48,13 @@ $namespaceNames = array(
  * Array of namespace aliases, mapping from name to NS_xxx index
  */
 $namespaceAliases = array(
-	'Gambar_Pembicaraan'    => NS_IMAGE_TALK,
+	'Gambar_Pembicaraan'    => NS_FILE_TALK,
 	'MediaWiki_Pembicaraan' => NS_MEDIAWIKI_TALK,
 	'Templat_Pembicaraan'   => NS_TEMPLATE_TALK,
 	'Bantuan_Pembicaraan'   => NS_HELP_TALK,
 	'Kategori_Pembicaraan'  => NS_CATEGORY_TALK,
-	'Gambar'                => NS_IMAGE,
-	'Pembicaraan_Gambar'    => NS_IMAGE_TALK,
+	'Gambar'                => NS_FILE,
+	'Pembicaraan_Gambar'    => NS_FILE_TALK,
 	'Bicara'                => NS_TALK,
 	'Bicara_Pengguna'       => NS_USER_TALK,
 );
diff --git a/languages/messages/MessagesIo.php b/languages/messages/MessagesIo.php
index ec40248c7a..f4368c904a 100644
--- a/languages/messages/MessagesIo.php
+++ b/languages/messages/MessagesIo.php
@@ -19,8 +19,8 @@ $namespaceNames = array(
 	NS_USER           => 'Uzanto',
 	NS_USER_TALK      => 'Uzanto_Debato',
 	NS_PROJECT_TALK   => '$1_Debato',
-	NS_IMAGE          => 'Imajo',
-	NS_IMAGE_TALK     => 'Imajo_Debato',
+	NS_FILE           => 'Imajo',
+	NS_FILE_TALK      => 'Imajo_Debato',
 	NS_MEDIAWIKI      => 'MediaWiki',
 	NS_MEDIAWIKI_TALK => 'MediaWiki_Debato',
 	NS_TEMPLATE       => 'Modelo',
diff --git a/languages/messages/MessagesIs.php b/languages/messages/MessagesIs.php
index bd93380cdd..a7563ef25f 100644
--- a/languages/messages/MessagesIs.php
+++ b/languages/messages/MessagesIs.php
@@ -33,8 +33,8 @@ $namespaceNames = array(
 	NS_USER             => 'Notandi',
 	NS_USER_TALK        => 'Notandaspjall',
 	NS_PROJECT_TALK     => '$1spjall',
-	NS_IMAGE            => 'Mynd',
-	NS_IMAGE_TALK       => 'Myndaspjall',
+	NS_FILE             => 'Mynd',
+	NS_FILE_TALK        => 'Myndaspjall',
 	NS_MEDIAWIKI        => 'Melding',
 	NS_MEDIAWIKI_TALK   => 'Meldingarspjall',
 	NS_TEMPLATE         => 'Snið',
@@ -143,8 +143,8 @@ $namespaceNames = array(
 	NS_USER_TALK      => 'Notandaspjall',
 	# NS_PROJECT set by $wgMetaNamespace
 	NS_PROJECT_TALK   => '$1spjall',
-	NS_IMAGE          => 'Mynd',
-	NS_IMAGE_TALK     => 'Myndaspjall',
+	NS_FILE           => 'Mynd',
+	NS_FILE_TALK      => 'Myndaspjall',
 	NS_MEDIAWIKI      => 'Melding',
 	NS_MEDIAWIKI_TALK => 'Meldingarspjall',
 	NS_TEMPLATE       => 'Snið',
diff --git a/languages/messages/MessagesIt.php b/languages/messages/MessagesIt.php
index 5fb1e585d0..8c976e8f4a 100644
--- a/languages/messages/MessagesIt.php
+++ b/languages/messages/MessagesIt.php
@@ -35,8 +35,8 @@ $namespaceNames = array(
 	NS_USER             => 'Utente',
 	NS_USER_TALK        => 'Discussioni_utente',
 	NS_PROJECT_TALK     => 'Discussioni_$1',
-	NS_IMAGE            => 'File',
-	NS_IMAGE_TALK       => 'Discussioni_file',
+	NS_FILE             => 'File',
+	NS_FILE_TALK        => 'Discussioni_file',
 	NS_MEDIAWIKI        => 'MediaWiki',
 	NS_MEDIAWIKI_TALK   => 'Discussioni_MediaWiki',
 	NS_TEMPLATE         => 'Template',
@@ -48,8 +48,8 @@ $namespaceNames = array(
 );
 
 $namespaceAliases = array(
-	'Immagine' => NS_IMAGE,
-	'Discussioni_immagine' => NS_IMAGE_TALK,
+	'Immagine' => NS_FILE,
+	'Discussioni_immagine' => NS_FILE_TALK,
 );
 
 $separatorTransformTable = array(',' => '.', '.' => ',' );
diff --git a/languages/messages/MessagesJa.php b/languages/messages/MessagesJa.php
index 055ca80edf..baa97118e8 100644
--- a/languages/messages/MessagesJa.php
+++ b/languages/messages/MessagesJa.php
@@ -53,8 +53,8 @@ $namespaceNames = array(
 	NS_USER             => '利用者',
 	NS_USER_TALK        => '利用者‐会話',
 	NS_PROJECT_TALK     => '$1‐ノート',
-	NS_IMAGE            => 'ファイル',
-	NS_IMAGE_TALK       => 'ファイル‐ノート',
+	NS_FILE             => 'ファイル',
+	NS_FILE_TALK        => 'ファイル‐ノート',
 	NS_MEDIAWIKI        => 'MediaWiki',
 	NS_MEDIAWIKI_TALK   => 'MediaWiki‐ノート',
 	NS_TEMPLATE         => 'Template',
@@ -66,8 +66,8 @@ $namespaceNames = array(
 );
 
 $namespaceAliases = array(
-	'画像' => NS_IMAGE,
-	'画像‐ノート' => NS_IMAGE_TALK,
+	'画像' => NS_FILE,
+	'画像‐ノート' => NS_FILE_TALK,
 );
 
 $specialPageAliases = array(
diff --git a/languages/messages/MessagesJv.php b/languages/messages/MessagesJv.php
index ef2a02aeb8..d6e7fd0cb4 100644
--- a/languages/messages/MessagesJv.php
+++ b/languages/messages/MessagesJv.php
@@ -23,8 +23,8 @@ $namespaceNames = array(
 	NS_USER_TALK        => 'Dhiskusi_Panganggo',
 	# NS_PROJECT set by $wgMetaNamespace
 	NS_PROJECT_TALK     => 'Dhiskusi_$1',
-	NS_IMAGE            => 'Gambar',
-	NS_IMAGE_TALK       => 'Dhiskusi_Gambar',
+	NS_FILE             => 'Gambar',
+	NS_FILE_TALK        => 'Dhiskusi_Gambar',
 	NS_MEDIAWIKI        => 'MediaWiki',
 	NS_MEDIAWIKI_TALK   => 'Dhiskusi_MediaWiki',
 	NS_TEMPLATE         => 'Cithakan',
@@ -36,7 +36,7 @@ $namespaceNames = array(
 );
 
 $namespaceAliases = array(
-	'Gambar_Dhiskusi' => NS_IMAGE_TALK,
+	'Gambar_Dhiskusi' => NS_FILE_TALK,
 	'MediaWiki_Dhiskusi' => NS_MEDIAWIKI_TALK,
 	'Cithakan_Dhiskusi' => NS_TEMPLATE_TALK,
 	'Pitulung_Dhiskusi' => NS_HELP_TALK,
diff --git a/languages/messages/MessagesKa.php b/languages/messages/MessagesKa.php
index ce0cd3a2c8..c382fc30d8 100644
--- a/languages/messages/MessagesKa.php
+++ b/languages/messages/MessagesKa.php
@@ -19,8 +19,8 @@ $namespaceNames = array(
 	NS_USER             => 'მომხმარებელი',
 	NS_USER_TALK        => 'მომხმარებლის_განხილვა',
 	NS_PROJECT_TALK     => '$1_განხილვა',
-	NS_IMAGE            => 'ფაილი',
-	NS_IMAGE_TALK       => 'ფაილის_განხილვა',
+	NS_FILE             => 'ფაილი',
+	NS_FILE_TALK        => 'ფაილის_განხილვა',
 	NS_MEDIAWIKI        => 'მედიავიკი',
 	NS_MEDIAWIKI_TALK   => 'მედიავიკის_განხილვა',
 	NS_TEMPLATE         => 'თარგი',
@@ -33,8 +33,8 @@ $namespaceNames = array(
 
 $namespaceAliases = array(
 	'მომხმარებელი_განხილვა' => NS_USER_TALK,
-	'სურათი' => NS_IMAGE,
-	'სურათი_განხილვა' => NS_IMAGE_TALK,
+	'სურათი' => NS_FILE,
+	'სურათი_განხილვა' => NS_FILE_TALK,
 	'მედიავიკი_განხილვა' => NS_MEDIAWIKI_TALK,
 	'თარგი_განხილვა' => NS_TEMPLATE_TALK,
 	'დახმარება_განხილვა' => NS_HELP_TALK,
diff --git a/languages/messages/MessagesKaa.php b/languages/messages/MessagesKaa.php
index c28f63cb3b..84d78ebecf 100644
--- a/languages/messages/MessagesKaa.php
+++ b/languages/messages/MessagesKaa.php
@@ -28,8 +28,8 @@ $namespaceNames = array(
 	NS_USER             => 'Paydalanıwshı',
 	NS_USER_TALK        => 'Paydalanıwshı_sa\'wbeti',
 	NS_PROJECT_TALK     => '$1_sa\'wbeti',
-	NS_IMAGE            => 'Su\'wret',
-	NS_IMAGE_TALK       => 'Su\'wret_sa\'wbeti',
+	NS_FILE             => 'Su\'wret',
+	NS_FILE_TALK        => 'Su\'wret_sa\'wbeti',
 	NS_MEDIAWIKI        => 'MediaWiki',
 	NS_MEDIAWIKI_TALK   => 'MediaWiki_sa\'wbeti',
 	NS_TEMPLATE         => 'Shablon',
diff --git a/languages/messages/MessagesKab.php b/languages/messages/MessagesKab.php
index 1e1b737751..999127fcf0 100644
--- a/languages/messages/MessagesKab.php
+++ b/languages/messages/MessagesKab.php
@@ -19,8 +19,8 @@ $namespaceNames = array(
 	NS_USER_TALK        => 'Amyannan_umsqedac',
 	# NS_PROJECT set by $wgMetaNamespace
 	NS_PROJECT_TALK     => 'Amyannan_n_$1',
-	NS_IMAGE            => 'Tugna',
-	NS_IMAGE_TALK       => 'Amyannan_n_tugna',
+	NS_FILE             => 'Tugna',
+	NS_FILE_TALK        => 'Amyannan_n_tugna',
 	NS_MEDIAWIKI        => 'MediaWiki',
 	NS_MEDIAWIKI_TALK   => 'Amyannan_n_MediaWiki',
 	NS_TEMPLATE         => 'Talɣa',
diff --git a/languages/messages/MessagesKk_arab.php b/languages/messages/MessagesKk_arab.php
index 06e80f2303..312f16da09 100644
--- a/languages/messages/MessagesKk_arab.php
+++ b/languages/messages/MessagesKk_arab.php
@@ -63,8 +63,8 @@ $namespaceNames = array(
 	NS_USER_TALK        => 'قاتىسۋشى_تالقىلاۋى',
 	# NS_PROJECT set by $wgMetaNamespace
 	NS_PROJECT_TALK     => '$1_تالقىلاۋى',
-	NS_IMAGE            => 'سۋرەت',
-	NS_IMAGE_TALK       => 'سۋرەت_تالقىلاۋى',
+	NS_FILE             => 'سۋرەت',
+	NS_FILE_TALK        => 'سۋرەت_تالقىلاۋى',
 	NS_MEDIAWIKI        => 'مەدىياۋىيكىي',
 	NS_MEDIAWIKI_TALK   => 'مەدىياۋىيكىي_تالقىلاۋى',
 	NS_TEMPLATE         => 'ۇلگى',
@@ -83,8 +83,8 @@ $namespaceAliases = array(
 	'Қатысушы'            => NS_USER,
 	'Қатысушы_талқылауы'  => NS_USER_TALK,
 	'$1_талқылауы'        => NS_PROJECT_TALK,
-	'Сурет'               => NS_IMAGE,
-	'Сурет_талқылауы'     => NS_IMAGE_TALK,
+	'Сурет'               => NS_FILE,
+	'Сурет_талқылауы'     => NS_FILE_TALK,
 	'МедиаУики'           => NS_MEDIAWIKI,
 	'МедиаУики_талқылауы' => NS_MEDIAWIKI_TALK,
 	'Үлгі'                => NS_TEMPLATE,
@@ -101,8 +101,8 @@ $namespaceAliases = array(
 	'Qatıswşı'            => NS_USER,
 	'Qatıswşı_talqılawı'  => NS_USER_TALK,
 	'$1_talqılawı'        => NS_PROJECT_TALK,
-	'Swret'               => NS_IMAGE,
-	'Swret_talqılawı'     => NS_IMAGE_TALK,
+	'Swret'               => NS_FILE,
+	'Swret_talqılawı'     => NS_FILE_TALK,
 	'MedïaWïkï'           => NS_MEDIAWIKI,
 	'MedïaWïkï_talqılawı' => NS_MEDIAWIKI_TALK,
 	'Ülgi'                => NS_TEMPLATE,
diff --git a/languages/messages/MessagesKk_cyrl.php b/languages/messages/MessagesKk_cyrl.php
index beef239f27..84ccc1d1c4 100644
--- a/languages/messages/MessagesKk_cyrl.php
+++ b/languages/messages/MessagesKk_cyrl.php
@@ -39,8 +39,8 @@ $namespaceNames = array(
 	NS_USER_TALK        => 'Қатысушы_талқылауы',
 	# NS_PROJECT set by $wgMetaNamespace
 	NS_PROJECT_TALK     => '$1_талқылауы',
-	NS_IMAGE            => 'Сурет',
-	NS_IMAGE_TALK       => 'Сурет_талқылауы',
+	NS_FILE             => 'Сурет',
+	NS_FILE_TALK        => 'Сурет_талқылауы',
 	NS_MEDIAWIKI        => 'МедиаУики',
 	NS_MEDIAWIKI_TALK   => 'МедиаУики_талқылауы',
 	NS_TEMPLATE         => 'Үлгі',
@@ -59,8 +59,8 @@ $namespaceAliases = array(
 	'Qatıswşı'            => NS_USER,
 	'Qatıswşı_talqılawı'  => NS_USER_TALK,
 	'$1_talqılawı'        => NS_PROJECT_TALK,
-	'Swret'               => NS_IMAGE,
-	'Swret_talqılawı'     => NS_IMAGE_TALK,
+	'Swret'               => NS_FILE,
+	'Swret_talqılawı'     => NS_FILE_TALK,
 	'MedïaWïkï'           => NS_MEDIAWIKI,
 	'MedïaWïkï_talqılawı' => NS_MEDIAWIKI_TALK,
 	'Ülgi'                => NS_TEMPLATE,
@@ -85,8 +85,8 @@ $namespaceAliases = array(
 	'قاتىسۋشى'          => NS_USER,
 	'قاتىسۋشى_تالقىلاۋى'=> NS_USER_TALK,
 	'$1_تالقىلاۋى'        => NS_PROJECT_TALK,
-	'سۋرەت'              => NS_IMAGE,
-	'سۋرەت_تالقىلاۋى'    => NS_IMAGE_TALK,
+	'سۋرەت'              => NS_FILE,
+	'سۋرەت_تالقىلاۋى'    => NS_FILE_TALK,
 	'مەدياۋيكي'           => NS_MEDIAWIKI,
 	'مەدياۋيكي_تالقىلاۋى' => NS_MEDIAWIKI_TALK,
 	'ٷلگٸ'              => NS_TEMPLATE,
diff --git a/languages/messages/MessagesKk_latn.php b/languages/messages/MessagesKk_latn.php
index 9f0ebff562..067285da98 100644
--- a/languages/messages/MessagesKk_latn.php
+++ b/languages/messages/MessagesKk_latn.php
@@ -43,8 +43,8 @@ $namespaceNames = array(
 	NS_USER_TALK        => 'Qatıswşı_talqılawı',
 	# NS_PROJECT set by $wgMetaNamespace
 	NS_PROJECT_TALK     => '$1_talqılawı',
-	NS_IMAGE            => 'Swret',
-	NS_IMAGE_TALK       => 'Swret_talqılawı',
+	NS_FILE             => 'Swret',
+	NS_FILE_TALK        => 'Swret_talqılawı',
 	NS_MEDIAWIKI        => 'MedïaWïkï',
 	NS_MEDIAWIKI_TALK   => 'MedïaWïkï_talqılawı',
 	NS_TEMPLATE         => 'Ülgi',
@@ -63,8 +63,8 @@ $namespaceAliases = array(
 	'Қатысушы'            => NS_USER,
 	'Қатысушы_талқылауы'  => NS_USER_TALK,
 	'$1_талқылауы'        => NS_PROJECT_TALK,
-	'Сурет'               => NS_IMAGE,
-	'Сурет_талқылауы'     => NS_IMAGE_TALK,
+	'Сурет'               => NS_FILE,
+	'Сурет_талқылауы'     => NS_FILE_TALK,
 	'МедиаУики'           => NS_MEDIAWIKI,
 	'МедиаУики_талқылауы' => NS_MEDIAWIKI_TALK,
 	'Үлгі'                => NS_TEMPLATE,
@@ -89,8 +89,8 @@ $namespaceAliases = array(
 	'قاتىسۋشى'          => NS_USER,
 	'قاتىسۋشى_تالقىلاۋى'=> NS_USER_TALK,
 	'$1_تالقىلاۋى'        => NS_PROJECT_TALK,
-	'سۋرەت'              => NS_IMAGE,
-	'سۋرەت_تالقىلاۋى'    => NS_IMAGE_TALK,
+	'سۋرەت'              => NS_FILE,
+	'سۋرەت_تالقىلاۋى'    => NS_FILE_TALK,
 	'مەدياۋيكي'           => NS_MEDIAWIKI,
 	'مەدياۋيكي_تالقىلاۋى' => NS_MEDIAWIKI_TALK,
 	'ٷلگٸ'              => NS_TEMPLATE,
diff --git a/languages/messages/MessagesKm.php b/languages/messages/MessagesKm.php
index bc7faed0e9..23a4d54346 100644
--- a/languages/messages/MessagesKm.php
+++ b/languages/messages/MessagesKm.php
@@ -21,8 +21,8 @@ $namespaceNames = array(
 	NS_USER             => 'អ្នកប្រើប្រាស់',
 	NS_USER_TALK        => 'ការពិភាក្សារបស់អ្នកប្រើប្រាស់',
 	NS_PROJECT_TALK     => 'ការពិភាក្សាអំពី$1',
-	NS_IMAGE            => 'ឯកសារ',
-	NS_IMAGE_TALK       => 'ការពិភាក្សាអំពីឯកសារ',
+	NS_FILE             => 'ឯកសារ',
+	NS_FILE_TALK        => 'ការពិភាក្សាអំពីឯកសារ',
 	NS_MEDIAWIKI        => 'មេឌាវិគី',
 	NS_MEDIAWIKI_TALK   => 'ការពិភាក្សាអំពីមេឌាវិគី',
 	NS_TEMPLATE         => 'ទំព័រគំរូ',
@@ -38,9 +38,9 @@ $namespaceAliases = array(
 	'ពិភាក្សា' => NS_TALK,
 	'អ្នកប្រើប្រាស់-ពិភាក្សា' => NS_USER_TALK,
 	'$1_ពិភាក្ស' => NS_PROJECT_TALK,
-	'រូបភាព' => NS_IMAGE,
-	'ការពិភាក្សាអំពីរូបភាព' => NS_IMAGE_TALK,
-	'រូបភាព-ពិភាក្សា' => NS_IMAGE_TALK,
+	'រូបភាព' => NS_FILE,
+	'ការពិភាក្សាអំពីរូបភាព' => NS_FILE_TALK,
+	'រូបភាព-ពិភាក្សា' => NS_FILE_TALK,
 	'មីឌាវិគី' => NS_MEDIAWIKI,
 	'មីឌាវិគី-ពិភាក្សា' => NS_MEDIAWIKI_TALK,
 	'ទំព័រគំរូ-ពិភាក្សា' => NS_TEMPLATE_TALK,
diff --git a/languages/messages/MessagesKn.php b/languages/messages/MessagesKn.php
index 5d565193ff..266ac7484a 100644
--- a/languages/messages/MessagesKn.php
+++ b/languages/messages/MessagesKn.php
@@ -22,8 +22,8 @@ $namespaceNames = array(
 	NS_USER_TALK        => 'ಸದಸ್ಯರ_ಚರ್ಚೆಪುಟ',
 	# NS_PROJECT set by $wgMetaNamespace
 	NS_PROJECT_TALK     => '$1_ಚರ್ಚೆ',
-	NS_IMAGE            => 'ಚಿತ್ರ',
-	NS_IMAGE_TALK       => 'ಚಿತ್ರ_ಚರ್ಚೆಪುಟ',
+	NS_FILE             => 'ಚಿತ್ರ',
+	NS_FILE_TALK        => 'ಚಿತ್ರ_ಚರ್ಚೆಪುಟ',
 	NS_MEDIAWIKI        => 'ಮೀಡಿಯವಿಕಿ',
 	NS_MEDIAWIKI_TALK   => 'ಮೀಡೀಯವಿಕಿ_ಚರ್ಚೆ',
 	NS_TEMPLATE         => 'ಟೆಂಪ್ಲೇಟು',
diff --git a/languages/messages/MessagesKo.php b/languages/messages/MessagesKo.php
index 27c179fa2e..0edaa74cd6 100644
--- a/languages/messages/MessagesKo.php
+++ b/languages/messages/MessagesKo.php
@@ -34,8 +34,8 @@ $namespaceNames = array(
 	NS_USER             => '사용자',
 	NS_USER_TALK        => '사용자토론',
 	NS_PROJECT_TALK     => '$1토론',
-	NS_IMAGE            => '파일',
-	NS_IMAGE_TALK       => '파일토론',
+	NS_FILE             => '파일',
+	NS_FILE_TALK        => '파일토론',
 	NS_MEDIAWIKI        => '미디어위키',
 	NS_MEDIAWIKI_TALK   => '미디어위키토론',
 	NS_TEMPLATE         => '틀',
@@ -49,8 +49,8 @@ $namespaceNames = array(
 $namespaceAliases = array(
 	'특'  => NS_SPECIAL,
 	'MediaWiki토론' => NS_MEDIAWIKI_TALK,
-	'그림' => NS_IMAGE,
-	'파일토론' => NS_IMAGE_TALK,
+	'그림' => NS_FILE,
+	'파일토론' => NS_FILE_TALK,
 );
 
 $specialPageAliases = array(
diff --git a/languages/messages/MessagesKsh.php b/languages/messages/MessagesKsh.php
index ccd839d7bc..7846fecccc 100644
--- a/languages/messages/MessagesKsh.php
+++ b/languages/messages/MessagesKsh.php
@@ -47,8 +47,8 @@ $namespaceNames = array(
 	NS_USER             => 'Metmaacher',
 	NS_USER_TALK        => 'Metmaacher_Klaaf',
 	NS_PROJECT_TALK     => '$1_Klaaf',
-	NS_IMAGE            => 'Datei',
-	NS_IMAGE_TALK       => 'Dateie_Klaaf',
+	NS_FILE             => 'Datei',
+	NS_FILE_TALK        => 'Dateie_Klaaf',
 	NS_MEDIAWIKI        => 'MediaWiki',
 	NS_MEDIAWIKI_TALK   => 'MediaWiki_Klaaf',
 	NS_TEMPLATE         => 'Schablon',
@@ -64,10 +64,10 @@ $namespaceAliases = array(
 	'Shpezjal'          => NS_SPECIAL,
 	'Medmaacher'        => NS_USER,
 	'Medmaacher_Klaaf'  => NS_USER_TALK,
-	'Beld'              => NS_IMAGE,
-	'Belld'             => NS_IMAGE,
-	'Belder_Klaaf'      => NS_IMAGE_TALK,
-	'Bellder_Klaaf'     => NS_IMAGE_TALK,
+	'Beld'              => NS_FILE,
+	'Belld'             => NS_FILE,
+	'Belder_Klaaf'      => NS_FILE_TALK,
+	'Bellder_Klaaf'     => NS_FILE_TALK,
 	'MedijaWikki'       => NS_MEDIAWIKI,
 	'MedijaWikki_Klaaf' => NS_MEDIAWIKI_TALK,
 	'Hülp'              => NS_HELP,
diff --git a/languages/messages/MessagesKu_latn.php b/languages/messages/MessagesKu_latn.php
index 093c4701c0..91d097e5d7 100644
--- a/languages/messages/MessagesKu_latn.php
+++ b/languages/messages/MessagesKu_latn.php
@@ -17,8 +17,8 @@ $namespaceNames = array(
 	NS_USER_TALK        => 'Bikarhêner_nîqaş',
 	# NS_PROJECT set by $wgMetaNamespace
 	NS_PROJECT_TALK     => '$1_nîqaş',
-	NS_IMAGE            => 'Wêne',
-	NS_IMAGE_TALK       => 'Wêne_nîqaş',
+	NS_FILE             => 'Wêne',
+	NS_FILE_TALK        => 'Wêne_nîqaş',
 	NS_MEDIAWIKI        => 'MediaWiki',
 	NS_MEDIAWIKI_TALK   => 'MediaWiki_nîqaş',
 	NS_TEMPLATE         => 'Şablon',
diff --git a/languages/messages/MessagesLa.php b/languages/messages/MessagesLa.php
index be9a4de0d4..1aef568bb4 100644
--- a/languages/messages/MessagesLa.php
+++ b/languages/messages/MessagesLa.php
@@ -24,8 +24,8 @@ $namespaceNames = array(
 	NS_USER             => 'Usor',
 	NS_USER_TALK        => 'Disputatio_Usoris',
 	NS_PROJECT_TALK     => 'Disputatio_{{GRAMMAR:genitive|$1}}',
-	NS_IMAGE            => 'Fasciculus',
-	NS_IMAGE_TALK       => 'Disputatio_Fasciculi',
+	NS_FILE             => 'Fasciculus',
+	NS_FILE_TALK        => 'Disputatio_Fasciculi',
 	NS_MEDIAWIKI        => 'MediaWiki',
 	NS_MEDIAWIKI_TALK   => 'Disputatio_MediaWiki',
 	NS_TEMPLATE         => 'Formula',
@@ -37,8 +37,8 @@ $namespaceNames = array(
 );
 
 $namespaceAliases = array(
-	'Imago' => NS_IMAGE,
-	'Disputatio_Imaginis' => NS_IMAGE_TALK,
+	'Imago' => NS_FILE,
+	'Disputatio_Imaginis' => NS_FILE_TALK,
 );
 
 $separatorTransformTable = array( ',' => "\xc2\xa0" );
diff --git a/languages/messages/MessagesLb.php b/languages/messages/MessagesLb.php
index 44a2c1bce1..f2c15a7c9a 100644
--- a/languages/messages/MessagesLb.php
+++ b/languages/messages/MessagesLb.php
@@ -19,8 +19,8 @@ $namespaceNames = array(
 	NS_USER             => 'Benotzer',
 	NS_USER_TALK        => 'Benotzer_Diskussioun',
 	NS_PROJECT_TALK     => '$1 Diskussioun',
-	NS_IMAGE            => 'Fichier',
-	NS_IMAGE_TALK       => 'Fichier_Diskussioun',
+	NS_FILE             => 'Fichier',
+	NS_FILE_TALK        => 'Fichier_Diskussioun',
 	NS_MEDIAWIKI        => 'MediaWiki',
 	NS_MEDIAWIKI_TALK   => 'MediaWiki_Diskussioun',
 	NS_TEMPLATE         => 'Schabloun',
@@ -32,8 +32,8 @@ $namespaceNames = array(
 );
 
 $namespaceAliases = array(
-	'Bild' => NS_IMAGE,
-	'Bild_Diskussioun' => NS_IMAGE_TALK,
+	'Bild' => NS_FILE,
+	'Bild_Diskussioun' => NS_FILE_TALK,
 );
 
 $skinNames = array(
diff --git a/languages/messages/MessagesLbe.php b/languages/messages/MessagesLbe.php
index 6580edb8aa..c584e75ed9 100644
--- a/languages/messages/MessagesLbe.php
+++ b/languages/messages/MessagesLbe.php
@@ -25,8 +25,8 @@ $namespaceNames = array(
 	NS_USER_TALK        => 'Гьуртту_хьуминнал_ихтилат', 
 	#NS_PROJECT set by $wgMetaNamespace
 	NS_PROJECT_TALK     => '$1лиясса_ихтилат',
-	NS_IMAGE            => 'Сурат',
-	NS_IMAGE_TALK       => 'Суратраясса_ихтилат',
+	NS_FILE             => 'Сурат',
+	NS_FILE_TALK        => 'Суратраясса_ихтилат',
 	NS_MEDIAWIKI        => 'MediaWiki',
 	NS_MEDIAWIKI_TALK   => 'MediaWikiлиясса_ихтилат',
 	NS_TEMPLATE         => 'Шаблон',
diff --git a/languages/messages/MessagesLfn.php b/languages/messages/MessagesLfn.php
index 2bde136a5e..6f7cbbfd35 100644
--- a/languages/messages/MessagesLfn.php
+++ b/languages/messages/MessagesLfn.php
@@ -15,8 +15,8 @@ $namespaceNames = array(
 	NS_USER             => 'Usor',
 	NS_USER_TALK        => 'Usor_Discute',
 	NS_PROJECT_TALK     => '$1_Discute',
-	NS_IMAGE            => 'Fix',
-	NS_IMAGE_TALK       => 'Fix_Discute',
+	NS_FILE             => 'Fix',
+	NS_FILE_TALK        => 'Fix_Discute',
 	NS_TEMPLATE         => 'Model',
 	NS_TEMPLATE_TALK    => 'Model_Discute',
 	NS_HELP             => 'Aida',
diff --git a/languages/messages/MessagesLi.php b/languages/messages/MessagesLi.php
index dd520c8cc9..88cb0d9e63 100644
--- a/languages/messages/MessagesLi.php
+++ b/languages/messages/MessagesLi.php
@@ -30,8 +30,8 @@ $namespaceNames = array(
 	NS_USER_TALK      => 'Euverlèk_gebroeker',
 	# NS_PROJECT set by $wgMetaNamespace
 	NS_PROJECT_TALK   => 'Euverlèk_$1',
-	NS_IMAGE          => 'Plaetje',
-	NS_IMAGE_TALK     => 'Euverlèk_plaetje',
+	NS_FILE           => 'Plaetje',
+	NS_FILE_TALK      => 'Euverlèk_plaetje',
 	NS_MEDIAWIKI      => 'MediaWiki',
 	NS_MEDIAWIKI_TALK => 'Euverlèk_MediaWiki',
 	NS_TEMPLATE       => 'Sjabloon',
@@ -45,8 +45,8 @@ $namespaceNames = array(
 $namespaceAliases = array(
 	'Kategorie'           => NS_CATEGORY,
 	'Euverlèk_kategorie'  => NS_CATEGORY_TALK,
-	'Aafbeilding'         => NS_IMAGE,
-	'Euverlèk_afbeelding' => NS_IMAGE_TALK,
+	'Aafbeilding'         => NS_FILE,
+	'Euverlèk_afbeelding' => NS_FILE_TALK,
 );
 
 $specialPageAliases = array(
diff --git a/languages/messages/MessagesLij.php b/languages/messages/MessagesLij.php
index ca94774063..358c5869f4 100644
--- a/languages/messages/MessagesLij.php
+++ b/languages/messages/MessagesLij.php
@@ -20,8 +20,8 @@ $namespaceNames = array(
 	NS_USER             => 'Utente',
 	NS_USER_TALK        => 'Discûscioîn_ûtente',
 	NS_PROJECT_TALK     => 'Discûscioîn_$1',
-	NS_IMAGE            => 'Immaggine',
-	NS_IMAGE_TALK       => 'Discûscioîn_immaggine',
+	NS_FILE             => 'Immaggine',
+	NS_FILE_TALK        => 'Discûscioîn_immaggine',
 	NS_MEDIAWIKI_TALK   => 'Discûscioîn_MediaWiki',
 	NS_TEMPLATE_TALK    => 'Discûscioîn_template',
 	NS_HELP             => 'Agiûtto',
@@ -35,8 +35,8 @@ $namespaceAliases = array(
 	'Discussione' => NS_TALK,
 	'Discussioni_utente' => NS_USER_TALK,
 	'Discussioni_$1' => NS_PROJECT_TALK,
-	'Immagine' => NS_IMAGE,
-	'Discussioni_immagine' => NS_IMAGE_TALK,
+	'Immagine' => NS_FILE,
+	'Discussioni_immagine' => NS_FILE_TALK,
 	'Discussioni_MediaWiki' => NS_MEDIAWIKI_TALK,
 	'Discussioni_template' => NS_TEMPLATE_TALK,
 	'Aiuto' => NS_HELP,
diff --git a/languages/messages/MessagesLo.php b/languages/messages/MessagesLo.php
index 6904f6d7d6..038efd228a 100644
--- a/languages/messages/MessagesLo.php
+++ b/languages/messages/MessagesLo.php
@@ -15,8 +15,8 @@ $namespaceNames = array(
 	NS_USER             => 'ຜູ້ໃຊ້',
 	NS_USER_TALK        => 'ສົນທະນາຂອງຜູ້ໃຊ້',
 	NS_PROJECT_TALK     => 'ສົນທະນາກ່ຽວກັບ$1',
-	NS_IMAGE            => 'ຮູບ',
-	NS_IMAGE_TALK       => 'ສົນທະນາກ່ຽວກັບຮູບ',
+	NS_FILE             => 'ຮູບ',
+	NS_FILE_TALK        => 'ສົນທະນາກ່ຽວກັບຮູບ',
 	NS_MEDIAWIKI        => 'ມີເດຍວິກິ',
 	NS_MEDIAWIKI_TALK   => 'ສົນທະນາກ່ຽວກັບມີເດຍວິກິ',
 	NS_TEMPLATE         => 'ແມ່ແບບ',
diff --git a/languages/messages/MessagesLt.php b/languages/messages/MessagesLt.php
index 2c4e422f55..a95113cbd3 100644
--- a/languages/messages/MessagesLt.php
+++ b/languages/messages/MessagesLt.php
@@ -25,8 +25,8 @@ $namespaceNames = array(
 	NS_USER_TALK        => 'Naudotojo_aptarimas',
 	# NS_PROJECT set by $wgMetaNamespace
 	NS_PROJECT_TALK     => '$1_aptarimas',
-	NS_IMAGE            => 'Vaizdas',
-	NS_IMAGE_TALK       => 'Vaizdo_aptarimas',
+	NS_FILE             => 'Vaizdas',
+	NS_FILE_TALK        => 'Vaizdo_aptarimas',
 	NS_MEDIAWIKI        => 'MediaWiki',
 	NS_MEDIAWIKI_TALK   => 'MediaWiki_aptarimas',
 	NS_TEMPLATE         => 'Å ablonas',
diff --git a/languages/messages/MessagesLv.php b/languages/messages/MessagesLv.php
index b106254851..887971982f 100644
--- a/languages/messages/MessagesLv.php
+++ b/languages/messages/MessagesLv.php
@@ -24,8 +24,8 @@ $namespaceNames = array(
 	NS_USER_TALK        => 'Lietotāja_diskusija',
 	# NS_PROJECT set by $wgMetaNamespace
 	NS_PROJECT_TALK     => '{{grammar:ģenitīvs|$1}}_diskusija',
-	NS_IMAGE            => 'Attēls',
-	NS_IMAGE_TALK       => 'Attēla_diskusija',
+	NS_FILE             => 'Attēls',
+	NS_FILE_TALK        => 'Attēla_diskusija',
 	NS_MEDIAWIKI        => 'MediaWiki',
 	NS_MEDIAWIKI_TALK   => 'MediaWiki_diskusija',
 	NS_TEMPLATE         => 'Veidne',
diff --git a/languages/messages/MessagesMdf.php b/languages/messages/MessagesMdf.php
index 6e4bc88b7e..563f963319 100644
--- a/languages/messages/MessagesMdf.php
+++ b/languages/messages/MessagesMdf.php
@@ -18,8 +18,8 @@ $namespaceNames = array(
 	NS_USER             => 'Тиись',
 	NS_USER_TALK        => 'Тиись_корхнема',
 	NS_PROJECT_TALK     => '$1_корхнема',
-	NS_IMAGE            => 'Няйф',
-	NS_IMAGE_TALK       => 'Няйф_корхнема',
+	NS_FILE             => 'Няйф',
+	NS_FILE_TALK        => 'Няйф_корхнема',
 	NS_MEDIAWIKI        => 'МедиаВики',
 	NS_MEDIAWIKI_TALK   => 'МедиаВики_корхнема',
 	NS_TEMPLATE         => 'Шаблон',
@@ -36,8 +36,8 @@ $namespaceAliases = array(
 	'Участник' => NS_USER,
 	'Обсуждение_участника' => NS_USER_TALK,
 	'Обсуждение_{{GRAMMAR:genitive|$1}}' => NS_PROJECT_TALK,
-	'Изображение' => NS_IMAGE,
-	'Обсуждение_изображения' => NS_IMAGE_TALK,
+	'Изображение' => NS_FILE,
+	'Обсуждение_изображения' => NS_FILE_TALK,
 	'MediaWiki' => NS_MEDIAWIKI,
 	'Обсуждение_MediaWiki' => NS_MEDIAWIKI_TALK,
 	'Шаблон' => NS_TEMPLATE,
diff --git a/languages/messages/MessagesMg.php b/languages/messages/MessagesMg.php
index 23460a3d54..aab309bf25 100644
--- a/languages/messages/MessagesMg.php
+++ b/languages/messages/MessagesMg.php
@@ -17,8 +17,8 @@ $namespaceNames = array(
 	NS_USER             => 'Mpikambana',
 	NS_USER_TALK        => 'Dinika_amin\'ny_mpikambana',
 	NS_PROJECT_TALK     => 'Dinika_amin\'ny_$1',
-	NS_IMAGE            => 'Sary',
-	NS_IMAGE_TALK       => 'Dinika_amin\'ny_sary',
+	NS_FILE             => 'Sary',
+	NS_FILE_TALK        => 'Dinika_amin\'ny_sary',
 	NS_MEDIAWIKI        => 'MediaWiki',
 	NS_MEDIAWIKI_TALK   => 'Dinika_amin\'ny_MediaWiki',
 	NS_TEMPLATE         => 'Endrika',
diff --git a/languages/messages/MessagesMk.php b/languages/messages/MessagesMk.php
index e939f77be6..4c2202e6a5 100644
--- a/languages/messages/MessagesMk.php
+++ b/languages/messages/MessagesMk.php
@@ -22,8 +22,8 @@ $namespaceNames = array(
 	NS_USER             => 'Корисник',
 	NS_USER_TALK        => 'Разговор_со_корисник',
 	NS_PROJECT_TALK     => 'Разговор_за_$1',
-	NS_IMAGE            => 'Податотека',
-	NS_IMAGE_TALK       => 'Разговор_за_податотека',
+	NS_FILE             => 'Податотека',
+	NS_FILE_TALK        => 'Разговор_за_податотека',
 	NS_MEDIAWIKI        => 'МедијаВики',
 	NS_MEDIAWIKI_TALK   => 'Разговор_за_МедијаВики',
 	NS_TEMPLATE         => 'Шаблон',
@@ -35,8 +35,8 @@ $namespaceNames = array(
 );
 
 $namespaceAliases = array(
-	'Слика' => NS_IMAGE,
-	'Разговор_за_слика' => NS_IMAGE_TALK,
+	'Слика' => NS_FILE,
+	'Разговор_за_слика' => NS_FILE_TALK,
 );
 
 $skinNames = array(
diff --git a/languages/messages/MessagesMl.php b/languages/messages/MessagesMl.php
index e22bfa58a3..82c62563a3 100644
--- a/languages/messages/MessagesMl.php
+++ b/languages/messages/MessagesMl.php
@@ -29,8 +29,8 @@ $namespaceNames = array(
 	NS_USER_TALK => 'ഉപയോക്താവിന്റെ_സംവാദം',
 	# NS_PROJECT set by $wgMetaNamespace
 	NS_PROJECT_TALK => '$1_സംവാദം',
-	NS_IMAGE => 'ചിത്രം',
-	NS_IMAGE_TALK => 'ചിത്രത്തിന്റെ_സംവാദം',
+	NS_FILE => 'ചിത്രം',
+	NS_FILE_TALK => 'ചിത്രത്തിന്റെ_സംവാദം',
 	NS_MEDIAWIKI => 'മീഡിയവിക്കി',
 	NS_MEDIAWIKI_TALK => 'മീഡിയവിക്കി_സംവാദം',
 	NS_TEMPLATE => 'ഫലകം',
@@ -46,8 +46,8 @@ $namespaceAliases = array(
 	'ഉ' => NS_USER,
 	'അംഗങ്ങളുടെ സംവാദം' => NS_USER_TALK,
 	'ഉസം' => NS_USER_TALK,
-	'ചി' => NS_IMAGE,
-	'ചിസം' => NS_IMAGE_TALK,
+	'ചി' => NS_FILE,
+	'ചിസം' => NS_FILE_TALK,
 	'à´«' => NS_TEMPLATE,
 	'ഫസം' => NS_TEMPLATE_TALK,
 	'വി' => NS_CATEGORY,
diff --git a/languages/messages/MessagesMn.php b/languages/messages/MessagesMn.php
index 0d51351291..a8a97aa7c8 100644
--- a/languages/messages/MessagesMn.php
+++ b/languages/messages/MessagesMn.php
@@ -15,8 +15,8 @@ $namespaceNames = array(
 	NS_USER             => 'Хэрэглэгч',
 	NS_USER_TALK        => 'Хэрэглэгчийн_яриа',
 	NS_PROJECT_TALK     => '$1-н_хэлэлцүүлэг',
-	NS_IMAGE            => 'Зураг',
-	NS_IMAGE_TALK       => 'Зургийн_хэлэлцүүлэг',
+	NS_FILE             => 'Зураг',
+	NS_FILE_TALK        => 'Зургийн_хэлэлцүүлэг',
 	NS_MEDIAWIKI        => 'МедиаВики',
 	NS_MEDIAWIKI_TALK   => 'МедиаВикигийн_хэлэлцүүлэг',
 	NS_TEMPLATE         => 'Загвар',
diff --git a/languages/messages/MessagesMr.php b/languages/messages/MessagesMr.php
index 051969ddaa..b6c3fb1bc3 100644
--- a/languages/messages/MessagesMr.php
+++ b/languages/messages/MessagesMr.php
@@ -34,8 +34,8 @@ $namespaceNames = array(
 	NS_USER             => 'सदस्य',
 	NS_USER_TALK        => 'सदस्य चर्चा',
 	NS_PROJECT_TALK     => '$1_चर्चा',
-	NS_IMAGE            => 'चित्र',
-	NS_IMAGE_TALK       => 'चित्र_चर्चा',
+	NS_FILE             => 'चित्र',
+	NS_FILE_TALK        => 'चित्र_चर्चा',
 	NS_MEDIAWIKI        => 'मिडियाविकी',
 	NS_MEDIAWIKI_TALK   => 'मिडियाविकी_चर्चा',
 	NS_TEMPLATE         => 'साचा',
diff --git a/languages/messages/MessagesMs.php b/languages/messages/MessagesMs.php
index 53412d5da9..7d8406825d 100644
--- a/languages/messages/MessagesMs.php
+++ b/languages/messages/MessagesMs.php
@@ -31,8 +31,8 @@ $namespaceNames = array(
 	NS_USER             => 'Pengguna',
 	NS_USER_TALK        => 'Perbincangan_Pengguna',
 	NS_PROJECT_TALK     => 'Perbincangan_$1',
-	NS_IMAGE            => 'Fail',
-	NS_IMAGE_TALK       => 'Perbincangan_Fail',
+	NS_FILE             => 'Fail',
+	NS_FILE_TALK        => 'Perbincangan_Fail',
 	NS_MEDIAWIKI        => 'MediaWiki',
 	NS_MEDIAWIKI_TALK   => 'Perbincangan_MediaWiki',
 	NS_TEMPLATE         => 'Templat',
@@ -44,8 +44,8 @@ $namespaceNames = array(
 );
 
 $namespaceAliases = array(
-	'Imej' => NS_IMAGE,
-	'Perbincangan_Imej' => NS_IMAGE_TALK,
+	'Imej' => NS_FILE,
+	'Perbincangan_Imej' => NS_FILE_TALK,
 );
 
 $namespaceAliases = array(
@@ -53,7 +53,7 @@ $namespaceAliases = array(
 	'Perbualan'           => NS_TALK,
 	'Perbualan_Pengguna'  => NS_USER_TALK,
 	'Perbualan_$1'        => NS_PROJECT_TALK,
-	'Imej_Perbualan'      => NS_IMAGE_TALK,
+	'Imej_Perbualan'      => NS_FILE_TALK,
 	'MediaWiki_Perbualan' => NS_MEDIAWIKI_TALK,
 	'Perbualan_Templat'   => NS_TEMPLATE_TALK,
 	'Perbualan_Kategori'  => NS_CATEGORY_TALK,
diff --git a/languages/messages/MessagesMt.php b/languages/messages/MessagesMt.php
index 10936bffe6..8456c5163f 100644
--- a/languages/messages/MessagesMt.php
+++ b/languages/messages/MessagesMt.php
@@ -17,8 +17,8 @@ $namespaceNames = array(
 	NS_USER             => 'Utent',
 	NS_USER_TALK        => 'Diskuti_utent',
 	NS_PROJECT_TALK     => '$1_diskuti',
-	NS_IMAGE            => 'Stampa',
-	NS_IMAGE_TALK       => 'Diskuti_stampa',
+	NS_FILE             => 'Stampa',
+	NS_FILE_TALK        => 'Diskuti_stampa',
 	NS_MEDIAWIKI        => 'MedjaWiki',
 	NS_MEDIAWIKI_TALK   => 'Diskuti_MedjaWiki',
 	NS_TEMPLATE         => 'Template',
diff --git a/languages/messages/MessagesMyv.php b/languages/messages/MessagesMyv.php
index 368e6ae9da..7667692eea 100644
--- a/languages/messages/MessagesMyv.php
+++ b/languages/messages/MessagesMyv.php
@@ -23,8 +23,8 @@ $namespaceNames = array(
 	NS_USER             => 'Теиця',
 	NS_USER_TALK        => 'Теицянь кортамось',
 	NS_PROJECT_TALK     => '$1 кортамось',
-	NS_IMAGE            => 'Артовкс',
-	NS_IMAGE_TALK       => 'Артовксто кортамось',
+	NS_FILE             => 'Артовкс',
+	NS_FILE_TALK        => 'Артовксто кортамось',
 	NS_MEDIAWIKI        => 'MediaWiki',
 	NS_MEDIAWIKI_TALK   => 'MediaWiki-нь кортамось',
 	NS_TEMPLATE         => 'ЛопаПарцун',
diff --git a/languages/messages/MessagesNah.php b/languages/messages/MessagesNah.php
index 74c292e747..9e400a5d28 100644
--- a/languages/messages/MessagesNah.php
+++ b/languages/messages/MessagesNah.php
@@ -18,8 +18,8 @@ $namespaceNames = array(
 	NS_USER             => 'Tlatequitiltilīlli',
 	NS_USER_TALK        => 'Tlatequitiltilīlli_tēixnāmiquiliztli',
 	NS_PROJECT_TALK     => '$1_tēixnāmiquiliztli',
-	NS_IMAGE            => 'Īxiptli',
-	NS_IMAGE_TALK       => 'Īxiptli_tēixnāmiquiliztli',
+	NS_FILE             => 'Īxiptli',
+	NS_FILE_TALK        => 'Īxiptli_tēixnāmiquiliztli',
 	NS_MEDIAWIKI        => 'Huiquimedia',
 	NS_MEDIAWIKI_TALK   => 'Huiquimedia_tēixnāmiquiliztli',
 	NS_TEMPLATE         => 'Nemachiyōtīlli',
@@ -38,8 +38,8 @@ $namespaceAliases = array(
 	'Usuario_Discusión'	=> NS_USER_TALK,
 	'Wikipedia'	=> NS_PROJECT,
 	'Wikipedia_Discusión'	=> NS_PROJECT_TALK,
-	'Imagen'	=> NS_IMAGE,
-	'Imagen_Discusión'	=> NS_IMAGE_TALK,
+	'Imagen'	=> NS_FILE,
+	'Imagen_Discusión'	=> NS_FILE_TALK,
 	'MediaWiki'	=> NS_MEDIAWIKI,
 	'MediaWiki_Discusión'	=> NS_MEDIAWIKI_TALK,
 	'Plantilla'	=> NS_TEMPLATE,
diff --git a/languages/messages/MessagesNap.php b/languages/messages/MessagesNap.php
index 0aa6aecc18..d33cc41f85 100644
--- a/languages/messages/MessagesNap.php
+++ b/languages/messages/MessagesNap.php
@@ -20,8 +20,8 @@ $namespaceNames = array(
 	NS_USER             => 'Utente',
 	NS_USER_TALK        => 'Utente_chiàcchiera',
 	NS_PROJECT_TALK     => '$1_chiàcchiera',
-	NS_IMAGE            => 'Fiùra',
-	NS_IMAGE_TALK       => 'Fiùra_chiàcchiera',
+	NS_FILE             => 'Fiùra',
+	NS_FILE_TALK        => 'Fiùra_chiàcchiera',
 	NS_MEDIAWIKI        => 'MediaWiki',
 	NS_MEDIAWIKI_TALK   => 'MediaWiki_chiàcchiera',
 	NS_TEMPLATE         => 'Modello',
@@ -38,8 +38,8 @@ $namespaceAliases = array(
 	'Utente' => NS_USER,
 	'Discussioni_utente' => NS_USER_TALK,
 	'Discussioni_$1' => NS_PROJECT_TALK,
-	'Immagine' => NS_IMAGE,
-	'Discussioni_immagine' => NS_IMAGE_TALK,
+	'Immagine' => NS_FILE,
+	'Discussioni_immagine' => NS_FILE_TALK,
 	'MediaWiki' => NS_MEDIAWIKI,
 	'Discussioni_MediaWiki' => NS_MEDIAWIKI_TALK,
 	'Discussioni_template' => NS_TEMPLATE_TALK,
diff --git a/languages/messages/MessagesNds.php b/languages/messages/MessagesNds.php
index 50edd7fde9..e895902a56 100644
--- a/languages/messages/MessagesNds.php
+++ b/languages/messages/MessagesNds.php
@@ -18,8 +18,8 @@ $namespaceNames = array(
 	NS_USER             => 'Bruker',
 	NS_USER_TALK        => 'Bruker_Diskuschoon',
 	NS_PROJECT_TALK     => '$1_Diskuschoon',
-	NS_IMAGE            => 'Datei',
-	NS_IMAGE_TALK       => 'Datei_Diskuschoon',
+	NS_FILE             => 'Datei',
+	NS_FILE_TALK        => 'Datei_Diskuschoon',
 	NS_MEDIAWIKI        => 'MediaWiki',
 	NS_MEDIAWIKI_TALK   => 'MediaWiki_Diskuschoon',
 	NS_TEMPLATE         => 'Vörlaag',
@@ -35,8 +35,8 @@ $namespaceAliases = array(
 	'Benutzer' => NS_USER,
 	'Benutzer_Diskussion' => NS_USER_TALK,
 	'$1_Diskussion' => NS_PROJECT_TALK,
-	'Bild' => NS_IMAGE,
-	'Bild_Diskussion' => NS_IMAGE_TALK,
+	'Bild' => NS_FILE,
+	'Bild_Diskussion' => NS_FILE_TALK,
 	'MediaWiki_Diskussion' => NS_MEDIAWIKI_TALK,
 	'Vorlage' => NS_TEMPLATE,
 	'Vorlage_Diskussion' => NS_TEMPLATE_TALK,
@@ -101,8 +101,8 @@ $namespaceNames = array(
 	NS_USER_TALK      => 'Bruker_Diskuschoon',
 	# NS_PROJECT set by \$wgMetaNamespace
 	NS_PROJECT_TALK   => '$1_Diskuschoon',
-	NS_IMAGE          => 'Bild',
-	NS_IMAGE_TALK     => 'Bild_Diskuschoon',
+	NS_FILE           => 'Bild',
+	NS_FILE_TALK      => 'Bild_Diskuschoon',
 	NS_MEDIAWIKI      => 'MediaWiki',
 	NS_MEDIAWIKI_TALK => 'MediaWiki_Diskuschoon',
 	NS_TEMPLATE       => 'Vörlaag',
diff --git a/languages/messages/MessagesNds_nl.php b/languages/messages/MessagesNds_nl.php
index 999bc416d5..c6c33042e0 100644
--- a/languages/messages/MessagesNds_nl.php
+++ b/languages/messages/MessagesNds_nl.php
@@ -32,8 +32,8 @@ $namespaceNames = array(
 	NS_USER_TALK        => 'Overleg_gebruker',
 	# NS_PROJECT set by $wgMetaNamespace
 	NS_PROJECT_TALK     => 'Overleg_$1',
-	NS_IMAGE            => 'Ofbeelding',
-	NS_IMAGE_TALK       => 'Overleg_ofbeelding',
+	NS_FILE             => 'Ofbeelding',
+	NS_FILE_TALK        => 'Overleg_ofbeelding',
 	NS_MEDIAWIKI        => 'MediaWiki',
 	NS_MEDIAWIKI_TALK   => 'Overleg_MediaWiki',
 	NS_TEMPLATE         => 'Sjabloon',
diff --git a/languages/messages/MessagesNew.php b/languages/messages/MessagesNew.php
index ce5cdc4b92..6eb2efd7c7 100644
--- a/languages/messages/MessagesNew.php
+++ b/languages/messages/MessagesNew.php
@@ -16,8 +16,8 @@ $namespaceNames = array(
 	NS_USER_TALK        => 'छ्येलेमि_खँलाबँला',
 	# NS_PROJECT set by $wgMetaNamespace
 	NS_PROJECT_TALK     => '$1_खँलाबँला',
-	NS_IMAGE            => 'किपा',
-	NS_IMAGE_TALK       => 'किपा_खँलाबँला',
+	NS_FILE             => 'किपा',
+	NS_FILE_TALK        => 'किपा_खँलाबँला',
 	NS_MEDIAWIKI        => 'मिडियाविकि',
 	NS_MEDIAWIKI_TALK   => 'मिडियाविकि_खँलाबँला',
 	NS_HELP             => 'ग्वाहालि',
diff --git a/languages/messages/MessagesNl.php b/languages/messages/MessagesNl.php
index df49609dde..e30e66efc2 100644
--- a/languages/messages/MessagesNl.php
+++ b/languages/messages/MessagesNl.php
@@ -29,8 +29,8 @@ $namespaceNames = array(
 	NS_USER             => 'Gebruiker',
 	NS_USER_TALK        => 'Overleg_gebruiker',
 	NS_PROJECT_TALK     => 'Overleg_$1',
-	NS_IMAGE            => 'Bestand',
-	NS_IMAGE_TALK       => 'Overleg_bestand',
+	NS_FILE             => 'Bestand',
+	NS_FILE_TALK        => 'Overleg_bestand',
 	NS_MEDIAWIKI        => 'MediaWiki',
 	NS_MEDIAWIKI_TALK   => 'Overleg_MediaWiki',
 	NS_TEMPLATE         => 'Sjabloon',
@@ -42,8 +42,8 @@ $namespaceNames = array(
 );
 
 $namespaceAliases = array(
-	'Afbeelding' => NS_IMAGE,
-	'Overleg_afbeelding' => NS_IMAGE_TALK,
+	'Afbeelding' => NS_FILE,
+	'Overleg_afbeelding' => NS_FILE_TALK,
 );
 
 $skinNames = array(
diff --git a/languages/messages/MessagesNn.php b/languages/messages/MessagesNn.php
index 386aeaf7b0..99e774e316 100644
--- a/languages/messages/MessagesNn.php
+++ b/languages/messages/MessagesNn.php
@@ -148,8 +148,8 @@ $namespaceNames = array(
 	NS_USER_TALK      => 'Brukardiskusjon',
 	# NS_PROJECT set by $wgMetaNamespace
 	NS_PROJECT_TALK   => '$1-diskusjon',
-	NS_IMAGE          => 'Fil',
-	NS_IMAGE_TALK     => 'Fildiskusjon',
+	NS_FILE           => 'Fil',
+	NS_FILE_TALK      => 'Fildiskusjon',
 	NS_MEDIAWIKI      => 'MediaWiki',
 	NS_MEDIAWIKI_TALK => 'MediaWiki-diskusjon',
 	NS_TEMPLATE       => 'Mal',
diff --git a/languages/messages/MessagesNo.php b/languages/messages/MessagesNo.php
index 9e89d5caf1..6111561dd6 100644
--- a/languages/messages/MessagesNo.php
+++ b/languages/messages/MessagesNo.php
@@ -47,8 +47,8 @@ $namespaceNames = array(
 	NS_USER             => 'Bruker',
 	NS_USER_TALK        => 'Brukerdiskusjon',
 	NS_PROJECT_TALK     => '$1-diskusjon',
-	NS_IMAGE            => 'Fil',
-	NS_IMAGE_TALK       => 'Fildiskusjon',
+	NS_FILE             => 'Fil',
+	NS_FILE_TALK        => 'Fildiskusjon',
 	NS_MEDIAWIKI        => 'MediaWiki',
 	NS_MEDIAWIKI_TALK   => 'MediaWiki-diskusjon',
 	NS_TEMPLATE         => 'Mal',
@@ -60,8 +60,8 @@ $namespaceNames = array(
 );
 
 $namespaceAliases = array(
-	'Bilde' => NS_IMAGE,
-	'Bildediskusjon' => NS_IMAGE_TALK,
+	'Bilde' => NS_FILE,
+	'Bildediskusjon' => NS_FILE_TALK,
 );
 
 $separatorTransformTable = array(',' => "\xc2\xa0", '.' => ',' );
diff --git a/languages/messages/MessagesNso.php b/languages/messages/MessagesNso.php
index fcfca649c8..8dd09731e5 100644
--- a/languages/messages/MessagesNso.php
+++ b/languages/messages/MessagesNso.php
@@ -15,8 +15,8 @@ $namespaceNames = array(
 	NS_USER             => 'Mošomi',
 	NS_USER_TALK        => 'Boledišana_le_Mošomi',
 	NS_PROJECT_TALK     => '$1_Poledišano',
-	NS_IMAGE            => 'Seswantšho',
-	NS_IMAGE_TALK       => 'Poledišano_ya_Seswantšho',
+	NS_FILE             => 'Seswantšho',
+	NS_FILE_TALK        => 'Poledišano_ya_Seswantšho',
 	NS_MEDIAWIKI        => 'MediaWiki',
 	NS_MEDIAWIKI_TALK   => 'Poledišano_ya_MediaWiki',
 	NS_TEMPLATE         => 'Template',
diff --git a/languages/messages/MessagesNv.php b/languages/messages/MessagesNv.php
index 6878779105..5c2ea31f98 100644
--- a/languages/messages/MessagesNv.php
+++ b/languages/messages/MessagesNv.php
@@ -20,8 +20,8 @@ $namespaceNames = array(
 	NS_USER_TALK        => 'Choinish\'įįhí_baa_yinísht\'į́',
 	# NS_PROJECT set by $wgMetaNamespace
 	NS_PROJECT_TALK     => '$1_baa_yinísht\'į́',
-	NS_IMAGE            => 'E\'elyaaígíí',
-	NS_IMAGE_TALK       => 'E\'elyaaígíí_baa_yinísht\'į́',
+	NS_FILE             => 'E\'elyaaígíí',
+	NS_FILE_TALK        => 'E\'elyaaígíí_baa_yinísht\'į́',
 	NS_MEDIAWIKI        => 'MediaWiki',
 	NS_MEDIAWIKI_TALK   => 'MediaWiki_baa_yinísht\'į́',
 	NS_TEMPLATE         => 'Template',
diff --git a/languages/messages/MessagesOc.php b/languages/messages/MessagesOc.php
index 85931775e8..f70085a5e2 100644
--- a/languages/messages/MessagesOc.php
+++ b/languages/messages/MessagesOc.php
@@ -33,8 +33,8 @@ $namespaceNames = array(
 	NS_USER           => 'Utilizaire',
 	NS_USER_TALK      => 'Discussion_Utilizaire',
 	NS_PROJECT_TALK   => 'Discussion_$1',
-	NS_IMAGE          => 'Imatge',
-	NS_IMAGE_TALK     => 'Discussion_Imatge',
+	NS_FILE           => 'Imatge',
+	NS_FILE_TALK      => 'Discussion_Imatge',
 	NS_MEDIAWIKI      => 'MediaWiki',
 	NS_MEDIAWIKI_TALK => 'Discussion_MediaWiki',
 	NS_TEMPLATE       => 'Modèl',
@@ -49,7 +49,7 @@ $namespaceAliases = array(
 	'Utilisator'            => NS_USER,
 	'Discussion_Utilisator' => NS_USER_TALK,
 	'Discutida_Utilisator' => NS_USER_TALK,
-	'Discutida_Imatge'     => NS_IMAGE_TALK,
+	'Discutida_Imatge'     => NS_FILE_TALK,
 	'Mediaòiqui'           => NS_MEDIAWIKI,
 	'Discussion_Mediaòiqui' => NS_MEDIAWIKI_TALK,
 	'Discutida_Mediaòiqui' => NS_MEDIAWIKI_TALK,
diff --git a/languages/messages/MessagesOs.php b/languages/messages/MessagesOs.php
index 1d9e59c6c7..017f1653a3 100644
--- a/languages/messages/MessagesOs.php
+++ b/languages/messages/MessagesOs.php
@@ -27,8 +27,8 @@ $namespaceNames = array(
 	NS_USER_TALK        => 'Архайæджы_дискусси',
 	# NS_PROJECT set by $wgMetaNamespace
 	NS_PROJECT_TALK     => 'Дискусси_$1',
-	NS_IMAGE            => 'Ныв',
-	NS_IMAGE_TALK       => 'Нывы_тыххæй_дискусси',
+	NS_FILE             => 'Ныв',
+	NS_FILE_TALK        => 'Нывы_тыххæй_дискусси',
 	NS_MEDIAWIKI        => 'MediaWiki',
 	NS_MEDIAWIKI_TALK   => 'Дискусси_MediaWiki',
 	NS_TEMPLATE         => 'Шаблон',
diff --git a/languages/messages/MessagesPa.php b/languages/messages/MessagesPa.php
index 960ea62fca..9764a39d87 100644
--- a/languages/messages/MessagesPa.php
+++ b/languages/messages/MessagesPa.php
@@ -33,8 +33,8 @@ $namespaceNames = array(
 	NS_USER_TALK      => 'ਮੈਂਬਰ_ਚਰਚਾ',
 	# NS_PROJECT set by $wgMetaNamespace
 	NS_PROJECT_TALK   => '$1_ਚਰਚਾ',
-	NS_IMAGE          => 'ਤਸਵੀਰ',
-	NS_IMAGE_TALK     => 'ਤਸਵੀਰ_ਚਰਚਾ',
+	NS_FILE           => 'ਤਸਵੀਰ',
+	NS_FILE_TALK      => 'ਤਸਵੀਰ_ਚਰਚਾ',
 	NS_MEDIAWIKI      => 'ਮੀਡੀਆਵਿਕਿ',
 	NS_MEDIAWIKI_TALK => 'ਮੀਡੀਆਵਿਕਿ_ਚਰਚਾ',
 	NS_TEMPLATE       => 'ਨਮੂਨਾ',
diff --git a/languages/messages/MessagesPl.php b/languages/messages/MessagesPl.php
index a88089e807..2ac56cd093 100644
--- a/languages/messages/MessagesPl.php
+++ b/languages/messages/MessagesPl.php
@@ -32,8 +32,8 @@ $namespaceNames = array(
 	NS_USER             => 'Użytkownik',
 	NS_USER_TALK        => 'Dyskusja_użytkownika',
 	NS_PROJECT_TALK     => 'Dyskusja_$1',
-	NS_IMAGE            => 'Plik',
-	NS_IMAGE_TALK       => 'Dyskusja_pliku',
+	NS_FILE             => 'Plik',
+	NS_FILE_TALK        => 'Dyskusja_pliku',
 	NS_MEDIAWIKI        => 'MediaWiki',
 	NS_MEDIAWIKI_TALK   => 'Dyskusja_MediaWiki',
 	NS_TEMPLATE         => 'Szablon',
@@ -45,8 +45,8 @@ $namespaceNames = array(
 );
 
 $namespaceAliases = array(
-	'Grafika' => NS_IMAGE,
-	'Dyskusja_grafiki' => NS_IMAGE_TALK,
+	'Grafika' => NS_FILE,
+	'Dyskusja_grafiki' => NS_FILE_TALK,
 );
 
 $skinNames = array(
diff --git a/languages/messages/MessagesPms.php b/languages/messages/MessagesPms.php
index 734ee768e4..aa3d0e063f 100644
--- a/languages/messages/MessagesPms.php
+++ b/languages/messages/MessagesPms.php
@@ -22,8 +22,8 @@ $namespaceNames = array(
 	NS_USER_TALK        => 'Ciaciarade',
 	# NS_PROJECT set by $wgMetaNamespace
 	NS_PROJECT_TALK     => 'Discussion_ant_sla_$1',
-	NS_IMAGE            => 'Figura',
-	NS_IMAGE_TALK       => 'Discussion_dla_figura',
+	NS_FILE             => 'Figura',
+	NS_FILE_TALK        => 'Discussion_dla_figura',
 	NS_MEDIAWIKI        => 'MediaWiki',
 	NS_MEDIAWIKI_TALK   => 'Discussion_dla_MediaWiki',
 	NS_TEMPLATE         => 'Stamp',
diff --git a/languages/messages/MessagesPnt.php b/languages/messages/MessagesPnt.php
index c5016f9da4..353c265498 100644
--- a/languages/messages/MessagesPnt.php
+++ b/languages/messages/MessagesPnt.php
@@ -17,8 +17,8 @@ $namespaceNames = array(
 	NS_USER           => 'Χρήστες',
 	NS_USER_TALK      => 'Καλάτσεμαν_χρήστε',
 	NS_PROJECT_TALK   => '$1_καλάτσεμαν',
-	NS_IMAGE          => 'Εικόναν',
-	NS_IMAGE_TALK     => 'Καλάτσεμαν_εικόνας',
+	NS_FILE           => 'Εικόναν',
+	NS_FILE_TALK      => 'Καλάτσεμαν_εικόνας',
 	NS_MEDIAWIKI      => 'MediaWiki',
 	NS_MEDIAWIKI_TALK => 'MediaWiki_talk',
 	NS_TEMPLATE       => 'Πρότυπον',
diff --git a/languages/messages/MessagesPs.php b/languages/messages/MessagesPs.php
index 032b56d4c4..8d6ad92f62 100644
--- a/languages/messages/MessagesPs.php
+++ b/languages/messages/MessagesPs.php
@@ -25,8 +25,8 @@ $namespaceNames = array(
 	NS_USER           => 'کارونکی',
 	NS_USER_TALK      => 'د_کارونکي_خبرې_اترې',
 	NS_PROJECT_TALK   => 'د_$1_خبرې_اترې',
-	NS_IMAGE          => 'انځور',
-	NS_IMAGE_TALK     => 'د_انځور_خبرې_اترې',
+	NS_FILE           => 'انځور',
+	NS_FILE_TALK      => 'د_انځور_خبرې_اترې',
 	NS_MEDIAWIKI      => 'ميډياويکي',
 	NS_MEDIAWIKI_TALK => 'د_ميډياويکي_خبرې_اترې',
 	NS_TEMPLATE       => 'کينډۍ',
diff --git a/languages/messages/MessagesPt.php b/languages/messages/MessagesPt.php
index 9a63e821ab..e5ce688dc4 100644
--- a/languages/messages/MessagesPt.php
+++ b/languages/messages/MessagesPt.php
@@ -31,8 +31,8 @@ $namespaceNames = array(
 	NS_USER             => 'Usuário',
 	NS_USER_TALK        => 'Usuário_Discussão',
 	NS_PROJECT_TALK     => '$1_Discussão',
-	NS_IMAGE            => 'Ficheiro',
-	NS_IMAGE_TALK       => 'Ficheiro_Discussão',
+	NS_FILE             => 'Ficheiro',
+	NS_FILE_TALK        => 'Ficheiro_Discussão',
 	NS_MEDIAWIKI        => 'MediaWiki',
 	NS_MEDIAWIKI_TALK   => 'MediaWiki_Discussão',
 	NS_TEMPLATE         => 'Predefinição',
@@ -44,8 +44,8 @@ $namespaceNames = array(
 );
 
 $namespaceAliases = array(
-	'Imagem' => NS_IMAGE,
-	'Imagem_Discussão' => NS_IMAGE_TALK,
+	'Imagem' => NS_FILE,
+	'Imagem_Discussão' => NS_FILE_TALK,
 );
 
 $skinNames = array(
diff --git a/languages/messages/MessagesPt_br.php b/languages/messages/MessagesPt_br.php
index 9368db8251..8ef20605f5 100644
--- a/languages/messages/MessagesPt_br.php
+++ b/languages/messages/MessagesPt_br.php
@@ -25,8 +25,8 @@ $namespaceNames = array(
 	NS_USER             => 'Usuário',
 	NS_USER_TALK        => 'Usuário_Discussão',
 	NS_PROJECT_TALK     => '$1_Discussão',
-	NS_IMAGE            => 'Arquivo',
-	NS_IMAGE_TALK       => 'Arquivo_Discussão',
+	NS_FILE             => 'Arquivo',
+	NS_FILE_TALK        => 'Arquivo_Discussão',
 	NS_MEDIAWIKI        => 'MediaWiki',
 	NS_MEDIAWIKI_TALK   => 'MediaWiki_Discussão',
 	NS_TEMPLATE         => 'Predefinição',
@@ -38,8 +38,8 @@ $namespaceNames = array(
 );
 
 $namespaceAliases = array(
-	'Imagem' => NS_IMAGE,
-	'Imagem_Discussão' => NS_IMAGE_TALK,
+	'Imagem' => NS_FILE,
+	'Imagem_Discussão' => NS_FILE_TALK,
 );
 
 $skinNames = array(
diff --git a/languages/messages/MessagesQu.php b/languages/messages/MessagesQu.php
index 78c4806d06..edf88fa26d 100644
--- a/languages/messages/MessagesQu.php
+++ b/languages/messages/MessagesQu.php
@@ -17,8 +17,8 @@ $namespaceNames = array(
 	NS_USER           => 'Ruraq',
 	NS_USER_TALK      => 'Ruraq_rimanakuy',
 	NS_PROJECT_TALK   => '$1_rimanakuy',
-	NS_IMAGE          => 'Rikcha',
-	NS_IMAGE_TALK     => 'Rikcha_rimanakuy',
+	NS_FILE           => 'Rikcha',
+	NS_FILE_TALK      => 'Rikcha_rimanakuy',
 	NS_MEDIAWIKI      => 'MediaWiki',
 	NS_MEDIAWIKI_TALK => 'MediaWiki_rimanakuy',
 	NS_TEMPLATE       => 'Plantilla',
diff --git a/languages/messages/MessagesRmy.php b/languages/messages/MessagesRmy.php
index 700ceb393c..a0e4e0afdd 100644
--- a/languages/messages/MessagesRmy.php
+++ b/languages/messages/MessagesRmy.php
@@ -19,8 +19,8 @@ $namespaceNames = array(
 	NS_USER_TALK      => 'Jeno_vakyarimata',
 	# NS_PROJECT set by $wgMetaNamespace
 	NS_PROJECT_TALK   => '{{grammar:genitive-pl|$1}}_vakyarimata',
-	NS_IMAGE          => 'Chitro',
-	NS_IMAGE_TALK     => 'Chitro_vakyarimata',
+	NS_FILE           => 'Chitro',
+	NS_FILE_TALK      => 'Chitro_vakyarimata',
 	NS_MEDIAWIKI      => 'MediyaViki',
 	NS_MEDIAWIKI_TALK => 'MediyaViki_vakyarimata',
 	NS_TEMPLATE       => 'Sikavno',
diff --git a/languages/messages/MessagesRo.php b/languages/messages/MessagesRo.php
index e3b3486a18..6e7e057049 100644
--- a/languages/messages/MessagesRo.php
+++ b/languages/messages/MessagesRo.php
@@ -44,8 +44,8 @@ $namespaceNames = array(
 	NS_USER             => 'Utilizator',
 	NS_USER_TALK        => 'Discuţie_Utilizator',
 	NS_PROJECT_TALK     => 'Discuţie_$1',
-	NS_IMAGE            => 'Fişier',
-	NS_IMAGE_TALK       => 'Discuţie_Fişier',
+	NS_FILE             => 'Fişier',
+	NS_FILE_TALK        => 'Discuţie_Fişier',
 	NS_MEDIAWIKI        => 'MediaWiki',
 	NS_MEDIAWIKI_TALK   => 'Discuţie_MediaWiki',
 	NS_TEMPLATE         => 'Format',
@@ -57,8 +57,8 @@ $namespaceNames = array(
 );
 
 $namespaceAliases = array(
-	'Imagine' => NS_IMAGE,
-	'Discuţie_Imagine' => NS_IMAGE_TALK,
+	'Imagine' => NS_FILE,
+	'Discuţie_Imagine' => NS_FILE_TALK,
 );
 
 $specialPageAliases = array(
diff --git a/languages/messages/MessagesRu.php b/languages/messages/MessagesRu.php
index a917a131f6..daa283a52d 100644
--- a/languages/messages/MessagesRu.php
+++ b/languages/messages/MessagesRu.php
@@ -46,8 +46,8 @@ $namespaceNames = array(
 	NS_USER             => 'Участник',
 	NS_USER_TALK        => 'Обсуждение_участника',
 	NS_PROJECT_TALK     => 'Обсуждение_{{GRAMMAR:genitive|$1}}',
-	NS_IMAGE            => 'Файл',
-	NS_IMAGE_TALK       => 'Обсуждение_файла',
+	NS_FILE             => 'Файл',
+	NS_FILE_TALK        => 'Обсуждение_файла',
 	NS_MEDIAWIKI        => 'MediaWiki',
 	NS_MEDIAWIKI_TALK   => 'Обсуждение_MediaWiki',
 	NS_TEMPLATE         => 'Шаблон',
@@ -61,8 +61,8 @@ $namespaceNames = array(
 $namespaceAliases = array(
 	'Участница'            => NS_USER,
 	'Обсуждение участницы' => NS_USER_TALK,
-	'Изображение' => NS_IMAGE,
-	'Обсуждение_изображения' => NS_IMAGE_TALK,
+	'Изображение' => NS_FILE,
+	'Обсуждение_изображения' => NS_FILE_TALK,
 );
 
 $skinNames = array(
diff --git a/languages/messages/MessagesSa.php b/languages/messages/MessagesSa.php
index 1f3ad0ce67..a8c2e3fecc 100644
--- a/languages/messages/MessagesSa.php
+++ b/languages/messages/MessagesSa.php
@@ -34,8 +34,8 @@ $namespaceNames = array(
 	NS_USER_TALK        => 'योजकसंभाषणं',
 	# NS_PROJECT set by $wgMetaNamespace
 	NS_PROJECT_TALK     => '$1संभाषणं',
-	NS_IMAGE            => 'चित्रं',
-	NS_IMAGE_TALK       => 'चित्रसंभाषणं',
+	NS_FILE             => 'चित्रं',
+	NS_FILE_TALK        => 'चित्रसंभाषणं',
 	NS_MEDIAWIKI        => 'MediaWiki',
 	NS_MEDIAWIKI_TALK   => 'MediaWiki_talk',
 	NS_TEMPLATE         => 'Template',
diff --git a/languages/messages/MessagesSah.php b/languages/messages/MessagesSah.php
index 439ac6ac88..0afd1e60b6 100644
--- a/languages/messages/MessagesSah.php
+++ b/languages/messages/MessagesSah.php
@@ -25,8 +25,8 @@ $namespaceNames = array(
 	NS_USER             => 'Кыттааччы',
 	NS_USER_TALK        => 'Кыттааччы ырытыыта',
 	NS_PROJECT_TALK     => '$1_ырытыыта',
-	NS_IMAGE            => 'Ойуу',
-	NS_IMAGE_TALK       => 'Ойуу ырытыыта',
+	NS_FILE             => 'Ойуу',
+	NS_FILE_TALK        => 'Ойуу ырытыыта',
 	NS_TEMPLATE         => 'Халыып',
 	NS_TEMPLATE_TALK    => 'Халыып ырытыыта',
 	NS_HELP             => 'Көмө',
diff --git a/languages/messages/MessagesSc.php b/languages/messages/MessagesSc.php
index fbd759f5c1..b8e7e50287 100644
--- a/languages/messages/MessagesSc.php
+++ b/languages/messages/MessagesSc.php
@@ -15,8 +15,8 @@ $namespaceNames = array(
 	NS_USER_TALK       => 'Utente_discussioni',
 	# NS_PROJECT set by $wgMetaNamespace
 	NS_PROJECT_TALK    => '$1_discussioni',
-	NS_IMAGE           => 'Immàgini',
-	NS_IMAGE_TALK      => 'Immàgini_contièndha'
+	NS_FILE            => 'Immàgini',
+	NS_FILE_TALK       => 'Immàgini_contièndha'
 );
 
 $dateFormats = array(
diff --git a/languages/messages/MessagesScn.php b/languages/messages/MessagesScn.php
index 00db97dd21..b0bb93278b 100644
--- a/languages/messages/MessagesScn.php
+++ b/languages/messages/MessagesScn.php
@@ -22,8 +22,8 @@ $namespaceNames = array(
 	NS_USER             => 'Utenti',
 	NS_USER_TALK        => 'Discussioni_utenti',
 	NS_PROJECT_TALK     => 'Discussioni_$1',
-	NS_IMAGE            => 'File',
-	NS_IMAGE_TALK       => 'Discussioni_file',
+	NS_FILE             => 'File',
+	NS_FILE_TALK        => 'Discussioni_file',
 	NS_MEDIAWIKI        => 'MediaWiki',
 	NS_MEDIAWIKI_TALK   => 'Discussioni_MediaWiki',
 	NS_TEMPLATE         => 'Template',
@@ -36,8 +36,8 @@ $namespaceNames = array(
 
 $namespaceAliases = array(
 	'Discussioni_Utenti' => NS_USER_TALK,
-	'Mmàggini' => NS_IMAGE,
-	'Discussioni mmàggini' => NS_IMAGE_TALK,
+	'Mmàggini' => NS_FILE,
+	'Discussioni mmàggini' => NS_FILE_TALK,
 	'Discussioni_Template' => NS_TEMPLATE_TALK,
 	'Discussioni_Aiutu' => NS_HELP_TALK,
 	'Discussioni_Catigurìa' => NS_CATEGORY_TALK,
diff --git a/languages/messages/MessagesSd.php b/languages/messages/MessagesSd.php
index 6a0af3d027..763212868c 100644
--- a/languages/messages/MessagesSd.php
+++ b/languages/messages/MessagesSd.php
@@ -16,8 +16,8 @@ $namespaceNames = array(
 	NS_USER             => 'يوزر',
 	NS_USER_TALK        => 'يوزر_بحث',
 	NS_PROJECT_TALK     => '$1_بحث',
-	NS_IMAGE            => 'عڪس',
-	NS_IMAGE_TALK       => 'عڪس_بحث',
+	NS_FILE             => 'عڪس',
+	NS_FILE_TALK        => 'عڪس_بحث',
 	NS_MEDIAWIKI        => 'ذريعات_وڪي',
 	NS_MEDIAWIKI_TALK   => 'ذريعات_وڪي_بحث',
 	NS_TEMPLATE         => 'سانچو',
diff --git a/languages/messages/MessagesSdc.php b/languages/messages/MessagesSdc.php
index 90452da5fa..141f092f6e 100644
--- a/languages/messages/MessagesSdc.php
+++ b/languages/messages/MessagesSdc.php
@@ -15,8 +15,8 @@ $namespaceNames = array(
 	NS_USER             => 'Utenti',
 	NS_USER_TALK        => 'Dischussioni_utenti',
 	NS_PROJECT_TALK     => 'Dischussioni_$1',
-	NS_IMAGE            => 'Immagina',
-	NS_IMAGE_TALK       => 'Dischussioni_immagina',
+	NS_FILE             => 'Immagina',
+	NS_FILE_TALK        => 'Dischussioni_immagina',
 	NS_MEDIAWIKI_TALK   => 'Dischussioni_MediaWiki',
 	NS_TEMPLATE         => 'Mudellu',
 	NS_TEMPLATE_TALK    => 'Dischussioni_mudellu',
diff --git a/languages/messages/MessagesSi.php b/languages/messages/MessagesSi.php
index a92771f75e..f98ba30125 100644
--- a/languages/messages/MessagesSi.php
+++ b/languages/messages/MessagesSi.php
@@ -17,8 +17,8 @@ $namespaceNames = array(
 	NS_USER             => 'පරිශීලක',
 	NS_USER_TALK        => 'පරිශීලක_සාකච්ඡාව',
 	NS_PROJECT_TALK     => '$1_සාකච්ඡාව',
-	NS_IMAGE            => 'ගොනුව',
-	NS_IMAGE_TALK       => 'ගොනුව_සාකච්ඡාව',
+	NS_FILE             => 'ගොනුව',
+	NS_FILE_TALK        => 'ගොනුව_සාකච්ඡාව',
 	NS_MEDIAWIKI        => 'මාධ්‍යවිකි',
 	NS_MEDIAWIKI_TALK   => 'මාධ්‍යවිකි_සාකච්ඡාව',
 	NS_TEMPLATE         => 'සැකිල්ල',
@@ -30,8 +30,8 @@ $namespaceNames = array(
 );
 
 $namespaceAliases = array(
-	'රූපය' => NS_IMAGE,
-	'රූපය_සාකච්ඡාව' => NS_IMAGE_TALK,
+	'රූපය' => NS_FILE,
+	'රූපය_සාකච්ඡාව' => NS_FILE_TALK,
 	'විකිමාධ්‍ය' => NS_MEDIAWIKI,
 	'විකිමාධ්‍ය_සාකච්ඡාව' => NS_MEDIAWIKI_TALK,
 	'උදව_සාකච්ඡාව' => NS_HELP_TALK,
diff --git a/languages/messages/MessagesSk.php b/languages/messages/MessagesSk.php
index a8e5c3775a..920c20b96d 100644
--- a/languages/messages/MessagesSk.php
+++ b/languages/messages/MessagesSk.php
@@ -120,8 +120,8 @@ $namespaceNames = array(
 	NS_USER             => 'Redaktor',
 	NS_USER_TALK        => 'Diskusia_s_redaktorom',
 	NS_PROJECT_TALK     => 'Diskusia_k_{{GRAMMAR:datív|$1}}',
-	NS_IMAGE            => 'Súbor',
-	NS_IMAGE_TALK       => 'Diskusia_k_súboru',
+	NS_FILE             => 'Súbor',
+	NS_FILE_TALK        => 'Diskusia_k_súboru',
 	NS_MEDIAWIKI        => 'MediaWiki',
 	NS_MEDIAWIKI_TALK   => 'Diskusia_k_MediaWiki',
 	NS_TEMPLATE         => 'Šablóna',
@@ -137,9 +137,9 @@ $namespaceAliases = array(
 	"Komentár"               => NS_TALK,
 	"Komentár_k_redaktorovi" => NS_USER_TALK,
 	"Komentár_k_Wikipédii"   => NS_PROJECT_TALK,
-	'Obrázok' => NS_IMAGE,
-	'Diskusia_k_obrázku' => NS_IMAGE_TALK,
-	"Komentár_k_obrázku"     => NS_IMAGE_TALK,
+	'Obrázok' => NS_FILE,
+	'Diskusia_k_obrázku' => NS_FILE_TALK,
+	"Komentár_k_obrázku"     => NS_FILE_TALK,
 	"Komentár_k_MediaWiki"   => NS_MEDIAWIKI_TALK,
 );
 
diff --git a/languages/messages/MessagesSl.php b/languages/messages/MessagesSl.php
index 9302946cd4..eeddf2d8f8 100644
--- a/languages/messages/MessagesSl.php
+++ b/languages/messages/MessagesSl.php
@@ -17,8 +17,8 @@ $namespaceNames = array(
 	NS_USER_TALK      => 'Uporabniški_pogovor',
 	# NS_PROJECT set by $wgMetaNamespace
 	NS_PROJECT_TALK   => 'Pogovor_{{grammar:mestnik|$1}}',
-	NS_IMAGE          => 'Slika',
-	NS_IMAGE_TALK     => 'Pogovor_o_sliki',
+	NS_FILE           => 'Slika',
+	NS_FILE_TALK      => 'Pogovor_o_sliki',
 	NS_MEDIAWIKI      => 'MediaWiki',
 	NS_MEDIAWIKI_TALK => 'Pogovor_o_MediaWiki',
 	NS_TEMPLATE       => 'Predloga',
diff --git a/languages/messages/MessagesSq.php b/languages/messages/MessagesSq.php
index 591c527e86..864fc20952 100644
--- a/languages/messages/MessagesSq.php
+++ b/languages/messages/MessagesSq.php
@@ -25,8 +25,8 @@ $namespaceNames = array(
 	NS_USER             => 'Përdoruesi',
 	NS_USER_TALK        => 'Përdoruesi_diskutim',
 	NS_PROJECT_TALK     => '$1_diskutim',
-	NS_IMAGE            => 'Figura',
-	NS_IMAGE_TALK       => 'Figura_diskutim',
+	NS_FILE             => 'Figura',
+	NS_FILE_TALK        => 'Figura_diskutim',
 	NS_MEDIAWIKI        => 'MediaWiki',
 	NS_MEDIAWIKI_TALK   => 'MediaWiki_diskutim',
 	NS_TEMPLATE         => 'Stampa',
diff --git a/languages/messages/MessagesSr_ec.php b/languages/messages/MessagesSr_ec.php
index f2bc2f6909..1a2c1e6457 100644
--- a/languages/messages/MessagesSr_ec.php
+++ b/languages/messages/MessagesSr_ec.php
@@ -21,8 +21,8 @@ $namespaceNames = array(
 	NS_USER_TALK        => "Разговор_са_корисником",
 	# NS_PROJECT set by $wgMetaNamespace
 	NS_PROJECT_TALK     => "Разговор_о_$1",
-	NS_IMAGE            => "Слика",
-	NS_IMAGE_TALK       => "Разговор_о_слици",
+	NS_FILE             => "Слика",
+	NS_FILE_TALK        => "Разговор_о_слици",
 	NS_MEDIAWIKI        => "МедијаВики",
 	NS_MEDIAWIKI_TALK   => "Разговор_о_МедијаВикију",
 	NS_TEMPLATE         => 'Шаблон',
@@ -41,8 +41,8 @@ $namespaceAliases = array(
 	"Korisnik"                => NS_USER,
 	"Razgovor_sa_korisnikom"  => NS_USER_TALK,
 	"Razgovor_o_$1"           => NS_PROJECT_TALK,
-	"Slika"                   => NS_IMAGE,
-	"Razgovor_o_slici"        => NS_IMAGE_TALK,
+	"Slika"                   => NS_FILE,
+	"Razgovor_o_slici"        => NS_FILE_TALK,
 	"MedijaViki"              => NS_MEDIAWIKI,
 	"Razgovor_o_MedijaVikiju" => NS_MEDIAWIKI_TALK,
 	'Å ablon'                  => NS_TEMPLATE,
diff --git a/languages/messages/MessagesSr_el.php b/languages/messages/MessagesSr_el.php
index a27aac54c0..16f7ddfe86 100644
--- a/languages/messages/MessagesSr_el.php
+++ b/languages/messages/MessagesSr_el.php
@@ -17,8 +17,8 @@ $namespaceNames = array(
 	NS_USER_TALK        => "Razgovor_sa_korisnikom",
 	# NS_PROJECT set by $wgMetaNamespace
 	NS_PROJECT_TALK     => "Razgovor_o_$1",
-	NS_IMAGE            => "Slika",
-	NS_IMAGE_TALK       => "Razgovor_o_slici",
+	NS_FILE             => "Slika",
+	NS_FILE_TALK        => "Razgovor_o_slici",
 	NS_MEDIAWIKI        => "MedijaViki",
 	NS_MEDIAWIKI_TALK   => "Razgovor_o_MedijaVikiju",
 	NS_TEMPLATE         => 'Å ablon',
@@ -37,8 +37,8 @@ $namespaceAliases = array(
 	"Корисник"                => NS_USER,
 	"Разговор_са_корисником"  => NS_USER_TALK,
 	"Разговор_о_$1"           => NS_PROJECT_TALK,
-	"Слика"                   => NS_IMAGE,
-	"Разговор_о_слици"        => NS_IMAGE_TALK,
+	"Слика"                   => NS_FILE,
+	"Разговор_о_слици"        => NS_FILE_TALK,
 	"МедијаВики"              => NS_MEDIAWIKI,
 	"Разговор_о_МедијаВикију" => NS_MEDIAWIKI_TALK,
 	'Шаблон'                  => NS_TEMPLATE,
diff --git a/languages/messages/MessagesSrn.php b/languages/messages/MessagesSrn.php
index 6fe1d65f12..0676adc924 100644
--- a/languages/messages/MessagesSrn.php
+++ b/languages/messages/MessagesSrn.php
@@ -19,8 +19,8 @@ $namespaceNames = array(
 	NS_USER             => 'Masyin',
 	NS_USER_TALK        => 'Taki_fu_masyin',
 	NS_PROJECT_TALK     => 'Taki_fu_$1',
-	NS_IMAGE            => 'Gefre',
-	NS_IMAGE_TALK       => 'Taki_fu_gefre',
+	NS_FILE             => 'Gefre',
+	NS_FILE_TALK        => 'Taki_fu_gefre',
 	NS_MEDIAWIKI_TALK   => 'Taki_fu_MediaWiki',
 	NS_TEMPLATE         => 'Ankra',
 	NS_TEMPLATE_TALK    => 'Taki_fu_ankra',
@@ -36,8 +36,8 @@ $namespaceAliases = array(
 	'Gebruiker' => NS_USER,
 	'Overleg_gebruiker' => NS_USER_TALK,
 	'Overleg_$1' => NS_PROJECT_TALK,
-	'Afbeelding' => NS_IMAGE,
-	'Overleg_afbeelding' => NS_IMAGE_TALK,
+	'Afbeelding' => NS_FILE,
+	'Overleg_afbeelding' => NS_FILE_TALK,
 	'Overleg_MediaWiki' => NS_MEDIAWIKI_TALK,
 	'Sjabloon' => NS_TEMPLATE,
 	'Overleg_sjabloon' => NS_TEMPLATE_TALK,
diff --git a/languages/messages/MessagesStq.php b/languages/messages/MessagesStq.php
index edf37b3d98..28d7ddaa10 100644
--- a/languages/messages/MessagesStq.php
+++ b/languages/messages/MessagesStq.php
@@ -18,8 +18,8 @@ $namespaceNames = array(
 	NS_USER           => 'Benutser',
 	NS_USER_TALK      => 'Benutser_Diskussion',
 	NS_PROJECT_TALK   => '$1_Diskussion',
-	NS_IMAGE          => 'Bielde',
-	NS_IMAGE_TALK     => 'Bielde_Diskussion',
+	NS_FILE           => 'Bielde',
+	NS_FILE_TALK      => 'Bielde_Diskussion',
 	NS_MEDIAWIKI      => 'MediaWiki',
 	NS_MEDIAWIKI_TALK => 'MediaWiki_Diskussion',
 	NS_TEMPLATE       => 'Foarloage',
diff --git a/languages/messages/MessagesSu.php b/languages/messages/MessagesSu.php
index b52312be56..c437c1e7e9 100644
--- a/languages/messages/MessagesSu.php
+++ b/languages/messages/MessagesSu.php
@@ -21,8 +21,8 @@ $namespaceNames = array(
 	NS_USER           => 'Pamaké',
 	NS_USER_TALK      => 'Obrolan_pamaké',
 	NS_PROJECT_TALK   => 'Obrolan_$1',
-	NS_IMAGE          => 'Gambar',
-	NS_IMAGE_TALK     => 'Obrolan_gambar',
+	NS_FILE           => 'Gambar',
+	NS_FILE_TALK      => 'Obrolan_gambar',
 	NS_MEDIAWIKI      => 'MédiaWiki',
 	NS_MEDIAWIKI_TALK => 'Obrolan MédiaWiki',
 	NS_TEMPLATE       => 'Citakan',
diff --git a/languages/messages/MessagesSv.php b/languages/messages/MessagesSv.php
index 77332d83cd..fe634fd1e2 100644
--- a/languages/messages/MessagesSv.php
+++ b/languages/messages/MessagesSv.php
@@ -41,8 +41,8 @@ $namespaceNames = array(
 	NS_USER             => 'Användare',
 	NS_USER_TALK        => 'Användardiskussion',
 	NS_PROJECT_TALK     => '$1diskussion',
-	NS_IMAGE            => 'Fil',
-	NS_IMAGE_TALK       => 'Fildiskussion',
+	NS_FILE             => 'Fil',
+	NS_FILE_TALK        => 'Fildiskussion',
 	NS_MEDIAWIKI        => 'MediaWiki',
 	NS_MEDIAWIKI_TALK   => 'MediaWiki-diskussion',
 	NS_TEMPLATE         => 'Mall',
@@ -54,8 +54,8 @@ $namespaceNames = array(
 );
 
 $namespaceAliases = array(
-	'Bild' => NS_IMAGE,
-	'Bilddiskussion' => NS_IMAGE_TALK,
+	'Bild' => NS_FILE,
+	'Bilddiskussion' => NS_FILE_TALK,
 	'MediaWiki_diskussion' => NS_MEDIAWIKI_TALK,
 	'Hjälp_diskussion'     => NS_HELP_TALK
 );
diff --git a/languages/messages/MessagesTa.php b/languages/messages/MessagesTa.php
index a342f67c90..d30f921c4b 100644
--- a/languages/messages/MessagesTa.php
+++ b/languages/messages/MessagesTa.php
@@ -26,8 +26,8 @@ $namespaceNames = array(
 	NS_USER_TALK      => 'பயனர்_பேச்சு',
 	# NS_PROJECT set by $wgMetaNamespace
 	NS_PROJECT_TALK   => '$1_பேச்சு',
-	NS_IMAGE          => 'படிமம்',
-	NS_IMAGE_TALK     => 'படிமப்_பேச்சு',
+	NS_FILE           => 'படிமம்',
+	NS_FILE_TALK      => 'படிமப்_பேச்சு',
 	NS_MEDIAWIKI      => 'மீடியாவிக்கி',
 	NS_MEDIAWIKI_TALK => 'மீடியாவிக்கி_பேச்சு',
 	NS_TEMPLATE       => 'வார்ப்புரு',
@@ -41,7 +41,7 @@ $namespaceNames = array(
 $namespaceAliases = array(
 	'விக்கிபீடியா' => NS_PROJECT,
 	'விக்கிபீடியா_பேச்சு' => NS_PROJECT_TALK,
-	'உருவப்_பேச்சு' => NS_IMAGE_TALK
+	'உருவப்_பேச்சு' => NS_FILE_TALK
 );
 $linkTrail = "/^([\xE0\xAE\x80-\xE0\xAF\xBF]+)(.*)$/sDu";
 
diff --git a/languages/messages/MessagesTe.php b/languages/messages/MessagesTe.php
index f51cd8ab26..0764546284 100644
--- a/languages/messages/MessagesTe.php
+++ b/languages/messages/MessagesTe.php
@@ -22,8 +22,8 @@ $namespaceNames = array(
 	NS_USER             => 'వాడుకరి',
 	NS_USER_TALK        => 'వాడుకరి_చర్చ',
 	NS_PROJECT_TALK     => '$1_చర్చ',
-	NS_IMAGE            => 'ఫైలు',
-	NS_IMAGE_TALK       => 'ఫైలుపై_చర్చ',
+	NS_FILE             => 'ఫైలు',
+	NS_FILE_TALK        => 'ఫైలుపై_చర్చ',
 	NS_MEDIAWIKI        => 'మీడియావికీ',
 	NS_MEDIAWIKI_TALK   => 'మీడియావికీ_చర్చ',
 	NS_TEMPLATE         => 'మూస',
@@ -39,9 +39,9 @@ $namespaceAliases = array(
 	'సభ్యులపై_చర్చ' => NS_USER_TALK,
 	'సభ్యుడు' => NS_USER, # set for bug 11615
 	'సభ్యునిపై_చర్చ' => NS_USER_TALK,
-	'బొమ్మ' => NS_IMAGE,
-	'బొమ్మపై_చర్చ' => NS_IMAGE_TALK,
-	'బొమ్మపై_చర్చ' => NS_IMAGE_TALK,
+	'బొమ్మ' => NS_FILE,
+	'బొమ్మపై_చర్చ' => NS_FILE_TALK,
+	'బొమ్మపై_చర్చ' => NS_FILE_TALK,
 	'సహాయము' => NS_HELP,
 	'సహాయము_చర్చ' => NS_HELP_TALK,
 );
diff --git a/languages/messages/MessagesTet.php b/languages/messages/MessagesTet.php
index f29132465e..76ad9f3675 100644
--- a/languages/messages/MessagesTet.php
+++ b/languages/messages/MessagesTet.php
@@ -21,8 +21,8 @@ $namespaceNames = array(
 	NS_USER           => 'Uza-na\'in',
 	NS_USER_TALK      => 'Diskusaun_Uza-na\'in',
 	NS_PROJECT_TALK   => 'Diskusaun_$1',
-	NS_IMAGE          => 'Imajen',
-	NS_IMAGE_TALK     => 'Diskusaun_Imajen',
+	NS_FILE           => 'Imajen',
+	NS_FILE_TALK      => 'Diskusaun_Imajen',
 	NS_MEDIAWIKI      => 'MediaWiki',
 	NS_MEDIAWIKI_TALK => 'Diskusaun_MediaWiki',
 	NS_TEMPLATE       => 'Template',
diff --git a/languages/messages/MessagesTg_cyrl.php b/languages/messages/MessagesTg_cyrl.php
index b2e8b79dd5..bedc2ef6c9 100644
--- a/languages/messages/MessagesTg_cyrl.php
+++ b/languages/messages/MessagesTg_cyrl.php
@@ -22,8 +22,8 @@ $namespaceNames = array(
 	NS_USER_TALK      => "Баҳси_корбар",
 	# NS_PROJECT set by $wgMetaNamespace
 	NS_PROJECT_TALK   => "Баҳси_$1",
-	NS_IMAGE          => "Акс",
-	NS_IMAGE_TALK     => "Баҳси_акс",
+	NS_FILE           => "Акс",
+	NS_FILE_TALK      => "Баҳси_акс",
 	NS_MEDIAWIKI      => "Медиавики",
 	NS_MEDIAWIKI_TALK => "Баҳси_медиавики",
 	NS_TEMPLATE       => "Шаблон",
diff --git a/languages/messages/MessagesTh.php b/languages/messages/MessagesTh.php
index aff5264ac4..e9dd6283dd 100644
--- a/languages/messages/MessagesTh.php
+++ b/languages/messages/MessagesTh.php
@@ -30,8 +30,8 @@ $namespaceNames = array(
 	NS_USER             => 'ผู้ใช้',
 	NS_USER_TALK        => 'คุยกับผู้ใช้',
 	NS_PROJECT_TALK     => 'คุยเรื่อง$1',
-	NS_IMAGE            => 'ไฟล์',
-	NS_IMAGE_TALK       => 'คุยเรื่องไฟล์',
+	NS_FILE             => 'ไฟล์',
+	NS_FILE_TALK        => 'คุยเรื่องไฟล์',
 	NS_MEDIAWIKI        => 'มีเดียวิกิ',
 	NS_MEDIAWIKI_TALK   => 'คุยเรื่องมีเดียวิกิ',
 	NS_TEMPLATE         => 'แม่แบบ',
@@ -43,8 +43,8 @@ $namespaceNames = array(
 );
 
 $namespaceAliases = array(
-	'ภาพ' => NS_IMAGE,
-	'คุยเรื่องภาพ' => NS_IMAGE_TALK,
+	'ภาพ' => NS_FILE,
+	'คุยเรื่องภาพ' => NS_FILE_TALK,
 );
 
 $specialPageAliases = array(
diff --git a/languages/messages/MessagesTl.php b/languages/messages/MessagesTl.php
index c89d382577..e59ae83871 100644
--- a/languages/messages/MessagesTl.php
+++ b/languages/messages/MessagesTl.php
@@ -16,8 +16,8 @@ $namespaceNames = array(
 	NS_USER             => 'Tagagamit',
 	NS_USER_TALK        => 'Usapang tagagamit',
 	NS_PROJECT_TALK     => 'Usapang $1',
-	NS_IMAGE            => 'Larawan',
-	NS_IMAGE_TALK       => 'Usapang larawan',
+	NS_FILE             => 'Larawan',
+	NS_FILE_TALK        => 'Usapang larawan',
 	NS_MEDIAWIKI        => 'MediaWiki',
 	NS_MEDIAWIKI_TALK   => 'Usapang MediaWiki',
 	NS_TEMPLATE         => 'Suleras',
diff --git a/languages/messages/MessagesTlh.php b/languages/messages/MessagesTlh.php
index 33b3875c63..612412e14f 100644
--- a/languages/messages/MessagesTlh.php
+++ b/languages/messages/MessagesTlh.php
@@ -15,8 +15,8 @@ $namespaceNames = array(
 	NS_USER_TALK        => "lo'wI'_ja'chuq",
 	# NS_PROJECT set by $wgMetaNamespace
 	NS_PROJECT_TALK     => "$1_ja'chuq",
-	NS_IMAGE            => "nagh_beQ",
-	NS_IMAGE_TALK       => "nagh_beQ_ja'chuq",
+	NS_FILE             => "nagh_beQ",
+	NS_FILE_TALK        => "nagh_beQ_ja'chuq",
 	NS_MEDIAWIKI        => "MediaWiki",
 	NS_MEDIAWIKI_TALK   => "MediaWiki_ja'chuq",
 	NS_TEMPLATE         => "chen'ay'",
diff --git a/languages/messages/MessagesTr.php b/languages/messages/MessagesTr.php
index e1104ef6e7..e1b140c725 100644
--- a/languages/messages/MessagesTr.php
+++ b/languages/messages/MessagesTr.php
@@ -27,8 +27,8 @@ $namespaceNames = array(
 	NS_USER             => 'Kullanıcı',
 	NS_USER_TALK        => 'Kullanıcı_mesaj',
 	NS_PROJECT_TALK     => '$1_tartışma',
-	NS_IMAGE            => 'Resim',
-	NS_IMAGE_TALK       => 'Resim_tartışma',
+	NS_FILE             => 'Resim',
+	NS_FILE_TALK        => 'Resim_tartışma',
 	NS_MEDIAWIKI        => 'MedyaViki',
 	NS_MEDIAWIKI_TALK   => 'MedyaViki_tartışma',
 	NS_TEMPLATE         => 'Şablon',
diff --git a/languages/messages/MessagesTt_latn.php b/languages/messages/MessagesTt_latn.php
index 7e234b2e18..f29f41be36 100644
--- a/languages/messages/MessagesTt_latn.php
+++ b/languages/messages/MessagesTt_latn.php
@@ -18,8 +18,8 @@ $namespaceNames = array(
         NS_USER_TALK        => "Äğzä_bäxäse",
         # NS_PROJECT set by $wgMetaNamespace
         NS_PROJECT_TALK     => '$1_bäxäse',
-        NS_IMAGE            => "Räsem",
-        NS_IMAGE_TALK       => "Räsem_bäxäse",
+        NS_FILE             => "Räsem",
+        NS_FILE_TALK        => "Räsem_bäxäse",
         NS_MEDIAWIKI        => "MediaWiki",
         NS_MEDIAWIKI_TALK   => "MediaWiki_bäxäse",
         NS_TEMPLATE         => "Ürnäk",
diff --git a/languages/messages/MessagesTyv.php b/languages/messages/MessagesTyv.php
index 25ab03b953..fe0a2f37c1 100644
--- a/languages/messages/MessagesTyv.php
+++ b/languages/messages/MessagesTyv.php
@@ -19,8 +19,8 @@ $namespaceNames = array(
 	NS_USER_TALK        => 'Aжыглакчы_чугаа', //User_talk
 	# NS_PROJECT set by $wgMetaNamespace
 	NS_PROJECT_TALK     => '$1_чугаа', //_talk
-	NS_IMAGE            => 'Чурук', //Image
-	NS_IMAGE_TALK       => 'Чурук_чугаа', //Image_talk
+	NS_FILE             => 'Чурук', //Image
+	NS_FILE_TALK        => 'Чурук_чугаа', //Image_talk
 	NS_MEDIAWIKI        => 'МедиаВики', //MediaWiki
 	NS_MEDIAWIKI_TALK   => 'МедиаВики_чугаа', //MediaWiki_talk
 	NS_TEMPLATE         => 'Хээ', //Template
diff --git a/languages/messages/MessagesUdm.php b/languages/messages/MessagesUdm.php
index 2cf33ccb53..41a07dc7ae 100644
--- a/languages/messages/MessagesUdm.php
+++ b/languages/messages/MessagesUdm.php
@@ -19,8 +19,8 @@ $namespaceNames = array(
 	NS_USER_TALK        => 'Викиавтор_сярысь_вераськон',
 	# NS_PROJECT set by $wgMetaNamespace
 	NS_PROJECT_TALK     => '$1_сярысь_вераськон',
-	NS_IMAGE            => 'Суред',
-	NS_IMAGE_TALK       => 'Суред_сярысь_вераськон',
+	NS_FILE             => 'Суред',
+	NS_FILE_TALK        => 'Суред_сярысь_вераськон',
 	NS_MEDIAWIKI        => 'MediaWiki',
 	NS_MEDIAWIKI_TALK   => 'MediaWiki_сярысь_вераськон',
 	NS_TEMPLATE         => 'Шаблон',
diff --git a/languages/messages/MessagesUk.php b/languages/messages/MessagesUk.php
index d204b8dac5..9f376b0c43 100644
--- a/languages/messages/MessagesUk.php
+++ b/languages/messages/MessagesUk.php
@@ -40,8 +40,8 @@ $namespaceNames = array(
 	NS_USER             => 'Користувач',
 	NS_USER_TALK        => 'Обговорення_користувача',
 	NS_PROJECT_TALK     => 'Обговорення_{{GRAMMAR:genitive|$1}}',
-	NS_IMAGE            => 'Файл',
-	NS_IMAGE_TALK       => 'Обговорення_файлу',
+	NS_FILE             => 'Файл',
+	NS_FILE_TALK        => 'Обговорення_файлу',
 	NS_MEDIAWIKI        => 'MediaWiki',
 	NS_MEDIAWIKI_TALK   => 'Обговорення_MediaWiki',
 	NS_TEMPLATE         => 'Шаблон',
@@ -54,8 +54,8 @@ $namespaceNames = array(
 
 $namespaceAliases = array(
 	'Спеціальні' => NS_SPECIAL,
-	'Зображення' => NS_IMAGE,
-	'Обговорення_зображення' => NS_IMAGE_TALK,
+	'Зображення' => NS_FILE,
+	'Обговорення_зображення' => NS_FILE_TALK,
 );
 
 $skinNames = array(
diff --git a/languages/messages/MessagesUr.php b/languages/messages/MessagesUr.php
index ec2b72fe12..043dd70bab 100644
--- a/languages/messages/MessagesUr.php
+++ b/languages/messages/MessagesUr.php
@@ -27,8 +27,8 @@ $namespaceNames = array(
 	NS_USER_TALK => 'تبادلۂ_خیال_صارف',
 	# NS_PROJECT set by $wgMetaNamespace
 	NS_PROJECT_TALK => 'تبادلۂ_خیال_$1',
-	NS_IMAGE => 'تصویر',
-	NS_IMAGE_TALK => 'تبادلۂ_خیال_تصویر',
+	NS_FILE => 'تصویر',
+	NS_FILE_TALK => 'تبادلۂ_خیال_تصویر',
 	NS_MEDIAWIKI => 'میڈیاوکی',
 	NS_MEDIAWIKI_TALK => 'تبادلۂ_خیال_میڈیاوکی',
 	NS_TEMPLATE => 'سانچہ',
diff --git a/languages/messages/MessagesUz.php b/languages/messages/MessagesUz.php
index 4dd29196af..4f0e6255c8 100644
--- a/languages/messages/MessagesUz.php
+++ b/languages/messages/MessagesUz.php
@@ -20,8 +20,8 @@ $namespaceNames = array(
 	NS_USER             => 'Foydalanuvchi',
 	NS_USER_TALK        => 'Foydalanuvchi_munozarasi',
 	NS_PROJECT_TALK     => '$1_munozarasi',
-	NS_IMAGE            => 'Tasvir',
-	NS_IMAGE_TALK       => 'Tasvir_munozarasi',
+	NS_FILE             => 'Tasvir',
+	NS_FILE_TALK        => 'Tasvir_munozarasi',
 	NS_MEDIAWIKI        => 'MediaWiki',
 	NS_MEDIAWIKI_TALK   => 'MediaWiki_munozarasi',
 	NS_TEMPLATE         => 'Andoza',
diff --git a/languages/messages/MessagesVec.php b/languages/messages/MessagesVec.php
index e0756d6449..9b39c547c1 100644
--- a/languages/messages/MessagesVec.php
+++ b/languages/messages/MessagesVec.php
@@ -21,8 +21,8 @@ $namespaceNames = array(
 	NS_USER             => 'Utente',
 	NS_USER_TALK        => 'Discussion_utente',
 	NS_PROJECT_TALK     => 'Discussion_$1',
-	NS_IMAGE            => 'File',
-	NS_IMAGE_TALK       => 'Discussion_file',
+	NS_FILE             => 'File',
+	NS_FILE_TALK        => 'Discussion_file',
 	NS_MEDIAWIKI        => 'MediaWiki',
 	NS_MEDIAWIKI_TALK   => 'Discussion_MediaWiki',
 	NS_TEMPLATE         => 'Template',
@@ -34,8 +34,8 @@ $namespaceNames = array(
 );
 
 $namespaceAliases = array(
-	'Imagine' => NS_IMAGE,
-	'Discussion_imagine' => NS_IMAGE_TALK,
+	'Imagine' => NS_FILE,
+	'Discussion_imagine' => NS_FILE_TALK,
 );
 
 $specialPageAliases = array(
diff --git a/languages/messages/MessagesVi.php b/languages/messages/MessagesVi.php
index 684c4678bc..60df11894b 100644
--- a/languages/messages/MessagesVi.php
+++ b/languages/messages/MessagesVi.php
@@ -28,8 +28,8 @@ $namespaceNames = array(
 	NS_USER             => 'Thành_viên',
 	NS_USER_TALK        => 'Thảo_luận_Thành_viên',
 	NS_PROJECT_TALK     => 'Thảo_luận_$1',
-	NS_IMAGE            => 'Tập_tin',
-	NS_IMAGE_TALK       => 'Thảo_luận_Tập_tin',
+	NS_FILE             => 'Tập_tin',
+	NS_FILE_TALK        => 'Thảo_luận_Tập_tin',
 	NS_MEDIAWIKI        => 'MediaWiki',
 	NS_MEDIAWIKI_TALK   => 'Thảo_luận_MediaWiki',
 	NS_TEMPLATE         => 'Tiêu_bản',
@@ -41,8 +41,8 @@ $namespaceNames = array(
 );
 
 $namespaceAliases = array(
-	'Hình' => NS_IMAGE,
-	'Thảo_luận_Hình' => NS_IMAGE_TALK,
+	'Hình' => NS_FILE,
+	'Thảo_luận_Hình' => NS_FILE_TALK,
 );
 
 $skinNames = array(
diff --git a/languages/messages/MessagesVls.php b/languages/messages/MessagesVls.php
index 240a3fdf39..1a22491208 100644
--- a/languages/messages/MessagesVls.php
+++ b/languages/messages/MessagesVls.php
@@ -19,8 +19,8 @@ $namespaceNames = array(
 	NS_USER_TALK      => 'Discuusje_gebruker',
 	# NS_PROJECT set by $wgMetaNamespace
 	NS_PROJECT_TALK   => 'Discuusje_$1',
-	NS_IMAGE          => 'Ofbeeldienge',
-	NS_IMAGE_TALK     => 'Discuusje_ofbeeldienge',
+	NS_FILE           => 'Ofbeeldienge',
+	NS_FILE_TALK      => 'Discuusje_ofbeeldienge',
 	NS_MEDIAWIKI      => 'MediaWiki',
 	NS_MEDIAWIKI_TALK => 'Discuusje_MediaWiki',
 	NS_TEMPLATE       => 'Patrôon',
diff --git a/languages/messages/MessagesVo.php b/languages/messages/MessagesVo.php
index 84af125d8e..27eec92581 100644
--- a/languages/messages/MessagesVo.php
+++ b/languages/messages/MessagesVo.php
@@ -16,8 +16,8 @@ $namespaceNames = array(
 	NS_USER             => 'Geban',
 	NS_USER_TALK        => 'Gebanibespik',
 	NS_PROJECT_TALK     => 'Bespik_dö_$1',
-	NS_IMAGE            => 'Ragiv',
-	NS_IMAGE_TALK       => 'Ragivibespik',
+	NS_FILE             => 'Ragiv',
+	NS_FILE_TALK        => 'Ragivibespik',
 	NS_MEDIAWIKI        => 'Sitanuns',
 	NS_MEDIAWIKI_TALK   => 'Bespik_dö_sitanuns',
 	NS_TEMPLATE         => 'Samafomot',
@@ -29,8 +29,8 @@ $namespaceNames = array(
 );
 
 $namespaceAliases = array(
-	'Magod' => NS_IMAGE,
-	'Magodibespik' => NS_IMAGE_TALK,
+	'Magod' => NS_FILE,
+	'Magodibespik' => NS_FILE_TALK,
 );
 
 $datePreferences = array(
diff --git a/languages/messages/MessagesWa.php b/languages/messages/MessagesWa.php
index 82ed076bc7..32c65b3554 100644
--- a/languages/messages/MessagesWa.php
+++ b/languages/messages/MessagesWa.php
@@ -41,8 +41,8 @@ $namespaceNames = array(
 	NS_USER_TALK      => "Uzeu_copene", /* User_talk */
 	# NS_PROJECT set by $wgMetaNamespace
 	NS_PROJECT_TALK   => '$1_copene',
-	NS_IMAGE          => "Imådje", /* Image */
-	NS_IMAGE_TALK     => "Imådje_copene", /* Image_talk */
+	NS_FILE           => "Imådje", /* Image */
+	NS_FILE_TALK      => "Imådje_copene", /* Image_talk */
 	NS_MEDIAWIKI      => "MediaWiki", /* MediaWiki */
 	NS_MEDIAWIKI_TALK => "MediaWiki_copene", /* MediaWiki_talk */
 	NS_TEMPLATE       => "Modele",
diff --git a/languages/messages/MessagesWo.php b/languages/messages/MessagesWo.php
index a4163cb509..4dbe611c4d 100644
--- a/languages/messages/MessagesWo.php
+++ b/languages/messages/MessagesWo.php
@@ -18,8 +18,8 @@ $namespaceNames = array(
 	NS_USER             => 'Jëfandikukat',
 	NS_USER_TALK        => 'Waxtaani_jëfandikukat',
 	NS_PROJECT_TALK     => '$1_waxtaan',
-	NS_IMAGE            => 'Dencukaay',
-	NS_IMAGE_TALK       => 'Waxtaani_dencukaay',
+	NS_FILE             => 'Dencukaay',
+	NS_FILE_TALK        => 'Waxtaani_dencukaay',
 	NS_MEDIAWIKI        => 'MediaWiki',
 	NS_MEDIAWIKI_TALK   => 'Waxtaani_MediaWiki',
 	NS_TEMPLATE         => 'Royuwaay',
@@ -35,7 +35,7 @@ $namespaceAliases = array(
 	'Utilisateur' => NS_USER,
 	'Discussion_Utilisateur' => NS_USER_TALK,
 	'Discussion_$1' => NS_PROJECT_TALK,
-	'Discussion_Image' => NS_IMAGE_TALK,
+	'Discussion_Image' => NS_FILE_TALK,
 	'Discussion_MediaWiki' => NS_MEDIAWIKI_TALK,
 	'Modèle' => NS_TEMPLATE,
 	'Discussion_Modèle' => NS_TEMPLATE_TALK,
diff --git a/languages/messages/MessagesXal.php b/languages/messages/MessagesXal.php
index b3190024e1..23765f8d01 100644
--- a/languages/messages/MessagesXal.php
+++ b/languages/messages/MessagesXal.php
@@ -17,8 +17,8 @@ $namespaceNames = array(
 	NS_USER_TALK        => 'Орлцачна_тускар_ухалвр',
 	# NS_PROJECT set by $wgMetaNamespace
 	NS_PROJECT_TALK     => '$1_тускар_ухалвр',
-	NS_IMAGE            => 'Зург',
-	NS_IMAGE_TALK       => 'Зургин_тускар_ухалвр',
+	NS_FILE             => 'Зург',
+	NS_FILE_TALK        => 'Зургин_тускар_ухалвр',
 	NS_MEDIAWIKI        => 'MediaWiki',
 	NS_MEDIAWIKI_TALK   => 'MediaWiki_тускар_ухалвр',
 	NS_TEMPLATE         => 'Зура',
diff --git a/languages/messages/MessagesYi.php b/languages/messages/MessagesYi.php
index 0d9242a950..e26cbabd26 100644
--- a/languages/messages/MessagesYi.php
+++ b/languages/messages/MessagesYi.php
@@ -22,8 +22,8 @@ $namespaceNames = array(
 	NS_USER             => 'באַניצער',
 	NS_USER_TALK        => 'באַניצער_רעדן',
 	NS_PROJECT_TALK     => '$1_רעדן',
-	NS_IMAGE            => 'טעקע',
-	NS_IMAGE_TALK       => 'טעקע_רעדן',
+	NS_FILE             => 'טעקע',
+	NS_FILE_TALK        => 'טעקע_רעדן',
 	NS_MEDIAWIKI        => 'מעדיעװיקי',
 	NS_MEDIAWIKI_TALK   => 'מעדיעװיקי_רעדן',
 	NS_TEMPLATE         => 'מוסטער',
@@ -38,8 +38,8 @@ $namespaceAliases = array(
 	'באזונדער' => NS_SPECIAL,
 	'באנוצער' => NS_USER,
 	'באנוצער_רעדן' => NS_USER_TALK,
-	'בילד' => NS_IMAGE,
-	'בילד_רעדן' => NS_IMAGE_TALK,
+	'בילד' => NS_FILE,
+	'בילד_רעדן' => NS_FILE_TALK,
 	'מעדיעוויקי' => NS_MEDIAWIKI,
 	'מעדיעוויקי_רעדן' => NS_MEDIAWIKI_TALK,
 	'קאטעגאריע' => NS_CATEGORY,
diff --git a/languages/messages/MessagesYo.php b/languages/messages/MessagesYo.php
index 0b93b150b7..279a29ae8e 100644
--- a/languages/messages/MessagesYo.php
+++ b/languages/messages/MessagesYo.php
@@ -16,8 +16,8 @@ $namespaceNames = array(
 	NS_USER             => 'Oníṣe',
 	NS_USER_TALK        => 'Ọ̀rọ̀_oníṣe',
 	NS_PROJECT_TALK     => 'Ọ̀rọ̀_$1',
-	NS_IMAGE            => 'Àwòrán',
-	NS_IMAGE_TALK       => 'Ọ̀rọ̀_àwòrán',
+	NS_FILE             => 'Àwòrán',
+	NS_FILE_TALK        => 'Ọ̀rọ̀_àwòrán',
 	NS_MEDIAWIKI        => 'MediaWiki',
 	NS_MEDIAWIKI_TALK   => 'Ọ̀rọ̀_mediaWiki',
 	NS_TEMPLATE         => 'Àdàkọ',
diff --git a/languages/messages/MessagesYue.php b/languages/messages/MessagesYue.php
index b7fa7cfb3a..f631aa741d 100644
--- a/languages/messages/MessagesYue.php
+++ b/languages/messages/MessagesYue.php
@@ -65,8 +65,8 @@ $namespaceNames = array(
 	NS_USER_TALK 		=> 'User_talk',
 	# NS_PROJECT 		=> $wgMetaNamespace,
 	NS_PROJECT_TALK 	=> '$1_talk',
-	NS_IMAGE 		=> 'Image',
-	NS_IMAGE_TALK 		=> 'Image_talk',
+	NS_FILE 		=> 'Image',
+	NS_FILE_TALK 		=> 'Image_talk',
 	NS_MEDIAWIKI 		=> 'MediaWiki',
 	NS_MEDIAWIKI_TALK 	=> 'MediaWiki_talk',
 	NS_TEMPLATE 		=> 'Template',
@@ -95,14 +95,14 @@ $namespaceAliases = array(
 	# This has never worked so it's unlikely to annoy anyone if I disable it -- TS
 	#"{$wgMetaNamespace} 討論" => NS_PROJECT_TALK,
 	#"{$wgMetaNamespace} 讨论" => NS_PROJECT_TALK,
-	"圖" 			=> NS_IMAGE,
-	"圖像" 			=> NS_IMAGE,
-	"图" 			=> NS_IMAGE,
-	"图像" 			=> NS_IMAGE,
-	"圖 討論" 		=> NS_IMAGE_TALK,
-	"图 讨论" 		=> NS_IMAGE_TALK,
-	"圖像 討論" 		=> NS_IMAGE_TALK,
-	"图像 讨论" 		=> NS_IMAGE_TALK,
+	"圖" 			=> NS_FILE,
+	"圖像" 			=> NS_FILE,
+	"图" 			=> NS_FILE,
+	"图像" 			=> NS_FILE,
+	"圖 討論" 		=> NS_FILE_TALK,
+	"图 讨论" 		=> NS_FILE_TALK,
+	"圖像 討論" 		=> NS_FILE_TALK,
+	"图像 讨论" 		=> NS_FILE_TALK,
 	"模" 			=> NS_TEMPLATE,
 	"模 討論" 		=> NS_TEMPLATE_TALK,
 	"模 讨论" 		=> NS_TEMPLATE_TALK,
diff --git a/languages/messages/MessagesZea.php b/languages/messages/MessagesZea.php
index 0c20bf96d7..d9271bb16c 100644
--- a/languages/messages/MessagesZea.php
+++ b/languages/messages/MessagesZea.php
@@ -27,8 +27,8 @@ $namespaceNames = array(
 	NS_USER_TALK        => 'Overleg_gebruker',
 	# NS_PROJECT set by $wgMetaNamespace
 	NS_PROJECT_TALK     => 'Overleg_$1',
-	NS_IMAGE            => 'Plaetje',
-	NS_IMAGE_TALK       => 'Overleg_plaetje',
+	NS_FILE             => 'Plaetje',
+	NS_FILE_TALK        => 'Overleg_plaetje',
 	NS_MEDIAWIKI        => 'MediaWiki',
 	NS_MEDIAWIKI_TALK   => 'Overleg_MediaWiki',
 	NS_TEMPLATE         => 'Sjabloon',
diff --git a/languages/messages/MessagesZh.php b/languages/messages/MessagesZh.php
index 79e070b3d5..2980e6d287 100644
--- a/languages/messages/MessagesZh.php
+++ b/languages/messages/MessagesZh.php
@@ -27,10 +27,10 @@ $namespaceAliases = array(
 	# This has never worked so it's unlikely to annoy anyone if I disable it -- TS
 	#'{{SITENAME}}_对话' => NS_PROJECT_TALK
 	#"{{SITENAME}}_對話" => NS_PROJECT_TALK
-	'图像' => NS_IMAGE,
-	'圖像' => NS_IMAGE,
-	'图像对话' => NS_IMAGE_TALK,
-	'圖像對話' => NS_IMAGE_TALK,
+	'图像' => NS_FILE,
+	'圖像' => NS_FILE,
+	'图像对话' => NS_FILE_TALK,
+	'圖像對話' => NS_FILE_TALK,
 	'模板'	=> NS_TEMPLATE,
 	'模板讨论'=> NS_TEMPLATE_TALK,
 	"樣板" => NS_TEMPLATE,
diff --git a/languages/messages/MessagesZh_hans.php b/languages/messages/MessagesZh_hans.php
index 84d663b10f..d771432f4c 100644
--- a/languages/messages/MessagesZh_hans.php
+++ b/languages/messages/MessagesZh_hans.php
@@ -17,8 +17,8 @@ $namespaceNames = array(
 	NS_USER_TALK        => 'User_talk',
 	# NS_PROJECT set by $wgMetaNamespace
 	NS_PROJECT_TALK     => '$1_talk',
-	NS_IMAGE            => 'Image',
-	NS_IMAGE_TALK       => 'Image_talk',
+	NS_FILE             => 'Image',
+	NS_FILE_TALK        => 'Image_talk',
 	NS_MEDIAWIKI        => 'MediaWiki',
 	NS_MEDIAWIKI_TALK   => 'MediaWiki_talk',
 	NS_TEMPLATE         => 'Template',
@@ -39,8 +39,8 @@ $namespaceAliases = array(
 	'用户讨论' => NS_USER_TALK,
 	# This has never worked so it's unlikely to annoy anyone if I disable it -- TS
 	#'{{SITENAME}}_对话' => NS_PROJECT_TALK
-	'图像' => NS_IMAGE,
-	'图像对话' => NS_IMAGE_TALK,
+	'图像' => NS_FILE,
+	'图像对话' => NS_FILE_TALK,
 	'模板'	=> NS_TEMPLATE,
 	'模板讨论'=> NS_TEMPLATE_TALK,
 	'帮助'	=> NS_HELP,
diff --git a/languages/messages/MessagesZh_hant.php b/languages/messages/MessagesZh_hant.php
index d3be1f3ffd..2964c0e88c 100644
--- a/languages/messages/MessagesZh_hant.php
+++ b/languages/messages/MessagesZh_hant.php
@@ -20,8 +20,8 @@ $namespaceNames = array(
 	NS_USER_TALK        => 'User_talk',
 	# NS_PROJECT set by $wgMetaNamespace
 	NS_PROJECT_TALK     => '$1_talk',
-	NS_IMAGE            => 'Image',
-	NS_IMAGE_TALK       => 'Image_talk',
+	NS_FILE             => 'Image',
+	NS_FILE_TALK        => 'Image_talk',
 	NS_MEDIAWIKI        => 'MediaWiki',
 	NS_MEDIAWIKI_TALK   => 'MediaWiki_talk',
 	NS_TEMPLATE         => 'Template',
@@ -40,8 +40,8 @@ $namespaceAliases = array(
 	"用戶對話" => NS_USER_TALK,
 	# This has never worked so it's unlikely to annoy anyone if I disable it -- TS
 	#"{{SITENAME}}_對話" => NS_PROJECT_TALK
-	"圖像" => NS_IMAGE,
-	"圖像對話" => NS_IMAGE_TALK,
+	"圖像" => NS_FILE,
+	"圖像對話" => NS_FILE_TALK,
 	"樣板" => NS_TEMPLATE,
 	"樣板討論" => NS_TEMPLATE_TALK,
 	"幫助" => NS_HELP,
diff --git a/languages/messages/MessagesZh_tw.php b/languages/messages/MessagesZh_tw.php
index e25f523723..0aca270cc4 100644
--- a/languages/messages/MessagesZh_tw.php
+++ b/languages/messages/MessagesZh_tw.php
@@ -22,8 +22,8 @@ $namespaceNames = array(
 	NS_USER_TALK        => '使用者討論',
 	# NS_PROJECT set by $wgMetaNamespace
 	NS_PROJECT_TALK     => '$1討論',
-	NS_IMAGE            => '圖片',
-	NS_IMAGE_TALK       => '圖片討論',
+	NS_FILE             => '圖片',
+	NS_FILE_TALK        => '圖片討論',
 	NS_MEDIAWIKI        => 'MediaWiki',
 	NS_MEDIAWIKI_TALK   => 'MediaWiki_talk',
 	NS_TEMPLATE         => '模板',
diff --git a/maintenance/FiveUpgrade.inc b/maintenance/FiveUpgrade.inc
index 7ae8f5d008..32c200f2c6 100644
--- a/maintenance/FiveUpgrade.inc
+++ b/maintenance/FiveUpgrade.inc
@@ -988,7 +988,7 @@ CREATE TABLE $1 (
 
   -- Filename of target image.
   -- This is also the page_title of the file's description page;
-  -- all such pages are in namespace 6 (NS_IMAGE).
+  -- all such pages are in namespace 6 (NS_FILE).
   il_to varchar(255) binary NOT NULL default '',
 
   UNIQUE KEY il_from(il_from,il_to),
diff --git a/maintenance/archives/patch-linktables.sql b/maintenance/archives/patch-linktables.sql
index ae9768a813..b15878c3a7 100644
--- a/maintenance/archives/patch-linktables.sql
+++ b/maintenance/archives/patch-linktables.sql
@@ -49,7 +49,7 @@ CREATE TABLE /*$wgDBprefix*/imagelinks (
   
   -- Filename of target image.
   -- This is also the page_title of the file's description page;
-  -- all such pages are in namespace 6 (NS_IMAGE).
+  -- all such pages are in namespace 6 (NS_FILE).
   il_to varchar(255) binary NOT NULL default '',
   
   UNIQUE KEY il_from(il_from,il_to),
diff --git a/maintenance/cleanupImages.php b/maintenance/cleanupImages.php
index b976ba80cf..00903f2222 100644
--- a/maintenance/cleanupImages.php
+++ b/maintenance/cleanupImages.php
@@ -64,7 +64,7 @@ class ImageCleanup extends TableCleanup {
 		// Many of remainder look like non-normalized unicode
 		$cleaned = UtfNormal::cleanUp( $cleaned );
 		
-		$title = Title::makeTitleSafe( NS_IMAGE, $cleaned );
+		$title = Title::makeTitleSafe( NS_FILE, $cleaned );
 		
 		if( is_null( $title ) ) {
 			$this->log( "page $source ($cleaned) is illegal." );
@@ -116,7 +116,7 @@ class ImageCleanup extends TableCleanup {
 		$final = $new;
 		
 		while( $db->selectField( 'image', 'img_name', array( 'img_name' => $final ), __METHOD__ ) ||
-			Title::makeTitle( NS_IMAGE, $final )->exists() ) {
+			Title::makeTitle( NS_FILE, $final )->exists() ) {
 			$this->log( "Rename conflicts with '$final'..." );
 			$version++;
 			$final = $this->appendTitle( $new, "_$version" );
@@ -140,7 +140,7 @@ class ImageCleanup extends TableCleanup {
 				__METHOD__ );
 			$db->update( 'page',
 				array( 'page_title' => $final ),
-				array( 'page_title' => $orig, 'page_namespace' => NS_IMAGE ),
+				array( 'page_title' => $orig, 'page_namespace' => NS_FILE ),
 				__METHOD__ );
 			$dir = dirname( $finalPath );
 			if( !file_exists( $dir ) ) {
@@ -171,7 +171,7 @@ class ImageCleanup extends TableCleanup {
 			array( $this, 'hexChar' ),
 			$name );
 		
-		$test = Title::makeTitleSafe( NS_IMAGE, $x );
+		$test = Title::makeTitleSafe( NS_FILE, $x );
 		if( is_null( $test ) || $test->getDBkey() !== $x ) {
 			$this->log( "Unable to generate safe title from '$name', got '$x'" );
 			return false;
diff --git a/maintenance/deleteBatch.php b/maintenance/deleteBatch.php
index d10948a0c6..092314e530 100644
--- a/maintenance/deleteBatch.php
+++ b/maintenance/deleteBatch.php
@@ -70,7 +70,7 @@ for ( $linenum = 1; !feof( $file ); $linenum++ ) {
 
 	print $page->getPrefixedText();
 	$dbw->begin();
-	if( $page->getNamespace() == NS_IMAGE ) {
+	if( $page->getNamespace() == NS_FILE ) {
 		$art = new ImagePage( $page );
 		$img = wfFindFile( $art->mTitle );
 		if( !$img || !$img->delete( $reason ) ) {
diff --git a/maintenance/generateSitemap.php b/maintenance/generateSitemap.php
index cc3f523a9a..34125aec03 100644
--- a/maintenance/generateSitemap.php
+++ b/maintenance/generateSitemap.php
@@ -80,8 +80,8 @@ class GenerateSitemap {
 		NS_USER_TALK		=> '0.1',
 		NS_PROJECT		=> '0.5',
 		NS_PROJECT_TALK		=> '0.1',
-		NS_IMAGE		=> '0.5',
-		NS_IMAGE_TALK		=> '0.1',
+		NS_FILE			=> '0.5',
+		NS_FILE_TALK		=> '0.1',
 		NS_MEDIAWIKI		=> '0.0',
 		NS_MEDIAWIKI_TALK	=> '0.1',
 		NS_TEMPLATE		=> '0.0',
diff --git a/maintenance/importImages.php b/maintenance/importImages.php
index c2e4e2b2a5..4c6082b214 100644
--- a/maintenance/importImages.php
+++ b/maintenance/importImages.php
@@ -63,7 +63,7 @@ if( count( $args ) > 0 ) {
 			$base = wfBaseName( $file );
 	
 			# Validate a title
-			$title = Title::makeTitleSafe( NS_IMAGE, $base );
+			$title = Title::makeTitleSafe( NS_FILE, $base );
 			if( !is_object( $title ) ) {
 				echo( "{$base} could not be imported; a valid title cannot be produced\n" );
 				continue;
diff --git a/maintenance/tables.sql b/maintenance/tables.sql
index d4a60af865..28f496ebc4 100644
--- a/maintenance/tables.sql
+++ b/maintenance/tables.sql
@@ -446,7 +446,7 @@ CREATE TABLE /*$wgDBprefix*/imagelinks (
   
   -- Filename of target image.
   -- This is also the page_title of the file's description page;
-  -- all such pages are in namespace 6 (NS_IMAGE).
+  -- all such pages are in namespace 6 (NS_FILE).
   il_to varchar(255) binary NOT NULL default '',
   
   UNIQUE KEY il_from (il_from,il_to),
@@ -701,7 +701,7 @@ CREATE TABLE /*$wgDBprefix*/ipblocks (
 CREATE TABLE /*$wgDBprefix*/image (
   -- Filename.
   -- This is also the title of the associated description page,
-  -- which will be in namespace 6 (NS_IMAGE).
+  -- which will be in namespace 6 (NS_FILE).
   img_name varchar(255) binary NOT NULL default '',
   
   -- File size in bytes.
diff --git a/skins/Standard.php b/skins/Standard.php
index 9b65de718e..e847514e90 100644
--- a/skins/Standard.php
+++ b/skins/Standard.php
@@ -175,7 +175,7 @@ class SkinStandard extends Skin {
 						case NS_TALK:
 						case NS_USER_TALK:
 						case NS_PROJECT_TALK:
-						case NS_IMAGE_TALK:
+						case NS_FILE_TALK:
 						case NS_MEDIAWIKI_TALK:
 						case NS_TEMPLATE_TALK:
 						case NS_HELP_TALK:
@@ -191,7 +191,7 @@ class SkinStandard extends Skin {
 						case NS_PROJECT:
 							$text = wfMsg( 'projectpage' );
 							break;
-						case NS_IMAGE:
+						case NS_FILE:
 							$text = wfMsg( 'imagepage' );
 							break;
 						case NS_MEDIAWIKI:
diff --git a/thumb.php b/thumb.php
index bb37e6e7a2..b973cc654b 100644
--- a/thumb.php
+++ b/thumb.php
@@ -55,7 +55,7 @@ function wfThumbMain() {
 			wfThumbError( 404, wfMsg( 'badtitletext' ) );
 			return;
 		}
-		$title = Title::makeTitleSafe( NS_IMAGE, $bits[1] );
+		$title = Title::makeTitleSafe( NS_FILE, $bits[1] );
 		if( is_null($title) ) {
 			wfThumbError( 404, wfMsg( 'badtitletext' ) );
 			return;
-- 
2.20.1