diff --git a/src/Sylius/Bundle/ResourceBundle/Manager/Doctrine/DoctrineResourceManager.php b/src/Sylius/Bundle/ResourceBundle/Manager/Doctrine/DoctrineResourceManager.php
index f0362605b8..350b49d68a 100644
--- a/src/Sylius/Bundle/ResourceBundle/Manager/Doctrine/DoctrineResourceManager.php
+++ b/src/Sylius/Bundle/ResourceBundle/Manager/Doctrine/DoctrineResourceManager.php
@@ -13,14 +13,14 @@ namespace Sylius\Bundle\ResourceBundle\Manager\Doctrine;
 
 use Doctrine\Common\Persistence\ObjectManager;
 use Sylius\Bundle\ResourceBundle\Manager\ResourceManager;
-use Sylius\Bundle\ResourceBundle\ResourceInterface;
+use Sylius\Bundle\ResourceBundle\Model\ResourceInterface;
 
 /**
  * Doctrine resource manager class.
  *
  * @author Paweł Jędrzejewski <pjedrzejewski@diweb.pl>
  */
-class DoctrineResourceManager extends ResourceManager implements DoctrineResourceManagerInterface
+abstract class DoctrineResourceManager extends ResourceManager implements DoctrineResourceManagerInterface
 {
     protected $objectManager;
     protected $objectRepository;
diff --git a/src/Sylius/Bundle/ResourceBundle/Manager/Doctrine/DoctrineResourceManagerInterface.php b/src/Sylius/Bundle/ResourceBundle/Manager/Doctrine/DoctrineResourceManagerInterface.php
index 0444eb8342..1397cd75ee 100644
--- a/src/Sylius/Bundle/ResourceBundle/Manager/Doctrine/DoctrineResourceManagerInterface.php
+++ b/src/Sylius/Bundle/ResourceBundle/Manager/Doctrine/DoctrineResourceManagerInterface.php
@@ -9,9 +9,9 @@
  * file that was distributed with this source code.
  */
 
-namespace Sylius\Component\Resource\Manager\Doctrine;
+namespace Sylius\Bundle\ResourceBundle\Manager\Doctrine;
 
-use Sylius\Component\Resource\Manager\ResourceManagerInterface;
+use Sylius\Bundle\ResourceBundle\Manager\ResourceManagerInterface;
 
 /**
  * Doctrine resource manager interface.
diff --git a/src/Sylius/Bundle/ResourceBundle/Manager/Doctrine/ORM/ResourceManager.php b/src/Sylius/Bundle/ResourceBundle/Manager/Doctrine/ORM/ResourceManager.php
index ee62ecaf38..dc745edd46 100644
--- a/src/Sylius/Bundle/ResourceBundle/Manager/Doctrine/ORM/ResourceManager.php
+++ b/src/Sylius/Bundle/ResourceBundle/Manager/Doctrine/ORM/ResourceManager.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Sylius\Component\Resource\Manager\Doctrine;
+namespace Sylius\Bundle\ResourceBundle\Manager\Doctrine\ORM;
 
 use Doctrine\ORM\EntityManager;
 use Pagerfanta\Adapter\DoctrineORMAdapter;
diff --git a/src/Sylius/Bundle/ResourceBundle/Manager/ResourceManagerInterface.php b/src/Sylius/Bundle/ResourceBundle/Manager/ResourceManagerInterface.php
index c31004b050..3661c85cc2 100644
--- a/src/Sylius/Bundle/ResourceBundle/Manager/ResourceManagerInterface.php
+++ b/src/Sylius/Bundle/ResourceBundle/Manager/ResourceManagerInterface.php
@@ -38,17 +38,17 @@ interface ResourceManagerInterface
      * Persist.
      *
      * @param ResourceInterface $resource
-     * @param Boolean           $flush
+     * @param Boolean           $commit
      */
-    function persist(ResourceInterface $resource, $flush =  true);
+    function persist(ResourceInterface $resource, $commit =  true);
 
     /**
      * Removes resource.
      *
      * @param ResourceInterface $resource
-     * @param Boolean           $flush
+     * @param Boolean           $commit
      */
-    function remove(ResourceInterface $resource, $flush = true);
+    function remove(ResourceInterface $resource, $commit = true);
 
     /**
      * Finds resource by id.
diff --git a/src/Sylius/Bundle/ResourceBundle/Model/ResourceInterface.php b/src/Sylius/Bundle/ResourceBundle/Model/ResourceInterface.php
index 01ebebcb31..3bb20e395e 100644
--- a/src/Sylius/Bundle/ResourceBundle/Model/ResourceInterface.php
+++ b/src/Sylius/Bundle/ResourceBundle/Model/ResourceInterface.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Sylius\Component\Resource;
+namespace Sylius\Bundle\ResourceBundle\Model;
 
 /**
  * Resource interface.