diff --git a/phpBB/includes/nestedset/interface.php b/phpBB/includes/tree/interface.php
similarity index 98%
rename from phpBB/includes/nestedset/interface.php
rename to phpBB/includes/tree/interface.php
index eadc9083b1..fd10bd357f 100644
--- a/phpBB/includes/nestedset/interface.php
+++ b/phpBB/includes/tree/interface.php
@@ -1,7 +1,7 @@
 <?php
 /**
 *
-* @package Nested Set
+* @package Tree
 * @copyright (c) 2013 phpBB Group
 * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
@@ -15,7 +15,7 @@ if (!defined('IN_PHPBB'))
 	exit;
 }
 
-interface phpbb_nestedset_interface
+interface phpbb_tree_interface
 {
 	/**
 	* Insert an item into the nested set (also insert the rows into the table)
diff --git a/phpBB/includes/nestedset/base.php b/phpBB/includes/tree/nestedset.php
similarity index 99%
rename from phpBB/includes/nestedset/base.php
rename to phpBB/includes/tree/nestedset.php
index cb06a0dabe..2110e1a6d2 100644
--- a/phpBB/includes/nestedset/base.php
+++ b/phpBB/includes/tree/nestedset.php
@@ -1,7 +1,7 @@
 <?php
 /**
 *
-* @package Nested Set
+* @package Tree - Nested Set
 * @copyright (c) 2013 phpBB Group
 * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
@@ -15,7 +15,7 @@ if (!defined('IN_PHPBB'))
 	exit;
 }
 
-abstract class phpbb_nestedset_base implements phpbb_nestedset_interface
+abstract class phpbb_tree_nestedset implements phpbb_tree_interface
 {
 	/** @var phpbb_db_driver */
 	protected $db;
diff --git a/phpBB/includes/nestedset/forum.php b/phpBB/includes/tree/nestedset_forum.php
similarity index 91%
rename from phpBB/includes/nestedset/forum.php
rename to phpBB/includes/tree/nestedset_forum.php
index dbf0e70202..0a66e68915 100644
--- a/phpBB/includes/nestedset/forum.php
+++ b/phpBB/includes/tree/nestedset_forum.php
@@ -1,7 +1,7 @@
 <?php
 /**
 *
-* @package Nested Set
+* @package Tree - Nested Set Forum
 * @copyright (c) 2013 phpBB Group
 * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
 *
@@ -15,7 +15,7 @@ if (!defined('IN_PHPBB'))
 	exit;
 }
 
-class phpbb_nestedset_forum extends phpbb_nestedset_base
+class phpbb_tree_nestedset_forum extends phpbb_tree_nestedset
 {
 	/**
 	* Column names in the table
diff --git a/tests/nestedset/set_forum_base.php b/tests/nestedset/set_forum_base.php
index 93d4dc3522..0d1cb1f881 100644
--- a/tests/nestedset/set_forum_base.php
+++ b/tests/nestedset/set_forum_base.php
@@ -56,7 +56,7 @@ class phpbb_tests_nestedset_set_forum_base extends phpbb_database_test_case
 		set_config(null, null, null, $this->config);
 
 		$this->lock = new phpbb_lock_db('nestedset_forum_lock', $this->config, $this->db);
-		$this->set = new phpbb_nestedset_forum($this->db, $this->lock, 'phpbb_forums');
+		$this->set = new phpbb_tree_nestedset_forum($this->db, $this->lock, 'phpbb_forums');
 
 		$this->set_up_forums();
 	}