diff --git a/phpBB/common.php b/phpBB/common.php
index bdb33707cc..5849d48453 100644
--- a/phpBB/common.php
+++ b/phpBB/common.php
@@ -45,7 +45,7 @@ if (!defined('PHPBB_INSTALLED'))
 	$script_path = preg_replace('#[\\\\/]{2,}#', '/', $script_path);
 	// Eliminate . and .. from the path
 	require($phpbb_root_path . 'includes/functions.' . $phpEx);
-	$script_path = clean_path($script_path);
+	$script_path = phpbb_clean_path($script_path);
 
 	$url = (($secure) ? 'https://' : 'http://') . $server_name;
 
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 2391b45038..65d8be32ad 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -1182,7 +1182,7 @@ else
 * @param string $path Path to clean
 * @return string Cleaned path
 */
-function clean_path($path)
+function phpbb_clean_path($path)
 {
 	$exploded = explode('/', $path);
 	$filtered = array();
diff --git a/tests/functions/clean_path_test.php b/tests/functions/clean_path_test.php
index 4c8fe54909..bcbe9838d9 100644
--- a/tests/functions/clean_path_test.php
+++ b/tests/functions/clean_path_test.php
@@ -37,7 +37,7 @@ class phpbb_clean_path_test extends phpbb_test_case
 	*/
 	public function test_clean_path($input, $expected)
 	{
-		$output = clean_path($input);
+		$output = phpbb_clean_path($input);
 
 		$this->assertEquals($expected, $output);
 	}