diff --git a/h5p-default-storage.class.php b/h5p-default-storage.class.php
index d445122..945aaac 100644
--- a/h5p-default-storage.class.php
+++ b/h5p-default-storage.class.php
@@ -4,8 +4,6 @@
  * File info?
  */
 
-namespace H5P;
-
 /**
  * The default file storage class for H5P. Will carry out the requested file
  * operations using PHP's standard file operation functions.
@@ -17,7 +15,7 @@ namespace H5P;
  * @copyright  2016 Joubel AS
  * @license    MIT
  */
-class DefaultStorage implements \H5P\FileStorage {
+class DefaultStorage implements \H5PFileStorage {
   private $path;
 
   /**
diff --git a/h5p-file-storage.interface.php b/h5p-file-storage.interface.php
index b0d4b4b..dfaa67a 100644
--- a/h5p-file-storage.interface.php
+++ b/h5p-file-storage.interface.php
@@ -4,12 +4,10 @@
  * File info?
  */
 
-namespace H5P;
-
 /**
  * Interface needed to handle storage and export of H5P Content.
  */
-interface FileStorage {
+interface H5PFileStorage {
 
   /**
    * Store the library folder.
diff --git a/h5p.classes.php b/h5p.classes.php
index d74e0b8..9466e3c 100644
--- a/h5p.classes.php
+++ b/h5p.classes.php
@@ -1694,7 +1694,7 @@ class H5PCore {
    *
    * @param object $H5PFramework
    *  The frameworks implementation of the H5PFrameworkInterface
-   * @param string|\H5P\FileStorage $path H5P file storage directory or class.
+   * @param string|\H5PFileStorage $path H5P file storage directory or class.
    * @param string $url To file storage directory.
    * @param string $language code. Defaults to english.
    * @param boolean $export enabled?
@@ -1703,7 +1703,7 @@ class H5PCore {
   public function __construct($H5PFramework, $path, $url, $language = 'en', $export = FALSE, $development_mode = H5PDevelopment::MODE_NONE) {
     $this->h5pF = $H5PFramework;
 
-    $this->fs = ($path instanceof \H5P\FileStorage ? $path : new \H5P\DefaultStorage($path));
+    $this->fs = ($path instanceof \H5PFileStorage ? $path : new \H5PDefaultStorage($path));
 
     $this->url = $url;
     $this->exportEnabled = $export;