diff --git a/src/Query/AbstractDriver.php b/src/Query/AbstractDriver.php
index 2d2fd0e..6d13372 100644
--- a/src/Query/AbstractDriver.php
+++ b/src/Query/AbstractDriver.php
@@ -6,7 +6,7 @@
  *
  * @package		Query
  * @author		Timothy J. Warren
- * @copyright	Copyright (c) 2012 - 2014
+ * @copyright	Copyright (c) 2012 - 2015
  * @link 		https://github.com/aviat4ion/Query
  * @license		http://philsturgeon.co.uk/code/dbad-license
  */
@@ -41,13 +41,13 @@ abstract class AbstractDriver extends \PDO implements DriverInterface {
 
 	/**
 	 * Reference to sql class
-	 * @var SQL_Interface
+	 * @var SQLInterface
 	 */
 	protected $sql;
 
 	/**
 	 * Reference to util class
-	 * @var Abstract_Util
+	 * @var AbstractUtil
 	 */
 	protected $util;
 
diff --git a/src/Query/AbstractQueryBuilder.php b/src/Query/AbstractQueryBuilder.php
index d739ebf..ddc1abf 100644
--- a/src/Query/AbstractQueryBuilder.php
+++ b/src/Query/AbstractQueryBuilder.php
@@ -6,7 +6,7 @@
  *
  * @package		Query
  * @author		Timothy J. Warren
- * @copyright	Copyright (c) 2012 - 2014
+ * @copyright	Copyright (c) 2012 - 2015
  * @link 		https://github.com/aviat4ion/Query
  * @license		http://philsturgeon.co.uk/code/dbad-license
  */
@@ -163,19 +163,19 @@ abstract class AbstractQueryBuilder {
 
 	/**
 	 * Query parser class instance
-	 * @var Query_Parser
+	 * @var QueryParser
 	 */
 	public $parser;
 
 	/**
 	 * Alias to driver util class
-	 * @var \Query\Driver\Abstract_Util
+	 * @var \Query\Driver\AbstractUtil
 	 */
 	public $util;
 
 	/**
 	 * Alias to driver sql class
-	 * @var \Query\Driver\SQL_Interface
+	 * @var \Query\Driver\SQLInterface
 	 */
 	public $sql;
 
@@ -376,7 +376,7 @@ abstract class AbstractQueryBuilder {
 			$last_item = end($this->query_map);
 
 			// Determine the correct conjunction
-			$conjunctionList = array_pluck($this->query_map, 'conjunction');
+			$conjunctionList = array_column($this->query_map, 'conjunction');
 			if (empty($this->query_map) || ( ! regex_in_array($conjunctionList, "/^ ?\n?WHERE/i")))
 			{
 				$conj = "\nWHERE ";
diff --git a/src/Query/AbstractSQL.php b/src/Query/AbstractSQL.php
index 40ade68..cc3942c 100644
--- a/src/Query/AbstractSQL.php
+++ b/src/Query/AbstractSQL.php
@@ -5,7 +5,7 @@
  * Free Query Builder / Database Abstraction Layer
  *
  * @author		Timothy J. Warren
- * @copyright	Copyright (c) 2012 - 2014
+ * @copyright	Copyright (c) 2012 - 2015
  * @link 		https://github.com/aviat4ion/Query
  * @license		http://philsturgeon.co.uk/code/dbad-license
  * @package		Query
diff --git a/src/Query/AbstractUtil.php b/src/Query/AbstractUtil.php
index afa7396..5d07911 100644
--- a/src/Query/AbstractUtil.php
+++ b/src/Query/AbstractUtil.php
@@ -6,7 +6,7 @@
  *
  * @package		Query
  * @author		Timothy J. Warren
- * @copyright	Copyright (c) 2012 - 2014
+ * @copyright	Copyright (c) 2012 - 2015
  * @link 		https://github.com/aviat4ion/Query
  * @license		http://philsturgeon.co.uk/code/dbad-license
  */
@@ -35,7 +35,7 @@ abstract class AbstractUtil {
 	/**
 	 * Save a reference to the connection object for later use
 	 *
-	 * @param Driver_Interface $conn
+	 * @param DriverInterface $conn
 	 */
 	public function __construct(DriverInterface $conn)
 	{
diff --git a/src/Query/BadDBDriverException.php b/src/Query/BadDBDriverException.php
index 4deac5b..5355787 100644
--- a/src/Query/BadDBDriverException.php
+++ b/src/Query/BadDBDriverException.php
@@ -6,7 +6,7 @@
  *
  * @package		Query
  * @author		Timothy J. Warren
- * @copyright	Copyright (c) 2012 - 2014
+ * @copyright	Copyright (c) 2012 - 2015
  * @link 		https://github.com/aviat4ion/Query
  * @license		http://philsturgeon.co.uk/code/dbad-license
  */
diff --git a/src/Query/ConnectionManager.php b/src/Query/ConnectionManager.php
index 28dca31..3117a2c 100644
--- a/src/Query/ConnectionManager.php
+++ b/src/Query/ConnectionManager.php
@@ -6,7 +6,7 @@
  *
  * @package		Query
  * @author		Timothy J. Warren
- * @copyright	Copyright (c) 2012 - 2014
+ * @copyright	Copyright (c) 2012 - 2015
  * @link 		https://github.com/aviat4ion/Query
  * @license		http://philsturgeon.co.uk/code/dbad-license
  */
@@ -83,7 +83,7 @@ final class ConnectionManager {
 	 * Return  a connection manager instance
 	 *
 	 * @staticvar null $instance
-	 * @return Connection_Manager
+	 * @return ConnectionManager
 	 */
 	public static function get_instance()
 	{
@@ -98,7 +98,7 @@ final class ConnectionManager {
 	 * Returns the connection specified by the name given
 	 *
 	 * @param string|array|object $name
-	 * @return Query_Builder
+	 * @return QueryBuilder
 	 * @throws \InvalidArgumentException
 	 */
 	public function get_connection($name = '')
diff --git a/src/Query/DriverInterface.php b/src/Query/DriverInterface.php
index 02c8dd9..c9ed803 100644
--- a/src/Query/DriverInterface.php
+++ b/src/Query/DriverInterface.php
@@ -6,7 +6,7 @@
  *
  * @package		Query
  * @author		Timothy J. Warren
- * @copyright	Copyright (c) 2012 - 2014
+ * @copyright	Copyright (c) 2012 - 2015
  * @link 		https://github.com/aviat4ion/Query
  * @license		http://philsturgeon.co.uk/code/dbad-license
  */
@@ -270,4 +270,4 @@ interface DriverInterface {
 	 */
 	public function insert_batch($table, $data=array());
 }
-// End of driver_interface.php
+// End of driver_interface.php
\ No newline at end of file
diff --git a/src/Query/Drivers/Firebird/Driver.php b/src/Query/Drivers/Firebird/Driver.php
index 5ffa36e..b7beb6b 100644
--- a/src/Query/Drivers/Firebird/Driver.php
+++ b/src/Query/Drivers/Firebird/Driver.php
@@ -6,7 +6,7 @@
  *
  * @package		Query
  * @author		Timothy J. Warren
- * @copyright	Copyright (c) 2012 - 2014
+ * @copyright	Copyright (c) 2012 - 2015
  * @link 		https://github.com/aviat4ion/Query
  * @license		http://philsturgeon.co.uk/code/dbad-license
  */
diff --git a/src/Query/Drivers/Firebird/Result.php b/src/Query/Drivers/Firebird/Result.php
index 1bc4d36..a3d71b1 100644
--- a/src/Query/Drivers/Firebird/Result.php
+++ b/src/Query/Drivers/Firebird/Result.php
@@ -6,7 +6,7 @@
  *
  * @package		Query
  * @author		Timothy J. Warren
- * @copyright	Copyright (c) 2012 - 2014
+ * @copyright	Copyright (c) 2012 - 2015
  * @link 		https://github.com/aviat4ion/Query
  * @license		http://philsturgeon.co.uk/code/dbad-license
  */
@@ -48,7 +48,7 @@ class Result extends \PDOStatement {
 	/**
 	 * Reference to the db drive to de-duplicate error functions
 	 *
-	 * @var \Query\Drivers\Firebird\Driver
+	 * @var Driver
 	 */
 	private $db;
 
diff --git a/src/Query/Drivers/Firebird/SQL.php b/src/Query/Drivers/Firebird/SQL.php
index c2cd78e..a94a0cb 100644
--- a/src/Query/Drivers/Firebird/SQL.php
+++ b/src/Query/Drivers/Firebird/SQL.php
@@ -6,7 +6,7 @@
  *
  * @package		Query
  * @author		Timothy J. Warren
- * @copyright	Copyright (c) 2012 - 2014
+ * @copyright	Copyright (c) 2012 - 2015
  * @link 		https://github.com/aviat4ion/Query
  * @license		http://philsturgeon.co.uk/code/dbad-license
  */
diff --git a/src/Query/Drivers/Firebird/Util.php b/src/Query/Drivers/Firebird/Util.php
index 89549c3..86c7856 100644
--- a/src/Query/Drivers/Firebird/Util.php
+++ b/src/Query/Drivers/Firebird/Util.php
@@ -6,7 +6,7 @@
  *
  * @package		Query
  * @author		Timothy J. Warren
- * @copyright	Copyright (c) 2012 - 2014
+ * @copyright	Copyright (c) 2012 - 2015
  * @link 		https://github.com/aviat4ion/Query
  * @license		http://philsturgeon.co.uk/code/dbad-license
  */
diff --git a/src/Query/Drivers/Mysql/Driver.php b/src/Query/Drivers/Mysql/Driver.php
index df24c84..c63a7e0 100644
--- a/src/Query/Drivers/Mysql/Driver.php
+++ b/src/Query/Drivers/Mysql/Driver.php
@@ -6,7 +6,7 @@
  *
  * @package		Query
  * @author		Timothy J. Warren
- * @copyright	Copyright (c) 2012 - 2014
+ * @copyright	Copyright (c) 2012 - 2015
  * @link 		https://github.com/aviat4ion/Query
  * @license		http://philsturgeon.co.uk/code/dbad-license
  */
diff --git a/src/Query/Drivers/Mysql/SQL.php b/src/Query/Drivers/Mysql/SQL.php
index 1cc7e1a..6df4552 100644
--- a/src/Query/Drivers/Mysql/SQL.php
+++ b/src/Query/Drivers/Mysql/SQL.php
@@ -6,7 +6,7 @@
  *
  * @package		Query
  * @author		Timothy J. Warren
- * @copyright	Copyright (c) 2012 - 2014
+ * @copyright	Copyright (c) 2012 - 2015
  * @link 		https://github.com/aviat4ion/Query
  * @license		http://philsturgeon.co.uk/code/dbad-license
  */
diff --git a/src/Query/Drivers/Mysql/Util.php b/src/Query/Drivers/Mysql/Util.php
index 06eb089..6c0f662 100644
--- a/src/Query/Drivers/Mysql/Util.php
+++ b/src/Query/Drivers/Mysql/Util.php
@@ -6,7 +6,7 @@
  *
  * @package		Query
  * @author		Timothy J. Warren
- * @copyright	Copyright (c) 2012 - 2014
+ * @copyright	Copyright (c) 2012 - 2015
  * @link 		https://github.com/aviat4ion/Query
  * @license		http://philsturgeon.co.uk/code/dbad-license
  */
@@ -118,4 +118,4 @@ class Util extends \Query\AbstractUtil {
 		return $output_sql;
 	}
 }
-// End of mysql_util.php
+// End of mysql_util.php
\ No newline at end of file
diff --git a/src/Query/Drivers/Pgsql/Driver.php b/src/Query/Drivers/Pgsql/Driver.php
index 16b944e..13bdb8a 100644
--- a/src/Query/Drivers/Pgsql/Driver.php
+++ b/src/Query/Drivers/Pgsql/Driver.php
@@ -6,7 +6,7 @@
  *
  * @package		Query
  * @author		Timothy J. Warren
- * @copyright	Copyright (c) 2012 - 2014
+ * @copyright	Copyright (c) 2012 - 2015
  * @link 		https://github.com/aviat4ion/Query
  * @license		http://philsturgeon.co.uk/code/dbad-license
  */
diff --git a/src/Query/Drivers/Pgsql/SQL.php b/src/Query/Drivers/Pgsql/SQL.php
index 57325c4..bd89c1a 100644
--- a/src/Query/Drivers/Pgsql/SQL.php
+++ b/src/Query/Drivers/Pgsql/SQL.php
@@ -5,7 +5,7 @@
  * Free Query Builder / Database Abstraction Layer
  *
  * @author 		Timothy J. Warren
- * @copyright	Copyright (c) 2012 - 2014
+ * @copyright	Copyright (c) 2012 - 2015
  * @link 		https://github.com/aviat4ion/Query
  * @license 	http://philsturgeon.co.uk/code/dbad-license
  */
diff --git a/src/Query/Drivers/Pgsql/Util.php b/src/Query/Drivers/Pgsql/Util.php
index 62f428d..c527b24 100644
--- a/src/Query/Drivers/Pgsql/Util.php
+++ b/src/Query/Drivers/Pgsql/Util.php
@@ -6,7 +6,7 @@
  *
  * @package		Query
  * @author		Timothy J. Warren
- * @copyright	Copyright (c) 2012 - 2014
+ * @copyright	Copyright (c) 2012 - 2015
  * @link 		https://github.com/aviat4ion/Query
  * @license		http://philsturgeon.co.uk/code/dbad-license
  */
@@ -96,4 +96,4 @@ class Util extends \Query\AbstractUtil {
 		return $output_sql;
 	}
 }
-// End of pgsql_util.php
+// End of pgsql_util.php
\ No newline at end of file
diff --git a/src/Query/Drivers/Sqlite/Driver.php b/src/Query/Drivers/Sqlite/Driver.php
index 7871407..87ba535 100644
--- a/src/Query/Drivers/Sqlite/Driver.php
+++ b/src/Query/Drivers/Sqlite/Driver.php
@@ -6,7 +6,7 @@
  *
  * @package		Query
  * @author		Timothy J. Warren
- * @copyright	Copyright (c) 2012 - 2014
+ * @copyright	Copyright (c) 2012 - 2015
  * @link 		https://github.com/aviat4ion/Query
  * @license		http://philsturgeon.co.uk/code/dbad-license
  */
diff --git a/src/Query/Drivers/Sqlite/SQL.php b/src/Query/Drivers/Sqlite/SQL.php
index c2abd49..ee1dd9d 100644
--- a/src/Query/Drivers/Sqlite/SQL.php
+++ b/src/Query/Drivers/Sqlite/SQL.php
@@ -6,7 +6,7 @@
  *
  * @package		Query
  * @author		Timothy J. Warren
- * @copyright	Copyright (c) 2012 - 2014
+ * @copyright	Copyright (c) 2012 - 2015
  * @link 		https://github.com/aviat4ion/Query
  * @license		http://philsturgeon.co.uk/code/dbad-license
  */
diff --git a/src/Query/Drivers/Sqlite/Util.php b/src/Query/Drivers/Sqlite/Util.php
index a8e3994..0c2f23a 100644
--- a/src/Query/Drivers/Sqlite/Util.php
+++ b/src/Query/Drivers/Sqlite/Util.php
@@ -6,7 +6,7 @@
  *
  * @package		Query
  * @author		Timothy J. Warren
- * @copyright	Copyright (c) 2012 - 2014
+ * @copyright	Copyright (c) 2012 - 2015
  * @link 		https://github.com/aviat4ion/Query
  * @license		http://philsturgeon.co.uk/code/dbad-license
  */
diff --git a/src/Query/QueryBuilder.php b/src/Query/QueryBuilder.php
index 88d9a23..c4bdd23 100644
--- a/src/Query/QueryBuilder.php
+++ b/src/Query/QueryBuilder.php
@@ -6,7 +6,7 @@
  *
  * @package		Query
  * @author		Timothy J. Warren
- * @copyright	Copyright (c) 2012 - 2014
+ * @copyright	Copyright (c) 2012 - 2015
  * @link 		https://github.com/aviat4ion/Query
  * @license		http://philsturgeon.co.uk/code/dbad-license
  */
diff --git a/src/Query/QueryBuilderInterface.php b/src/Query/QueryBuilderInterface.php
index cb45e8b..ab0d58c 100644
--- a/src/Query/QueryBuilderInterface.php
+++ b/src/Query/QueryBuilderInterface.php
@@ -6,7 +6,7 @@
  *
  * @package		Query
  * @author		Timothy J. Warren
- * @copyright	Copyright (c) 2012 - 2014
+ * @copyright	Copyright (c) 2012 - 2015
  * @link 		https://github.com/aviat4ion/Query
  * @license		http://philsturgeon.co.uk/code/dbad-license
  */
@@ -19,7 +19,7 @@ namespace Query;
  * Interface defining the Query Builder class
  *
  * @package Query
- * @subpackage Query_Builder
+ * @subpackage QueryBuilder
  */
 interface QueryBuilderInterface {
 
@@ -31,7 +31,7 @@ interface QueryBuilderInterface {
 	 * Specifies rows to select in a query
 	 *
 	 * @param string $fields
-	 * @return Query_Builder
+	 * @return QueryBuilder
 	 */
 	public function select($fields);
 
@@ -42,7 +42,7 @@ interface QueryBuilderInterface {
 	 *
 	 * @param string $field
 	 * @param string|bool $as
-	 * @return Query_Builder
+	 * @return QueryBuilder
 	 */
 	public function select_max($field, $as=FALSE);
 
@@ -53,7 +53,7 @@ interface QueryBuilderInterface {
 	 *
 	 * @param string $field
 	 * @param string|bool $as
-	 * @return Query_Builder
+	 * @return QueryBuilder
 	 */
 	public function select_min($field, $as=FALSE);
 
@@ -64,7 +64,7 @@ interface QueryBuilderInterface {
 	 *
 	 * @param string $field
 	 * @param string|bool $as
-	 * @return Query_Builder
+	 * @return QueryBuilder
 	 */
 	public function select_avg($field, $as=FALSE);
 
@@ -75,7 +75,7 @@ interface QueryBuilderInterface {
 	 *
 	 * @param string $field
 	 * @param string|bool $as
-	 * @return Query_Builder
+	 * @return QueryBuilder
 	 */
 	public function select_sum($field, $as=FALSE);
 
@@ -84,7 +84,7 @@ interface QueryBuilderInterface {
 	/**
 	 * Adds the 'distinct' keyword to a query
 	 *
-	 * @return Query_Builder
+	 * @return QueryBuilder
 	 */
 	public function distinct();
 
@@ -93,7 +93,7 @@ interface QueryBuilderInterface {
 	/**
 	 * Shows the query plan for the query
 	 *
-	 * @return Query_Builder
+	 * @return QueryBuilder
 	 */
 	public function explain();
 
@@ -103,7 +103,7 @@ interface QueryBuilderInterface {
 	 * Specify the database table to select from
 	 *
 	 * @param string $tblname
-	 * @return Query_Builder
+	 * @return QueryBuilder
 	 */
 	public function from($tblname);
 
@@ -117,7 +117,7 @@ interface QueryBuilderInterface {
 	 * @param string $field
 	 * @param mixed $val
 	 * @param string $pos
-	 * @return Query_Builder
+	 * @return QueryBuilder
 	 */
 	public function like($field, $val, $pos='both');
 
@@ -129,7 +129,7 @@ interface QueryBuilderInterface {
 	 * @param string $field
 	 * @param mixed $val
 	 * @param string $pos
-	 * @return Query_Builder
+	 * @return QueryBuilder
 	 */
 	public function or_like($field, $val, $pos='both');
 
@@ -141,7 +141,7 @@ interface QueryBuilderInterface {
 	 * @param string $field
 	 * @param mixed $val
 	 * @param string $pos
-	 * @return Query_Builder
+	 * @return QueryBuilder
 	 */
 	public function not_like($field, $val, $pos='both');
 
@@ -153,7 +153,7 @@ interface QueryBuilderInterface {
 	 * @param string $field
 	 * @param mixed $val
 	 * @param string $pos
-	 * @return Query_Builder
+	 * @return QueryBuilder
 	 */
 	public function or_not_like($field, $val, $pos='both');
 
@@ -166,7 +166,7 @@ interface QueryBuilderInterface {
 	 *
 	 * @param mixed $key
 	 * @param mixed $val
-	 * @return Query_Builder
+	 * @return QueryBuilder
 	 */
 	public function having($key, $val=array());
 
@@ -177,7 +177,7 @@ interface QueryBuilderInterface {
 	 *
 	 * @param mixed $key
 	 * @param mixed $val
-	 * @return Query_Builder
+	 * @return QueryBuilder
 	 */
 	public function or_having($key, $val=array());
 
@@ -193,7 +193,7 @@ interface QueryBuilderInterface {
 	 * @param mixed $key
 	 * @param mixed $val
 	 * @param bool $escape
-	 * @return Query_Builder
+	 * @return QueryBuilder
 	 */
 	public function where($key, $val=array(), $escape = NULL);
 
@@ -204,7 +204,7 @@ interface QueryBuilderInterface {
 	 *
 	 * @param string $key
 	 * @param mixed $val
-	 * @return Query_Builder
+	 * @return QueryBuilder
 	 */
 	public function or_where($key, $val=array());
 
@@ -215,7 +215,7 @@ interface QueryBuilderInterface {
 	 *
 	 * @param mixed $field
 	 * @param mixed $val
-	 * @return Query_Builder
+	 * @return QueryBuilder
 	 */
 	public function where_in($field, $val=array());
 
@@ -226,7 +226,7 @@ interface QueryBuilderInterface {
 	 *
 	 * @param string $field
 	 * @param mixed $val
-	 * @return Query_Builder
+	 * @return QueryBuilder
 	 */
 	public function or_where_in($field, $val=array());
 
@@ -237,7 +237,7 @@ interface QueryBuilderInterface {
 	 *
 	 * @param string $field
 	 * @param mixed $val
-	 * @return Query_Builder
+	 * @return QueryBuilder
 	 */
 	public function where_not_in($field, $val=array());
 
@@ -248,7 +248,7 @@ interface QueryBuilderInterface {
 	 *
 	 * @param string $field
 	 * @param mixed $val
-	 * @return Query_Builder
+	 * @return QueryBuilder
 	 */
 	public function or_where_not_in($field, $val=array());
 
@@ -261,7 +261,7 @@ interface QueryBuilderInterface {
 	 *
 	 * @param mixed $key
 	 * @param mixed $val
-	 * @return Query_Builder
+	 * @return QueryBuilder
 	 */
 	public function set($key, $val = NULL);
 
@@ -273,7 +273,7 @@ interface QueryBuilderInterface {
 	 * @param string $table
 	 * @param string $condition
 	 * @param string $type
-	 * @return Query_Builder
+	 * @return QueryBuilder
 	 */
 	public function join($table, $condition, $type='');
 
@@ -283,7 +283,7 @@ interface QueryBuilderInterface {
 	 * Group the results by the selected field(s)
 	 *
 	 * @param mixed $field
-	 * @return Query_Builder
+	 * @return QueryBuilder
 	 */
 	public function group_by($field);
 
@@ -294,7 +294,7 @@ interface QueryBuilderInterface {
 	 *
 	 * @param string $field
 	 * @param string $type
-	 * @return Query_Builder
+	 * @return QueryBuilder
 	 */
 	public function order_by($field, $type="");
 
@@ -305,7 +305,7 @@ interface QueryBuilderInterface {
 	 *
 	 * @param int $limit
 	 * @param int|bool $offset
-	 * @return Query_Builder
+	 * @return QueryBuilder
 	 */
 	public function limit($limit, $offset=FALSE);
 
@@ -316,7 +316,7 @@ interface QueryBuilderInterface {
 	/**
 	 * Adds a paren to the current query for query grouping
 	 *
-	 * @return Query_Builder
+	 * @return QueryBuilder
 	 */
 	public function group_start();
 
@@ -326,7 +326,7 @@ interface QueryBuilderInterface {
 	 * Adds a paren to the current query for query grouping,
 	 * prefixed with 'OR'
 	 *
-	 * @return Query_Builder
+	 * @return QueryBuilder
 	 */
 	public function or_group_start();
 
@@ -336,7 +336,7 @@ interface QueryBuilderInterface {
 	 * Adds a paren to the current query for query grouping,
 	 * prefixed with 'OR NOT'
 	 *
-	 * @return Query_Builder
+	 * @return QueryBuilder
 	 */
 	public function or_not_group_start();
 
@@ -345,7 +345,7 @@ interface QueryBuilderInterface {
 	/**
 	 * Ends a query group
 	 *
-	 * @return Query_Builder
+	 * @return QueryBuilder
 	 */
 	public function group_end();
 
@@ -500,4 +500,4 @@ interface QueryBuilderInterface {
 	public function reset_query();
 }
 
-// End of query_builder_interface.php
+// End of QueryBuilder_interface.php
diff --git a/src/Query/QueryParser.php b/src/Query/QueryParser.php
index 8f0c072..bcc3c58 100644
--- a/src/Query/QueryParser.php
+++ b/src/Query/QueryParser.php
@@ -6,7 +6,7 @@
  *
  * @package		Query
  * @author		Timothy J. Warren
- * @copyright	Copyright (c) 2012 - 2014
+ * @copyright	Copyright (c) 2012 - 2015
  * @link 		https://github.com/aviat4ion/Query
  * @license		http://philsturgeon.co.uk/code/dbad-license
  */
diff --git a/src/Query/SQLInterface.php b/src/Query/SQLInterface.php
index 5f17fc3..f6b5b04 100644
--- a/src/Query/SQLInterface.php
+++ b/src/Query/SQLInterface.php
@@ -5,7 +5,7 @@
  * Free Query Builder / Database Abstraction Layer
  *
  * @author		Timothy J. Warren
- * @copyright	Copyright (c) 2012 - 2014
+ * @copyright	Copyright (c) 2012 - 2015
  * @link 		https://github.com/aviat4ion/Query
  * @license		http://philsturgeon.co.uk/code/dbad-license
  * @package		Query
diff --git a/src/common.php b/src/common.php
index 0870112..8d16d05 100644
--- a/src/common.php
+++ b/src/common.php
@@ -7,7 +7,7 @@
  * @package		Query
  * @subpackage	Core
  * @author		Timothy J. Warren
- * @copyright	Copyright (c) 2012 - 2014
+ * @copyright	Copyright (c) 2012 - 2015
  * @link 		https://github.com/aviat4ion/Query
  * @license		http://philsturgeon.co.uk/code/dbad-license
  */
@@ -132,7 +132,7 @@ if ( ! function_exists('array_zipper'))
 
 // --------------------------------------------------------------------------
 
-if ( ! function_exists('array_pluck'))
+if ( ! function_exists('array_column'))
 {
 	/**
 	 * Get an array out of an multi-dimensional array based on a common
@@ -142,7 +142,7 @@ if ( ! function_exists('array_pluck'))
 	 * @param string $key
 	 * @return array
 	 */
-	function array_pluck(Array $array, $key)
+	function array_column(Array $array, $key)
 	{
 		$output = array();