diff --git a/roles/mediawiki/templates/LocalSettings.php.fp.j2 b/roles/mediawiki/templates/LocalSettings.php.fp.j2
index 57cec204ba..c6edba8a09 100644
--- a/roles/mediawiki/templates/LocalSettings.php.fp.j2
+++ b/roles/mediawiki/templates/LocalSettings.php.fp.j2
@@ -246,7 +246,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,
@@ -278,8 +278,8 @@ $wgNamespacesToBeSearchedDefault = array(
         NS_USER_TALK =>      false,
         NS_PROJECT =>        true,
         NS_PROJECT_TALK =>   false,
-        NS_IMAGE =>          true,
-        NS_IMAGE_TALK =>     false,
+        NS_FILE =>           true,
+        NS_FILE_TALK =>      false,
         NS_MEDIAWIKI =>      false,
         NS_MEDIAWIKI_TALK => false,
         NS_TEMPLATE =>       false,