diff --git a/src/Composer/Package/MemoryPackage.php b/src/Composer/Package/MemoryPackage.php
index 8e7cd0329..b62b42cfe 100644
--- a/src/Composer/Package/MemoryPackage.php
+++ b/src/Composer/Package/MemoryPackage.php
@@ -20,8 +20,8 @@ namespace Composer\Package;
 class MemoryPackage extends BasePackage
 {
     protected $type;
-    protected $repositoryType;
-    protected $repositoryUrl;
+    protected $sourceType;
+    protected $sourceUrl;
     protected $releaseType;
     protected $version;
     protected $license;
@@ -67,33 +67,33 @@ class MemoryPackage extends BasePackage
     /**
      * @param string $type
      */
-    public function setRepositoryType($type)
+    public function setSourceType($type)
     {
-        $this->repositoryType = $type;
+        $this->sourceType = $type;
     }
 
     /**
      * {@inheritDoc}
      */
-    public function getRepositoryType()
+    public function getSourceType()
     {
-        return $this->repositoryType;
+        return $this->sourceType;
     }
 
     /**
      * @param string $url
      */
-    public function setRepositoryUrl($url)
+    public function setSourceUrl($url)
     {
-        $this->repositoryUrl = $url;
+        $this->sourceUrl = $url;
     }
 
     /**
      * {@inheritDoc}
      */
-    public function getRepositoryUrl()
+    public function getSourceUrl()
     {
-        return $this->repositoryUrl;
+        return $this->sourceUrl;
     }
 
     /**
diff --git a/src/Composer/DependencyResolver/ArrayRepository.php b/src/Composer/Repository/ArrayRepository.php
similarity index 96%
rename from src/Composer/DependencyResolver/ArrayRepository.php
rename to src/Composer/Repository/ArrayRepository.php
index 716fb27ed..f73b5bed7 100644
--- a/src/Composer/DependencyResolver/ArrayRepository.php
+++ b/src/Composer/Repository/ArrayRepository.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Composer\DependencyResolver;
+namespace Composer\Repository;
 
 use Composer\Package\PackageInterface;
 
diff --git a/src/Composer/DependencyResolver/RepositoryInterface.php b/src/Composer/Repository/RepositoryInterface.php
similarity index 91%
rename from src/Composer/DependencyResolver/RepositoryInterface.php
rename to src/Composer/Repository/RepositoryInterface.php
index 5a054a1a8..49e16690e 100644
--- a/src/Composer/DependencyResolver/RepositoryInterface.php
+++ b/src/Composer/Repository/RepositoryInterface.php
@@ -10,7 +10,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Composer\DependencyResolver;
+namespace Composer\Repository;
 
 /**
  * @author Nils Adermann <naderman@naderman.de>