diff --git a/Controller/UploadController.php b/Controller/UploadController.php
index 6107062599733eea168d15dd669766a0982f2eba..18589565a2904abf74a22d93142a081d9d0a62f7 100644
--- a/Controller/UploadController.php
+++ b/Controller/UploadController.php
@@ -9,7 +9,7 @@ namespace Irstea\FileUploadBundle\Controller;
 
 use Irstea\FileUploadBundle\Entity\UploadedFile;
 use Irstea\FileUploadBundle\Http\UploadedFileResponse;
-use Irstea\FileUploadBundle\Service\FileManagerInterface;
+use Irstea\FileUploadBundle\Model\FileManagerInterface;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
 use Symfony\Bundle\FrameworkBundle\Controller\Controller;
diff --git a/Entity/Repository/UploadedFileRepository.php b/Entity/Repository/UploadedFileRepository.php
index a4e8db8e3f9e69224d8728b8e9a109b976a20a3c..9335ec404755d0460abb991b37f8b2434499f027 100644
--- a/Entity/Repository/UploadedFileRepository.php
+++ b/Entity/Repository/UploadedFileRepository.php
@@ -12,7 +12,7 @@ use Gaufrette\Filesystem;
 use Irstea\FileUploadBundle\Entity\UploadedFile;
 use Irstea\FileUploadBundle\Event\FileUploadCompleteEvent;
 use Irstea\FileUploadBundle\FileUploadEvents;
-use Irstea\FileUploadBundle\Service\FileManagerInterface;
+use Irstea\FileUploadBundle\Model\FileManagerInterface;
 use Psr\Log\LogLevel;
 use Symfony\Component\EventDispatcher\EventDispatcher;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
diff --git a/Form/DataTranformer/UploadedFileTransformer.php b/Form/DataTranformer/UploadedFileTransformer.php
index 845dd4cd41a8caedf32e678647e45eb8245233cf..c97958c077c99b7b81ac72196bb86cc649062dca 100644
--- a/Form/DataTranformer/UploadedFileTransformer.php
+++ b/Form/DataTranformer/UploadedFileTransformer.php
@@ -8,7 +8,7 @@
 namespace Irstea\FileUploadBundle\Form\DataTranformer;
 
 use Irstea\FileUploadBundle\Entity\UploadedFile;
-use Irstea\FileUploadBundle\Service\FileManagerInterface;
+use Irstea\FileUploadBundle\Model\FileManagerInterface;
 use Symfony\Component\Form\DataTransformerInterface;
 use Symfony\Component\Form\Exception\TransformationFailedException;
 
diff --git a/Form/Type/FileUploadType.php b/Form/Type/FileUploadType.php
index e570f5ade87d4f36479db549418f0a5d6ed59ff1..82fd1ae4b7c36fa7c84292b3647aa4aee59253cf 100644
--- a/Form/Type/FileUploadType.php
+++ b/Form/Type/FileUploadType.php
@@ -9,7 +9,7 @@ namespace Irstea\FileUploadBundle\Form\Type;
 
 use Irstea\FileUploadBundle\Controller\UploadController;
 use Irstea\FileUploadBundle\Form\DataTranformer\UploadedFileTransformer;
-use Irstea\FileUploadBundle\Service\FileManagerInterface;
+use Irstea\FileUploadBundle\Model\FileManagerInterface;
 use Symfony\Bridge\Doctrine\Form\DataTransformer\CollectionToArrayTransformer;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\Extension\Core\EventListener\MergeCollectionListener;
diff --git a/Service/FileManagerInterface.php b/Model/FileManagerInterface.php
similarity index 55%
rename from Service/FileManagerInterface.php
rename to Model/FileManagerInterface.php
index b73817d63ca2ce0e8794dfa81e605c0162de9ab9..bba54a897d64aeec280f15d80c08a4921d2bfa6c 100644
--- a/Service/FileManagerInterface.php
+++ b/Model/FileManagerInterface.php
@@ -5,10 +5,7 @@
  * All rights reserved.
  */
 
-namespace Irstea\FileUploadBundle\Service;
-
-use Irstea\FileUploadBundle\Entity\UploadedFile;
-use Symfony\Component\HttpFoundation\Response;
+namespace Irstea\FileUploadBundle\Model;
 
 /**
  * Description of FileManager
@@ -18,7 +15,7 @@ interface FileManagerInterface
     /**
      *
      * @param string $id
-     * @return UploadedFile
+     * @return UploadedFileInterface
      */
     public function get($id);
 
@@ -27,17 +24,17 @@ interface FileManagerInterface
      * @param int $size
      * @param string $mimeType
      * @param int $lastModified
-     * @return UploadedFile
+     * @return UploadedFileInterface
      */
     public function create($name, $size, $mimeType, $lastModified);
 
     /**
-     * @param UploadedFile $file
+     * @param UploadedFileInterface $file
      */
-    public function delete(UploadedFile $file);
+    public function delete(UploadedFileInterface $file);
 
     /**
-     * @param UploadedFile $file
+     * @param UploadedFileInterface $file
      */
-    public function completed(UploadedFile $file);
+    public function completed(UploadedFileInterface $file);
 }