diff --git a/src/Avalonia.Diagnostics/ViewModels/TreeNode.cs b/src/Avalonia.Diagnostics/ViewModels/TreeNode.cs
index f9da42c071..0b0b7a94fe 100644
--- a/src/Avalonia.Diagnostics/ViewModels/TreeNode.cs
+++ b/src/Avalonia.Diagnostics/ViewModels/TreeNode.cs
@@ -5,7 +5,6 @@ using System;
 using System.Collections.Specialized;
 using System.Reactive;
 using System.Reactive.Linq;
-using Avalonia.Controls;
 using Avalonia.Styling;
 using Avalonia.VisualTree;
 using ReactiveUI;
@@ -17,13 +16,13 @@ namespace Avalonia.Diagnostics.ViewModels
         private string _classes;
         private bool _isExpanded;
 
-        public TreeNode(IVisual control, TreeNode parent)
+        public TreeNode(IVisual visual, TreeNode parent)
         {
             Parent = parent;
-            Type = control.GetType().Name;
-            Control = control;
+            Type = visual.GetType().Name;
+            Visual = visual;
 
-            if (control is IStyleable styleable)
+            if (visual is IStyleable styleable)
             {
                 var classesChanged = Observable.FromEventPattern<
                         NotifyCollectionChangedEventHandler,
@@ -60,7 +59,7 @@ namespace Avalonia.Diagnostics.ViewModels
             private set { this.RaiseAndSetIfChanged(ref _classes, value); }
         }
 
-        public IVisual Control
+        public IVisual Visual
         {
             get;
         }
diff --git a/src/Avalonia.Diagnostics/ViewModels/TreePageViewModel.cs b/src/Avalonia.Diagnostics/ViewModels/TreePageViewModel.cs
index 92be04a056..97bd971e74 100644
--- a/src/Avalonia.Diagnostics/ViewModels/TreePageViewModel.cs
+++ b/src/Avalonia.Diagnostics/ViewModels/TreePageViewModel.cs
@@ -18,7 +18,7 @@ namespace Avalonia.Diagnostics.ViewModels
         {
             Nodes = nodes;
             _details = this.WhenAnyValue(x => x.SelectedNode)
-                .Select(x => x != null ? new ControlDetailsViewModel(x.Control) : null)
+                .Select(x => x != null ? new ControlDetailsViewModel(x.Visual) : null)
                 .ToProperty(this, x => x.Details);
         }
 
@@ -79,7 +79,7 @@ namespace Avalonia.Diagnostics.ViewModels
 
         private TreeNode FindNode(TreeNode node, IControl control)
         {
-            if (node.Control == control)
+            if (node.Visual == control)
             {
                 return node;
             }
diff --git a/src/Avalonia.Diagnostics/ViewModels/VisualTreeNode.cs b/src/Avalonia.Diagnostics/ViewModels/VisualTreeNode.cs
index bcbd88b876..f1b02a61c9 100644
--- a/src/Avalonia.Diagnostics/ViewModels/VisualTreeNode.cs
+++ b/src/Avalonia.Diagnostics/ViewModels/VisualTreeNode.cs
@@ -24,7 +24,7 @@ namespace Avalonia.Diagnostics.ViewModels
                 Children = new ReactiveList<VisualTreeNode>(new[] { new VisualTreeNode(host.Root, this) });
             }
 
-            if ((Control is IStyleable styleable))
+            if ((Visual is IStyleable styleable))
             {
                 IsInTemplate = styleable.TemplatedParent != null;
             }
diff --git a/src/Avalonia.Diagnostics/Views/TreePage.xaml.cs b/src/Avalonia.Diagnostics/Views/TreePage.xaml.cs
index 0a79aa90d7..7e4e5a8564 100644
--- a/src/Avalonia.Diagnostics/Views/TreePage.xaml.cs
+++ b/src/Avalonia.Diagnostics/Views/TreePage.xaml.cs
@@ -23,14 +23,14 @@ namespace Avalonia.Diagnostics.Views
         protected void AddAdorner(object sender, PointerEventArgs e)
         {
             var node = (TreeNode)((Control)sender).DataContext;
-            var layer = AdornerLayer.GetAdornerLayer(node.Control);
+            var layer = AdornerLayer.GetAdornerLayer(node.Visual);
 
             if (layer != null)
             {
                 _adorner = new Rectangle
                 {
                     Fill = new SolidColorBrush(0x80a0c5e8),
-                    [AdornerLayer.AdornedElementProperty] = node.Control,
+                    [AdornerLayer.AdornedElementProperty] = node.Visual,
                 };
 
                 layer.Children.Add(_adorner);