diff --git a/src/Composer/Package/Version/VersionGuesser.php b/src/Composer/Package/Version/VersionGuesser.php
index 6cb3e678f..6b9b020d4 100644
--- a/src/Composer/Package/Version/VersionGuesser.php
+++ b/src/Composer/Package/Version/VersionGuesser.php
@@ -15,7 +15,7 @@ namespace Composer\Package\Version;
 use Composer\Config;
 use Composer\Repository\Vcs\HgDriver;
 use Composer\IO\NullIO;
-use Composer\Semver\VersionParser as BaseVersionParser;
+use Composer\Semver\VersionParser as SemverVersionParser;
 use Composer\Util\Git as GitUtil;
 use Composer\Util\ProcessExecutor;
 use Composer\Util\Svn as SvnUtil;
@@ -39,7 +39,7 @@ class VersionGuesser
     private $process;
 
     /**
-     * @var BaseVersionParser
+     * @var SemverVersionParser
      */
     private $versionParser;
 
@@ -48,7 +48,7 @@ class VersionGuesser
      * @param ProcessExecutor $process
      * @param VersionParser   $versionParser
      */
-    public function __construct(Config $config, ProcessExecutor $process, BaseVersionParser $versionParser)
+    public function __construct(Config $config, ProcessExecutor $process, SemverVersionParser $versionParser)
     {
         $this->config = $config;
         $this->process = $process;
diff --git a/src/Composer/Package/Version/VersionParser.php b/src/Composer/Package/Version/VersionParser.php
index 4c29599c8..00d1e669a 100644
--- a/src/Composer/Package/Version/VersionParser.php
+++ b/src/Composer/Package/Version/VersionParser.php
@@ -12,14 +12,19 @@
 
 namespace Composer\Package\Version;
 
-use Composer\Semver\VersionParser as BaseVersionParser;
+use Composer\Semver\VersionParser as SemverVersionParser;
 
-class VersionParser extends BaseVersionParser
+class VersionParser extends SemverVersionParser
 {
     /**
-     * @param array $pairs
+     * Parses an array of strings representing package/version pairs.
      *
-     * @return array[]
+     * The parsing results in an array of arrays, each of which
+     * contain a 'name' key with value and optionally a 'version' key with value.
+     *
+     * @param array $pairs a set of package/version pairs separated by ":", "=" or " "
+     *
+     * @return array[] array of arrays containing a name and (if provided) a version
      */
     public function parseNameVersionPairs(array $pairs)
     {
diff --git a/src/Composer/Package/Version/VersionSelector.php b/src/Composer/Package/Version/VersionSelector.php
index 3874f2118..a22cf2c70 100644
--- a/src/Composer/Package/Version/VersionSelector.php
+++ b/src/Composer/Package/Version/VersionSelector.php
@@ -16,7 +16,7 @@ use Composer\DependencyResolver\Pool;
 use Composer\Package\PackageInterface;
 use Composer\Package\Loader\ArrayLoader;
 use Composer\Package\Dumper\ArrayDumper;
-use Composer\Semver\VersionParser as BaseVersionParser;
+use Composer\Semver\VersionParser as SemverVersionParser;
 
 /**
  * Selects the best possible version for a package
@@ -131,7 +131,7 @@ class VersionSelector
     private function getParser()
     {
         if ($this->parser === null) {
-            $this->parser = new BaseVersionParser();
+            $this->parser = new SemverVersionParser();
         }
 
         return $this->parser;