diff --git a/doc/1_Installation.markdown b/doc/1_Installation.markdown
index 799404b..788cc4b 100644
--- a/doc/1_Installation.markdown
+++ b/doc/1_Installation.markdown
@@ -15,7 +15,7 @@ Create a `composer.json` file in your project root and use it to define your dep
 
     {
         "require": {
-            "nikic/php-parser": "1.0-dev"
+            "nikic/php-parser": "1.0.*@dev"
         }
     }
 
diff --git a/doc/2_Usage_of_basic_components.markdown b/doc/2_Usage_of_basic_components.markdown
index 6c728e7..54aa026 100644
--- a/doc/2_Usage_of_basic_components.markdown
+++ b/doc/2_Usage_of_basic_components.markdown
@@ -108,7 +108,7 @@ in the above example you would write `$stmts[0]->exprs`. If you wanted to access
 call, you would write `$stmts[0]->exprs[1]->name`.
 
 All nodes also define a `getType()` method that returns the node type. The type is the class name
-without the `PHPParser\Node\` prefix and `\` replaced with `_`. It also does not contain a trailing
+without the `PhpParser\Node\` prefix and `\` replaced with `_`. It also does not contain a trailing
 `_` for reserved-keyword class names.
 
 It is possible to associate custom metadata with a node using the `setAttribute()` method. This data
diff --git a/lib/PhpParser/BuilderAbstract.php b/lib/PhpParser/BuilderAbstract.php
index 9689776..abfa062 100644
--- a/lib/PhpParser/BuilderAbstract.php
+++ b/lib/PhpParser/BuilderAbstract.php
@@ -26,7 +26,7 @@ abstract class BuilderAbstract implements Builder {
     }
 
     /**
-     * Normalizes a name: Converts plain string names to PHPParser_Node_Name.
+     * Normalizes a name: Converts plain string names to PhpParser\Node\Name.
      *
      * @param Name|string $name The name to normalize
      *
diff --git a/lib/PhpParser/Lexer.php b/lib/PhpParser/Lexer.php
index ccfdc8c..68b3298 100644
--- a/lib/PhpParser/Lexer.php
+++ b/lib/PhpParser/Lexer.php
@@ -16,7 +16,7 @@ class Lexer
      * Creates a Lexer.
      */
     public function __construct() {
-        // map from internal tokens to PHPParser tokens
+        // map from internal tokens to PhpParser tokens
         $this->tokenMap = $this->createTokenMap();
 
         // map of tokens to drop while lexing (the map is only used for isset lookup,
diff --git a/test_old/run.php b/test_old/run.php
index 57d8040..9a78141 100644
--- a/test_old/run.php
+++ b/test_old/run.php
@@ -65,7 +65,7 @@ if ('Symfony' === $TEST_TYPE) {
     showHelp('Test type must be either "Symfony" or "PHP"!');
 }
 
-require_once dirname(__FILE__) . '/../lib/PHPParser/Autoloader.php';
+require_once dirname(__FILE__) . '/../lib/PhpParser/Autoloader.php';
 PhpParser\Autoloader::register();
 
 $parser        = new PhpParser\Parser(new PhpParser\Lexer\Emulative);