diff --git a/phpBB/includes/tree/interface.php b/phpBB/includes/tree/interface.php
index 5e43478e22..9bd633a5eb 100644
--- a/phpBB/includes/tree/interface.php
+++ b/phpBB/includes/tree/interface.php
@@ -99,7 +99,7 @@ interface phpbb_tree_interface
 	public function get_path_and_subtree_data($item_id, $order_asc, $include_item);
 
 	/**
-	* Get all ancestors items of the item
+	* Get all ancestors of the item
 	*
 	* @param int		$item_id		The item id to get the ancestors from
 	* @param bool		$order_asc		Order the items ascending (most outer ancestor first)
diff --git a/phpBB/includes/tree/nestedset.php b/phpBB/includes/tree/nestedset.php
index 7710895a25..ae9805aa45 100644
--- a/phpBB/includes/tree/nestedset.php
+++ b/phpBB/includes/tree/nestedset.php
@@ -1,7 +1,7 @@
 <?php
 /**
 *
-* @package tree - nestedset
+* @package tree
 * @copyright (c) 2013 phpBB Group
 * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
@@ -50,7 +50,7 @@ abstract class phpbb_tree_nestedset implements phpbb_tree_interface
 	protected $sql_where = '';
 
 	/**
-	* List of item properties to be cached in $item_parents
+	* List of item properties to be cached in the item_parents column
 	* @var array
 	*/
 	protected $item_basic_data = array('*');
@@ -746,11 +746,11 @@ abstract class phpbb_tree_nestedset implements phpbb_tree_interface
 	* problems:
 	*	- The set has a duplicated value inside the left/right id chain
 	*	- The set has a missing value inside the left/right id chain
-	*	- The set has items that do not have a left/right is set
+	*	- The set has items that do not have a left/right id set
 	*
 	* When regenerating the items, the items are sorted by parent id and their
 	* current left id, so the current child/parent relationships are kept
-	* and running the function on a working set will not change any orders.
+	* and running the function on a working set will not change the order.
 	*
 	* @param int	$new_id		First left_id to be used (should start with 1)
 	* @param int	$parent_id	parent_id of the current set (default = 0)
diff --git a/phpBB/includes/tree/nestedset_forum.php b/phpBB/includes/tree/nestedset_forum.php
index 06ef37e971..ff09ef55d0 100644
--- a/phpBB/includes/tree/nestedset_forum.php
+++ b/phpBB/includes/tree/nestedset_forum.php
@@ -1,7 +1,7 @@
 <?php
 /**
 *
-* @package tree - nestedset forum
+* @package tree
 * @copyright (c) 2013 phpBB Group
 * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
diff --git a/tests/tree/nestedset_forum_base.php b/tests/tree/nestedset_forum_base.php
index bfb97ba63e..2b617fcc53 100644
--- a/tests/tree/nestedset_forum_base.php
+++ b/tests/tree/nestedset_forum_base.php
@@ -1,7 +1,7 @@
 <?php
 /**
 *
-* @package tree - nestedset forum
+* @package tree
 * @copyright (c) 2013 phpBB Group
 * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
diff --git a/tests/tree/nestedset_forum_get_data_test.php b/tests/tree/nestedset_forum_get_data_test.php
index 49586fbade..76c99650aa 100644
--- a/tests/tree/nestedset_forum_get_data_test.php
+++ b/tests/tree/nestedset_forum_get_data_test.php
@@ -1,7 +1,7 @@
 <?php
 /**
 *
-* @package tree - nestedset forum
+* @package tree
 * @copyright (c) 2013 phpBB Group
 * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
diff --git a/tests/tree/nestedset_forum_insert_delete_test.php b/tests/tree/nestedset_forum_insert_delete_test.php
index 1e4eb2fccb..d11180ca78 100644
--- a/tests/tree/nestedset_forum_insert_delete_test.php
+++ b/tests/tree/nestedset_forum_insert_delete_test.php
@@ -1,7 +1,7 @@
 <?php
 /**
 *
-* @package tree - nestedset forum
+* @package tree
 * @copyright (c) 2013 phpBB Group
 * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
diff --git a/tests/tree/nestedset_forum_move_test.php b/tests/tree/nestedset_forum_move_test.php
index 2471f1c69c..2407a43ab6 100644
--- a/tests/tree/nestedset_forum_move_test.php
+++ b/tests/tree/nestedset_forum_move_test.php
@@ -1,7 +1,7 @@
 <?php
 /**
 *
-* @package tree - nestedset forum
+* @package tree
 * @copyright (c) 2013 phpBB Group
 * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
diff --git a/tests/tree/nestedset_forum_regenerate_test.php b/tests/tree/nestedset_forum_regenerate_test.php
index e01ef0faed..38338dbc4d 100644
--- a/tests/tree/nestedset_forum_regenerate_test.php
+++ b/tests/tree/nestedset_forum_regenerate_test.php
@@ -1,7 +1,7 @@
 <?php
 /**
 *
-* @package tree - nestedset forum
+* @package tree
 * @copyright (c) 2013 phpBB Group
 * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
diff --git a/tests/tree/nestedset_forum_test.php b/tests/tree/nestedset_forum_test.php
index fb9bbc1660..4e335f9d35 100644
--- a/tests/tree/nestedset_forum_test.php
+++ b/tests/tree/nestedset_forum_test.php
@@ -1,7 +1,7 @@
 <?php
 /**
 *
-* @package tree - nestedset forum
+* @package tree
 * @copyright (c) 2013 phpBB Group
 * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *