diff --git a/Perspex.Controls/Control.cs b/Perspex.Controls/Control.cs
index c1b24cea1d..dffee0001d 100644
--- a/Perspex.Controls/Control.cs
+++ b/Perspex.Controls/Control.cs
@@ -101,7 +101,7 @@ namespace Perspex.Controls
             }
         }
 
-        public string Id
+        public string Name
         {
             get
             {
diff --git a/Perspex.Controls/ControlExtensions.cs b/Perspex.Controls/ControlExtensions.cs
index 26f494e2d8..af7c10403a 100644
--- a/Perspex.Controls/ControlExtensions.cs
+++ b/Perspex.Controls/ControlExtensions.cs
@@ -21,7 +21,7 @@ namespace Perspex.Controls
         {
             return control.GetLogicalDescendents()
                 .OfType<T>()
-                .FirstOrDefault(x => x.Id == id);
+                .FirstOrDefault(x => x.Name == id);
         }
     }
 }
diff --git a/Perspex.Controls/INamed.cs b/Perspex.Controls/INamed.cs
index 5bbfe33fad..579c731f5f 100644
--- a/Perspex.Controls/INamed.cs
+++ b/Perspex.Controls/INamed.cs
@@ -8,6 +8,6 @@ namespace Perspex.Controls
 {
     public interface INamed
     {
-        string Id { get; }
+        string Name { get; }
     }
 }
diff --git a/Perspex.Controls/Templates/TemplateExtensions.cs b/Perspex.Controls/Templates/TemplateExtensions.cs
index aac0bc3f68..de77d7f73a 100644
--- a/Perspex.Controls/Templates/TemplateExtensions.cs
+++ b/Perspex.Controls/Templates/TemplateExtensions.cs
@@ -17,7 +17,7 @@ namespace Perspex.Controls.Templates
     {
         public static T FindTemplateChild<T>(this ITemplatedControl control, string id) where T : INamed
         {
-            return control.GetTemplateChildren().OfType<T>().SingleOrDefault(x => x.Id == id);
+            return control.GetTemplateChildren().OfType<T>().SingleOrDefault(x => x.Name == id);
         }
 
         public static T GetTemplateChild<T>(this ITemplatedControl control, string id) where T : INamed
diff --git a/Perspex.Interactive.UnitTests/InteractiveTests.cs b/Perspex.Interactive.UnitTests/InteractiveTests.cs
index 0c45fe46fb..c8eba683a3 100644
--- a/Perspex.Interactive.UnitTests/InteractiveTests.cs
+++ b/Perspex.Interactive.UnitTests/InteractiveTests.cs
@@ -21,7 +21,7 @@ namespace Perspex.Interactive.UnitTests
         {
             var ev = new RoutedEvent("test", RoutingStrategies.Direct, typeof(RoutedEventArgs), typeof(TestInteractive));
             var invoked = new List<string>();
-            EventHandler<RoutedEventArgs> handler = (s, e) => invoked.Add(((TestInteractive)s).Id);
+            EventHandler<RoutedEventArgs> handler = (s, e) => invoked.Add(((TestInteractive)s).Name);
             var target = this.CreateTree(ev, handler, RoutingStrategies.Direct);
 
             var args = new RoutedEventArgs(ev, target);
@@ -55,7 +55,7 @@ namespace Perspex.Interactive.UnitTests
         {
             var ev = new RoutedEvent("test", RoutingStrategies.Bubble, typeof(RoutedEventArgs), typeof(TestInteractive));
             var invoked = new List<string>();
-            EventHandler<RoutedEventArgs> handler = (s, e) => invoked.Add(((TestInteractive)s).Id);
+            EventHandler<RoutedEventArgs> handler = (s, e) => invoked.Add(((TestInteractive)s).Name);
             var target = this.CreateTree(ev, handler, RoutingStrategies.Bubble | RoutingStrategies.Tunnel);
 
             var args = new RoutedEventArgs(ev, target);
@@ -69,7 +69,7 @@ namespace Perspex.Interactive.UnitTests
         {
             var ev = new RoutedEvent("test", RoutingStrategies.Tunnel, typeof(RoutedEventArgs), typeof(TestInteractive));
             var invoked = new List<string>();
-            EventHandler<RoutedEventArgs> handler = (s, e) => invoked.Add(((TestInteractive)s).Id);
+            EventHandler<RoutedEventArgs> handler = (s, e) => invoked.Add(((TestInteractive)s).Name);
             var target = this.CreateTree(ev, handler, RoutingStrategies.Bubble | RoutingStrategies.Tunnel);
 
             var args = new RoutedEventArgs(ev, target);
@@ -87,7 +87,7 @@ namespace Perspex.Interactive.UnitTests
                 typeof(RoutedEventArgs), 
                 typeof(TestInteractive));
             var invoked = new List<string>();
-            EventHandler<RoutedEventArgs> handler = (s, e) => invoked.Add(((TestInteractive)s).Id);
+            EventHandler<RoutedEventArgs> handler = (s, e) => invoked.Add(((TestInteractive)s).Name);
             var target = this.CreateTree(ev, handler, RoutingStrategies.Bubble | RoutingStrategies.Tunnel);
 
             var args = new RoutedEventArgs(ev, target);
@@ -204,7 +204,7 @@ namespace Perspex.Interactive.UnitTests
 
             EventHandler<RoutedEventArgs> handler = (s, e) =>
             {
-                invoked.Add(((TestInteractive)s).Id);
+                invoked.Add(((TestInteractive)s).Name);
                 e.Handled = true;
             };
 
@@ -225,7 +225,7 @@ namespace Perspex.Interactive.UnitTests
                 typeof(RoutedEventArgs),
                 typeof(TestInteractive));
             var invoked = new List<string>();
-            EventHandler<RoutedEventArgs> handler = (s, e) => invoked.Add(((TestInteractive)s).Id);
+            EventHandler<RoutedEventArgs> handler = (s, e) => invoked.Add(((TestInteractive)s).Name);
 
             var target = this.CreateTree(ev, null, 0);
 
@@ -246,7 +246,7 @@ namespace Perspex.Interactive.UnitTests
                 typeof(RoutedEventArgs),
                 typeof(TestInteractive));
             var invoked = new List<string>();
-            EventHandler<RoutedEventArgs> handler = (s, e) => invoked.Add(((TestInteractive)s).Id);
+            EventHandler<RoutedEventArgs> handler = (s, e) => invoked.Add(((TestInteractive)s).Name);
 
             var target = this.CreateTree(ev, null, 0);
 
@@ -267,7 +267,7 @@ namespace Perspex.Interactive.UnitTests
                 typeof(RoutedEventArgs),
                 typeof(TestInteractive));
             var invoked = new List<string>();
-            EventHandler<RoutedEventArgs> handler = (s, e) => invoked.Add(((TestInteractive)s).Id);
+            EventHandler<RoutedEventArgs> handler = (s, e) => invoked.Add(((TestInteractive)s).Name);
 
             var target = this.CreateTree(ev, null, 0);
 
@@ -308,21 +308,21 @@ namespace Perspex.Interactive.UnitTests
 
             var tree = new TestInteractive
             {
-                Id = "1",
+                Name = "1",
                 Children = new[]
                 {
                     new TestInteractive
                     {
-                        Id = "2a",
+                        Name = "2a",
                     },
                     (target = new TestInteractive
                     {
-                        Id = "2b",
+                        Name = "2b",
                         Children = new[]
                         {
                             new TestInteractive
                             {
-                                Id = "3",
+                                Name = "3",
                             },
                         },
                     }),
@@ -342,7 +342,7 @@ namespace Perspex.Interactive.UnitTests
 
         private class TestInteractive : Interactive
         {
-            public string Id { get; set; }
+            public string Name { get; set; }
 
             public bool ClassHandlerInvoked { get; private set; }
 
diff --git a/Perspex.Styling/IStyleable.cs b/Perspex.Styling/IStyleable.cs
index a655ce3598..7897606ade 100644
--- a/Perspex.Styling/IStyleable.cs
+++ b/Perspex.Styling/IStyleable.cs
@@ -21,7 +21,7 @@ namespace Perspex.Styling
         /// <summary>
         /// Gets the ID of the control.
         /// </summary>
-        string Id { get; }
+        string Name { get; }
 
         /// <summary>
         /// Gets the type by which the control is styled.
diff --git a/Perspex.Styling/Selectors.cs b/Perspex.Styling/Selectors.cs
index 181eba47a0..65cf3cfee3 100644
--- a/Perspex.Styling/Selectors.cs
+++ b/Perspex.Styling/Selectors.cs
@@ -53,13 +53,13 @@ namespace Perspex.Styling
             };
         }
 
-        public static Selector Id(this Selector previous, string id)
+        public static Selector Name(this Selector previous, string id)
         {
             Contract.Requires<ArgumentNullException>(previous != null);
 
             return new Selector(previous)
             {
-                GetObservable = control => Observable.Return(control.Id == id),
+                GetObservable = control => Observable.Return(control.Name == id),
                 SelectorString = '#' + id,
             };
         }
diff --git a/Perspex.Themes.Default/ButtonStyle.cs b/Perspex.Themes.Default/ButtonStyle.cs
index 2abd6f04b7..800fdcc2f1 100644
--- a/Perspex.Themes.Default/ButtonStyle.cs
+++ b/Perspex.Themes.Default/ButtonStyle.cs
@@ -31,7 +31,7 @@ namespace Perspex.Themes.Default
                         new Setter(Button.VerticalContentAlignmentProperty, VerticalAlignment.Center),
                     },
                 },
-                new Style(x => x.OfType<Button>().Template().Id("border"))
+                new Style(x => x.OfType<Button>().Template().Name("border"))
                 {
                     Setters = new[]
                     {
@@ -41,7 +41,7 @@ namespace Perspex.Themes.Default
                         new Setter(Button.ForegroundProperty, new SolidColorBrush(0xff000000)),
                     },
                 },
-                new Style(x => x.OfType<Button>().Class(":pointerover").Template().Id("border"))
+                new Style(x => x.OfType<Button>().Class(":pointerover").Template().Name("border"))
                 {
                     Setters = new[]
                     {
@@ -49,21 +49,21 @@ namespace Perspex.Themes.Default
                         new Setter(Button.BorderBrushProperty, new SolidColorBrush(0xff3c7fb1)),
                     },
                 },
-                new Style(x => x.OfType<Button>().Class(":pointerover").Class(":pressed").Template().Id("border"))
+                new Style(x => x.OfType<Button>().Class(":pointerover").Class(":pressed").Template().Name("border"))
                 {
                     Setters = new[]
                     {
                         new Setter(Button.BackgroundProperty, new SolidColorBrush(0xffc4e5f6)),
                     },
                 },
-                new Style(x => x.OfType<Button>().Class(":pressed").Template().Id("border"))
+                new Style(x => x.OfType<Button>().Class(":pressed").Template().Name("border"))
                 {
                     Setters = new[]
                     {
                         new Setter(Button.BorderBrushProperty, new SolidColorBrush(0xffff628b)),
                     },
                 },
-                new Style(x => x.OfType<Button>().Class(":disabled").Template().Id("border"))
+                new Style(x => x.OfType<Button>().Class(":disabled").Template().Name("border"))
                 {
                     Setters = new[]
                     {
@@ -88,11 +88,11 @@ namespace Perspex.Themes.Default
         {
             Border border = new Border
             {
-                Id = "border",
+                Name = "border",
                 Padding = new Thickness(3),
                 Content = new ContentPresenter
                 {
-                    Id = "contentPresenter",
+                    Name = "contentPresenter",
                     [~ContentPresenter.ContentProperty] = control[~Button.ContentProperty],
                     [~ContentPresenter.HorizontalAlignmentProperty] = control[~Button.HorizontalContentAlignmentProperty],
                     [~ContentPresenter.VerticalAlignmentProperty] = control[~Button.VerticalContentAlignmentProperty],
diff --git a/Perspex.Themes.Default/CheckBoxStyle.cs b/Perspex.Themes.Default/CheckBoxStyle.cs
index 2c8c9ed48b..827664e53a 100644
--- a/Perspex.Themes.Default/CheckBoxStyle.cs
+++ b/Perspex.Themes.Default/CheckBoxStyle.cs
@@ -28,14 +28,14 @@ namespace Perspex.Themes.Default
                         new Setter(Button.TemplateProperty, ControlTemplate.Create<CheckBox>(this.Template)),
                     },
                 },
-                new Style(x => x.OfType<CheckBox>().Template().Id("checkMark"))
+                new Style(x => x.OfType<CheckBox>().Template().Name("checkMark"))
                 {
                     Setters = new[]
                     {
                         new Setter(Shape.IsVisibleProperty, false),
                     },
                 },
-                new Style(x => x.OfType<CheckBox>().Class(":checked").Template().Id("checkMark"))
+                new Style(x => x.OfType<CheckBox>().Class(":checked").Template().Name("checkMark"))
                 {
                     Setters = new[]
                     {
@@ -61,7 +61,7 @@ namespace Perspex.Themes.Default
                     {
                         new Border
                         {
-                            Id = "checkBorder",
+                            Name = "checkBorder",
                             BorderBrush = Brushes.Black,
                             BorderThickness = 2,
                             Width = 18,
@@ -71,7 +71,7 @@ namespace Perspex.Themes.Default
                         },
                         new Path
                         {
-                            Id = "checkMark",
+                            Name = "checkMark",
                             Fill = Brushes.Black,
                             Width = 11,
                             Height = 10,
@@ -83,7 +83,7 @@ namespace Perspex.Themes.Default
                         },
                         new ContentPresenter
                         {
-                            Id = "contentPresenter",
+                            Name = "contentPresenter",
                             Margin = new Thickness(4, 0, 0, 0),
                             VerticalAlignment = VerticalAlignment.Center,
                             [~ContentPresenter.ContentProperty] = control[~CheckBox.ContentProperty],
diff --git a/Perspex.Themes.Default/ContentControlStyle.cs b/Perspex.Themes.Default/ContentControlStyle.cs
index 4060c3bd44..e34f2afc0e 100644
--- a/Perspex.Themes.Default/ContentControlStyle.cs
+++ b/Perspex.Themes.Default/ContentControlStyle.cs
@@ -32,7 +32,7 @@ namespace Perspex.Themes.Default
         {
             return new ContentPresenter
             { 
-                Id = "contentPresenter",
+                Name = "contentPresenter",
                 [~ContentPresenter.ContentProperty] = control[~ContentControl.ContentProperty],
             };
         }
diff --git a/Perspex.Themes.Default/DeckStyle.cs b/Perspex.Themes.Default/DeckStyle.cs
index 8be76a1a14..a70ae4940e 100644
--- a/Perspex.Themes.Default/DeckStyle.cs
+++ b/Perspex.Themes.Default/DeckStyle.cs
@@ -31,7 +31,7 @@ namespace Perspex.Themes.Default
         {
             return new DeckPresenter
             {
-                Id = "itemsPresenter",
+                Name = "itemsPresenter",
                 [~ItemsPresenter.ItemsProperty] = control[~Deck.ItemsProperty],
                 [~ItemsPresenter.ItemsPanelProperty] = control[~Deck.ItemsPanelProperty],
                 [~DeckPresenter.SelectedItemProperty] = control[~Deck.SelectedItemProperty],
diff --git a/Perspex.Themes.Default/DropDownStyle.cs b/Perspex.Themes.Default/DropDownStyle.cs
index 789696a23b..6c3ae734d5 100644
--- a/Perspex.Themes.Default/DropDownStyle.cs
+++ b/Perspex.Themes.Default/DropDownStyle.cs
@@ -52,7 +52,7 @@ namespace Perspex.Themes.Default
                 [~Border.BorderThicknessProperty] = control[~DropDown.BorderThicknessProperty],
                 Content = new Grid
                 {
-                    Id = "container",
+                    Name = "container",
                     ColumnDefinitions = new ColumnDefinitions
                     {
                         new ColumnDefinition(new GridLength(1, GridUnitType.Star)),
@@ -62,7 +62,7 @@ namespace Perspex.Themes.Default
                     {
                         new ContentControl
                         {
-                            Id = "contentControl",
+                            Name = "contentControl",
                             Margin = new Thickness(3),
                             [~ContentControl.ContentProperty] = control[~DropDown.ContentProperty],
                             [~ContentControl.HorizontalAlignmentProperty] = control[~DropDown.HorizontalContentAlignmentProperty],
@@ -70,13 +70,13 @@ namespace Perspex.Themes.Default
                         },
                         new ToggleButton
                         {
-                            Id = "toggle",
+                            Name = "toggle",
                             BorderThickness = 0,
                             Background = Brushes.Transparent,
                             ClickMode = ClickMode.Press,
                             Content = new Path
                             {
-                                Id = "checkMark",
+                                Name = "checkMark",
                                 Fill = Brushes.Black,
                                 Width = 8,
                                 Height = 4,
diff --git a/Perspex.Themes.Default/ItemsControlStyle.cs b/Perspex.Themes.Default/ItemsControlStyle.cs
index d9c1862862..c7f6adf71f 100644
--- a/Perspex.Themes.Default/ItemsControlStyle.cs
+++ b/Perspex.Themes.Default/ItemsControlStyle.cs
@@ -31,7 +31,7 @@ namespace Perspex.Themes.Default
         {
             return new ItemsPresenter
             {
-                Id = "itemsPresenter",
+                Name = "itemsPresenter",
                 [~ItemsPresenter.ItemsProperty] = control[~ItemsControl.ItemsProperty],
                 [~ItemsPresenter.ItemsPanelProperty] = control[~ItemsControl.ItemsPanelProperty],
             };
diff --git a/Perspex.Themes.Default/ListBoxItemStyle.cs b/Perspex.Themes.Default/ListBoxItemStyle.cs
index d87f93e476..eebb533b5c 100644
--- a/Perspex.Themes.Default/ListBoxItemStyle.cs
+++ b/Perspex.Themes.Default/ListBoxItemStyle.cs
@@ -25,7 +25,7 @@ namespace Perspex.Themes.Default
                         new Setter(ListBoxItem.TemplateProperty, ControlTemplate.Create<ListBoxItem>(this.Template)),
                     },
                 },
-                new Style(x => x.OfType<ListBoxItem>().Class(":selected").Template().Id("border"))
+                new Style(x => x.OfType<ListBoxItem>().Class(":selected").Template().Name("border"))
                 {
                     Setters = new[]
                     {
@@ -40,7 +40,7 @@ namespace Perspex.Themes.Default
         {
             return new Border
             {
-                Id = "border",
+                Name = "border",
                 [~Border.BackgroundProperty] = control[~ListBoxItem.BackgroundProperty],
                 [~Border.BorderBrushProperty] = control[~ListBoxItem.BorderBrushProperty],
                 [~Border.BorderThicknessProperty] = control[~ListBoxItem.BorderThicknessProperty],
diff --git a/Perspex.Themes.Default/ListBoxStyle.cs b/Perspex.Themes.Default/ListBoxStyle.cs
index 39df2e89e6..d6e35ecb20 100644
--- a/Perspex.Themes.Default/ListBoxStyle.cs
+++ b/Perspex.Themes.Default/ListBoxStyle.cs
@@ -42,7 +42,7 @@ namespace Perspex.Themes.Default
                 {
                     Content = new ItemsPresenter
                     {
-                        Id = "itemsPresenter",
+                        Name = "itemsPresenter",
                         [~ItemsPresenter.ItemsProperty] = control[~ListBox.ItemsProperty],
                         [~ItemsPresenter.ItemsPanelProperty] = control[~ListBox.ItemsPanelProperty],
                     }
diff --git a/Perspex.Themes.Default/PopupRootStyle.cs b/Perspex.Themes.Default/PopupRootStyle.cs
index 198ad6429f..c41be5197c 100644
--- a/Perspex.Themes.Default/PopupRootStyle.cs
+++ b/Perspex.Themes.Default/PopupRootStyle.cs
@@ -37,7 +37,7 @@ namespace Perspex.Themes.Default
                 [~Border.BackgroundProperty] = control[~PopupRoot.BackgroundProperty],
                 Content = new ContentPresenter
                 {
-                    Id = "contentPresenter",
+                    Name = "contentPresenter",
                     [~ContentPresenter.ContentProperty] = control[~PopupRoot.ContentProperty],
                 }
             };
diff --git a/Perspex.Themes.Default/RadioButtonStyle.cs b/Perspex.Themes.Default/RadioButtonStyle.cs
index 0393f4ea86..02026e987a 100644
--- a/Perspex.Themes.Default/RadioButtonStyle.cs
+++ b/Perspex.Themes.Default/RadioButtonStyle.cs
@@ -28,14 +28,14 @@ namespace Perspex.Themes.Default
                         new Setter(Button.TemplateProperty, ControlTemplate.Create<RadioButton>(this.Template)),
                     },
                 },
-                new Style(x => x.OfType<RadioButton>().Template().Id("checkMark"))
+                new Style(x => x.OfType<RadioButton>().Template().Name("checkMark"))
                 {
                     Setters = new[]
                     {
                         new Setter(Shape.IsVisibleProperty, false),
                     },
                 },
-                new Style(x => x.OfType<RadioButton>().Class(":checked").Template().Id("checkMark"))
+                new Style(x => x.OfType<RadioButton>().Class(":checked").Template().Name("checkMark"))
                 {
                     Setters = new[]
                     {
@@ -61,7 +61,7 @@ namespace Perspex.Themes.Default
                     {
                         new Ellipse
                         {
-                            Id = "checkBorder",
+                            Name = "checkBorder",
                             Stroke = Brushes.Black,
                             StrokeThickness = 2,
                             Width = 18,
@@ -71,7 +71,7 @@ namespace Perspex.Themes.Default
                         },
                         new Ellipse
                         {
-                            Id = "checkMark",
+                            Name = "checkMark",
                             Fill = Brushes.Black,
                             Width = 10,
                             Height = 10,
@@ -82,7 +82,7 @@ namespace Perspex.Themes.Default
                         },
                         new ContentPresenter
                         {
-                            Id = "contentPresenter",
+                            Name = "contentPresenter",
                             Margin = new Thickness(4, 0, 0, 0),
                             VerticalAlignment = VerticalAlignment.Center,
                             [~ContentPresenter.ContentProperty] = control[~RadioButton.ContentProperty],
diff --git a/Perspex.Themes.Default/ScrollBarStyle.cs b/Perspex.Themes.Default/ScrollBarStyle.cs
index 452a7228b3..ba926ed95f 100644
--- a/Perspex.Themes.Default/ScrollBarStyle.cs
+++ b/Perspex.Themes.Default/ScrollBarStyle.cs
@@ -34,7 +34,7 @@ namespace Perspex.Themes.Default
                         new Setter(ScrollBar.HeightProperty, 10.0),
                     },
                 },
-                new Style(x => x.OfType<ScrollBar>().Class(":horizontal").Template().Id("thumb"))
+                new Style(x => x.OfType<ScrollBar>().Class(":horizontal").Template().Name("thumb"))
                 {
                     Setters = new[]
                     {
@@ -49,7 +49,7 @@ namespace Perspex.Themes.Default
                         new Setter(ScrollBar.WidthProperty, 10.0),
                     },
                 },
-                new Style(x => x.OfType<ScrollBar>().Class(":vertical").Template().Id("thumb"))
+                new Style(x => x.OfType<ScrollBar>().Class(":vertical").Template().Name("thumb"))
                 {
                     Setters = new[]
                     {
@@ -66,14 +66,14 @@ namespace Perspex.Themes.Default
                 Background = Brushes.Silver,
                 Content = new Track
                 {
-                    Id = "track",
+                    Name = "track",
                     [~Track.MinimumProperty] = control[~ScrollBar.MinimumProperty],
                     [~Track.MaximumProperty] = control[~ScrollBar.MaximumProperty],
                     [~Track.ViewportSizeProperty] = control[~ScrollBar.ViewportSizeProperty],
                     [~Track.OrientationProperty] = control[~ScrollBar.OrientationProperty],
                     Thumb = new Thumb
                     {
-                        Id = "thumb",
+                        Name = "thumb",
                         Template = ControlTemplate.Create<Thumb>(this.ThumbTemplate),
                     },
                 },
diff --git a/Perspex.Themes.Default/ScrollViewerStyle.cs b/Perspex.Themes.Default/ScrollViewerStyle.cs
index 306b98316d..321477308b 100644
--- a/Perspex.Themes.Default/ScrollViewerStyle.cs
+++ b/Perspex.Themes.Default/ScrollViewerStyle.cs
@@ -47,7 +47,7 @@ namespace Perspex.Themes.Default
                 {
                     new ScrollContentPresenter
                     {
-                        Id = "contentPresenter",
+                        Name = "contentPresenter",
                         [~ScrollContentPresenter.ContentProperty] = control[~ScrollViewer.ContentProperty],
                         [~~ScrollContentPresenter.ExtentProperty] = control[~~ScrollViewer.ExtentProperty],
                         [~~ScrollContentPresenter.OffsetProperty] = control[~~ScrollViewer.OffsetProperty],
@@ -56,7 +56,7 @@ namespace Perspex.Themes.Default
                     },
                     new ScrollBar
                     {
-                        Id = "horizontalScrollBar",
+                        Name = "horizontalScrollBar",
                         Orientation = Orientation.Horizontal,
                         [~ScrollBar.MaximumProperty] = control[~ScrollViewer.HorizontalScrollBarMaximumProperty],
                         [~~ScrollBar.ValueProperty] = control[~~ScrollViewer.HorizontalScrollBarValueProperty],
@@ -66,7 +66,7 @@ namespace Perspex.Themes.Default
                     },
                     new ScrollBar
                     {
-                        Id = "verticalScrollBar",
+                        Name = "verticalScrollBar",
                         Orientation = Orientation.Vertical,
                         [~ScrollBar.MaximumProperty] = control[~ScrollViewer.VerticalScrollBarMaximumProperty],
                         [~~ScrollBar.ValueProperty] = control[~~ScrollViewer.VerticalScrollBarValueProperty],
diff --git a/Perspex.Themes.Default/TabControlStyle.cs b/Perspex.Themes.Default/TabControlStyle.cs
index 098ecc7771..6f566b3904 100644
--- a/Perspex.Themes.Default/TabControlStyle.cs
+++ b/Perspex.Themes.Default/TabControlStyle.cs
@@ -45,13 +45,13 @@ namespace Perspex.Themes.Default
                 {
                     new TabStrip
                     {
-                        Id = "tabStrip",
+                        Name = "tabStrip",
                         [~TabStrip.ItemsProperty] = control[~TabControl.ItemsProperty],
                         [~~TabStrip.SelectedItemProperty] = control[~~TabControl.SelectedItemProperty],
                     },
                     new Deck
                     {
-                        Id = "deck",
+                        Name = "deck",
                         DataTemplates = new DataTemplates
                         {
                             new DataTemplate<TabItem>(x => control.MaterializeDataTemplate(x.Content)),
diff --git a/Perspex.Themes.Default/TabItemStyle.cs b/Perspex.Themes.Default/TabItemStyle.cs
index c7bfc90c81..0cb134136d 100644
--- a/Perspex.Themes.Default/TabItemStyle.cs
+++ b/Perspex.Themes.Default/TabItemStyle.cs
@@ -41,7 +41,7 @@ namespace Perspex.Themes.Default
         {
             return new ContentPresenter
             {
-                Id = "headerPresenter",
+                Name = "headerPresenter",
                 [~ContentPresenter.ContentProperty] = control[~TabItem.HeaderProperty],
             };
         }
diff --git a/Perspex.Themes.Default/TabStripStyle.cs b/Perspex.Themes.Default/TabStripStyle.cs
index e6e3fbcddb..ed5180e035 100644
--- a/Perspex.Themes.Default/TabStripStyle.cs
+++ b/Perspex.Themes.Default/TabStripStyle.cs
@@ -40,7 +40,7 @@ namespace Perspex.Themes.Default
         {
             return new ItemsPresenter
             {
-                Id = "itemsPresenter",
+                Name = "itemsPresenter",
                 [~ItemsPresenter.ItemsProperty] = control[~ItemsControl.ItemsProperty],
                 [~ItemsPresenter.ItemsPanelProperty] = control[~ItemsControl.ItemsPanelProperty],
             };
diff --git a/Perspex.Themes.Default/TextBoxStyle.cs b/Perspex.Themes.Default/TextBoxStyle.cs
index 8b341f616d..8220afb0bc 100644
--- a/Perspex.Themes.Default/TextBoxStyle.cs
+++ b/Perspex.Themes.Default/TextBoxStyle.cs
@@ -30,7 +30,7 @@ namespace Perspex.Themes.Default
                         new Setter(TextBox.FocusAdornerProperty, null),
                     },
                 },
-                new Style(x => x.OfType<TextBox>().Class(":focus").Template().Id("border"))
+                new Style(x => x.OfType<TextBox>().Class(":focus").Template().Name("border"))
                 {
                     Setters = new[]
                     {
@@ -44,7 +44,7 @@ namespace Perspex.Themes.Default
         {
             Border result = new Border
             {
-                Id = "border",
+                Name = "border",
                 Padding = new Thickness(2),
                 [~Border.BackgroundProperty] = control[~TextBox.BackgroundProperty],
                 [~Border.BorderBrushProperty] = control[~TextBox.BorderBrushProperty],
@@ -56,7 +56,7 @@ namespace Perspex.Themes.Default
                     [~ScrollViewer.VerticalScrollBarVisibilityProperty] = control[~ScrollViewer.VerticalScrollBarVisibilityProperty],
                     Content = new TextPresenter
                     {
-                        Id = "textPresenter",
+                        Name = "textPresenter",
                         [~TextPresenter.CaretIndexProperty] = control[~TextBox.CaretIndexProperty],
                         [~TextPresenter.SelectionStartProperty] = control[~TextBox.SelectionStartProperty],
                         [~TextPresenter.SelectionEndProperty] = control[~TextBox.SelectionEndProperty],
diff --git a/Perspex.Themes.Default/ToggleButtonStyle.cs b/Perspex.Themes.Default/ToggleButtonStyle.cs
index 42e59ef5af..cb43807202 100644
--- a/Perspex.Themes.Default/ToggleButtonStyle.cs
+++ b/Perspex.Themes.Default/ToggleButtonStyle.cs
@@ -34,14 +34,14 @@ namespace Perspex.Themes.Default
                         new Setter(ToggleButton.VerticalContentAlignmentProperty, VerticalAlignment.Center),
                     },
                 },
-                new Style(x => x.OfType<ToggleButton>().Class(":checked").Template().Id("border"))
+                new Style(x => x.OfType<ToggleButton>().Class(":checked").Template().Name("border"))
                 {
                     Setters = new[]
                     {
                         new Setter(ToggleButton.BackgroundProperty, new SolidColorBrush(0xff7f7f7f)),
                     },
                 },
-                new Style(x => x.OfType<ToggleButton>().Class(":pointerover").Template().Id("border"))
+                new Style(x => x.OfType<ToggleButton>().Class(":pointerover").Template().Name("border"))
                 {
                     Setters = new[]
                     {
@@ -49,28 +49,28 @@ namespace Perspex.Themes.Default
                         new Setter(ToggleButton.BorderBrushProperty, new SolidColorBrush(0xff3c7fb1)),
                     },
                 },
-                new Style(x => x.OfType<ToggleButton>().Class(":checked").Class(":pointerover").Template().Id("border"))
+                new Style(x => x.OfType<ToggleButton>().Class(":checked").Class(":pointerover").Template().Name("border"))
                 {
                     Setters = new[]
                     {
                         new Setter(ToggleButton.BackgroundProperty, new SolidColorBrush(0xffa0a0a0)),
                     },
                 },
-                new Style(x => x.OfType<ToggleButton>().Class(":pointerover").Class(":pressed").Template().Id("border"))
+                new Style(x => x.OfType<ToggleButton>().Class(":pointerover").Class(":pressed").Template().Name("border"))
                 {
                     Setters = new[]
                     {
                         new Setter(ToggleButton.BackgroundProperty, new SolidColorBrush(0xffc4e5f6)),
                     },
                 },
-                new Style(x => x.OfType<ToggleButton>().Class(":pressed").Template().Id("border"))
+                new Style(x => x.OfType<ToggleButton>().Class(":pressed").Template().Name("border"))
                 {
                     Setters = new[]
                     {
                         new Setter(ToggleButton.BorderBrushProperty, new SolidColorBrush(0xffff628b)),
                     },
                 },
-                new Style(x => x.OfType<ToggleButton>().Class(":disabled").Template().Id("border"))
+                new Style(x => x.OfType<ToggleButton>().Class(":disabled").Template().Name("border"))
                 {
                     Setters = new[]
                     {
@@ -84,14 +84,14 @@ namespace Perspex.Themes.Default
         {
             Border border = new Border
             {
-                Id = "border",
+                Name = "border",
                 Padding = new Thickness(3),
                 [~Border.BackgroundProperty] = control[~ToggleButton.BackgroundProperty],
                 [~Border.BorderBrushProperty] = control[~ToggleButton.BorderBrushProperty],
                 [~Border.BorderThicknessProperty] = control[~ToggleButton.BorderThicknessProperty],
                 Content = new ContentPresenter
                 {
-                    Id = "contentPresenter",
+                    Name = "contentPresenter",
                     [~ContentPresenter.ContentProperty] = control[~ToggleButton.ContentProperty],
                     [~ContentPresenter.HorizontalAlignmentProperty] = control[~ToggleButton.HorizontalContentAlignmentProperty],
                     [~ContentPresenter.VerticalAlignmentProperty] = control[~ToggleButton.VerticalContentAlignmentProperty],
diff --git a/Perspex.Themes.Default/TreeViewItemStyle.cs b/Perspex.Themes.Default/TreeViewItemStyle.cs
index a3a830b28c..2b952480f9 100644
--- a/Perspex.Themes.Default/TreeViewItemStyle.cs
+++ b/Perspex.Themes.Default/TreeViewItemStyle.cs
@@ -28,14 +28,14 @@ namespace Perspex.Themes.Default
                         new Setter(Button.TemplateProperty, ControlTemplate.Create<TreeViewItem>(this.Template)),
                     },
                 },
-                new Style(x => x.OfType<TreeViewItem>().Template().Id("header"))
+                new Style(x => x.OfType<TreeViewItem>().Template().Name("header"))
                 {
                     Setters = new[]
                     {
                         new Setter(Border.PaddingProperty, new Thickness(2)),
                     },
                 },
-                new Style(x => x.OfType<TreeViewItem>().Class(":selected").Template().Id("header"))
+                new Style(x => x.OfType<TreeViewItem>().Class(":selected").Template().Name("header"))
                 {
                     Setters = new[]
                     {
@@ -89,7 +89,7 @@ namespace Perspex.Themes.Default
                             },
                             new Border
                             {
-                                Id = "header",
+                                Name = "header",
                                 [~Border.BackgroundProperty] = control[~TreeViewItem.BackgroundProperty],
                                 [Grid.ColumnProperty] = 1,
                                 Content = new ContentPresenter
@@ -101,7 +101,7 @@ namespace Perspex.Themes.Default
                     },
                     new ItemsPresenter
                     {
-                        Id = "itemsPresenter",
+                        Name = "itemsPresenter",
                         Margin = new Thickness(24, 0, 0, 0),
                         [~ItemsPresenter.ItemsProperty] = control[~TreeViewItem.ItemsProperty],
                         [~ItemsPresenter.ItemsPanelProperty] = control[~TreeViewItem.ItemsPanelProperty],
diff --git a/Perspex.Themes.Default/TreeViewStyle.cs b/Perspex.Themes.Default/TreeViewStyle.cs
index 9c267cf6d6..5283effd59 100644
--- a/Perspex.Themes.Default/TreeViewStyle.cs
+++ b/Perspex.Themes.Default/TreeViewStyle.cs
@@ -43,7 +43,7 @@ namespace Perspex.Themes.Default
                     CanScrollHorizontally = true,
                     Content = new ItemsPresenter
                     {
-                        Id = "itemsPresenter",
+                        Name = "itemsPresenter",
                         [~ItemsPresenter.ItemsProperty] = control[~TreeView.ItemsProperty],
                         [~ItemsPresenter.ItemsPanelProperty] = control[~TreeView.ItemsPanelProperty],
                     }
diff --git a/Perspex.Themes.Default/WindowStyle.cs b/Perspex.Themes.Default/WindowStyle.cs
index c1e4e7545c..45c3cce639 100644
--- a/Perspex.Themes.Default/WindowStyle.cs
+++ b/Perspex.Themes.Default/WindowStyle.cs
@@ -40,7 +40,7 @@ namespace Perspex.Themes.Default
                 {
                     Content = new ContentPresenter
                     {
-                        Id = "contentPresenter",
+                        Name = "contentPresenter",
                         [~ContentPresenter.ContentProperty] = control[~Window.ContentProperty],
                     }
                 }
diff --git a/TestApplication/Program.cs b/TestApplication/Program.cs
index 833e05619f..ccc6a2423f 100644
--- a/TestApplication/Program.cs
+++ b/TestApplication/Program.cs
@@ -412,7 +412,7 @@ namespace TestApplication
                     {
                         new TreeView
                         {
-                            Id = "treeView",
+                            Name = "treeView",
                             Items = treeData,
                         },
                         (listBox = new ListBox
diff --git a/Tests/Perspex.Controls.UnitTests/ContentControlTests.cs b/Tests/Perspex.Controls.UnitTests/ContentControlTests.cs
index d773601f7d..1c4be7badf 100644
--- a/Tests/Perspex.Controls.UnitTests/ContentControlTests.cs
+++ b/Tests/Perspex.Controls.UnitTests/ContentControlTests.cs
@@ -160,7 +160,7 @@ namespace Perspex.Controls.UnitTests
             target.Content = null;
 
             // Need to call ApplyTemplate on presenter for LogocalChildren to be updated.
-            var presenter = target.GetTemplateChildren().Single(x => x.Id == "contentPresenter");
+            var presenter = target.GetTemplateChildren().Single(x => x.Name == "contentPresenter");
             presenter.ApplyTemplate();
 
             Assert.Equal(new ILogical[0], ((ILogical)target).LogicalChildren.ToList());
@@ -181,7 +181,7 @@ namespace Perspex.Controls.UnitTests
             contentControl.ApplyTemplate();
 
             // Need to call ApplyTemplate on presenter for CollectionChanged to be called.
-            var presenter = contentControl.GetTemplateChildren().Single(x => x.Id == "contentPresenter");
+            var presenter = contentControl.GetTemplateChildren().Single(x => x.Name == "contentPresenter");
             presenter.ApplyTemplate();
 
             Assert.True(called);
@@ -204,7 +204,7 @@ namespace Perspex.Controls.UnitTests
             contentControl.Content = null;
 
             // Need to call ApplyTemplate on presenter for CollectionChanged to be called.
-            var presenter = contentControl.GetTemplateChildren().Single(x => x.Id == "contentPresenter");
+            var presenter = contentControl.GetTemplateChildren().Single(x => x.Name == "contentPresenter");
             presenter.ApplyTemplate();
 
             Assert.True(called);
@@ -228,7 +228,7 @@ namespace Perspex.Controls.UnitTests
             contentControl.Content = child2;
 
             // Need to call ApplyTemplate on presenter for CollectionChanged to be called.
-            var presenter = contentControl.GetTemplateChildren().Single(x => x.Id == "contentPresenter");
+            var presenter = contentControl.GetTemplateChildren().Single(x => x.Name == "contentPresenter");
             presenter.ApplyTemplate();
 
             Assert.True(called);
@@ -243,7 +243,7 @@ namespace Perspex.Controls.UnitTests
                     Background = new Perspex.Media.SolidColorBrush(0xffffffff),
                     Content = new ContentPresenter
                     {
-                        Id = "contentPresenter",
+                        Name = "contentPresenter",
                         [~ContentPresenter.ContentProperty] = parent[~ContentControl.ContentProperty],
                     }
                 };
diff --git a/Tests/Perspex.Controls.UnitTests/DeckTests.cs b/Tests/Perspex.Controls.UnitTests/DeckTests.cs
index 25581050cf..7261f53b4c 100644
--- a/Tests/Perspex.Controls.UnitTests/DeckTests.cs
+++ b/Tests/Perspex.Controls.UnitTests/DeckTests.cs
@@ -57,7 +57,7 @@ namespace Perspex.Controls.UnitTests
         {
             return new DeckPresenter
             {
-                Id = "itemsPresenter",
+                Name = "itemsPresenter",
                 [~ItemsPresenter.ItemsProperty] = control[~Deck.ItemsProperty],
                 [~ItemsPresenter.ItemsPanelProperty] = control[~Deck.ItemsPanelProperty],
                 [~DeckPresenter.SelectedItemProperty] = control[~Deck.SelectedItemProperty],
diff --git a/Tests/Perspex.Controls.UnitTests/DropDownTests.cs b/Tests/Perspex.Controls.UnitTests/DropDownTests.cs
index 10492d23d4..fdf1071f83 100644
--- a/Tests/Perspex.Controls.UnitTests/DropDownTests.cs
+++ b/Tests/Perspex.Controls.UnitTests/DropDownTests.cs
@@ -32,7 +32,7 @@ namespace Perspex.Controls.UnitTests
             target.Template = this.GetTemplate();
             target.ApplyTemplate();
 
-            var childIds = ((ILogical)target).LogicalChildren.Cast<Control>().Select(x => x.Id);
+            var childIds = ((ILogical)target).LogicalChildren.Cast<Control>().Select(x => x.Name);
 
             Assert.Equal(new[] { "contentControl", "toggle", "popup" }, childIds);
         }
@@ -43,21 +43,21 @@ namespace Perspex.Controls.UnitTests
             {
                 return new Panel
                 {
-                    Id = "container",
+                    Name = "container",
                     Children = new Controls
                     {
                         new ContentControl
                         {
-                            Id = "contentControl",
+                            Name = "contentControl",
                             [~ContentPresenter.ContentProperty] = parent[~DropDown.ContentProperty],
                         },
                         new ToggleButton
                         {
-                            Id = "toggle",
+                            Name = "toggle",
                         },
                         new Popup
                         {
-                            Id = "popup",
+                            Name = "popup",
                         }
                     }
                 };
diff --git a/Tests/Perspex.Controls.UnitTests/ItemsControlTests.cs b/Tests/Perspex.Controls.UnitTests/ItemsControlTests.cs
index 872ee9a2a0..71bf53c007 100644
--- a/Tests/Perspex.Controls.UnitTests/ItemsControlTests.cs
+++ b/Tests/Perspex.Controls.UnitTests/ItemsControlTests.cs
@@ -284,7 +284,7 @@ namespace Perspex.Controls.UnitTests
                     Background = new Perspex.Media.SolidColorBrush(0xffffffff),
                     Content = new ItemsPresenter
                     {
-                        Id = "itemsPresenter",
+                        Name = "itemsPresenter",
                         [~ItemsPresenter.ItemsProperty] = parent[~ItemsControl.ItemsProperty],
                     }
                 };
diff --git a/Tests/Perspex.Controls.UnitTests/ListBoxTests.cs b/Tests/Perspex.Controls.UnitTests/ListBoxTests.cs
index 36d98a2fe5..a24646316b 100644
--- a/Tests/Perspex.Controls.UnitTests/ListBoxTests.cs
+++ b/Tests/Perspex.Controls.UnitTests/ListBoxTests.cs
@@ -42,7 +42,7 @@ namespace Perspex.Controls.UnitTests
                 Template = new ControlTemplate(this.CreateScrollViewerTemplate),
                 Content = new ItemsPresenter
                 {
-                    Id = "itemsPresenter",
+                    Name = "itemsPresenter",
                     [~ItemsPresenter.ItemsProperty] = parent.GetObservable(ListBox.ItemsProperty),
                 }
             };
diff --git a/Tests/Perspex.Controls.UnitTests/Primitives/SelectingItemsControlTests.cs b/Tests/Perspex.Controls.UnitTests/Primitives/SelectingItemsControlTests.cs
index 0d280f30a0..c9302205c7 100644
--- a/Tests/Perspex.Controls.UnitTests/Primitives/SelectingItemsControlTests.cs
+++ b/Tests/Perspex.Controls.UnitTests/Primitives/SelectingItemsControlTests.cs
@@ -288,7 +288,7 @@ namespace Perspex.Controls.Primitives.UnitTests
             return ControlTemplate.Create<Target>(control =>
                 new ItemsPresenter
                 {
-                    Id = "itemsPresenter",
+                    Name = "itemsPresenter",
                     [~ItemsPresenter.ItemsProperty] = control[~ListBox.ItemsProperty],
                     [~ItemsPresenter.ItemsPanelProperty] = control[~ListBox.ItemsPanelProperty],
                 });
diff --git a/Tests/Perspex.Controls.UnitTests/ScrollViewerTests.cs b/Tests/Perspex.Controls.UnitTests/ScrollViewerTests.cs
index deccb37246..741c352a6c 100644
--- a/Tests/Perspex.Controls.UnitTests/ScrollViewerTests.cs
+++ b/Tests/Perspex.Controls.UnitTests/ScrollViewerTests.cs
@@ -46,7 +46,7 @@ namespace Perspex.Controls.UnitTests
 
             var presenter = target.GetVisualDescendents()
                 .OfType<ContentPresenter>()
-                .Single(x => x.Id == "this");
+                .Single(x => x.Name == "this");
 
             Assert.Equal(target, presenter.TemplatedParent);
         }
@@ -69,7 +69,7 @@ namespace Perspex.Controls.UnitTests
                 {
                     new ScrollContentPresenter
                     {
-                        Id = "contentPresenter",
+                        Name = "contentPresenter",
                         [~ScrollContentPresenter.ContentProperty] = control[~ScrollViewer.ContentProperty],
                         [~~ScrollContentPresenter.ExtentProperty] = control[~~ScrollViewer.ExtentProperty],
                         [~~ScrollContentPresenter.OffsetProperty] = control[~~ScrollViewer.OffsetProperty],
@@ -78,7 +78,7 @@ namespace Perspex.Controls.UnitTests
                     },
                     new ScrollBar
                     {
-                        Id = "horizontalScrollBar",
+                        Name = "horizontalScrollBar",
                         Orientation = Orientation.Horizontal,
                         [~ScrollBar.MaximumProperty] = control[~ScrollViewer.HorizontalScrollBarMaximumProperty],
                         [~~ScrollBar.ValueProperty] = control[~~ScrollViewer.HorizontalScrollBarValueProperty],
@@ -88,7 +88,7 @@ namespace Perspex.Controls.UnitTests
                     },
                     new ScrollBar
                     {
-                        Id = "verticalScrollBar",
+                        Name = "verticalScrollBar",
                         Orientation = Orientation.Vertical,
                         [~ScrollBar.MaximumProperty] = control[~ScrollViewer.VerticalScrollBarMaximumProperty],
                         [~~ScrollBar.ValueProperty] = control[~~ScrollViewer.VerticalScrollBarValueProperty],
@@ -107,7 +107,7 @@ namespace Perspex.Controls.UnitTests
                 Template = ControlTemplate.Create<ScrollViewer>(this.CreateTemplate),
                 Content = new ContentPresenter
                 {
-                    Id = "this"
+                    Name = "this"
                 }
             };
         }
diff --git a/Tests/Perspex.Controls.UnitTests/TabControlTests.cs b/Tests/Perspex.Controls.UnitTests/TabControlTests.cs
index 3a3f257bdf..d214652008 100644
--- a/Tests/Perspex.Controls.UnitTests/TabControlTests.cs
+++ b/Tests/Perspex.Controls.UnitTests/TabControlTests.cs
@@ -25,11 +25,11 @@ namespace Perspex.Controls.UnitTests
                 {
                     new TabItem
                     {
-                        Id = "first"
+                        Name = "first"
                     },
                     new TabItem
                     {
-                        Id = "second"
+                        Name = "second"
                     },
                 }
             };
@@ -74,11 +74,11 @@ namespace Perspex.Controls.UnitTests
                 {
                     new TabItem
                     {
-                        Id = "first"
+                        Name = "first"
                     },
                     new TabItem
                     {
-                        Id = "second"
+                        Name = "second"
                     },
                 }
             };
@@ -99,11 +99,11 @@ namespace Perspex.Controls.UnitTests
                 {
                     new TabItem
                     {
-                        Id = "first"
+                        Name = "first"
                     },
                     new TabItem
                     {
-                        Id = "second"
+                        Name = "second"
                     },
                 }
             };
@@ -124,11 +124,11 @@ namespace Perspex.Controls.UnitTests
                 {
                     new TabItem
                     {
-                        Content = new TextBlock { Id = "Foo" }
+                        Content = new TextBlock { Name = "Foo" }
                     },
                     new TabItem
                     {
-                        Content = new TextBlock { Id = "Foo" }
+                        Content = new TextBlock { Name = "Foo" }
                     },
                 },
             };
@@ -136,7 +136,7 @@ namespace Perspex.Controls.UnitTests
             target.ApplyTemplate();
 
             Assert.Equal(1, target.GetLogicalChildren().Count());
-            Assert.Equal("Foo", ((TextBlock)target.GetLogicalChildren().First()).Id);
+            Assert.Equal("Foo", ((TextBlock)target.GetLogicalChildren().First()).Name);
         }
 
         private Control CreateTabControlTemplate(TabControl parent)
@@ -147,14 +147,14 @@ namespace Perspex.Controls.UnitTests
                 {
                     new TabStrip
                     {
-                        Id = "tabStrip",
+                        Name = "tabStrip",
                         Template = ControlTemplate.Create<TabStrip>(this.CreateTabStripTemplate),
                         [~TabStrip.ItemsProperty] = parent[~TabControl.ItemsProperty],
                         [~~TabStrip.SelectedTabProperty] = parent[~~TabControl.SelectedTabProperty]
                     },
                     new Deck
                     {
-                        Id = "deck",
+                        Name = "deck",
                         [~Deck.ItemsProperty] = parent[~TabControl.ItemsProperty],
                         [!Deck.SelectedItemProperty] = parent[!TabControl.SelectedItemProperty],
                     }
@@ -166,7 +166,7 @@ namespace Perspex.Controls.UnitTests
         {
             return new ItemsPresenter
             {
-                Id = "itemsPresenter",
+                Name = "itemsPresenter",
                 [~ItemsPresenter.ItemsProperty] = parent[~TabStrip.ItemsProperty],
             };
         }
diff --git a/Tests/Perspex.Controls.UnitTests/TabStripTests.cs b/Tests/Perspex.Controls.UnitTests/TabStripTests.cs
index 910ebb7ab6..ac16d371e5 100644
--- a/Tests/Perspex.Controls.UnitTests/TabStripTests.cs
+++ b/Tests/Perspex.Controls.UnitTests/TabStripTests.cs
@@ -25,11 +25,11 @@ namespace Perspex.Controls.UnitTests
                 {
                     new TabItem
                     {
-                        Id = "first"
+                        Name = "first"
                     },
                     new TabItem
                     {
-                        Id = "second"
+                        Name = "second"
                     },
                 }
             };
@@ -50,11 +50,11 @@ namespace Perspex.Controls.UnitTests
                 {
                     new TabItem
                     {
-                        Id = "first"
+                        Name = "first"
                     },
                     new TabItem
                     {
-                        Id = "second"
+                        Name = "second"
                     },
                 }
             };
@@ -75,11 +75,11 @@ namespace Perspex.Controls.UnitTests
                 {
                     new TabItem
                     {
-                        Id = "first"
+                        Name = "first"
                     },
                     new TabItem
                     {
-                        Id = "second"
+                        Name = "second"
                     },
                 }
             };
@@ -94,7 +94,7 @@ namespace Perspex.Controls.UnitTests
         {
             return new ItemsPresenter
             {
-                Id = "itemsPresenter",
+                Name = "itemsPresenter",
                 [~ItemsPresenter.ItemsProperty] = parent[~TabStrip.ItemsProperty],
             };
         }
diff --git a/Tests/Perspex.Controls.UnitTests/Templates/TemplateExtensionsTests.cs b/Tests/Perspex.Controls.UnitTests/Templates/TemplateExtensionsTests.cs
index 160f8807be..dd87fa9328 100644
--- a/Tests/Perspex.Controls.UnitTests/Templates/TemplateExtensionsTests.cs
+++ b/Tests/Perspex.Controls.UnitTests/Templates/TemplateExtensionsTests.cs
@@ -23,12 +23,12 @@ namespace Perspex.Controls.Templates.UnitTests
         public void GetTemplateChildren_Should_Not_Return_Nested_Template_Controls()
         {
             var target = new TestTemplatedControl();
-            var border1 = new Border { Id = "border1", TemplatedParent = target };
-            var inner = new TestTemplatedControl { Id = "inner", TemplatedParent = target };
-            var border2 = new Border { Id = "border2", TemplatedParent = inner };
-            var border3 = new Border { Id = "border3", TemplatedParent = inner };
-            var border4 = new Border { Id = "border4", TemplatedParent = target };
-            var border5 = new Border { Id = "border5", TemplatedParent = null };
+            var border1 = new Border { Name = "border1", TemplatedParent = target };
+            var inner = new TestTemplatedControl { Name = "inner", TemplatedParent = target };
+            var border2 = new Border { Name = "border2", TemplatedParent = inner };
+            var border3 = new Border { Name = "border3", TemplatedParent = inner };
+            var border4 = new Border { Name = "border4", TemplatedParent = target };
+            var border5 = new Border { Name = "border5", TemplatedParent = null };
 
             target.AddVisualChild(border1);
             border1.Content = inner;
@@ -37,7 +37,7 @@ namespace Perspex.Controls.Templates.UnitTests
             border3.Content = border4;
             border4.Content = border5;
 
-            var result = target.GetTemplateChildren().Select(x => x.Id).ToArray();
+            var result = target.GetTemplateChildren().Select(x => x.Name).ToArray();
 
             Assert.Equal(new[] { "border1", "inner", "border4" }, result);
         }
diff --git a/Tests/Perspex.Input.UnitTests/KeyboardNavigationTests.cs b/Tests/Perspex.Input.UnitTests/KeyboardNavigationTests.cs
index 0473ac70e3..292ff1fcf8 100644
--- a/Tests/Perspex.Input.UnitTests/KeyboardNavigationTests.cs
+++ b/Tests/Perspex.Input.UnitTests/KeyboardNavigationTests.cs
@@ -26,18 +26,18 @@ namespace Perspex.Input.UnitTests
                     {
                         Children = new Controls
                         {
-                            new Button { Id = "Button1" },
-                            (current = new Button { Id = "Button2" }),
-                            (next = new Button { Id = "Button3" }),
+                            new Button { Name = "Button1" },
+                            (current = new Button { Name = "Button2" }),
+                            (next = new Button { Name = "Button3" }),
                         }
                     }),
                     new StackPanel
                     {
                         Children = new Controls
                         {
-                            new Button { Id = "Button4" },
-                            new Button { Id = "Button5" },
-                            new Button { Id = "Button6" },
+                            new Button { Name = "Button4" },
+                            new Button { Name = "Button5" },
+                            new Button { Name = "Button6" },
                         }
                     },
                 }
@@ -64,18 +64,18 @@ namespace Perspex.Input.UnitTests
                     {
                         Children = new Controls
                         {
-                            new Button { Id = "Button1" },
-                            new Button { Id = "Button2" },
-                            (current = new Button { Id = "Button3" }),
+                            new Button { Name = "Button1" },
+                            new Button { Name = "Button2" },
+                            (current = new Button { Name = "Button3" }),
                         }
                     }),
                     new StackPanel
                     {
                         Children = new Controls
                         {
-                            (next = new Button { Id = "Button4" }),
-                            new Button { Id = "Button5" },
-                            new Button { Id = "Button6" },
+                            (next = new Button { Name = "Button4" }),
+                            new Button { Name = "Button5" },
+                            new Button { Name = "Button6" },
                         }
                     },
                 }
@@ -102,12 +102,12 @@ namespace Perspex.Input.UnitTests
                     {
                         Children = new Controls
                         {
-                            new Button { Id = "Button1" },
-                            new Button { Id = "Button2" },
-                            (current = new Button { Id = "Button3" }),
+                            new Button { Name = "Button1" },
+                            new Button { Name = "Button2" },
+                            (current = new Button { Name = "Button3" }),
                         }
                     }),
-                    (next = new Button { Id = "Button4" }),
+                    (next = new Button { Name = "Button4" }),
                 }
             };
 
@@ -136,9 +136,9 @@ namespace Perspex.Input.UnitTests
                             {
                                 Children = new Controls
                                 {
-                                    new Button { Id = "Button1" },
-                                    new Button { Id = "Button2" },
-                                    (current = new Button { Id = "Button3" }),
+                                    new Button { Name = "Button1" },
+                                    new Button { Name = "Button2" },
+                                    (current = new Button { Name = "Button3" }),
                                 }
                             }),
                         },
@@ -147,9 +147,9 @@ namespace Perspex.Input.UnitTests
                     {
                         Children = new Controls
                         {
-                            (next = new Button { Id = "Button4" }),
-                            new Button { Id = "Button5" },
-                            new Button { Id = "Button6" },
+                            (next = new Button { Name = "Button4" }),
+                            new Button { Name = "Button5" },
+                            new Button { Name = "Button6" },
                         }
                     },
                 }
@@ -170,7 +170,7 @@ namespace Perspex.Input.UnitTests
             {
                 Children = new Controls
                 {
-                    (next = new Button { Id = "Button1" }),
+                    (next = new Button { Name = "Button1" }),
                 }
             };
 
@@ -199,9 +199,9 @@ namespace Perspex.Input.UnitTests
                             {
                                 Children = new Controls
                                 {
-                                    (next = new Button { Id = "Button1" }),
-                                    new Button { Id = "Button2" },
-                                    new Button { Id = "Button3" },
+                                    (next = new Button { Name = "Button1" }),
+                                    new Button { Name = "Button2" },
+                                    new Button { Name = "Button3" },
                                 }
                             }),
                         },
@@ -210,9 +210,9 @@ namespace Perspex.Input.UnitTests
                     {
                         Children = new Controls
                         {
-                            new Button { Id = "Button4" },
-                            new Button { Id = "Button5" },
-                            (current = new Button { Id = "Button6" }),
+                            new Button { Name = "Button4" },
+                            new Button { Name = "Button5" },
+                            (current = new Button { Name = "Button6" }),
                         }
                     },
                 }
@@ -240,18 +240,18 @@ namespace Perspex.Input.UnitTests
                         [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
                         Children = new Controls
                         {
-                            new Button { Id = "Button1" },
-                            (current = new Button { Id = "Button2" }),
-                            (next = new Button { Id = "Button3" }),
+                            new Button { Name = "Button1" },
+                            (current = new Button { Name = "Button2" }),
+                            (next = new Button { Name = "Button3" }),
                         }
                     }),
                     new StackPanel
                     {
                         Children = new Controls
                         {
-                            new Button { Id = "Button4" },
-                            new Button { Id = "Button5" },
-                            new Button { Id = "Button6" },
+                            new Button { Name = "Button4" },
+                            new Button { Name = "Button5" },
+                            new Button { Name = "Button6" },
                         }
                     },
                 }
@@ -279,18 +279,18 @@ namespace Perspex.Input.UnitTests
                         [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
                         Children = new Controls
                         {
-                            (next = new Button { Id = "Button1" }),
-                            new Button { Id = "Button2" },
-                            (current = new Button { Id = "Button3" }),
+                            (next = new Button { Name = "Button1" }),
+                            new Button { Name = "Button2" },
+                            (current = new Button { Name = "Button3" }),
                         }
                     }),
                     new StackPanel
                     {
                         Children = new Controls
                         {
-                            new Button { Id = "Button4" },
-                            new Button { Id = "Button5" },
-                            new Button { Id = "Button6" },
+                            new Button { Name = "Button4" },
+                            new Button { Name = "Button5" },
+                            new Button { Name = "Button6" },
                         }
                     },
                 }
@@ -318,18 +318,18 @@ namespace Perspex.Input.UnitTests
                         [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Once,
                         Children = new Controls
                         {
-                            new Button { Id = "Button1" },
-                            (current = new Button { Id = "Button2" }),
-                            new Button { Id = "Button3" },
+                            new Button { Name = "Button1" },
+                            (current = new Button { Name = "Button2" }),
+                            new Button { Name = "Button3" },
                         }
                     }),
                     new StackPanel
                     {
                         Children = new Controls
                         {
-                            (next = new Button { Id = "Button4" }),
-                            new Button { Id = "Button5" },
-                            new Button { Id = "Button6" },
+                            (next = new Button { Name = "Button4" }),
+                            new Button { Name = "Button5" },
+                            new Button { Name = "Button6" },
                         }
                     },
                 }
@@ -357,18 +357,18 @@ namespace Perspex.Input.UnitTests
                         [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Once,
                         Children = new Controls
                         {
-                            new Button { Id = "Button1" },
-                            (next = new Button { Id = "Button2" }),
-                            new Button { Id = "Button3" },
+                            new Button { Name = "Button1" },
+                            (next = new Button { Name = "Button2" }),
+                            new Button { Name = "Button3" },
                         }
                     }),
                     new StackPanel
                     {
                         Children = new Controls
                         {
-                            new Button { Id = "Button4" },
-                            new Button { Id = "Button5" },
-                            (current = new Button { Id = "Button6" }),
+                            new Button { Name = "Button4" },
+                            new Button { Name = "Button5" },
+                            (current = new Button { Name = "Button6" }),
                         }
                     },
                 }
@@ -398,18 +398,18 @@ namespace Perspex.Input.UnitTests
                         [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Never,
                         Children = new Controls
                         {
-                            new Button { Id = "Button1" },
-                            (current = new Button { Id = "Button2" }),
-                            new Button { Id = "Button3" },
+                            new Button { Name = "Button1" },
+                            (current = new Button { Name = "Button2" }),
+                            new Button { Name = "Button3" },
                         }
                     }),
                     new StackPanel
                     {
                         Children = new Controls
                         {
-                            (next = new Button { Id = "Button4" }),
-                            new Button { Id = "Button5" },
-                            new Button { Id = "Button6" },
+                            (next = new Button { Name = "Button4" }),
+                            new Button { Name = "Button5" },
+                            new Button { Name = "Button6" },
                         }
                     },
                 }
@@ -437,18 +437,18 @@ namespace Perspex.Input.UnitTests
                         [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Never,
                         Children = new Controls
                         {
-                            new Button { Id = "Button1" },
-                            new Button { Id = "Button2" },
-                            new Button { Id = "Button3" },
+                            new Button { Name = "Button1" },
+                            new Button { Name = "Button2" },
+                            new Button { Name = "Button3" },
                         }
                     }),
                     new StackPanel
                     {
                         Children = new Controls
                         {
-                            (next = new Button { Id = "Button4" }),
-                            new Button { Id = "Button5" },
-                            (current = new Button { Id = "Button6" }),
+                            (next = new Button { Name = "Button4" }),
+                            new Button { Name = "Button5" },
+                            (current = new Button { Name = "Button6" }),
                         }
                     },
                 }
@@ -477,18 +477,18 @@ namespace Perspex.Input.UnitTests
                     {
                         Children = new Controls
                         {
-                            new Button { Id = "Button1" },
-                            (next = new Button { Id = "Button2" }),
-                            (current = new Button { Id = "Button3" }),
+                            new Button { Name = "Button1" },
+                            (next = new Button { Name = "Button2" }),
+                            (current = new Button { Name = "Button3" }),
                         }
                     }),
                     new StackPanel
                     {
                         Children = new Controls
                         {
-                            new Button { Id = "Button4" },
-                            new Button { Id = "Button5" },
-                            new Button { Id = "Button6" },
+                            new Button { Name = "Button4" },
+                            new Button { Name = "Button5" },
+                            new Button { Name = "Button6" },
                         }
                     },
                 }
@@ -515,18 +515,18 @@ namespace Perspex.Input.UnitTests
                     {
                         Children = new Controls
                         {
-                            new Button { Id = "Button1" },
-                            new Button { Id = "Button2" },
-                            (next = new Button { Id = "Button3" }),
+                            new Button { Name = "Button1" },
+                            new Button { Name = "Button2" },
+                            (next = new Button { Name = "Button3" }),
                         }
                     }),
                     new StackPanel
                     {
                         Children = new Controls
                         {
-                            (current = new Button { Id = "Button4" }),
-                            new Button { Id = "Button5" },
-                            new Button { Id = "Button6" },
+                            (current = new Button { Name = "Button4" }),
+                            new Button { Name = "Button5" },
+                            new Button { Name = "Button6" },
                         }
                     },
                 }
@@ -553,12 +553,12 @@ namespace Perspex.Input.UnitTests
                     {
                         Children = new Controls
                         {
-                            new Button { Id = "Button1" },
-                            new Button { Id = "Button2" },
-                            (next = new Button { Id = "Button3" }),
+                            new Button { Name = "Button1" },
+                            new Button { Name = "Button2" },
+                            (next = new Button { Name = "Button3" }),
                         }
                     }),
-                    (current = new Button { Id = "Button4" }),
+                    (current = new Button { Name = "Button4" }),
                 }
             };
 
@@ -587,9 +587,9 @@ namespace Perspex.Input.UnitTests
                             {
                                 Children = new Controls
                                 {
-                                    new Button { Id = "Button1" },
-                                    new Button { Id = "Button2" },
-                                    (next = new Button { Id = "Button3" }),
+                                    new Button { Name = "Button1" },
+                                    new Button { Name = "Button2" },
+                                    (next = new Button { Name = "Button3" }),
                                 }
                             }),
                         },
@@ -598,9 +598,9 @@ namespace Perspex.Input.UnitTests
                     {
                         Children = new Controls
                         {
-                            (current = new Button { Id = "Button4" }),
-                            new Button { Id = "Button5" },
-                            new Button { Id = "Button6" },
+                            (current = new Button { Name = "Button4" }),
+                            new Button { Name = "Button5" },
+                            new Button { Name = "Button6" },
                         }
                     },
                 }
@@ -631,9 +631,9 @@ namespace Perspex.Input.UnitTests
                             {
                                 Children = new Controls
                                 {
-                                    (current = new Button { Id = "Button1" }),
-                                    new Button { Id = "Button2" },
-                                    new Button { Id = "Button3" },
+                                    (current = new Button { Name = "Button1" }),
+                                    new Button { Name = "Button2" },
+                                    new Button { Name = "Button3" },
                                 }
                             }),
                         },
@@ -642,9 +642,9 @@ namespace Perspex.Input.UnitTests
                     {
                         Children = new Controls
                         {
-                            new Button { Id = "Button4" },
-                            new Button { Id = "Button5" },
-                            (next = new Button { Id = "Button6" }),
+                            new Button { Name = "Button4" },
+                            new Button { Name = "Button5" },
+                            (next = new Button { Name = "Button6" }),
                         }
                     },
                 }
@@ -672,18 +672,18 @@ namespace Perspex.Input.UnitTests
                         [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
                         Children = new Controls
                         {
-                            (next = new Button { Id = "Button1" }),
-                            (current = new Button { Id = "Button2" }),
-                            new Button { Id = "Button3" },
+                            (next = new Button { Name = "Button1" }),
+                            (current = new Button { Name = "Button2" }),
+                            new Button { Name = "Button3" },
                         }
                     }),
                     new StackPanel
                     {
                         Children = new Controls
                         {
-                            new Button { Id = "Button4" },
-                            new Button { Id = "Button5" },
-                            new Button { Id = "Button6" },
+                            new Button { Name = "Button4" },
+                            new Button { Name = "Button5" },
+                            new Button { Name = "Button6" },
                         }
                     },
                 }
@@ -711,18 +711,18 @@ namespace Perspex.Input.UnitTests
                         [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle,
                         Children = new Controls
                         {
-                            (current = new Button { Id = "Button1" }),
-                            new Button { Id = "Button2" },
-                            (next = new Button { Id = "Button3" }),
+                            (current = new Button { Name = "Button1" }),
+                            new Button { Name = "Button2" },
+                            (next = new Button { Name = "Button3" }),
                         }
                     }),
                     new StackPanel
                     {
                         Children = new Controls
                         {
-                            new Button { Id = "Button4" },
-                            new Button { Id = "Button5" },
-                            new Button { Id = "Button6" },
+                            new Button { Name = "Button4" },
+                            new Button { Name = "Button5" },
+                            new Button { Name = "Button6" },
                         }
                     },
                 }
@@ -749,9 +749,9 @@ namespace Perspex.Input.UnitTests
                     {
                         Children = new Controls
                         {
-                            new Button { Id = "Button1" },
-                            new Button { Id = "Button2" },
-                            (next = new Button { Id = "Button3" }),
+                            new Button { Name = "Button1" },
+                            new Button { Name = "Button2" },
+                            (next = new Button { Name = "Button3" }),
                         }
                     }),
                     new StackPanel
@@ -759,9 +759,9 @@ namespace Perspex.Input.UnitTests
                         [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Once,
                         Children = new Controls
                         {
-                            new Button { Id = "Button4" },
-                            (current = new Button { Id = "Button5" }),
-                            new Button { Id = "Button6" },
+                            new Button { Name = "Button4" },
+                            (current = new Button { Name = "Button5" }),
+                            new Button { Name = "Button6" },
                         }
                     },
                 }
@@ -789,18 +789,18 @@ namespace Perspex.Input.UnitTests
                         [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Once,
                         Children = new Controls
                         {
-                            new Button { Id = "Button1" },
-                            (next = new Button { Id = "Button2" }),
-                            new Button { Id = "Button3" },
+                            new Button { Name = "Button1" },
+                            (next = new Button { Name = "Button2" }),
+                            new Button { Name = "Button3" },
                         }
                     }),
                     new StackPanel
                     {
                         Children = new Controls
                         {
-                            (current = new Button { Id = "Button4" }),
-                            new Button { Id = "Button5" },
-                            new Button { Id = "Button6" },
+                            (current = new Button { Name = "Button4" }),
+                            new Button { Name = "Button5" },
+                            new Button { Name = "Button6" },
                         }
                     },
                 }
@@ -830,18 +830,18 @@ namespace Perspex.Input.UnitTests
                         [KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Once,
                         Children = new Controls
                         {
-                            (next = new Button { Id = "Button1" }),
-                            new Button { Id = "Button2" },
-                            new Button { Id = "Button3" },
+                            (next = new Button { Name = "Button1" }),
+                            new Button { Name = "Button2" },
+                            new Button { Name = "Button3" },
                         }
                     }),
                     new StackPanel
                     {
                         Children = new Controls
                         {
-                            (current = new Button { Id = "Button4" }),
-                            new Button { Id = "Button5" },
-                            new Button { Id = "Button6" },
+                            (current = new Button { Name = "Button4" }),
+                            new Button { Name = "Button5" },
+                            new Button { Name = "Button6" },
                         }
                     },
                 }
diff --git a/Tests/Perspex.Styling.UnitTests/SelectorTests_Descendent.cs b/Tests/Perspex.Styling.UnitTests/SelectorTests_Descendent.cs
index 8c60544125..f32842c8b9 100644
--- a/Tests/Perspex.Styling.UnitTests/SelectorTests_Descendent.cs
+++ b/Tests/Perspex.Styling.UnitTests/SelectorTests_Descendent.cs
@@ -87,7 +87,7 @@ namespace Perspex.Styling.UnitTests
         public abstract class TestLogical : ILogical, IStyleable
         {
             public abstract Classes Classes { get; }
-            public abstract string Id { get; }
+            public abstract string Name { get; }
             public abstract IPerspexReadOnlyList<ILogical> LogicalChildren { get; }
             public abstract ILogical LogicalParent { get; }
             public Type StyleKey { get; }
diff --git a/Tests/Perspex.Styling.UnitTests/SelectorTests_Id.cs b/Tests/Perspex.Styling.UnitTests/SelectorTests_Id.cs
index 7dd2d8f5f6..558458a2b0 100644
--- a/Tests/Perspex.Styling.UnitTests/SelectorTests_Id.cs
+++ b/Tests/Perspex.Styling.UnitTests/SelectorTests_Id.cs
@@ -18,25 +18,25 @@ namespace Perspex.Styling.UnitTests
         public void Id_Priority_Is_Style()
         {
             var control = new Control1();
-            var target = new Selector().Id("foo");
+            var target = new Selector().Name("foo");
 
             Assert.Equal(BindingPriority.Style, target.Priority);
         }
 
         [Fact]
-        public void Id_Matches_Control_With_Correct_Id()
+        public void Id_Matches_Control_With_Correct_Name()
         {
-            var control = new Control1 { Id = "foo" };
-            var target = new Selector().Id("foo");
+            var control = new Control1 { Name = "foo" };
+            var target = new Selector().Name("foo");
 
             Assert.True(ActivatorValue(target, control));
         }
 
         [Fact]
-        public void Id_Doesnt_Match_Control_Of_Wrong_Id()
+        public void Id_Doesnt_Match_Control_Of_Wrong_Name()
         {
-            var control = new Control1 { Id = "foo" };
-            var target = new Selector().Id("bar");
+            var control = new Control1 { Name = "foo" };
+            var target = new Selector().Name("bar");
 
             Assert.False(ActivatorValue(target, control));
         }
@@ -45,7 +45,7 @@ namespace Perspex.Styling.UnitTests
         public void Id_Doesnt_Match_Control_With_TemplatedParent()
         {
             var control = new Control1 { TemplatedParent = new Mock<ITemplatedControl>().Object };
-            var target = new Selector().Id("foo");
+            var target = new Selector().Name("foo");
 
             Assert.False(ActivatorValue(target, control));
         }
@@ -53,8 +53,8 @@ namespace Perspex.Styling.UnitTests
         [Fact]
         public void When_Id_Matches_Control_Other_Selectors_Are_Subscribed()
         {
-            var control = new Control1 { Id = "foo" };
-            var target = new Selector().Id("foo").SubscribeCheck();
+            var control = new Control1 { Name = "foo" };
+            var target = new Selector().Name("foo").SubscribeCheck();
 
             var result = target.GetActivator(control).ToEnumerable().Take(1).ToArray();
 
@@ -64,8 +64,8 @@ namespace Perspex.Styling.UnitTests
         [Fact]
         public void When_Id_Doesnt_Match_Control_Other_Selectors_Are_Not_Subscribed()
         {
-            var control = new Control1 { Id = "foo" };
-            var target = new Selector().Id("bar").SubscribeCheck();
+            var control = new Control1 { Name = "foo" };
+            var target = new Selector().Name("bar").SubscribeCheck();
 
             var result = target.GetActivator(control).ToEnumerable().Take(1).ToArray();
 
diff --git a/Tests/Perspex.Styling.UnitTests/SelectorTests_Multiple.cs b/Tests/Perspex.Styling.UnitTests/SelectorTests_Multiple.cs
index 3857d33903..373994b36e 100644
--- a/Tests/Perspex.Styling.UnitTests/SelectorTests_Multiple.cs
+++ b/Tests/Perspex.Styling.UnitTests/SelectorTests_Multiple.cs
@@ -22,7 +22,7 @@ namespace Perspex.Styling.UnitTests
             {
                 return new Border
                 {
-                    Id = "border",
+                    Name = "border",
                 };
             });
 
@@ -38,7 +38,7 @@ namespace Perspex.Styling.UnitTests
                 .Class("foo")
                 .Class("bar")
                 .Template()
-                .Id("border");
+                .Name("border");
 
             var border = (Border)((IVisual)control).VisualChildren.Single();
             var values = new List<bool>();
diff --git a/Tests/Perspex.Styling.UnitTests/TestControlBase.cs b/Tests/Perspex.Styling.UnitTests/TestControlBase.cs
index 6644c0a12f..6fa32919b3 100644
--- a/Tests/Perspex.Styling.UnitTests/TestControlBase.cs
+++ b/Tests/Perspex.Styling.UnitTests/TestControlBase.cs
@@ -17,7 +17,7 @@ namespace Perspex.Styling.UnitTests
             this.SubscribeCheckObservable = new TestObservable();
         }
 
-        public string Id { get; set; }
+        public string Name { get; set; }
 
         public virtual Classes Classes { get; set; }
 
diff --git a/Tests/Perspex.Styling.UnitTests/TestTemplatedControl.cs b/Tests/Perspex.Styling.UnitTests/TestTemplatedControl.cs
index 91979eba57..0549dbd97b 100644
--- a/Tests/Perspex.Styling.UnitTests/TestTemplatedControl.cs
+++ b/Tests/Perspex.Styling.UnitTests/TestTemplatedControl.cs
@@ -17,7 +17,7 @@ namespace Perspex.Styling.UnitTests
             get;
         }
 
-        public abstract string Id
+        public abstract string Name
         {
             get;
         }