diff --git a/lib/db/renamedclasses.php b/lib/db/renamedclasses.php
index 537bcf8e84c..b12deba8919 100644
--- a/lib/db/renamedclasses.php
+++ b/lib/db/renamedclasses.php
@@ -37,4 +37,7 @@ defined('MOODLE_INTERNAL') || die();
 // The array must be called $renamedclasses.
 $renamedclasses = array(
     'core\progress\null' => 'core\progress\none',
+    'core_search\area\base' => 'core_search\base',
+    'core_search\area\base_mod' => 'core_search\base_mod',
+    'core_search\area\base_activity' => 'core_search\base_activity'
 );
diff --git a/search/classes/area/base.php b/search/classes/base.php
similarity index 99%
rename from search/classes/area/base.php
rename to search/classes/base.php
index 97cbc0d1d40..9b7180601c3 100644
--- a/search/classes/area/base.php
+++ b/search/classes/base.php
@@ -22,7 +22,7 @@
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-namespace core_search\area;
+namespace core_search;
 
 defined('MOODLE_INTERNAL') || die();
 
diff --git a/search/classes/area/base_activity.php b/search/classes/base_activity.php
similarity index 99%
rename from search/classes/area/base_activity.php
rename to search/classes/base_activity.php
index 0f1b3a5b5e1..b2fda829a01 100644
--- a/search/classes/area/base_activity.php
+++ b/search/classes/base_activity.php
@@ -22,7 +22,7 @@
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-namespace core_search\area;
+namespace core_search;
 
 defined('MOODLE_INTERNAL') || die();
 
diff --git a/search/classes/area/base_mod.php b/search/classes/base_mod.php
similarity index 99%
rename from search/classes/area/base_mod.php
rename to search/classes/base_mod.php
index 288cb1a728f..61eadad519f 100644
--- a/search/classes/area/base_mod.php
+++ b/search/classes/base_mod.php
@@ -22,7 +22,7 @@
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-namespace core_search\area;
+namespace core_search;
 
 defined('MOODLE_INTERNAL') || die();