diff --git a/phpBB/phpbb/avatar/driver/driver.php b/phpBB/phpbb/avatar/driver/driver.php
index d688e7d70c..0c54951cbd 100644
--- a/phpBB/phpbb/avatar/driver/driver.php
+++ b/phpBB/phpbb/avatar/driver/driver.php
@@ -114,7 +114,7 @@ abstract class driver implements \phpbb\avatar\driver\driver_interface
 	*/
 	public function get_template_name()
 	{
-		$driver = preg_replace('#^phpbb_avatar_driver_#', '', get_class($this));
+		$driver = preg_replace('#^phpbb\\\\avatar\\\\driver\\\\#', '', get_class($this));
 		$template = "ucp_avatar_options_$driver.html";
 
 		return $template;
diff --git a/phpBB/phpbb/avatar/manager.php b/phpBB/phpbb/avatar/manager.php
index 11f401d9ed..c28380a401 100644
--- a/phpBB/phpbb/avatar/manager.php
+++ b/phpBB/phpbb/avatar/manager.php
@@ -277,7 +277,7 @@ class manager
 	*/
 	public function get_driver_config_name($driver)
 	{
-		return preg_replace('#^phpbb\\avatar\\driver\\\\#', '', get_class($driver));
+		return preg_replace('#^phpbb\\\\avatar\\\\driver\\\\#', '', get_class($driver));
 	}
 
 	/**