diff --git a/.gitignore b/.gitignore
index b26bc4d..9c2a389 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,12 @@
 test_config.json
 index.html
 tests/db_files/*
+build/api/*
+build/coverage/*
+build/logs/*
+build/pdepend/*
+build/phpdox/*
+cache.properties
 ._*
 tests/settings.json
 .php_cs
diff --git a/src/Query/QueryBuilder.php b/src/Query/QueryBuilder.php
index 967e805..892a189 100644
--- a/src/Query/QueryBuilder.php
+++ b/src/Query/QueryBuilder.php
@@ -64,10 +64,10 @@ class QueryBuilder extends AbstractQueryBuilder implements QueryBuilderInterface
 	/**
 	 * Constructor
 	 *
-	 * @param Driver_Interface $db
-	 * @param Query_Parser $parser
+	 * @param DriverInterface $db
+	 * @param QueryParser $parser
 	 */
-	public function __construct(Driver_Interface $db, Query_Parser $parser)
+	public function __construct(DriverInterface $db, QueryParser $parser)
 	{
 		// Inject driver and parser
 		$this->db = $db;
diff --git a/src/Query/QueryParser.php b/src/Query/QueryParser.php
index 5661d9d..89478e8 100644
--- a/src/Query/QueryParser.php
+++ b/src/Query/QueryParser.php
@@ -26,7 +26,7 @@ class QueryParser {
 	/**
 	 * DB Driver
 	 *
-	 * @var Driver_Interface
+	 * @var DriverInterface
 	 */
 	private $db;
 
@@ -56,9 +56,9 @@ class QueryParser {
 	/**
 	 * Constructor/entry point into parser
 	 *
-	 * @param Driver\Driver_Interface $db
+	 * @param Driver\DriverInterface $db
 	 */
-	public function __construct(Driver_Interface $db)
+	public function __construct(DriverInterface $db)
 	{
 		$this->db = $db;
 	}
diff --git a/tests/core/connection_manager_test.php b/tests/core/connection_manager_test.php
index ddd869b..c803ef1 100644
--- a/tests/core/connection_manager_test.php
+++ b/tests/core/connection_manager_test.php
@@ -6,7 +6,7 @@ class Connection_Manager_Test extends Query_TestCase {
 
 	public static function setUpBeforeClass()
 	{
-		self::$instance = Query\Connection_Manager::get_instance();
+		self::$instance = Query\ConnectionManager::get_instance();
 	}
 
 	// --------------------------------------------------------------------------
@@ -72,7 +72,7 @@ class Connection_Manager_Test extends Query_TestCase {
 		);
 
 		$conn = self::$instance->connect($params);
-		$this->assertInstanceOf('Query\\Query_Builder', $conn);
+		$this->assertInstanceOf('Query\\QueryBuilder', $conn);
 
 
 		// Check that the connection just made is returned from the get_connection method
@@ -94,7 +94,7 @@ class Connection_Manager_Test extends Query_TestCase {
 		);
 
 		$conn = self::$instance->connect($params);
-		$this->assertInstanceOf('Query\\Query_Builder', $conn);
+		$this->assertInstanceOf('Query\\QueryBuilder', $conn);
 
 		$this->assertEqual($conn, self::$instance->get_connection('conn_manager'));
 	}
diff --git a/tests/core/query_parser_test.php b/tests/core/query_parser_test.php
index 877bec0..d872789 100644
--- a/tests/core/query_parser_test.php
+++ b/tests/core/query_parser_test.php
@@ -21,7 +21,7 @@ class Query_Parser_Test extends Query_TestCase {
 	public function setUp()
 	{
 		$db = new Query\Drivers\Sqlite\Driver("sqlite::memory:");
-		$this->parser = new Query\Query_Parser($db);
+		$this->parser = new Query\QueryParser($db);
 	}
 
 	public function TestGeneric()