diff --git a/inc/Media/MediaFile.php b/inc/File/MediaFile.php
similarity index 99%
rename from inc/Media/MediaFile.php
rename to inc/File/MediaFile.php
index bebacc8d4..4c27cc65c 100644
--- a/inc/Media/MediaFile.php
+++ b/inc/File/MediaFile.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace dokuwiki\Media;
+namespace dokuwiki\File;
 
 use dokuwiki\Utf8\PhpString;
 
diff --git a/inc/Ui/Media/Display.php b/inc/Ui/Media/Display.php
index fd46fa6b2..16f2137b1 100644
--- a/inc/Ui/Media/Display.php
+++ b/inc/Ui/Media/Display.php
@@ -2,7 +2,7 @@
 
 namespace dokuwiki\Ui\Media;
 
-use dokuwiki\Media\MediaFile;
+use dokuwiki\File\MediaFile;
 
 class Display
 {
diff --git a/inc/Ui/Media/DisplayTile.php b/inc/Ui/Media/DisplayTile.php
index f20ed1407..aff294b9b 100644
--- a/inc/Ui/Media/DisplayTile.php
+++ b/inc/Ui/Media/DisplayTile.php
@@ -2,7 +2,7 @@
 
 namespace dokuwiki\Ui\Media;
 
-use dokuwiki\Media\MediaFile;
+use dokuwiki\File\MediaFile;
 
 /**
  * Display a MediaFile in the FullScreen MediaManager
diff --git a/inc/search.php b/inc/search.php
index 47892d01c..7a797c2d5 100644
--- a/inc/search.php
+++ b/inc/search.php
@@ -279,7 +279,7 @@ function search_mediafiles(&$data,$base,$file,$type,$lvl,$opts){
         return false;
     }
 
-    $data[] = new \dokuwiki\Media\MediaFile($id);
+    $data[] = new \dokuwiki\File\MediaFile($id);
     return false;
 }