Index: Core/Common/src/Core.Common.Controls.TreeView/TreeViewControl.cs
===================================================================
diff -u -rfafe08c402bd6ab5a283556660e34df47ce01dea -r2dcbaa4e3e89663c926fd0eeaab2141e79b34cad
--- Core/Common/src/Core.Common.Controls.TreeView/TreeViewControl.cs	(.../TreeViewControl.cs)	(revision fafe08c402bd6ab5a283556660e34df47ce01dea)
+++ Core/Common/src/Core.Common.Controls.TreeView/TreeViewControl.cs	(.../TreeViewControl.cs)	(revision 2dcbaa4e3e89663c926fd0eeaab2141e79b34cad)
@@ -38,10 +38,10 @@
 {
     public partial class TreeViewControl : UserControl
     {
-        public event EventHandler TreeNodeDoubleClick;
+        public event EventHandler DataDoubleClick;
+        public event EventHandler SelectedDataChanged;
         public event EventHandler NodeUpdated; // TODO; Way to explicit!
-        public event EventHandler<TreeNodeDataDeletedEventArgs> NodeDataDeleted; // TODO; Way to explicit!
-        public event EventHandler SelectedNodeChanged;
+        public event EventHandler<TreeNodeDataDeletedEventArgs> DataDeleted; // TODO; Way to explicit!
 
         private static readonly ILog Log = LogManager.GetLogger(typeof(TreeViewControl));
         private readonly ICollection<TreeNodeInfo> treeNodeInfos = new HashSet<TreeNodeInfo>();
@@ -707,9 +707,9 @@
 
         private void OnTreeNodeDoubleClick()
         {
-            if (TreeNodeDoubleClick != null)
+            if (DataDoubleClick != null)
             {
-                TreeNodeDoubleClick(treeView.SelectedNode, EventArgs.Empty);
+                DataDoubleClick(treeView.SelectedNode, EventArgs.Empty);
             }
         }
 
@@ -870,9 +870,9 @@
 
         private void TreeViewAfterSelect(object sender, TreeViewEventArgs e)
         {
-            if (SelectedNodeChanged != null)
+            if (SelectedDataChanged != null)
             {
-                SelectedNodeChanged(treeView.SelectedNode, EventArgs.Empty);
+                SelectedDataChanged(this, EventArgs.Empty);
             }
         }
 
@@ -1036,9 +1036,9 @@
 
         private void OnNodeDataDeleted(TreeNode node)
         {
-            if (NodeDataDeleted != null)
+            if (DataDeleted != null)
             {
-                NodeDataDeleted(this, new TreeNodeDataDeletedEventArgs(node.Tag));
+                DataDeleted(this, new TreeNodeDataDeletedEventArgs(node.Tag));
             }
         }
 
Index: Core/Plugins/src/Core.Plugins.ProjectExplorer/ProjectExplorer.cs
===================================================================
diff -u -rc37787efa31f4a9aa6df2ace311109ccd21d96fd -r2dcbaa4e3e89663c926fd0eeaab2141e79b34cad
--- Core/Plugins/src/Core.Plugins.ProjectExplorer/ProjectExplorer.cs	(.../ProjectExplorer.cs)	(revision c37787efa31f4a9aa6df2ace311109ccd21d96fd)
+++ Core/Plugins/src/Core.Plugins.ProjectExplorer/ProjectExplorer.cs	(.../ProjectExplorer.cs)	(revision 2dcbaa4e3e89663c926fd0eeaab2141e79b34cad)
@@ -133,9 +133,9 @@
 
         private void BindTreeInteractionEvents()
         {
-            treeViewControl.TreeNodeDoubleClick += TreeViewDoubleClick;
-            treeViewControl.NodeDataDeleted += ProjectDataDeleted;
-            treeViewControl.SelectedNodeChanged += TreeViewSelectedNodeChanged;
+            treeViewControl.DataDoubleClick += TreeViewControlDataDoubleClick;
+            treeViewControl.DataDeleted += TreeViewControlDataDeleted;
+            treeViewControl.SelectedDataChanged += TreeViewControlSelectedDataChanged;
         }
 
         private void RegisterTreeNodeInfos(IEnumerable<TreeNodeInfo> treeNodeInfos)
@@ -146,17 +146,17 @@
             }
         }
 
-        private void TreeViewSelectedNodeChanged(object sender, EventArgs e)
+        private void TreeViewControlSelectedDataChanged(object sender, EventArgs e)
         {
-            applicationSelection.Selection = ((TreeNode) sender).Tag;
+            applicationSelection.Selection = treeViewControl.SelectedData;
         }
 
-        private void TreeViewDoubleClick(object sender, EventArgs e)
+        private void TreeViewControlDataDoubleClick(object sender, EventArgs e)
         {
             viewCommands.OpenViewForSelection();
         }
 
-        private void ProjectDataDeleted(object sender, TreeNodeDataDeletedEventArgs e)
+        private void TreeViewControlDataDeleted(object sender, TreeNodeDataDeletedEventArgs e)
         {
             viewCommands.RemoveAllViewsForItem(e.DeletedDataInstance);
         }