diff --git a/libraries/navigation/Navigation.class.php b/libraries/navigation/Navigation.class.php
index 7c0689da02..e910daaadf 100644
--- a/libraries/navigation/Navigation.class.php
+++ b/libraries/navigation/Navigation.class.php
@@ -49,7 +49,7 @@ class PMA_Navigation {
     {
         /* Init */
         $retval = '';
-        $tree   = new CollapsibleTree($this->pos);
+        $tree   = new PMA_NavigationTree($this->pos);
         if (! empty($_REQUEST['full']) || ! empty($_REQUEST['reload'])) {
             $_url_params = array('pos' => $this->pos, 'server' => $GLOBALS['server']);
             $num_db = PMA_DBI_fetch_value(
diff --git a/libraries/navigation/CollapsibleTree.class.php b/libraries/navigation/NavigationTree.class.php
similarity index 99%
rename from libraries/navigation/CollapsibleTree.class.php
rename to libraries/navigation/NavigationTree.class.php
index fe2639d05b..124abfb0e2 100644
--- a/libraries/navigation/CollapsibleTree.class.php
+++ b/libraries/navigation/NavigationTree.class.php
@@ -8,7 +8,7 @@
 /**
  * Displays a collapsible of database objects in the navigation frame
  */
-class CollapsibleTree {
+class PMA_NavigationTree {
     /**
      * @var Node Reference to the root node of the tree
      */
diff --git a/navigation.php b/navigation.php
index 79475d9e18..e999d7492c 100644
--- a/navigation.php
+++ b/navigation.php
@@ -32,7 +32,7 @@ require_once './libraries/navigation/Nodes/Node_Trigger_Container.class.php';
 require_once './libraries/navigation/Nodes/Node_View_Container.class.php';
 
 // Generates a collapsible tree of database objects
-require_once './libraries/navigation/CollapsibleTree.class.php';
+require_once './libraries/navigation/NavigationTree.class.php';
 
 // Also initialises the collapsible tree class
 require_once './libraries/navigation/Navigation.class.php';