Index: Core/Plugins/test/Core.Plugins.OxyPlot.Test/Legend/AreaDataTreeNodeInfoTest.cs
===================================================================
diff -u -ra49c98841cb7c943ff7abbfef8110b4bf6f52a8b -r5bcddcaff997d5871cbe96230dfa2c23a8832925
--- Core/Plugins/test/Core.Plugins.OxyPlot.Test/Legend/AreaDataTreeNodeInfoTest.cs	(.../AreaDataTreeNodeInfoTest.cs)	(revision a49c98841cb7c943ff7abbfef8110b4bf6f52a8b)
+++ Core/Plugins/test/Core.Plugins.OxyPlot.Test/Legend/AreaDataTreeNodeInfoTest.cs	(.../AreaDataTreeNodeInfoTest.cs)	(revision 5bcddcaff997d5871cbe96230dfa2c23a8832925)
@@ -10,7 +10,6 @@
 using Core.Plugins.OxyPlot.Properties;
 using NUnit.Framework;
 using Rhino.Mocks;
-using TreeView = Core.Common.Controls.TreeView.TreeView;
 
 namespace Core.Plugins.OxyPlot.Test.Legend
 {
@@ -27,9 +26,9 @@
             mocks = new MockRepository();
             legendView = new LegendView();
 
-            var treeView = TypeUtils.GetField<TreeView>(legendView, "treeView");
+            var treeViewControl = TypeUtils.GetField<TreeViewControl>(legendView, "treeViewControl");
 
-            info = treeView.TreeViewController.TreeNodeInfos.First(tni => tni.TagType == typeof(AreaData));
+            info = treeViewControl.TreeNodeInfos.First(tni => tni.TagType == typeof(AreaData));
         }
 
         [Test]
Index: Core/Plugins/test/Core.Plugins.OxyPlot.Test/Legend/ChartDataCollectionTreeNodeInfoTest.cs
===================================================================
diff -u -ra49c98841cb7c943ff7abbfef8110b4bf6f52a8b -r5bcddcaff997d5871cbe96230dfa2c23a8832925
--- Core/Plugins/test/Core.Plugins.OxyPlot.Test/Legend/ChartDataCollectionTreeNodeInfoTest.cs	(.../ChartDataCollectionTreeNodeInfoTest.cs)	(revision a49c98841cb7c943ff7abbfef8110b4bf6f52a8b)
+++ Core/Plugins/test/Core.Plugins.OxyPlot.Test/Legend/ChartDataCollectionTreeNodeInfoTest.cs	(.../ChartDataCollectionTreeNodeInfoTest.cs)	(revision 5bcddcaff997d5871cbe96230dfa2c23a8832925)
@@ -12,7 +12,6 @@
 using Rhino.Mocks;
 using Resources = Core.Plugins.OxyPlot.Properties.Resources;
 using GuiResources = Core.Common.Gui.Properties.Resources;
-using TreeView = Core.Common.Controls.TreeView.TreeView;
 
 namespace Core.Plugins.OxyPlot.Test.Legend
 {
@@ -29,9 +28,9 @@
             mocks = new MockRepository();
             legendView = new LegendView();
 
-            var treeView = TypeUtils.GetField<TreeView>(legendView, "treeView");
+            var treeViewControl = TypeUtils.GetField<TreeViewControl>(legendView, "treeViewControl");
 
-            info = treeView.TreeViewController.TreeNodeInfos.First(tni => tni.TagType == typeof(ChartDataCollection));
+            info = treeViewControl.TreeNodeInfos.First(tni => tni.TagType == typeof(ChartDataCollection));
         }
 
         [Test]
Index: Core/Plugins/test/Core.Plugins.OxyPlot.Test/Legend/LineDataTreeNodeInfoTest.cs
===================================================================
diff -u -ra49c98841cb7c943ff7abbfef8110b4bf6f52a8b -r5bcddcaff997d5871cbe96230dfa2c23a8832925
--- Core/Plugins/test/Core.Plugins.OxyPlot.Test/Legend/LineDataTreeNodeInfoTest.cs	(.../LineDataTreeNodeInfoTest.cs)	(revision a49c98841cb7c943ff7abbfef8110b4bf6f52a8b)
+++ Core/Plugins/test/Core.Plugins.OxyPlot.Test/Legend/LineDataTreeNodeInfoTest.cs	(.../LineDataTreeNodeInfoTest.cs)	(revision 5bcddcaff997d5871cbe96230dfa2c23a8832925)
@@ -10,7 +10,6 @@
 using Core.Plugins.OxyPlot.Properties;
 using NUnit.Framework;
 using Rhino.Mocks;
-using TreeView = Core.Common.Controls.TreeView.TreeView;
 
 namespace Core.Plugins.OxyPlot.Test.Legend
 {
@@ -27,9 +26,9 @@
             mocks = new MockRepository();
             legendView = new LegendView();
 
-            var treeView = TypeUtils.GetField<TreeView>(legendView, "treeView");
+            var treeViewControl = TypeUtils.GetField<TreeViewControl>(legendView, "treeViewControl");
 
-            info = treeView.TreeViewController.TreeNodeInfos.First(tni => tni.TagType == typeof(LineData));
+            info = treeViewControl.TreeNodeInfos.First(tni => tni.TagType == typeof(LineData));
         }
 
         [Test]
Index: Core/Plugins/test/Core.Plugins.OxyPlot.Test/Legend/PointDataTreeNodeInfoTest.cs
===================================================================
diff -u -ra49c98841cb7c943ff7abbfef8110b4bf6f52a8b -r5bcddcaff997d5871cbe96230dfa2c23a8832925
--- Core/Plugins/test/Core.Plugins.OxyPlot.Test/Legend/PointDataTreeNodeInfoTest.cs	(.../PointDataTreeNodeInfoTest.cs)	(revision a49c98841cb7c943ff7abbfef8110b4bf6f52a8b)
+++ Core/Plugins/test/Core.Plugins.OxyPlot.Test/Legend/PointDataTreeNodeInfoTest.cs	(.../PointDataTreeNodeInfoTest.cs)	(revision 5bcddcaff997d5871cbe96230dfa2c23a8832925)
@@ -10,7 +10,6 @@
 using Core.Plugins.OxyPlot.Properties;
 using NUnit.Framework;
 using Rhino.Mocks;
-using TreeView = Core.Common.Controls.TreeView.TreeView;
 
 namespace Core.Plugins.OxyPlot.Test.Legend
 {
@@ -27,9 +26,9 @@
             mocks = new MockRepository();
             legendView = new LegendView();
 
-            var treeView = TypeUtils.GetField<TreeView>(legendView, "treeView");
+            var treeViewControl = TypeUtils.GetField<TreeViewControl>(legendView, "treeViewControl");
 
-            info = treeView.TreeViewController.TreeNodeInfos.First(tni => tni.TagType == typeof(PointData));
+            info = treeViewControl.TreeNodeInfos.First(tni => tni.TagType == typeof(PointData));
         }
 
         [Test]