diff --git a/phpBB/adm/style/acp_ext_gallery.html b/phpBB/adm/style/acp_ext_catalog.html
similarity index 92%
rename from phpBB/adm/style/acp_ext_gallery.html
rename to phpBB/adm/style/acp_ext_catalog.html
index 4b85494a09..23b966c615 100644
--- a/phpBB/adm/style/acp_ext_gallery.html
+++ b/phpBB/adm/style/acp_ext_catalog.html
@@ -2,9 +2,9 @@
 
 <a id="maincontent"></a>
 
-<h1>{{lang( 'EXTENSIONS_GALLERY') }}</h1>
+<h1>{{lang( 'EXTENSIONS_CATALOG') }}</h1>
 
-<p>{{lang( 'EXTENSIONS_GALLERY_EXPLAIN') }}</p>
+<p>{{lang( 'EXTENSIONS_CATALOG_EXPLAIN') }}</p>
 
 {% if not enabled %}
 <div class="errorbox">
@@ -13,7 +13,7 @@
 {% endif %}
 
 <fieldset class="quick quick-left">
-	<span class="small"><a href="https://www.phpbb.com/go/customise/extensions/3.1" target="_blank">{{ lang('BROWSE_EXTENSIONS_DATABASE') }}</a> &bull; <a href="javascript:phpbb.toggleDisplay('gallery_settings');">{{ lang('SETTINGS') }}</a></span>
+	<span class="small"><a href="https://www.phpbb.com/go/customise/extensions/3.1" target="_blank">{{ lang('BROWSE_EXTENSIONS_DATABASE') }}</a> &bull; <a href="javascript:phpbb.toggleDisplay('catalog_settings');">{{ lang('SETTINGS') }}</a></span>
 </fieldset>
 
 {% if pagination is defined %}
@@ -22,9 +22,9 @@
 	</div>
 {% endif %}
 
-<form id="gallery_settings" method="post" action="{{ U_ACTION }}" style="display:none">
+<form id="catalog_settings" method="post" action="{{ U_ACTION }}" style="display:none">
 	<fieldset style="clear: both;">
-		<legend>{{ lang('EXTENSIONS_GALLERY_SETTINGS') }}</legend>
+		<legend>{{ lang('EXTENSIONS_CATALOG_SETTINGS') }}</legend>
 		<dl>
 			<dt><label for="enable_on_install">{{ lang('ENABLE_ON_INSTALL') }}{{ lang('COLON') }}</label></dt>
 			<dd>
@@ -66,7 +66,7 @@
 		<p class="submit-buttons">
 			<input class="button1" type="submit" name="update" value="{{ lang('SUBMIT') }}" />&nbsp;
 			<input class="button2" type="reset" name="reset" value="{{ lang('RESET') }}" />
-			<input type="hidden" name="action" value="set_gallery_settings" />
+			<input type="hidden" name="action" value="set_catalog_settings" />
 			{{ S_FORM_TOKEN }}
 		</p>
 	</fieldset>
diff --git a/phpBB/adm/style/acp_ext_list.html b/phpBB/adm/style/acp_ext_list.html
index 0ab620b864..9f22c03722 100644
--- a/phpBB/adm/style/acp_ext_list.html
+++ b/phpBB/adm/style/acp_ext_list.html
@@ -65,8 +65,8 @@
 
 				<!-- IF enabled.META_NAME in MANAGED_EXTENSIONS -->
 					<!-- IF enabled.actions is defined  -->&nbsp;|&nbsp;<!-- ENDIF -->
-					<a href="{U_GALLERY_ACTION}&amp;action=update&amp;extension={enabled.META_NAME}">{L_UPDATE}</a>
-					&nbsp;|&nbsp;<a href="{U_GALLERY_ACTION}&amp;action=remove&amp;extension={enabled.META_NAME}" style="color: #BC2A4D;">{L_REMOVE}</a>
+					<a href="{U_CATALOG_ACTION}&amp;action=update&amp;extension={enabled.META_NAME}">{L_UPDATE}</a>
+					&nbsp;|&nbsp;<a href="{U_CATALOG_ACTION}&amp;action=remove&amp;extension={enabled.META_NAME}" style="color: #BC2A4D;">{L_REMOVE}</a>
 				<!-- ENDIF -->
 			</td>
 		</tr>
@@ -98,8 +98,8 @@
 
 				<!-- IF disabled.META_NAME in MANAGED_EXTENSIONS -->
 					<!-- IF disabled.actions is defined -->&nbsp;|&nbsp;<!-- ENDIF -->
-					<a href="{U_GALLERY_ACTION}&amp;action=update&amp;extension={disabled.META_NAME}">{L_UPDATE}</a>
-					&nbsp;|&nbsp;<a href="{U_GALLERY_ACTION}&amp;action=remove&amp;extension={disabled.META_NAME}" style="color: #BC2A4D;">{L_REMOVE}</a>
+					<a href="{U_CATALOG_ACTION}&amp;action=update&amp;extension={disabled.META_NAME}">{L_UPDATE}</a>
+					&nbsp;|&nbsp;<a href="{U_CATALOG_ACTION}&amp;action=remove&amp;extension={disabled.META_NAME}" style="color: #BC2A4D;">{L_REMOVE}</a>
 				<!-- ENDIF -->
 			</td>
 		</tr>
diff --git a/phpBB/includes/acp/acp_extensions.php b/phpBB/includes/acp/acp_extensions.php
index 4dd1afa27b..aaac3b04fd 100644
--- a/phpBB/includes/acp/acp_extensions.php
+++ b/phpBB/includes/acp/acp_extensions.php
@@ -60,8 +60,8 @@ class acp_extensions
 
 		switch ($mode)
 		{
-			case 'gallery':
-				$this->gallery_mode($id, $mode);
+			case 'catalog':
+				$this->catalog_mode($id, $mode);
 				break;
 			default:
 				$this->main_mode($id, $mode);
@@ -177,7 +177,7 @@ class acp_extensions
 					'FORCE_UNSTABLE'		=> $this->config['extension_force_unstable'],
 					'U_ACTION' 				=> $this->u_action,
 					'MANAGED_EXTENSIONS'	=> array_keys($composer_manager->get_managed_packages()),
-					'U_GALLERY_ACTION' 		=> append_sid("{$phpbb_admin_path}index.$phpEx", "i=$id&amp;mode=gallery"),
+					'U_CATALOG_ACTION' 		=> append_sid("{$phpbb_admin_path}index.$phpEx", "i=$id&amp;mode=catalog"),
 				));
 				$this->request->disable_super_globals();
 
@@ -409,7 +409,7 @@ class acp_extensions
 		$this->tpl_name = $tpl_name;
 	}
 
-	public function gallery_mode($id, $mode)
+	public function catalog_mode($id, $mode)
 	{
 		global $phpbb_container;
 
@@ -593,7 +593,7 @@ class acp_extensions
 				$submit = $this->request->is_set('update');
 				if ($submit)
 				{
-					if (!check_form_key('gallery_settings'))
+					if (!check_form_key('catalog_settings'))
 					{
 						trigger_error($language->lang('FORM_INVALID') . adm_back_link($this->u_action), E_USER_WARNING);
 					}
@@ -640,8 +640,8 @@ class acp_extensions
 
 				$pagination->generate_template_pagination($base_url, 'pagination', 'start', count($available_extensions), 20, $start);
 
-				$this->page_title = 'ACP_EXTENSIONS_GALLERY';
-				$this->tpl_name = 'acp_ext_gallery';
+				$this->page_title = 'ACP_EXTENSIONS_CATALOG';
+				$this->tpl_name = 'acp_ext_catalog';
 
 				$this->template->assign_var('extensions', $extensions);
 				$this->template->assign_var('managed_extensions', array_keys($managed_packages));
@@ -655,7 +655,7 @@ class acp_extensions
 				]);
 				$this->template->assign_var('enabled', $manager->check_requirements());
 
-				add_form_key('gallery_settings');
+				add_form_key('catalog_settings');
 
 				break;
 		}
diff --git a/phpBB/includes/acp/info/acp_extensions.php b/phpBB/includes/acp/info/acp_extensions.php
index 5d9e420fda..f555d0fa8c 100644
--- a/phpBB/includes/acp/info/acp_extensions.php
+++ b/phpBB/includes/acp/info/acp_extensions.php
@@ -20,7 +20,7 @@ class acp_extensions_info
 			'title'		=> 'ACP_EXTENSION_MANAGEMENT',
 			'modes'		=> array(
 				'main'		=> array('title' => 'ACP_EXTENSIONS', 'auth' => 'acl_a_extensions', 'cat' => array('ACP_EXTENSION_MANAGEMENT')),
-				'gallery'	=> array('title' => 'ACP_EXTENSIONS_GALLERY', 'auth' => 'acl_a_extensions', 'cat' => array('ACP_EXTENSION_MANAGEMENT')),
+				'catalog'	=> array('title' => 'ACP_EXTENSIONS_CATALOG', 'auth' => 'acl_a_extensions', 'cat' => array('ACP_EXTENSION_MANAGEMENT')),
 			),
 		);
 	}
diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php
index 4657c08bcf..53ac2f3fa2 100644
--- a/phpBB/language/en/acp/common.php
+++ b/phpBB/language/en/acp/common.php
@@ -88,7 +88,7 @@ $lang = array_merge($lang, array(
 	'ACP_EXTENSION_GROUPS'		=> 'Manage attachment extension groups',
 	'ACP_EXTENSION_MANAGEMENT'	=> 'Extension management',
 	'ACP_EXTENSIONS'			=> 'Manage extensions',
-	'ACP_EXTENSIONS_GALLERY'	=> 'Extensions gallery',
+	'ACP_EXTENSIONS_CATALOG'	=> 'Extensions catalog',
 	'ACP_EXTENSIONS_INSTALL'	=> 'Install extensions',
 	'ACP_EXTENSIONS_REMOVE'		=> 'Remove extensions',
 	'ACP_EXTENSIONS_UPDATE'		=> 'Update extensions',
diff --git a/phpBB/language/en/acp/extensions.php b/phpBB/language/en/acp/extensions.php
index 0a94481a87..aaeb1ec3e0 100644
--- a/phpBB/language/en/acp/extensions.php
+++ b/phpBB/language/en/acp/extensions.php
@@ -48,8 +48,8 @@ $lang = array_merge($lang, array(
 	'ENABLING_EXTENSIONS'	=> 'Enabling extensions',
 	'DISABLING_EXTENSIONS'	=> 'Disabling extensions',
 
-	'EXTENSIONS_GALLERY' => 'Extensions Gallery',
-	'EXTENSIONS_GALLERY_EXPLAIN' => 'The Extensions Gallery is a tool in your phpBB Board which allows you to see all the extensions that are available for your board.',
+	'EXTENSIONS_CATALOG'			=> 'Extensions Catalog',
+	'EXTENSIONS_CATALOG_EXPLAIN'	=> 'Here you can browse all of the extensions available for your phpBB board. Extensions can easily be installed or removed with just a click. Adjust the Settings to allow instant enabling and purging of extensions.',
 
 	'EXTENSION'					=> 'Extension',
 	'EXTENSIONS'				=> 'Extensions',
@@ -150,7 +150,7 @@ $lang = array_merge($lang, array(
 	'META_FIELD_NOT_SET'	=> 'Required meta field %s has not been set.',
 	'META_FIELD_INVALID'	=> 'Meta field %s is invalid.',
 
-	'EXTENSIONS_GALLERY_SETTINGS'	=> 'Extensions gallery settings',
+	'EXTENSIONS_CATALOG_SETTINGS'	=> 'Extensions catalog settings',
 	'ENABLE_ON_INSTALL'				=> 'Enable extensions when installing',
 	'PURGE_ON_REMOVE'				=> 'Purge extensions when removing',
 	'ENABLE_PACKAGIST'				=> 'Enable Packagist usage',
diff --git a/phpBB/phpbb/db/migration/data/v320/extensions_composer.php b/phpBB/phpbb/db/migration/data/v320/extensions_composer.php
index 976dcfaa3e..71456afd49 100644
--- a/phpBB/phpbb/db/migration/data/v320/extensions_composer.php
+++ b/phpBB/phpbb/db/migration/data/v320/extensions_composer.php
@@ -29,7 +29,7 @@ class extensions_composer extends \phpbb\db\migration\migration
 				'ACP_EXTENSION_MANAGEMENT',
 				array(
 					'module_basename'	=> 'acp_extensions',
-					'modes'				=> array('gallery'),
+					'modes'				=> array('catalog'),
 				),
 			)),
 		);