diff --git a/phpBB/includes/acp/acp_language.php b/phpBB/includes/acp/acp_language.php
index 4584be632f..6f95a8df2b 100644
--- a/phpBB/includes/acp/acp_language.php
+++ b/phpBB/includes/acp/acp_language.php
@@ -220,7 +220,7 @@ class acp_language
 				{
 					try
 					{
-						$iterator = new \phpbb\iterator\recursive_path_iterator($this->phpbb_root_path . 'language/' . $this->config['default_lang'] . '/');
+						$iterator = new \phpbb\finder\recursive_path_iterator($this->phpbb_root_path . 'language/' . $this->config['default_lang'] . '/');
 					}
 					catch (\Exception $e)
 					{
diff --git a/phpBB/includes/functions_compatibility.php b/phpBB/includes/functions_compatibility.php
index 5ecd8c7a37..77b2ef4220 100644
--- a/phpBB/includes/functions_compatibility.php
+++ b/phpBB/includes/functions_compatibility.php
@@ -646,7 +646,7 @@ function phpbb_email_hash($email)
  */
 function phpbb_load_extensions_autoloaders($phpbb_root_path)
 {
-	$iterator = new \phpbb\iterator\recursive_path_iterator(
+	$iterator = new \phpbb\finder\recursive_path_iterator(
 		$phpbb_root_path . 'ext/',
 		\RecursiveIteratorIterator::SELF_FIRST,
 		\FilesystemIterator::SKIP_DOTS | \FilesystemIterator::FOLLOW_SYMLINKS
diff --git a/phpBB/phpbb/event/md_exporter.php b/phpBB/phpbb/event/md_exporter.php
index fcc5b78afc..04e5f91ca2 100644
--- a/phpBB/phpbb/event/md_exporter.php
+++ b/phpBB/phpbb/event/md_exporter.php
@@ -659,7 +659,7 @@ class md_exporter
 	{
 		try
 		{
-			$iterator = new \phpbb\iterator\recursive_path_iterator(
+			$iterator = new \phpbb\finder\recursive_path_iterator(
 				$dir,
 				\RecursiveIteratorIterator::SELF_FIRST
 			);
diff --git a/phpBB/phpbb/extension/manager.php b/phpBB/phpbb/extension/manager.php
index 24dfeb75b4..adb6d884d1 100644
--- a/phpBB/phpbb/extension/manager.php
+++ b/phpBB/phpbb/extension/manager.php
@@ -380,7 +380,7 @@ class manager
 			return $available;
 		}
 
-		$iterator = new \phpbb\iterator\recursive_path_iterator(
+		$iterator = new \phpbb\finder\recursive_path_iterator(
 			$this->phpbb_root_path . 'ext/',
 			\RecursiveIteratorIterator::SELF_FIRST,
 			\FilesystemIterator::NEW_CURRENT_AND_KEY | \FilesystemIterator::FOLLOW_SYMLINKS
diff --git a/phpBB/phpbb/finder/finder.php b/phpBB/phpbb/finder/finder.php
index bcd1c355c0..9e7f201ea3 100644
--- a/phpBB/phpbb/finder/finder.php
+++ b/phpBB/phpbb/finder/finder.php
@@ -486,7 +486,7 @@ class finder
 
 			if (is_dir($path))
 			{
-				$iterator = new \phpbb\iterator\recursive_path_iterator(
+				$iterator = new \phpbb\finder\recursive_path_iterator(
 					$path,
 					\RecursiveIteratorIterator::SELF_FIRST
 				);
diff --git a/phpBB/phpbb/finder/recursive_dot_prefix_filter_iterator.php b/phpBB/phpbb/finder/recursive_dot_prefix_filter_iterator.php
index 08f5bde262..e4f9ea1d8a 100644
--- a/phpBB/phpbb/finder/recursive_dot_prefix_filter_iterator.php
+++ b/phpBB/phpbb/finder/recursive_dot_prefix_filter_iterator.php
@@ -11,7 +11,7 @@
 *
 */
 
-namespace phpbb\iterator;
+namespace phpbb\finder;
 
 /**
 * Class recursive_dot_prefix_filter_iterator
diff --git a/phpBB/phpbb/finder/recursive_path_iterator.php b/phpBB/phpbb/finder/recursive_path_iterator.php
index d120c451fd..f93a240af2 100644
--- a/phpBB/phpbb/finder/recursive_path_iterator.php
+++ b/phpBB/phpbb/finder/recursive_path_iterator.php
@@ -13,7 +13,7 @@
 
 declare(strict_types=1);
 
-namespace phpbb\iterator;
+namespace phpbb\finder;
 
 class recursive_path_iterator extends \RecursiveIteratorIterator
 {