From 01417ba883011f3c5f10131b634145b6f5383aa4 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Fri, 16 Oct 2015 01:02:17 +0200
Subject: [PATCH] Renamed ControlTemplate -> FuncControlTemplate

---
 samples/TestApplication/GalleryStyle.cs       |  4 ++--
 src/Perspex.Controls/Perspex.Controls.csproj  |  4 ++--
 .../Primitives/TemplatedControl.cs            |  6 ++---
 ...trolTemplate.cs => FuncControlTemplate.cs} |  6 ++---
 ...Template`2.cs => FuncControlTemplate`2.cs} |  6 ++---
 src/Perspex.Themes.Default/ButtonStyle.cs     |  2 +-
 src/Perspex.Themes.Default/CarouselStyle.cs   |  2 +-
 src/Perspex.Themes.Default/CheckBoxStyle.cs   |  2 +-
 .../ContentControlStyle.cs                    |  2 +-
 src/Perspex.Themes.Default/DropDownStyle.cs   |  2 +-
 .../GridSplitterStyle.cs                      |  2 +-
 .../ItemsControlStyle.cs                      |  2 +-
 .../ListBoxItemStyle.cs                       |  2 +-
 src/Perspex.Themes.Default/ListBoxStyle.cs    |  2 +-
 src/Perspex.Themes.Default/MenuItemStyle.cs   |  4 ++--
 src/Perspex.Themes.Default/MenuStyle.cs       |  2 +-
 src/Perspex.Themes.Default/PopupRootStyle.cs  |  2 +-
 .../ProgressBarStyle.cs                       |  2 +-
 .../RadioButtonStyle.cs                       |  2 +-
 src/Perspex.Themes.Default/ScrollBarStyle.cs  |  4 ++--
 .../ScrollViewerStyle.cs                      |  2 +-
 src/Perspex.Themes.Default/TabControlStyle.cs |  2 +-
 src/Perspex.Themes.Default/TabItemStyle.cs    |  2 +-
 src/Perspex.Themes.Default/TabStripStyle.cs   |  2 +-
 src/Perspex.Themes.Default/TextBoxStyle.cs    |  2 +-
 .../ToggleButtonStyle.cs                      |  2 +-
 src/Perspex.Themes.Default/ToolTipStyle.cs    |  2 +-
 .../TreeViewItemStyle.cs                      |  4 ++--
 src/Perspex.Themes.Default/TreeViewStyle.cs   |  2 +-
 src/Perspex.Themes.Default/WindowStyle.cs     |  2 +-
 .../CarouselTests.cs                          |  4 ++--
 .../ContentControlTests.cs                    |  4 ++--
 .../DropDownTests.cs                          |  4 ++--
 .../ItemsControlTests.cs                      |  4 ++--
 .../ListBoxTests.cs                           |  8 +++----
 .../ListBoxTests_Single.cs                    | 20 ++++++++---------
 .../Primitives/PopupTests.cs                  |  4 ++--
 .../Primitives/ScrollBarTests.cs              |  8 +++----
 .../Primitives/SelectingItemsControlTests.cs  |  4 ++--
 .../SelectingItemsControlTests_AutoSelect.cs  |  4 ++--
 .../SelectingItemsControlTests_Multiple.cs    |  4 ++--
 .../Primitives/TabStripTests.cs               |  8 +++----
 .../Primitives/TemplatedControlTests.cs       | 12 +++++-----
 .../ScrollViewerTests.cs                      |  6 ++---
 .../TabControlTests.cs                        | 14 ++++++------
 .../TemplatedControlTests.cs                  | 22 +++++++++----------
 .../TopLevelTests.cs                          |  4 ++--
 .../TreeViewTests.cs                          |  6 ++---
 .../Utils/HotKeyManagerTests.cs               |  4 ++--
 .../SelectorTests_Multiple.cs                 |  2 +-
 50 files changed, 114 insertions(+), 114 deletions(-)
 rename src/Perspex.Controls/Templates/{ControlTemplate.cs => FuncControlTemplate.cs} (67%)
 rename src/Perspex.Controls/Templates/{ControlTemplate`2.cs => FuncControlTemplate`2.cs} (72%)

diff --git a/samples/TestApplication/GalleryStyle.cs b/samples/TestApplication/GalleryStyle.cs
index 060ec13141..a0e32b7740 100644
--- a/samples/TestApplication/GalleryStyle.cs
+++ b/samples/TestApplication/GalleryStyle.cs
@@ -23,7 +23,7 @@ namespace TestApplication
                 {
                     Setters = new[]
                     {
-                        new Setter (TemplatedControl.TemplateProperty, new ControlTemplate<TabControl> (TabControlTemplate))
+                        new Setter (TemplatedControl.TemplateProperty, new FuncControlTemplate<TabControl> (TabControlTemplate))
                     }
                 },
 
@@ -31,7 +31,7 @@ namespace TestApplication
                 {
                     Setters = new[]
                     {
-                        new Setter (TemplatedControl.TemplateProperty, new ControlTemplate<TabItem> (TabItemTemplate)),
+                        new Setter (TemplatedControl.TemplateProperty, new FuncControlTemplate<TabItem> (TabItemTemplate)),
                     }
                 },
 
diff --git a/src/Perspex.Controls/Perspex.Controls.csproj b/src/Perspex.Controls/Perspex.Controls.csproj
index 2d9109a089..31542f9b7d 100644
--- a/src/Perspex.Controls/Perspex.Controls.csproj
+++ b/src/Perspex.Controls/Perspex.Controls.csproj
@@ -72,7 +72,7 @@
     <Compile Include="Primitives\Popup.cs" />
     <Compile Include="Primitives\ScrollInfoAdapter.cs" />
     <Compile Include="Canvas.cs" />
-    <Compile Include="Templates\ControlTemplate`2.cs" />
+    <Compile Include="Templates\FuncControlTemplate`2.cs" />
     <Compile Include="Templates\FuncDataTemplate`1.cs" />
     <Compile Include="Templates\FuncMemberSelector.cs" />
     <Compile Include="Templates\IControlTemplate.cs" />
@@ -101,7 +101,7 @@
     <Compile Include="Control.cs" />
     <Compile Include="ControlExtensions.cs" />
     <Compile Include="Controls.cs" />
-    <Compile Include="Templates\ControlTemplate.cs" />
+    <Compile Include="Templates\FuncControlTemplate.cs" />
     <Compile Include="Templates\DataTemplateExtensions.cs" />
     <Compile Include="Templates\FuncDataTemplate.cs" />
     <Compile Include="Generators\TreeItemContainerGenerator.cs" />
diff --git a/src/Perspex.Controls/Primitives/TemplatedControl.cs b/src/Perspex.Controls/Primitives/TemplatedControl.cs
index 23f5655d6c..71da46a99e 100644
--- a/src/Perspex.Controls/Primitives/TemplatedControl.cs
+++ b/src/Perspex.Controls/Primitives/TemplatedControl.cs
@@ -69,8 +69,8 @@ namespace Perspex.Controls.Primitives
         /// <summary>
         /// Defines the <see cref="TemplateProperty"/> property.
         /// </summary>
-        public static readonly PerspexProperty<ControlTemplate> TemplateProperty =
-            PerspexProperty.Register<TemplatedControl, ControlTemplate>("Template");
+        public static readonly PerspexProperty<FuncControlTemplate> TemplateProperty =
+            PerspexProperty.Register<TemplatedControl, FuncControlTemplate>("Template");
 
         private bool _templateApplied;
 
@@ -177,7 +177,7 @@ namespace Perspex.Controls.Primitives
         /// <summary>
         /// Gets or sets the template that defines the control's appearance.
         /// </summary>
-        public ControlTemplate Template
+        public FuncControlTemplate Template
         {
             get { return GetValue(TemplateProperty); }
             set { SetValue(TemplateProperty, value); }
diff --git a/src/Perspex.Controls/Templates/ControlTemplate.cs b/src/Perspex.Controls/Templates/FuncControlTemplate.cs
similarity index 67%
rename from src/Perspex.Controls/Templates/ControlTemplate.cs
rename to src/Perspex.Controls/Templates/FuncControlTemplate.cs
index 692059e4b2..3f3ec407b4 100644
--- a/src/Perspex.Controls/Templates/ControlTemplate.cs
+++ b/src/Perspex.Controls/Templates/FuncControlTemplate.cs
@@ -10,13 +10,13 @@ namespace Perspex.Controls.Templates
     /// <summary>
     /// A template for a <see cref="TemplatedControl"/>.
     /// </summary>
-    public class ControlTemplate : FuncTemplate<ITemplatedControl, IControl>, IControlTemplate
+    public class FuncControlTemplate : FuncTemplate<ITemplatedControl, IControl>, IControlTemplate
     {
         /// <summary>
-        /// Initializes a new instance of the <see cref="ControlTemplate"/> class.
+        /// Initializes a new instance of the <see cref="FuncControlTemplate"/> class.
         /// </summary>
         /// <param name="build">The build function.</param>
-        public ControlTemplate(Func<ITemplatedControl, IControl> build)
+        public FuncControlTemplate(Func<ITemplatedControl, IControl> build)
             : base(build)
         {
         }
diff --git a/src/Perspex.Controls/Templates/ControlTemplate`2.cs b/src/Perspex.Controls/Templates/FuncControlTemplate`2.cs
similarity index 72%
rename from src/Perspex.Controls/Templates/ControlTemplate`2.cs
rename to src/Perspex.Controls/Templates/FuncControlTemplate`2.cs
index cc521a55fe..43fbae4441 100644
--- a/src/Perspex.Controls/Templates/ControlTemplate`2.cs
+++ b/src/Perspex.Controls/Templates/FuncControlTemplate`2.cs
@@ -11,13 +11,13 @@ namespace Perspex.Controls.Templates
     /// A template for a <see cref="TemplatedControl"/>.
     /// </summary>
     /// <typeparam name="T">The type of the lookless control.</typeparam>
-    public class ControlTemplate<T> : ControlTemplate where T : ITemplatedControl
+    public class FuncControlTemplate<T> : FuncControlTemplate where T : ITemplatedControl
     {
         /// <summary>
-        /// Initializes a new instance of the <see cref="ControlTemplate{T}"/> class.
+        /// Initializes a new instance of the <see cref="FuncControlTemplate{T}"/> class.
         /// </summary>
         /// <param name="build">The build function.</param>
-        public ControlTemplate(Func<T, IControl> build)
+        public FuncControlTemplate(Func<T, IControl> build)
             : base(x => build((T)x))
         {
         }
diff --git a/src/Perspex.Themes.Default/ButtonStyle.cs b/src/Perspex.Themes.Default/ButtonStyle.cs
index fb383100e8..5675a26c90 100644
--- a/src/Perspex.Themes.Default/ButtonStyle.cs
+++ b/src/Perspex.Themes.Default/ButtonStyle.cs
@@ -35,7 +35,7 @@ namespace Perspex.Themes.Default
                         new Setter(TemplatedControl.BorderThicknessProperty, 2),
                         new Setter(TemplatedControl.ForegroundProperty, new SolidColorBrush(0xff000000)),
                         new Setter(Control.FocusAdornerProperty, new FuncTemplate<IControl>(FocusAdornerTemplate)),
-                        new Setter(TemplatedControl.TemplateProperty, new ControlTemplate<Button>(Template)),
+                        new Setter(TemplatedControl.TemplateProperty, new FuncControlTemplate<Button>(Template)),
                         new Setter(ContentControl.HorizontalContentAlignmentProperty, HorizontalAlignment.Center),
                         new Setter(ContentControl.VerticalContentAlignmentProperty, VerticalAlignment.Center),
                     },
diff --git a/src/Perspex.Themes.Default/CarouselStyle.cs b/src/Perspex.Themes.Default/CarouselStyle.cs
index aa1f66e5f0..5db9a34dfc 100644
--- a/src/Perspex.Themes.Default/CarouselStyle.cs
+++ b/src/Perspex.Themes.Default/CarouselStyle.cs
@@ -26,7 +26,7 @@ namespace Perspex.Themes.Default
                 {
                     Setters = new[]
                     {
-                        new Setter(TemplatedControl.TemplateProperty, new ControlTemplate<Carousel>(Template)),
+                        new Setter(TemplatedControl.TemplateProperty, new FuncControlTemplate<Carousel>(Template)),
                     },
                 },
             });
diff --git a/src/Perspex.Themes.Default/CheckBoxStyle.cs b/src/Perspex.Themes.Default/CheckBoxStyle.cs
index dbdfe3e4fb..aa8c85a5d9 100644
--- a/src/Perspex.Themes.Default/CheckBoxStyle.cs
+++ b/src/Perspex.Themes.Default/CheckBoxStyle.cs
@@ -31,7 +31,7 @@ namespace Perspex.Themes.Default
                 {
                     Setters = new[]
                     {
-                        new Setter(TemplatedControl.TemplateProperty, new ControlTemplate<CheckBox>(Template)),
+                        new Setter(TemplatedControl.TemplateProperty, new FuncControlTemplate<CheckBox>(Template)),
                     },
                 },
                 new Style(x => x.OfType<CheckBox>().Template().Name("checkMark"))
diff --git a/src/Perspex.Themes.Default/ContentControlStyle.cs b/src/Perspex.Themes.Default/ContentControlStyle.cs
index 31a7ec1760..e2da91d71d 100644
--- a/src/Perspex.Themes.Default/ContentControlStyle.cs
+++ b/src/Perspex.Themes.Default/ContentControlStyle.cs
@@ -26,7 +26,7 @@ namespace Perspex.Themes.Default
                 {
                     Setters = new[]
                     {
-                        new Setter(TemplatedControl.TemplateProperty, new ControlTemplate<ContentControl>(Template)),
+                        new Setter(TemplatedControl.TemplateProperty, new FuncControlTemplate<ContentControl>(Template)),
                     },
                 },
             });
diff --git a/src/Perspex.Themes.Default/DropDownStyle.cs b/src/Perspex.Themes.Default/DropDownStyle.cs
index 5705031b04..05159ce187 100644
--- a/src/Perspex.Themes.Default/DropDownStyle.cs
+++ b/src/Perspex.Themes.Default/DropDownStyle.cs
@@ -33,7 +33,7 @@ namespace Perspex.Themes.Default
                 {
                     Setters = new[]
                     {
-                        new Setter(TemplatedControl.TemplateProperty, new ControlTemplate<DropDown>(Template)),
+                        new Setter(TemplatedControl.TemplateProperty, new FuncControlTemplate<DropDown>(Template)),
                         new Setter(TemplatedControl.BorderBrushProperty, new SolidColorBrush(0xff707070)),
                         new Setter(TemplatedControl.BorderThicknessProperty, 2.0),
                         new Setter(Control.FocusAdornerProperty, new FuncTemplate<IControl>(FocusAdornerTemplate)),
diff --git a/src/Perspex.Themes.Default/GridSplitterStyle.cs b/src/Perspex.Themes.Default/GridSplitterStyle.cs
index f5df6f8fb8..0c6e9fac50 100644
--- a/src/Perspex.Themes.Default/GridSplitterStyle.cs
+++ b/src/Perspex.Themes.Default/GridSplitterStyle.cs
@@ -26,7 +26,7 @@ namespace Perspex.Themes.Default
                 {
                     Setters = new[]
                     {
-                        new Setter(TemplatedControl.TemplateProperty, new ControlTemplate<GridSplitter>(Template)),
+                        new Setter(TemplatedControl.TemplateProperty, new FuncControlTemplate<GridSplitter>(Template)),
                         new Setter(Layoutable.WidthProperty, 4.0),
                     },
                 },
diff --git a/src/Perspex.Themes.Default/ItemsControlStyle.cs b/src/Perspex.Themes.Default/ItemsControlStyle.cs
index 7c66107010..91565b4471 100644
--- a/src/Perspex.Themes.Default/ItemsControlStyle.cs
+++ b/src/Perspex.Themes.Default/ItemsControlStyle.cs
@@ -26,7 +26,7 @@ namespace Perspex.Themes.Default
                 {
                     Setters = new[]
                     {
-                        new Setter(TemplatedControl.TemplateProperty, new ControlTemplate<ItemsControl>(Template)),
+                        new Setter(TemplatedControl.TemplateProperty, new FuncControlTemplate<ItemsControl>(Template)),
                     },
                 },
             });
diff --git a/src/Perspex.Themes.Default/ListBoxItemStyle.cs b/src/Perspex.Themes.Default/ListBoxItemStyle.cs
index e1589dee26..47552476c5 100644
--- a/src/Perspex.Themes.Default/ListBoxItemStyle.cs
+++ b/src/Perspex.Themes.Default/ListBoxItemStyle.cs
@@ -27,7 +27,7 @@ namespace Perspex.Themes.Default
                 {
                     Setters = new[]
                     {
-                        new Setter(TemplatedControl.TemplateProperty, new ControlTemplate<ListBoxItem>(Template)),
+                        new Setter(TemplatedControl.TemplateProperty, new FuncControlTemplate<ListBoxItem>(Template)),
                     },
                 },
                 new Style(x => x.OfType<ListBoxItem>().Class(":selected").Template().Name("border"))
diff --git a/src/Perspex.Themes.Default/ListBoxStyle.cs b/src/Perspex.Themes.Default/ListBoxStyle.cs
index 06edb9f7bf..860b948f81 100644
--- a/src/Perspex.Themes.Default/ListBoxStyle.cs
+++ b/src/Perspex.Themes.Default/ListBoxStyle.cs
@@ -27,7 +27,7 @@ namespace Perspex.Themes.Default
                 {
                     Setters = new[]
                     {
-                        new Setter(TemplatedControl.TemplateProperty, new ControlTemplate<ListBox>(Template)),
+                        new Setter(TemplatedControl.TemplateProperty, new FuncControlTemplate<ListBox>(Template)),
                         new Setter(TemplatedControl.BorderBrushProperty, Brushes.Black),
                         new Setter(TemplatedControl.BorderThicknessProperty, 1.0),
                     },
diff --git a/src/Perspex.Themes.Default/MenuItemStyle.cs b/src/Perspex.Themes.Default/MenuItemStyle.cs
index e79c6b7179..16871a7b3b 100644
--- a/src/Perspex.Themes.Default/MenuItemStyle.cs
+++ b/src/Perspex.Themes.Default/MenuItemStyle.cs
@@ -37,14 +37,14 @@ namespace Perspex.Themes.Default
                     {
                         new Setter(TemplatedControl.BorderThicknessProperty, 1.0),
                         new Setter(TemplatedControl.PaddingProperty, new Thickness(6, 0)),
-                        new Setter(TemplatedControl.TemplateProperty, new ControlTemplate<MenuItem>(PopupTemplate)),
+                        new Setter(TemplatedControl.TemplateProperty, new FuncControlTemplate<MenuItem>(PopupTemplate)),
                     },
                 },
                 new Style(x => x.OfType<Menu>().Child().OfType<MenuItem>())
                 {
                     Setters = new[]
                     {
-                        new Setter(TemplatedControl.TemplateProperty, new ControlTemplate<MenuItem>(TopLevelTemplate)),
+                        new Setter(TemplatedControl.TemplateProperty, new FuncControlTemplate<MenuItem>(TopLevelTemplate)),
                     },
                 },
                 new Style(x => x.OfType<MenuItem>().Class(":selected").Template().Name("root"))
diff --git a/src/Perspex.Themes.Default/MenuStyle.cs b/src/Perspex.Themes.Default/MenuStyle.cs
index def3c2eb7d..c50d1d8163 100644
--- a/src/Perspex.Themes.Default/MenuStyle.cs
+++ b/src/Perspex.Themes.Default/MenuStyle.cs
@@ -27,7 +27,7 @@ namespace Perspex.Themes.Default
                 {
                     Setters = new[]
                     {
-                        new Setter(TemplatedControl.TemplateProperty, new ControlTemplate<Menu>(Template)),
+                        new Setter(TemplatedControl.TemplateProperty, new FuncControlTemplate<Menu>(Template)),
                     },
                 },
             });
diff --git a/src/Perspex.Themes.Default/PopupRootStyle.cs b/src/Perspex.Themes.Default/PopupRootStyle.cs
index e745ec23c7..89b6ee2c88 100644
--- a/src/Perspex.Themes.Default/PopupRootStyle.cs
+++ b/src/Perspex.Themes.Default/PopupRootStyle.cs
@@ -26,7 +26,7 @@ namespace Perspex.Themes.Default
                 {
                     Setters = new[]
                     {
-                        new Setter(TemplatedControl.TemplateProperty, new ControlTemplate<PopupRoot>(Template)),
+                        new Setter(TemplatedControl.TemplateProperty, new FuncControlTemplate<PopupRoot>(Template)),
                         new Setter(TemplatedControl.FontFamilyProperty, "Segoe UI"),
                         new Setter(TemplatedControl.FontSizeProperty, 12.0),
                     },
diff --git a/src/Perspex.Themes.Default/ProgressBarStyle.cs b/src/Perspex.Themes.Default/ProgressBarStyle.cs
index 147d870a34..357de033da 100644
--- a/src/Perspex.Themes.Default/ProgressBarStyle.cs
+++ b/src/Perspex.Themes.Default/ProgressBarStyle.cs
@@ -32,7 +32,7 @@ namespace Perspex.Themes.Default
                 {
                     Setters = new[]
                     {
-                        new Setter(TemplatedControl.TemplateProperty, new ControlTemplate<ProgressBar>(Template)),
+                        new Setter(TemplatedControl.TemplateProperty, new FuncControlTemplate<ProgressBar>(Template)),
                         new Setter(TemplatedControl.BackgroundProperty, new SolidColorBrush(0xffdddddd)),
                         new Setter(TemplatedControl.ForegroundProperty, new SolidColorBrush(0xffbee6fd)),
                     },
diff --git a/src/Perspex.Themes.Default/RadioButtonStyle.cs b/src/Perspex.Themes.Default/RadioButtonStyle.cs
index 8392bd4882..e8412ddc39 100644
--- a/src/Perspex.Themes.Default/RadioButtonStyle.cs
+++ b/src/Perspex.Themes.Default/RadioButtonStyle.cs
@@ -31,7 +31,7 @@ namespace Perspex.Themes.Default
                 {
                     Setters = new[]
                     {
-                        new Setter(TemplatedControl.TemplateProperty,  new ControlTemplate<RadioButton>(Template)),
+                        new Setter(TemplatedControl.TemplateProperty,  new FuncControlTemplate<RadioButton>(Template)),
                     },
                 },
                 new Style(x => x.OfType<RadioButton>().Template().Name("checkMark"))
diff --git a/src/Perspex.Themes.Default/ScrollBarStyle.cs b/src/Perspex.Themes.Default/ScrollBarStyle.cs
index debcfcb0e4..42ee617267 100644
--- a/src/Perspex.Themes.Default/ScrollBarStyle.cs
+++ b/src/Perspex.Themes.Default/ScrollBarStyle.cs
@@ -28,7 +28,7 @@ namespace Perspex.Themes.Default
                 {
                     Setters = new[]
                     {
-                        new Setter(TemplatedControl.TemplateProperty, new ControlTemplate<ScrollBar>(Template)),
+                        new Setter(TemplatedControl.TemplateProperty, new FuncControlTemplate<ScrollBar>(Template)),
                     },
                 },
                 new Style(x => x.OfType<ScrollBar>().PropertyEquals(ScrollBar.OrientationProperty, Orientation.Horizontal))
@@ -83,7 +83,7 @@ namespace Perspex.Themes.Default
                     Thumb = new Thumb
                     {
                         Name = "thumb",
-                        Template = new ControlTemplate<Thumb>(ThumbTemplate),
+                        Template = new FuncControlTemplate<Thumb>(ThumbTemplate),
                     },
                 },
             };
diff --git a/src/Perspex.Themes.Default/ScrollViewerStyle.cs b/src/Perspex.Themes.Default/ScrollViewerStyle.cs
index 89ba2f0bef..d80e5b4d90 100644
--- a/src/Perspex.Themes.Default/ScrollViewerStyle.cs
+++ b/src/Perspex.Themes.Default/ScrollViewerStyle.cs
@@ -28,7 +28,7 @@ namespace Perspex.Themes.Default
                 {
                     Setters = new[]
                     {
-                        new Setter(TemplatedControl.TemplateProperty, new ControlTemplate<ScrollViewer>(Template)),
+                        new Setter(TemplatedControl.TemplateProperty, new FuncControlTemplate<ScrollViewer>(Template)),
                     },
                 },
             });
diff --git a/src/Perspex.Themes.Default/TabControlStyle.cs b/src/Perspex.Themes.Default/TabControlStyle.cs
index 253f0e1e28..6b6eec9766 100644
--- a/src/Perspex.Themes.Default/TabControlStyle.cs
+++ b/src/Perspex.Themes.Default/TabControlStyle.cs
@@ -28,7 +28,7 @@ namespace Perspex.Themes.Default
                 {
                     Setters = new[]
                     {
-                        new Setter(TemplatedControl.TemplateProperty, new ControlTemplate<TabControl>(Template)),
+                        new Setter(TemplatedControl.TemplateProperty, new FuncControlTemplate<TabControl>(Template)),
                     },
                 },
             });
diff --git a/src/Perspex.Themes.Default/TabItemStyle.cs b/src/Perspex.Themes.Default/TabItemStyle.cs
index f4163ea0db..720557d08d 100644
--- a/src/Perspex.Themes.Default/TabItemStyle.cs
+++ b/src/Perspex.Themes.Default/TabItemStyle.cs
@@ -29,7 +29,7 @@ namespace Perspex.Themes.Default
                     {
                         new Setter(TemplatedControl.FontSizeProperty, 16.0),
                         new Setter(TemplatedControl.ForegroundProperty, Brushes.Gray),
-                        new Setter(TemplatedControl.TemplateProperty, new ControlTemplate<TabItem>(Template)),
+                        new Setter(TemplatedControl.TemplateProperty, new FuncControlTemplate<TabItem>(Template)),
                     },
                 },
                 new Style(x => x.OfType<TabItem>().Class(":selected"))
diff --git a/src/Perspex.Themes.Default/TabStripStyle.cs b/src/Perspex.Themes.Default/TabStripStyle.cs
index 1e14b4a1d0..3159e1019f 100644
--- a/src/Perspex.Themes.Default/TabStripStyle.cs
+++ b/src/Perspex.Themes.Default/TabStripStyle.cs
@@ -26,7 +26,7 @@ namespace Perspex.Themes.Default
                 {
                     Setters = new[]
                     {
-                        new Setter(TemplatedControl.TemplateProperty, new ControlTemplate<TabStrip>(Template)),
+                        new Setter(TemplatedControl.TemplateProperty, new FuncControlTemplate<TabStrip>(Template)),
                     },
                 },
                 new Style(x => x.OfType<TabStrip>().Template().OfType<StackPanel>())
diff --git a/src/Perspex.Themes.Default/TextBoxStyle.cs b/src/Perspex.Themes.Default/TextBoxStyle.cs
index 82a2519469..874594469b 100644
--- a/src/Perspex.Themes.Default/TextBoxStyle.cs
+++ b/src/Perspex.Themes.Default/TextBoxStyle.cs
@@ -28,7 +28,7 @@ namespace Perspex.Themes.Default
                 {
                     Setters = new[]
                     {
-                        new Setter(TemplatedControl.TemplateProperty, new ControlTemplate<TextBox>(Template)),
+                        new Setter(TemplatedControl.TemplateProperty, new FuncControlTemplate<TextBox>(Template)),
                         new Setter(TemplatedControl.BackgroundProperty, Brushes.White),
                         new Setter(TemplatedControl.BorderBrushProperty, new SolidColorBrush(0xff707070)),
                         new Setter(TemplatedControl.BorderThicknessProperty, 2.0),
diff --git a/src/Perspex.Themes.Default/ToggleButtonStyle.cs b/src/Perspex.Themes.Default/ToggleButtonStyle.cs
index 238b5d332a..f5dbb4b3be 100644
--- a/src/Perspex.Themes.Default/ToggleButtonStyle.cs
+++ b/src/Perspex.Themes.Default/ToggleButtonStyle.cs
@@ -28,7 +28,7 @@ namespace Perspex.Themes.Default
                 {
                     Setters = new[]
                     {
-                        new Setter(TemplatedControl.TemplateProperty, new ControlTemplate<ToggleButton>(Template)),
+                        new Setter(TemplatedControl.TemplateProperty, new FuncControlTemplate<ToggleButton>(Template)),
 						new Setter(TemplatedControl.BackgroundProperty, new SolidColorBrush(0xffaaaaaa)),
 						new Setter(TemplatedControl.BorderBrushProperty, new SolidColorBrush(0xffaaaaaa)),
                         new Setter(TemplatedControl.BorderThicknessProperty, 2.0),
diff --git a/src/Perspex.Themes.Default/ToolTipStyle.cs b/src/Perspex.Themes.Default/ToolTipStyle.cs
index 86940e7804..96d75b09d6 100644
--- a/src/Perspex.Themes.Default/ToolTipStyle.cs
+++ b/src/Perspex.Themes.Default/ToolTipStyle.cs
@@ -27,7 +27,7 @@ namespace Perspex.Themes.Default
                 {
                     Setters = new[]
                     {
-                        new Setter(TemplatedControl.TemplateProperty, new ControlTemplate<ToolTip>(Template)),
+                        new Setter(TemplatedControl.TemplateProperty, new FuncControlTemplate<ToolTip>(Template)),
                         new Setter(TemplatedControl.BackgroundProperty, new SolidColorBrush(0xffffffe1)),
                         new Setter(TemplatedControl.BorderBrushProperty, Brushes.Gray),
                         new Setter(TemplatedControl.BorderThicknessProperty, 1.0),
diff --git a/src/Perspex.Themes.Default/TreeViewItemStyle.cs b/src/Perspex.Themes.Default/TreeViewItemStyle.cs
index 3485041a62..b485cea22e 100644
--- a/src/Perspex.Themes.Default/TreeViewItemStyle.cs
+++ b/src/Perspex.Themes.Default/TreeViewItemStyle.cs
@@ -31,7 +31,7 @@ namespace Perspex.Themes.Default
                 {
                     Setters = new[]
                     {
-                        new Setter(TemplatedControl.TemplateProperty, new ControlTemplate<TreeViewItem>(Template)),
+                        new Setter(TemplatedControl.TemplateProperty, new FuncControlTemplate<TreeViewItem>(Template)),
                         new Setter(Control.FocusAdornerProperty, null),
                     },
                 },
@@ -61,7 +61,7 @@ namespace Perspex.Themes.Default
                 {
                     Setters = new[]
                     {
-                        new Setter(TemplatedControl.TemplateProperty, new ControlTemplate<ToggleButton>(ToggleButtonTemplate)),
+                        new Setter(TemplatedControl.TemplateProperty, new FuncControlTemplate<ToggleButton>(ToggleButtonTemplate)),
                     },
                 },
                 new Style(x => x.OfType<TreeViewItem>().Template().OfType<ToggleButton>().Class("expander").Class(":checked").Template().OfType<Path>())
diff --git a/src/Perspex.Themes.Default/TreeViewStyle.cs b/src/Perspex.Themes.Default/TreeViewStyle.cs
index b85cb82143..37f1e15030 100644
--- a/src/Perspex.Themes.Default/TreeViewStyle.cs
+++ b/src/Perspex.Themes.Default/TreeViewStyle.cs
@@ -27,7 +27,7 @@ namespace Perspex.Themes.Default
                 {
                     Setters = new[]
                     {
-                        new Setter(TemplatedControl.TemplateProperty, new ControlTemplate<TreeView>(Template)),
+                        new Setter(TemplatedControl.TemplateProperty, new FuncControlTemplate<TreeView>(Template)),
                         new Setter(TemplatedControl.BorderBrushProperty, Brushes.Black),
                         new Setter(TemplatedControl.BorderThicknessProperty, 1.0),
                     },
diff --git a/src/Perspex.Themes.Default/WindowStyle.cs b/src/Perspex.Themes.Default/WindowStyle.cs
index 0530863eb5..1a501dbe55 100644
--- a/src/Perspex.Themes.Default/WindowStyle.cs
+++ b/src/Perspex.Themes.Default/WindowStyle.cs
@@ -26,7 +26,7 @@ namespace Perspex.Themes.Default
                 {
                     Setters = new[]
                     {
-                        new Setter(TemplatedControl.TemplateProperty, new ControlTemplate<Window>(Template)),
+                        new Setter(TemplatedControl.TemplateProperty, new FuncControlTemplate<Window>(Template)),
                         new Setter(TemplatedControl.FontFamilyProperty, "Segoe UI"),
                         new Setter(TemplatedControl.FontSizeProperty, 12.0),
                     },
diff --git a/tests/Perspex.Controls.UnitTests/CarouselTests.cs b/tests/Perspex.Controls.UnitTests/CarouselTests.cs
index 250aac3a44..b1a0a871cd 100644
--- a/tests/Perspex.Controls.UnitTests/CarouselTests.cs
+++ b/tests/Perspex.Controls.UnitTests/CarouselTests.cs
@@ -17,7 +17,7 @@ namespace Perspex.Controls.UnitTests
         {
             var target = new Carousel
             {
-                Template = new ControlTemplate<Carousel>(CreateTemplate),
+                Template = new FuncControlTemplate<Carousel>(CreateTemplate),
                 Items = new[]
                 {
                     "Foo",
@@ -36,7 +36,7 @@ namespace Perspex.Controls.UnitTests
         {
             var target = new Carousel
             {
-                Template = new ControlTemplate<Carousel>(CreateTemplate),
+                Template = new FuncControlTemplate<Carousel>(CreateTemplate),
                 Items = new[]
                 {
                     "Foo",
diff --git a/tests/Perspex.Controls.UnitTests/ContentControlTests.cs b/tests/Perspex.Controls.UnitTests/ContentControlTests.cs
index 35c91b746c..4c62f8b812 100644
--- a/tests/Perspex.Controls.UnitTests/ContentControlTests.cs
+++ b/tests/Perspex.Controls.UnitTests/ContentControlTests.cs
@@ -286,9 +286,9 @@ namespace Perspex.Controls.UnitTests
             Assert.Null(target.Presenter.Child.DataContext);
         }
 
-        private ControlTemplate GetTemplate()
+        private FuncControlTemplate GetTemplate()
         {
-            return new ControlTemplate<ContentControl>(parent =>
+            return new FuncControlTemplate<ContentControl>(parent =>
             {
                 return new Border
                 {
diff --git a/tests/Perspex.Controls.UnitTests/DropDownTests.cs b/tests/Perspex.Controls.UnitTests/DropDownTests.cs
index a60f0fe86a..29ccfeeb53 100644
--- a/tests/Perspex.Controls.UnitTests/DropDownTests.cs
+++ b/tests/Perspex.Controls.UnitTests/DropDownTests.cs
@@ -28,9 +28,9 @@ namespace Perspex.Controls.UnitTests
             Assert.Equal(new[] { "contentControl", "toggle", "popup" }, childIds);
         }
 
-        private ControlTemplate GetTemplate()
+        private FuncControlTemplate GetTemplate()
         {
-            return new ControlTemplate<DropDown>(parent =>
+            return new FuncControlTemplate<DropDown>(parent =>
             {
                 return new Panel
                 {
diff --git a/tests/Perspex.Controls.UnitTests/ItemsControlTests.cs b/tests/Perspex.Controls.UnitTests/ItemsControlTests.cs
index 124a559ef0..bb57daa004 100644
--- a/tests/Perspex.Controls.UnitTests/ItemsControlTests.cs
+++ b/tests/Perspex.Controls.UnitTests/ItemsControlTests.cs
@@ -352,9 +352,9 @@ namespace Perspex.Controls.UnitTests
             public string Value { get; }
         }
 
-        private ControlTemplate GetTemplate()
+        private FuncControlTemplate GetTemplate()
         {
-            return new ControlTemplate<ItemsControl>(parent =>
+            return new FuncControlTemplate<ItemsControl>(parent =>
             {
                 return new Border
                 {
diff --git a/tests/Perspex.Controls.UnitTests/ListBoxTests.cs b/tests/Perspex.Controls.UnitTests/ListBoxTests.cs
index 966c01a496..b1baf4b099 100644
--- a/tests/Perspex.Controls.UnitTests/ListBoxTests.cs
+++ b/tests/Perspex.Controls.UnitTests/ListBoxTests.cs
@@ -18,7 +18,7 @@ namespace Perspex.Controls.UnitTests
         {
             var target = new ListBox
             {
-                Template = new ControlTemplate(CreateListBoxTemplate),
+                Template = new FuncControlTemplate(CreateListBoxTemplate),
                 Items = new[] { "Foo", "Bar", "Baz " },
             };
 
@@ -45,7 +45,7 @@ namespace Perspex.Controls.UnitTests
 
             var target = new ListBox
             {
-                Template = new ControlTemplate(CreateListBoxTemplate),
+                Template = new FuncControlTemplate(CreateListBoxTemplate),
                 DataContext = "Base",
                 DataTemplates = new DataTemplates
                 {
@@ -71,7 +71,7 @@ namespace Perspex.Controls.UnitTests
         {
             var target = new ListBox
             {
-                Template = new ControlTemplate(CreateListBoxTemplate),
+                Template = new FuncControlTemplate(CreateListBoxTemplate),
                 Items = new[] { "Foo", "Bar", "Baz " },
             };
 
@@ -94,7 +94,7 @@ namespace Perspex.Controls.UnitTests
         {
             return new ScrollViewer
             {
-                Template = new ControlTemplate(CreateScrollViewerTemplate),
+                Template = new FuncControlTemplate(CreateScrollViewerTemplate),
                 Content = new ItemsPresenter
                 {
                     Name = "itemsPresenter",
diff --git a/tests/Perspex.Controls.UnitTests/ListBoxTests_Single.cs b/tests/Perspex.Controls.UnitTests/ListBoxTests_Single.cs
index 8dba79c008..1d77a18af0 100644
--- a/tests/Perspex.Controls.UnitTests/ListBoxTests_Single.cs
+++ b/tests/Perspex.Controls.UnitTests/ListBoxTests_Single.cs
@@ -18,7 +18,7 @@ namespace Perspex.Controls.UnitTests
         {
             var target = new ListBox
             {
-                Template = new ControlTemplate(CreateListBoxTemplate),
+                Template = new FuncControlTemplate(CreateListBoxTemplate),
                 Items = new[] { "Foo", "Bar", "Baz " },
             };
 
@@ -38,7 +38,7 @@ namespace Perspex.Controls.UnitTests
         {
             var target = new ListBox
             {
-                Template = new ControlTemplate(CreateListBoxTemplate),
+                Template = new FuncControlTemplate(CreateListBoxTemplate),
                 Items = new[] { "Foo", "Bar", "Baz " },
             };
 
@@ -58,7 +58,7 @@ namespace Perspex.Controls.UnitTests
         {
             var target = new ListBox
             {
-                Template = new ControlTemplate(CreateListBoxTemplate),
+                Template = new FuncControlTemplate(CreateListBoxTemplate),
                 Items = new[] { "Foo", "Bar", "Baz " },
             };
 
@@ -78,7 +78,7 @@ namespace Perspex.Controls.UnitTests
         {
             var target = new ListBox
             {
-                Template = new ControlTemplate(CreateListBoxTemplate),
+                Template = new FuncControlTemplate(CreateListBoxTemplate),
                 Items = new[] { "Foo", "Bar", "Baz " },
             };
 
@@ -99,7 +99,7 @@ namespace Perspex.Controls.UnitTests
         {
             var target = new ListBox
             {
-                Template = new ControlTemplate(CreateListBoxTemplate),
+                Template = new FuncControlTemplate(CreateListBoxTemplate),
                 Items = new[] { "Foo", "Bar", "Baz " },
                 SelectionMode = SelectionMode.Single | SelectionMode.Toggle,
             };
@@ -120,7 +120,7 @@ namespace Perspex.Controls.UnitTests
         {
             var target = new ListBox
             {
-                Template = new ControlTemplate(CreateListBoxTemplate),
+                Template = new FuncControlTemplate(CreateListBoxTemplate),
                 Items = new[] { "Foo", "Bar", "Baz " },
                 SelectionMode = SelectionMode.Toggle,
             };
@@ -142,7 +142,7 @@ namespace Perspex.Controls.UnitTests
         {
             var target = new ListBox
             {
-                Template = new ControlTemplate(CreateListBoxTemplate),
+                Template = new FuncControlTemplate(CreateListBoxTemplate),
                 Items = new[] { "Foo", "Bar", "Baz " },
                 SelectionMode = SelectionMode.Toggle | SelectionMode.AlwaysSelected,
             };
@@ -164,7 +164,7 @@ namespace Perspex.Controls.UnitTests
         {
             var target = new ListBox
             {
-                Template = new ControlTemplate(CreateListBoxTemplate),
+                Template = new FuncControlTemplate(CreateListBoxTemplate),
                 Items = new[] { "Foo", "Bar", "Baz " },
                 SelectionMode = SelectionMode.Single | SelectionMode.Toggle,
             };
@@ -186,7 +186,7 @@ namespace Perspex.Controls.UnitTests
         {
             var target = new ListBox
             {
-                Template = new ControlTemplate(CreateListBoxTemplate),
+                Template = new FuncControlTemplate(CreateListBoxTemplate),
                 Items = new[] { "Foo", "Bar", "Baz " },
             };
 
@@ -202,7 +202,7 @@ namespace Perspex.Controls.UnitTests
         {
             return new ScrollViewer
             {
-                Template = new ControlTemplate(CreateScrollViewerTemplate),
+                Template = new FuncControlTemplate(CreateScrollViewerTemplate),
                 Content = new ItemsPresenter
                 {
                     Name = "itemsPresenter",
diff --git a/tests/Perspex.Controls.UnitTests/Primitives/PopupTests.cs b/tests/Perspex.Controls.UnitTests/Primitives/PopupTests.cs
index cb7cd43d0d..7c2db5e86a 100644
--- a/tests/Perspex.Controls.UnitTests/Primitives/PopupTests.cs
+++ b/tests/Perspex.Controls.UnitTests/Primitives/PopupTests.cs
@@ -209,7 +209,7 @@ namespace Perspex.Controls.UnitTests.Primitives
                     Child = target = new PopupContentControl
                     {
                         Content = new Border(),
-                        Template = new ControlTemplate<PopupContentControl>(PopupContentControlTemplate),
+                        Template = new FuncControlTemplate<PopupContentControl>(PopupContentControlTemplate),
                     }
                 };
 
@@ -255,7 +255,7 @@ namespace Perspex.Controls.UnitTests.Primitives
                 {
                     Setters = new[]
                     {
-                        new Setter(TemplatedControl.TemplateProperty, new ControlTemplate<PopupRoot>(PopupRootTemplate)),
+                        new Setter(TemplatedControl.TemplateProperty, new FuncControlTemplate<PopupRoot>(PopupRootTemplate)),
                     }
                 },
             };
diff --git a/tests/Perspex.Controls.UnitTests/Primitives/ScrollBarTests.cs b/tests/Perspex.Controls.UnitTests/Primitives/ScrollBarTests.cs
index b7c017d410..6ba3adc899 100644
--- a/tests/Perspex.Controls.UnitTests/Primitives/ScrollBarTests.cs
+++ b/tests/Perspex.Controls.UnitTests/Primitives/ScrollBarTests.cs
@@ -16,7 +16,7 @@ namespace Perspex.Controls.UnitTests.Primitives
         {
             var target = new ScrollBar
             {
-                Template = new ControlTemplate<ScrollBar>(Template),
+                Template = new FuncControlTemplate<ScrollBar>(Template),
             };
 
             target.ApplyTemplate();
@@ -31,7 +31,7 @@ namespace Perspex.Controls.UnitTests.Primitives
         {
             var target = new ScrollBar
             {
-                Template = new ControlTemplate<ScrollBar>(Template),
+                Template = new FuncControlTemplate<ScrollBar>(Template),
             };
 
             target.ApplyTemplate();
@@ -46,7 +46,7 @@ namespace Perspex.Controls.UnitTests.Primitives
         {
             var target = new ScrollBar
             {
-                Template = new ControlTemplate<ScrollBar>(Template),
+                Template = new FuncControlTemplate<ScrollBar>(Template),
             };
 
             target.ApplyTemplate();
@@ -124,7 +124,7 @@ namespace Perspex.Controls.UnitTests.Primitives
                     [!Track.OrientationProperty] = control[!ScrollBar.OrientationProperty],
                     Thumb = new Thumb
                     {
-                        Template = new ControlTemplate<Thumb>(ThumbTemplate),
+                        Template = new FuncControlTemplate<Thumb>(ThumbTemplate),
                     },
                 },
             };
diff --git a/tests/Perspex.Controls.UnitTests/Primitives/SelectingItemsControlTests.cs b/tests/Perspex.Controls.UnitTests/Primitives/SelectingItemsControlTests.cs
index 928bd62b0f..c61c81e8ce 100644
--- a/tests/Perspex.Controls.UnitTests/Primitives/SelectingItemsControlTests.cs
+++ b/tests/Perspex.Controls.UnitTests/Primitives/SelectingItemsControlTests.cs
@@ -420,9 +420,9 @@ namespace Perspex.Controls.UnitTests.Primitives
             Assert.Equal(target.SelectedItem, items[1]);
         }
 
-        private ControlTemplate Template()
+        private FuncControlTemplate Template()
         {
-            return new ControlTemplate<SelectingItemsControl>(control =>
+            return new FuncControlTemplate<SelectingItemsControl>(control =>
                 new ItemsPresenter
                 {
                     Name = "itemsPresenter",
diff --git a/tests/Perspex.Controls.UnitTests/Primitives/SelectingItemsControlTests_AutoSelect.cs b/tests/Perspex.Controls.UnitTests/Primitives/SelectingItemsControlTests_AutoSelect.cs
index 490fadc4ba..22f2509e1d 100644
--- a/tests/Perspex.Controls.UnitTests/Primitives/SelectingItemsControlTests_AutoSelect.cs
+++ b/tests/Perspex.Controls.UnitTests/Primitives/SelectingItemsControlTests_AutoSelect.cs
@@ -82,9 +82,9 @@ namespace Perspex.Controls.UnitTests.Primitives
             Assert.Null(target.SelectedItem);
         }
 
-        private ControlTemplate Template()
+        private FuncControlTemplate Template()
         {
-            return new ControlTemplate<SelectingItemsControl>(control =>
+            return new FuncControlTemplate<SelectingItemsControl>(control =>
                 new ItemsPresenter
                 {
                     Name = "itemsPresenter",
diff --git a/tests/Perspex.Controls.UnitTests/Primitives/SelectingItemsControlTests_Multiple.cs b/tests/Perspex.Controls.UnitTests/Primitives/SelectingItemsControlTests_Multiple.cs
index 002c67f506..7108c90158 100644
--- a/tests/Perspex.Controls.UnitTests/Primitives/SelectingItemsControlTests_Multiple.cs
+++ b/tests/Perspex.Controls.UnitTests/Primitives/SelectingItemsControlTests_Multiple.cs
@@ -429,9 +429,9 @@ namespace Perspex.Controls.UnitTests.Primitives
             Assert.Equal(new[] { "bar" }, vm.SelectedItems);
         }
 
-        private ControlTemplate Template()
+        private FuncControlTemplate Template()
         {
-            return new ControlTemplate<SelectingItemsControl>(control =>
+            return new FuncControlTemplate<SelectingItemsControl>(control =>
                 new ItemsPresenter
                 {
                     Name = "itemsPresenter",
diff --git a/tests/Perspex.Controls.UnitTests/Primitives/TabStripTests.cs b/tests/Perspex.Controls.UnitTests/Primitives/TabStripTests.cs
index f73637fb07..d20b15be23 100644
--- a/tests/Perspex.Controls.UnitTests/Primitives/TabStripTests.cs
+++ b/tests/Perspex.Controls.UnitTests/Primitives/TabStripTests.cs
@@ -17,7 +17,7 @@ namespace Perspex.Controls.UnitTests.Primitives
         {
             var target = new TabStrip
             {
-                Template = new ControlTemplate<TabStrip>(CreateTabStripTemplate),
+                Template = new FuncControlTemplate<TabStrip>(CreateTabStripTemplate),
                 Items = new[]
                 {
                     new TabItem
@@ -43,7 +43,7 @@ namespace Perspex.Controls.UnitTests.Primitives
         {
             var target = new TabStrip
             {
-                Template = new ControlTemplate<TabStrip>(CreateTabStripTemplate),
+                Template = new FuncControlTemplate<TabStrip>(CreateTabStripTemplate),
                 Items = new[]
                 {
                     new TabItem
@@ -68,7 +68,7 @@ namespace Perspex.Controls.UnitTests.Primitives
         {
             var target = new TabStrip
             {
-                Template = new ControlTemplate<TabStrip>(CreateTabStripTemplate),
+                Template = new FuncControlTemplate<TabStrip>(CreateTabStripTemplate),
                 Items = new[]
                 {
                     new TabItem
@@ -109,7 +109,7 @@ namespace Perspex.Controls.UnitTests.Primitives
 
             var target = new TabStrip
             {
-                Template = new ControlTemplate<TabStrip>(CreateTabStripTemplate),
+                Template = new FuncControlTemplate<TabStrip>(CreateTabStripTemplate),
                 Items = list
             };
 
diff --git a/tests/Perspex.Controls.UnitTests/Primitives/TemplatedControlTests.cs b/tests/Perspex.Controls.UnitTests/Primitives/TemplatedControlTests.cs
index 5f650b1cc2..0138fe99fa 100644
--- a/tests/Perspex.Controls.UnitTests/Primitives/TemplatedControlTests.cs
+++ b/tests/Perspex.Controls.UnitTests/Primitives/TemplatedControlTests.cs
@@ -21,7 +21,7 @@ namespace Perspex.Controls.UnitTests.Primitives
         {
             var target = new TemplatedControl
             {
-                Template = new ControlTemplate(_ => new Decorator
+                Template = new FuncControlTemplate(_ => new Decorator
                 {
                     Child = new Panel
                     {
@@ -55,7 +55,7 @@ namespace Perspex.Controls.UnitTests.Primitives
         {
             var target = new TemplatedControl
             {
-                Template = new ControlTemplate(_ => new Decorator
+                Template = new FuncControlTemplate(_ => new Decorator
                 {
                     Child = new Panel
                     {
@@ -84,7 +84,7 @@ namespace Perspex.Controls.UnitTests.Primitives
         {
             var target = new TemplatedControl
             {
-                Template = new ControlTemplate(_ => new Decorator())
+                Template = new FuncControlTemplate(_ => new Decorator())
             };
 
             target.ApplyTemplate();
@@ -100,7 +100,7 @@ namespace Perspex.Controls.UnitTests.Primitives
         {
             var target = new TemplatedControl
             {
-                Template = new ControlTemplate(_ => new ApplyTemplateTracker())
+                Template = new FuncControlTemplate(_ => new ApplyTemplateTracker())
             };
 
             target.ApplyTemplate();
@@ -121,7 +121,7 @@ namespace Perspex.Controls.UnitTests.Primitives
         {
             var target = new ItemsControl
             {
-                Template = new ControlTemplate<ItemsControl>(ItemsControlTemplate),
+                Template = new FuncControlTemplate<ItemsControl>(ItemsControlTemplate),
                 Items = new[] { "Foo", }
             };
 
@@ -169,7 +169,7 @@ namespace Perspex.Controls.UnitTests.Primitives
             {
                 Child = new ScrollViewer
                 {
-                    Template = new ControlTemplate<ScrollViewer>(ScrollViewerTemplate),
+                    Template = new FuncControlTemplate<ScrollViewer>(ScrollViewerTemplate),
                     Content = new ItemsPresenter
                     {
                         Name = "itemsPresenter",
diff --git a/tests/Perspex.Controls.UnitTests/ScrollViewerTests.cs b/tests/Perspex.Controls.UnitTests/ScrollViewerTests.cs
index ceb74babf0..596acd53d8 100644
--- a/tests/Perspex.Controls.UnitTests/ScrollViewerTests.cs
+++ b/tests/Perspex.Controls.UnitTests/ScrollViewerTests.cs
@@ -18,7 +18,7 @@ namespace Perspex.Controls.UnitTests
         {
             var target = new ScrollViewer
             {
-                Template = new ControlTemplate<ScrollViewer>(CreateTemplate),
+                Template = new FuncControlTemplate<ScrollViewer>(CreateTemplate),
                 Content = "Foo",
             };
 
@@ -34,7 +34,7 @@ namespace Perspex.Controls.UnitTests
         {
             var target = new ContentControl
             {
-                Template = new ControlTemplate<ContentControl>(CreateNestedTemplate),
+                Template = new FuncControlTemplate<ContentControl>(CreateNestedTemplate),
                 Content = "Foo",
             };
 
@@ -100,7 +100,7 @@ namespace Perspex.Controls.UnitTests
         {
             return new ScrollViewer
             {
-                Template = new ControlTemplate<ScrollViewer>(CreateTemplate),
+                Template = new FuncControlTemplate<ScrollViewer>(CreateTemplate),
                 Content = new ContentPresenter
                 {
                     Name = "this"
diff --git a/tests/Perspex.Controls.UnitTests/TabControlTests.cs b/tests/Perspex.Controls.UnitTests/TabControlTests.cs
index 09f1dd6b9a..5c2b734796 100644
--- a/tests/Perspex.Controls.UnitTests/TabControlTests.cs
+++ b/tests/Perspex.Controls.UnitTests/TabControlTests.cs
@@ -19,7 +19,7 @@ namespace Perspex.Controls.UnitTests
             TabItem selected;
             var target = new TabControl
             {
-                Template = new ControlTemplate<TabControl>(CreateTabControlTemplate),
+                Template = new FuncControlTemplate<TabControl>(CreateTabControlTemplate),
                 Items = new[]
                 {
                     (selected = new TabItem
@@ -46,7 +46,7 @@ namespace Perspex.Controls.UnitTests
         {
             var target = new TabControl
             {
-                Template = new ControlTemplate<TabControl>(CreateTabControlTemplate),
+                Template = new FuncControlTemplate<TabControl>(CreateTabControlTemplate),
                 Items = new[]
                 {
                     new TabItem
@@ -73,7 +73,7 @@ namespace Perspex.Controls.UnitTests
         {
             var target = new TabControl
             {
-                Template = new ControlTemplate<TabControl>(CreateTabControlTemplate),
+                Template = new FuncControlTemplate<TabControl>(CreateTabControlTemplate),
                 Items = new[]
                 {
                     new TabItem
@@ -117,7 +117,7 @@ namespace Perspex.Controls.UnitTests
 
             var target = new TabControl
             {
-                Template = new ControlTemplate<TabControl>(CreateTabControlTemplate),
+                Template = new FuncControlTemplate<TabControl>(CreateTabControlTemplate),
                 Items = collection,
             };
 
@@ -144,7 +144,7 @@ namespace Perspex.Controls.UnitTests
 
             var target = new TabControl
             {
-                Template = new ControlTemplate<TabControl>(CreateTabControlTemplate),
+                Template = new FuncControlTemplate<TabControl>(CreateTabControlTemplate),
                 DataContext = "Base",
                 DataTemplates = new DataTemplates
                 {
@@ -184,14 +184,14 @@ namespace Perspex.Controls.UnitTests
                     new TabStrip
                     {
                         Name = "tabStrip",
-                        Template = new ControlTemplate<TabStrip>(CreateTabStripTemplate),
+                        Template = new FuncControlTemplate<TabStrip>(CreateTabStripTemplate),
                         [!ItemsControl.ItemsProperty] = parent[!ItemsControl.ItemsProperty],
                         [!!TabStrip.SelectedTabProperty] = parent[!!TabControl.SelectedTabProperty]
                     },
                     new Carousel
                     {
                         Name = "carousel",
-                        Template = new ControlTemplate<Carousel>(CreateCarouselTemplate),
+                        Template = new FuncControlTemplate<Carousel>(CreateCarouselTemplate),
                         MemberSelector = parent.ContentSelector,
                         [!ItemsControl.ItemsProperty] = parent[!ItemsControl.ItemsProperty],
                         [!SelectingItemsControl.SelectedItemProperty] = parent[!SelectingItemsControl.SelectedItemProperty],
diff --git a/tests/Perspex.Controls.UnitTests/TemplatedControlTests.cs b/tests/Perspex.Controls.UnitTests/TemplatedControlTests.cs
index 6177574dc0..dd6ef2e858 100644
--- a/tests/Perspex.Controls.UnitTests/TemplatedControlTests.cs
+++ b/tests/Perspex.Controls.UnitTests/TemplatedControlTests.cs
@@ -20,7 +20,7 @@ namespace Perspex.Controls.UnitTests
         {
             bool executed = false;
 
-            var template = new ControlTemplate(_ =>
+            var template = new FuncControlTemplate(_ =>
             {
                 executed = true;
                 return new Control();
@@ -39,7 +39,7 @@ namespace Perspex.Controls.UnitTests
         {
             bool executed = false;
 
-            var template = new ControlTemplate(_ =>
+            var template = new FuncControlTemplate(_ =>
             {
                 executed = true;
                 return new Control();
@@ -60,7 +60,7 @@ namespace Perspex.Controls.UnitTests
         {
             Control templateResult = new Control();
 
-            var template = new ControlTemplate(_ =>
+            var template = new FuncControlTemplate(_ =>
             {
                 return templateResult;
             });
@@ -81,7 +81,7 @@ namespace Perspex.Controls.UnitTests
         {
             Control templateResult = new Control();
 
-            var template = new ControlTemplate(_ =>
+            var template = new FuncControlTemplate(_ =>
             {
                 return templateResult;
             });
@@ -101,7 +101,7 @@ namespace Perspex.Controls.UnitTests
         {
             var target = new TestTemplatedControl
             {
-                Template = new ControlTemplate(_ =>
+                Template = new FuncControlTemplate(_ =>
                 {
                     return new Control();
                 })
@@ -117,7 +117,7 @@ namespace Perspex.Controls.UnitTests
         {
             var target = new TestTemplatedControl
             {
-                Template = new ControlTemplate(_ =>
+                Template = new FuncControlTemplate(_ =>
                 {
                     return new StackPanel
                     {
@@ -154,7 +154,7 @@ namespace Perspex.Controls.UnitTests
                 {
                     Child = target = new TestTemplatedControl
                     {
-                        Template = new ControlTemplate(_ =>
+                        Template = new FuncControlTemplate(_ =>
                         {
                             return new StackPanel
                             {
@@ -182,7 +182,7 @@ namespace Perspex.Controls.UnitTests
         {
             var target = new TestTemplatedControl
             {
-                Template = new ControlTemplate(_ =>
+                Template = new FuncControlTemplate(_ =>
                 {
                     return new StackPanel
                     {
@@ -210,7 +210,7 @@ namespace Perspex.Controls.UnitTests
         {
             var target = new TestTemplatedControl
             {
-                Template = new ControlTemplate(_ =>
+                Template = new FuncControlTemplate(_ =>
                 {
                     return new ContentPresenter
                     {
@@ -235,11 +235,11 @@ namespace Perspex.Controls.UnitTests
         {
             var target = new TestTemplatedControl
             {
-                Template = new ControlTemplate(_ =>
+                Template = new FuncControlTemplate(_ =>
                 {
                     return new ContentControl
                     {
-                        Template = new ControlTemplate(parent =>
+                        Template = new FuncControlTemplate(parent =>
                         {
                             return new Border
                             {
diff --git a/tests/Perspex.Controls.UnitTests/TopLevelTests.cs b/tests/Perspex.Controls.UnitTests/TopLevelTests.cs
index aa489b44bc..6e8ea4c068 100644
--- a/tests/Perspex.Controls.UnitTests/TopLevelTests.cs
+++ b/tests/Perspex.Controls.UnitTests/TopLevelTests.cs
@@ -316,9 +316,9 @@ namespace Perspex.Controls.UnitTests
             }
         }
 
-        private ControlTemplate<TestTopLevel> CreateTemplate()
+        private FuncControlTemplate<TestTopLevel> CreateTemplate()
         {
-            return new ControlTemplate<TestTopLevel>(x =>
+            return new FuncControlTemplate<TestTopLevel>(x =>
                 new ContentPresenter
                 {
                     [!ContentPresenter.ContentProperty] = x[!ContentControl.ContentProperty],
diff --git a/tests/Perspex.Controls.UnitTests/TreeViewTests.cs b/tests/Perspex.Controls.UnitTests/TreeViewTests.cs
index b3cb7dbbe3..b4cb191960 100644
--- a/tests/Perspex.Controls.UnitTests/TreeViewTests.cs
+++ b/tests/Perspex.Controls.UnitTests/TreeViewTests.cs
@@ -19,7 +19,7 @@ namespace Perspex.Controls.UnitTests
         {
             var target = new TreeView
             {
-                Template = new ControlTemplate(CreateTreeViewTemplate),
+                Template = new FuncControlTemplate(CreateTreeViewTemplate),
                 Items = new[] { "Foo", "Bar", "Baz " },
             };
 
@@ -46,7 +46,7 @@ namespace Perspex.Controls.UnitTests
 
             var target = new TreeView
             {
-                Template = new ControlTemplate(CreateTreeViewTemplate),
+                Template = new FuncControlTemplate(CreateTreeViewTemplate),
                 DataContext = "Base",
                 DataTemplates = new DataTemplates
                 {
@@ -71,7 +71,7 @@ namespace Perspex.Controls.UnitTests
         {
             return new ScrollViewer
             {
-                Template = new ControlTemplate(CreateScrollViewerTemplate),
+                Template = new FuncControlTemplate(CreateScrollViewerTemplate),
                 Content = new ItemsPresenter
                 {
                     Name = "itemsPresenter",
diff --git a/tests/Perspex.Controls.UnitTests/Utils/HotKeyManagerTests.cs b/tests/Perspex.Controls.UnitTests/Utils/HotKeyManagerTests.cs
index fc0c17b9d3..43a32199d4 100644
--- a/tests/Perspex.Controls.UnitTests/Utils/HotKeyManagerTests.cs
+++ b/tests/Perspex.Controls.UnitTests/Utils/HotKeyManagerTests.cs
@@ -59,9 +59,9 @@ namespace Perspex.Controls.UnitTests.Utils
             }
         }
 
-        private ControlTemplate CreateWindowTemplate()
+        private FuncControlTemplate CreateWindowTemplate()
         {
-            return new ControlTemplate<Window>(parent =>
+            return new FuncControlTemplate<Window>(parent =>
             {
                 return new ContentPresenter
                 {
diff --git a/tests/Perspex.Styling.UnitTests/SelectorTests_Multiple.cs b/tests/Perspex.Styling.UnitTests/SelectorTests_Multiple.cs
index aafa3d913e..189fc98670 100644
--- a/tests/Perspex.Styling.UnitTests/SelectorTests_Multiple.cs
+++ b/tests/Perspex.Styling.UnitTests/SelectorTests_Multiple.cs
@@ -16,7 +16,7 @@ namespace Perspex.Styling.UnitTests
         [Fact]
         public void Template_Child_Of_Control_With_Two_Classes()
         {
-            var template = new ControlTemplate(parent =>
+            var template = new FuncControlTemplate(parent =>
             {
                 return new Border
                 {