8 files changed, 18 insertions, 18 deletions
diff --git a/phpBB/config/avatars.yml b/phpBB/config/avatars.yml
index 4f49d21b34..cc9ed05836 100644
--- a/phpBB/config/avatars.yml
+++ b/phpBB/config/avatars.yml
@@ -1,6 +1,6 @@
 services:
-    avatar.driver.core.gravatar:
-        class: phpbb_avatar_driver_core_gravatar
+    avatar.driver.gravatar:
+        class: phpbb_avatar_driver_gravatar
         arguments:
             - @config
             - @request
@@ -10,8 +10,8 @@ services:
         tags:
             - { name: avatar.driver }
 
-    avatar.driver.core.local:
-        class: phpbb_avatar_driver_core_local
+    avatar.driver.local:
+        class: phpbb_avatar_driver_local
         arguments:
             - @config
             - @request
@@ -21,8 +21,8 @@ services:
         tags:
             - { name: avatar.driver }
 
-    avatar.driver.core.remote:
-        class: phpbb_avatar_driver_core_remote
+    avatar.driver.remote:
+        class: phpbb_avatar_driver_remote
         arguments:
             - @config
             - @request
@@ -32,8 +32,8 @@ services:
         tags:
             - { name: avatar.driver }
 
-    avatar.driver.core.upload:
-        class: phpbb_avatar_driver_core_upload
+    avatar.driver.upload:
+        class: phpbb_avatar_driver_upload
         arguments:
             - @config
             - @request
diff --git a/phpBB/includes/avatar/driver/driver.php b/phpBB/includes/avatar/driver/driver.php
index cce0a8db0f..9a213ce730 100644
--- a/phpBB/includes/avatar/driver/driver.php
+++ b/phpBB/includes/avatar/driver/driver.php
@@ -147,7 +147,7 @@ abstract class phpbb_avatar_driver implements phpbb_avatar_driver_interface
 	**/
 	public function is_enabled()
 	{
-		$driver = preg_replace('#^phpbb_avatar_driver_core_#', '', get_class($this));
+		$driver = preg_replace('#^phpbb_avatar_driver_#', '', get_class($this));
 
 		return $this->config["allow_avatar_$driver"];
 	}
@@ -157,7 +157,7 @@ abstract class phpbb_avatar_driver implements phpbb_avatar_driver_interface
 	**/
 	public function get_template_name()
 	{
-		$driver = preg_replace('#^phpbb_avatar_driver_core_#', '', get_class($this));
+		$driver = preg_replace('#^phpbb_avatar_driver_#', '', get_class($this));
 		$template = "ucp_avatar_options_$driver.html";
 
 		return $template;
diff --git a/phpBB/includes/avatar/driver/core/gravatar.php b/phpBB/includes/avatar/driver/gravatar.php
index 34aa0fa27f..0ac7d71bef 100644
--- a/phpBB/includes/avatar/driver/core/gravatar.php
+++ b/phpBB/includes/avatar/driver/gravatar.php
@@ -20,7 +20,7 @@ if (!defined('IN_PHPBB'))
 * @package avatars
 */
 // @todo: rename classes to phpbb_ext_foo_avatar_driver_foo and similar
-class phpbb_avatar_driver_core_gravatar extends phpbb_avatar_driver
+class phpbb_avatar_driver_gravatar extends phpbb_avatar_driver
 {
 	/**
 	* We'll need to create a different type of avatar for gravatar
diff --git a/phpBB/includes/avatar/driver/core/local.php b/phpBB/includes/avatar/driver/local.php
index a8ed8ad130..e4648381c2 100644
--- a/phpBB/includes/avatar/driver/core/local.php
+++ b/phpBB/includes/avatar/driver/local.php
@@ -19,7 +19,7 @@ if (!defined('IN_PHPBB'))
 * Handles avatars selected from the board gallery
 * @package avatars
 */
-class phpbb_avatar_driver_core_local extends phpbb_avatar_driver
+class phpbb_avatar_driver_local extends phpbb_avatar_driver
 {
 	/**
 	* @inheritdoc
diff --git a/phpBB/includes/avatar/driver/core/remote.php b/phpBB/includes/avatar/driver/remote.php
index 8b315b80a8..fbe158d200 100644
--- a/phpBB/includes/avatar/driver/core/remote.php
+++ b/phpBB/includes/avatar/driver/remote.php
@@ -19,7 +19,7 @@ if (!defined('IN_PHPBB'))
 * Handles avatars hosted remotely
 * @package avatars
 */
-class phpbb_avatar_driver_core_remote extends phpbb_avatar_driver
+class phpbb_avatar_driver_remote extends phpbb_avatar_driver
 {
 	/**
 	* @inheritdoc
diff --git a/phpBB/includes/avatar/driver/core/upload.php b/phpBB/includes/avatar/driver/upload.php
index 1ad1133bff..a86cc44d2f 100644
--- a/phpBB/includes/avatar/driver/core/upload.php
+++ b/phpBB/includes/avatar/driver/upload.php
@@ -19,7 +19,7 @@ if (!defined('IN_PHPBB'))
 * Handles avatars uploaded to the board
 * @package avatars
 */
-class phpbb_avatar_driver_core_upload extends phpbb_avatar_driver
+class phpbb_avatar_driver_upload extends phpbb_avatar_driver
 {
 	/**
 	* @inheritdoc
diff --git a/phpBB/includes/avatar/manager.php b/phpBB/includes/avatar/manager.php
index 4256188f0a..546cdcdc05 100644
--- a/phpBB/includes/avatar/manager.php
+++ b/phpBB/includes/avatar/manager.php
@@ -57,13 +57,13 @@ class phpbb_avatar_manager
 		switch ($avatar_type)
 		{
 			case AVATAR_GALLERY:
-				$avatar_type = 'avatar.driver.core.local';
+				$avatar_type = 'avatar.driver.local';
 				break;
 			case AVATAR_UPLOAD:
-				$avatar_type = 'avatar.driver.core.upload';
+				$avatar_type = 'avatar.driver.upload';
 				break;
 			case AVATAR_REMOTE:
-				$avatar_type = 'avatar.driver.core.remote';
+				$avatar_type = 'avatar.driver.remote';
 				break;
 		}
 
diff --git a/phpBB/includes/ucp/ucp_profile.php b/phpBB/includes/ucp/ucp_profile.php
index afa8c99b34..b0d4946bd4 100644
--- a/phpBB/includes/ucp/ucp_profile.php
+++ b/phpBB/includes/ucp/ucp_profile.php
@@ -564,7 +564,7 @@ class ucp_profile
 						if (check_form_key('ucp_avatar'))
 						{
 							$driver = str_replace('_', '.', request_var('avatar_driver', ''));
-							$config_name = preg_replace('#^avatar.driver.core.#', '', $driver);
+							$config_name = preg_replace('#^avatar.driver.#', '', $driver);
 							if (in_array($driver, $avatar_drivers) && $config["allow_avatar_$config_name"])
 							{
 								$avatar = $phpbb_avatar_manager->get_driver($driver);