diff --git a/Perspex.sln b/Perspex.sln
index 26a0fd1273..89a70f102b 100644
--- a/Perspex.sln
+++ b/Perspex.sln
@@ -57,7 +57,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Perspex.Input.UnitTests", "
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Perspex.Direct2D1.UnitTests", "tests\Perspex.Direct2D1.UnitTests\Perspex.Direct2D1.UnitTests.csproj", "{EFB11458-9CDF-41C0-BE4F-44AF45A4CAB8}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Perspex.Xaml", "src\Markup\Perspex.Xaml\Perspex.Xaml.csproj", "{3E53A01A-B331-47F3-B828-4A5717E77A24}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Perspex.Markup.Xaml", "src\Markup\Perspex.Markup.Xaml\Perspex.Markup.Xaml.csproj", "{3E53A01A-B331-47F3-B828-4A5717E77A24}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XamlTestApplication", "samples\XamlTestApplication\XamlTestApplication.csproj", "{78CAFE33-DBEB-4132-8A28-81CFE8A4933C}"
 EndProject
diff --git a/samples/XamlTestApplication/Views/MainWindow.cs b/samples/XamlTestApplication/Views/MainWindow.cs
index 5280cca0c3..18760d9601 100644
--- a/samples/XamlTestApplication/Views/MainWindow.cs
+++ b/samples/XamlTestApplication/Views/MainWindow.cs
@@ -8,7 +8,7 @@
     using OmniXaml;
     using Perspex.Controls;
     using Perspex.Diagnostics;
-    using Perspex.Xaml;
+    using Perspex.Markup.Xaml;
 
     public class MainWindow : Window
     {
diff --git a/samples/XamlTestApplication/XamlTestApplication.csproj b/samples/XamlTestApplication/XamlTestApplication.csproj
index 5ea8e34004..d365195058 100644
--- a/samples/XamlTestApplication/XamlTestApplication.csproj
+++ b/samples/XamlTestApplication/XamlTestApplication.csproj
@@ -177,7 +177,7 @@
       <Project>{3e10a5fa-e8da-48b1-ad44-6a5b6cb7750f}</Project>
       <Name>Perspex.Themes.Default</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\src\Markup\Perspex.Xaml\Perspex.Xaml.csproj">
+    <ProjectReference Include="..\..\src\Markup\Perspex.Markup.Xaml\Perspex.Markup.Xaml.csproj">
       <Project>{3e53a01a-b331-47f3-b828-4a5717e77a24}</Project>
       <Name>Perspex.Xaml</Name>
     </ProjectReference>
diff --git a/src/Markup/Perspex.Xaml/Context/PerspexObjectAssembler.cs b/src/Markup/Perspex.Markup.Xaml/Context/PerspexObjectAssembler.cs
similarity index 96%
rename from src/Markup/Perspex.Xaml/Context/PerspexObjectAssembler.cs
rename to src/Markup/Perspex.Markup.Xaml/Context/PerspexObjectAssembler.cs
index b147ad42ee..23e7eb3696 100644
--- a/src/Markup/Perspex.Xaml/Context/PerspexObjectAssembler.cs
+++ b/src/Markup/Perspex.Markup.Xaml/Context/PerspexObjectAssembler.cs
@@ -1,4 +1,4 @@
-namespace Perspex.Xaml.Context
+namespace Perspex.Markup.Xaml.Context
 {
     using System;
     using OmniXaml;
diff --git a/src/Markup/Perspex.Xaml/Context/PerspexParserFactory.cs b/src/Markup/Perspex.Markup.Xaml/Context/PerspexParserFactory.cs
similarity index 96%
rename from src/Markup/Perspex.Xaml/Context/PerspexParserFactory.cs
rename to src/Markup/Perspex.Markup.Xaml/Context/PerspexParserFactory.cs
index c89509f7d2..0c065bb1bf 100644
--- a/src/Markup/Perspex.Xaml/Context/PerspexParserFactory.cs
+++ b/src/Markup/Perspex.Markup.Xaml/Context/PerspexParserFactory.cs
@@ -1,10 +1,10 @@
-namespace Perspex.Xaml.Context
+namespace Perspex.Markup.Xaml.Context
 {
     using OmniXaml;
     using OmniXaml.ObjectAssembler;
     using OmniXaml.Parsers.ProtoParser;
     using OmniXaml.Parsers.XamlNodes;
-    using Perspex.Xaml.Context;
+    using Perspex.Markup.Xaml.Context;
 
     public class PerspexParserFactory : IXamlParserFactory
     {
diff --git a/src/Markup/Perspex.Xaml/Context/PerspexTypeRepository.cs b/src/Markup/Perspex.Markup.Xaml/Context/PerspexTypeRepository.cs
similarity index 95%
rename from src/Markup/Perspex.Xaml/Context/PerspexTypeRepository.cs
rename to src/Markup/Perspex.Markup.Xaml/Context/PerspexTypeRepository.cs
index fa7dc74fc4..21079e6cac 100644
--- a/src/Markup/Perspex.Xaml/Context/PerspexTypeRepository.cs
+++ b/src/Markup/Perspex.Markup.Xaml/Context/PerspexTypeRepository.cs
@@ -1,4 +1,4 @@
-namespace Perspex.Xaml.Context
+namespace Perspex.Markup.Xaml.Context
 {
     using System;
     using DataBinding;
diff --git a/src/Markup/Perspex.Xaml/Context/PerspexWiringContext.cs b/src/Markup/Perspex.Markup.Xaml/Context/PerspexWiringContext.cs
similarity index 99%
rename from src/Markup/Perspex.Xaml/Context/PerspexWiringContext.cs
rename to src/Markup/Perspex.Markup.Xaml/Context/PerspexWiringContext.cs
index c97a5cc8f2..d52fe9df92 100644
--- a/src/Markup/Perspex.Xaml/Context/PerspexWiringContext.cs
+++ b/src/Markup/Perspex.Markup.Xaml/Context/PerspexWiringContext.cs
@@ -1,4 +1,4 @@
-namespace Perspex.Xaml.Context
+namespace Perspex.Markup.Xaml.Context
 {
     using System.Collections.Generic;
     using System.Collections.ObjectModel;
diff --git a/src/Markup/Perspex.Xaml/Context/PerspexXamlMember.cs b/src/Markup/Perspex.Markup.Xaml/Context/PerspexXamlMember.cs
similarity index 95%
rename from src/Markup/Perspex.Xaml/Context/PerspexXamlMember.cs
rename to src/Markup/Perspex.Markup.Xaml/Context/PerspexXamlMember.cs
index 58ad1c6c64..d1c8575afc 100644
--- a/src/Markup/Perspex.Xaml/Context/PerspexXamlMember.cs
+++ b/src/Markup/Perspex.Markup.Xaml/Context/PerspexXamlMember.cs
@@ -1,4 +1,4 @@
-namespace Perspex.Xaml.Context
+namespace Perspex.Markup.Xaml.Context
 {
     using DataBinding;
     using OmniXaml;
diff --git a/src/Markup/Perspex.Xaml/Context/PerspexXamlMemberValuePlugin.cs b/src/Markup/Perspex.Markup.Xaml/Context/PerspexXamlMemberValuePlugin.cs
similarity index 98%
rename from src/Markup/Perspex.Xaml/Context/PerspexXamlMemberValuePlugin.cs
rename to src/Markup/Perspex.Markup.Xaml/Context/PerspexXamlMemberValuePlugin.cs
index e52031e023..175706d5fa 100644
--- a/src/Markup/Perspex.Xaml/Context/PerspexXamlMemberValuePlugin.cs
+++ b/src/Markup/Perspex.Markup.Xaml/Context/PerspexXamlMemberValuePlugin.cs
@@ -1,4 +1,4 @@
-namespace Perspex.Xaml.Context
+namespace Perspex.Markup.Xaml.Context
 {
     using System;
     using System.Reactive.Linq;
diff --git a/src/Markup/Perspex.Xaml/Context/PerspexXamlType.cs b/src/Markup/Perspex.Markup.Xaml/Context/PerspexXamlType.cs
similarity index 96%
rename from src/Markup/Perspex.Xaml/Context/PerspexXamlType.cs
rename to src/Markup/Perspex.Markup.Xaml/Context/PerspexXamlType.cs
index bf377d03df..687d70dae8 100644
--- a/src/Markup/Perspex.Xaml/Context/PerspexXamlType.cs
+++ b/src/Markup/Perspex.Markup.Xaml/Context/PerspexXamlType.cs
@@ -1,4 +1,4 @@
-namespace Perspex.Xaml.Context
+namespace Perspex.Markup.Xaml.Context
 {
     using System;
     using DataBinding;
diff --git a/src/Markup/Perspex.Xaml/Converters/BitmapConverter.cs b/src/Markup/Perspex.Markup.Xaml/Converters/BitmapConverter.cs
similarity index 95%
rename from src/Markup/Perspex.Xaml/Converters/BitmapConverter.cs
rename to src/Markup/Perspex.Markup.Xaml/Converters/BitmapConverter.cs
index 3d758163d8..3075e234c9 100644
--- a/src/Markup/Perspex.Xaml/Converters/BitmapConverter.cs
+++ b/src/Markup/Perspex.Markup.Xaml/Converters/BitmapConverter.cs
@@ -1,4 +1,4 @@
-namespace Perspex.Xaml.Converters
+namespace Perspex.Markup.Xaml.Converters
 {
     using System;
     using System.Globalization;
diff --git a/src/Markup/Perspex.Xaml/Converters/BrushConverter.cs b/src/Markup/Perspex.Markup.Xaml/Converters/BrushConverter.cs
similarity index 98%
rename from src/Markup/Perspex.Xaml/Converters/BrushConverter.cs
rename to src/Markup/Perspex.Markup.Xaml/Converters/BrushConverter.cs
index 28e50ac615..5236df0df8 100644
--- a/src/Markup/Perspex.Xaml/Converters/BrushConverter.cs
+++ b/src/Markup/Perspex.Markup.Xaml/Converters/BrushConverter.cs
@@ -1,4 +1,4 @@
-namespace Perspex.Xaml.Converters
+namespace Perspex.Markup.Xaml.Converters
 {
     using System;
     using System.Globalization;
diff --git a/src/Markup/Perspex.Xaml/Converters/GridLengthTypeConverter.cs b/src/Markup/Perspex.Markup.Xaml/Converters/GridLengthTypeConverter.cs
similarity index 96%
rename from src/Markup/Perspex.Xaml/Converters/GridLengthTypeConverter.cs
rename to src/Markup/Perspex.Markup.Xaml/Converters/GridLengthTypeConverter.cs
index 0a013a92a4..3f3b2d39f6 100644
--- a/src/Markup/Perspex.Xaml/Converters/GridLengthTypeConverter.cs
+++ b/src/Markup/Perspex.Markup.Xaml/Converters/GridLengthTypeConverter.cs
@@ -1,4 +1,4 @@
-namespace Perspex.Xaml.Converters
+namespace Perspex.Markup.Xaml.Converters
 {
     using System;
     using System.Globalization;
diff --git a/src/Markup/Perspex.Xaml/Converters/ThicknessConverter.cs b/src/Markup/Perspex.Markup.Xaml/Converters/ThicknessConverter.cs
similarity index 97%
rename from src/Markup/Perspex.Xaml/Converters/ThicknessConverter.cs
rename to src/Markup/Perspex.Markup.Xaml/Converters/ThicknessConverter.cs
index 54c98316f6..e4768c1afe 100644
--- a/src/Markup/Perspex.Xaml/Converters/ThicknessConverter.cs
+++ b/src/Markup/Perspex.Markup.Xaml/Converters/ThicknessConverter.cs
@@ -1,4 +1,4 @@
-namespace Perspex.Xaml.Converters
+namespace Perspex.Markup.Xaml.Converters
 {
     using System;
     using System.Collections.Generic;
diff --git a/src/Markup/Perspex.Xaml/DataBinding/ChangeTracking/ObservablePropertyBranch.cs b/src/Markup/Perspex.Markup.Xaml/DataBinding/ChangeTracking/ObservablePropertyBranch.cs
similarity index 98%
rename from src/Markup/Perspex.Xaml/DataBinding/ChangeTracking/ObservablePropertyBranch.cs
rename to src/Markup/Perspex.Markup.Xaml/DataBinding/ChangeTracking/ObservablePropertyBranch.cs
index 5a1ccb6faa..b13b5d4bf9 100644
--- a/src/Markup/Perspex.Xaml/DataBinding/ChangeTracking/ObservablePropertyBranch.cs
+++ b/src/Markup/Perspex.Markup.Xaml/DataBinding/ChangeTracking/ObservablePropertyBranch.cs
@@ -1,4 +1,4 @@
-namespace Perspex.Xaml.DataBinding.ChangeTracking
+namespace Perspex.Markup.Xaml.DataBinding.ChangeTracking
 {
     using System;
     using System.Collections.Generic;
diff --git a/src/Markup/Perspex.Xaml/DataBinding/ChangeTracking/PropertyMountPoint.cs b/src/Markup/Perspex.Markup.Xaml/DataBinding/ChangeTracking/PropertyMountPoint.cs
similarity index 95%
rename from src/Markup/Perspex.Xaml/DataBinding/ChangeTracking/PropertyMountPoint.cs
rename to src/Markup/Perspex.Markup.Xaml/DataBinding/ChangeTracking/PropertyMountPoint.cs
index 40e73793f3..6b5819302f 100644
--- a/src/Markup/Perspex.Xaml/DataBinding/ChangeTracking/PropertyMountPoint.cs
+++ b/src/Markup/Perspex.Markup.Xaml/DataBinding/ChangeTracking/PropertyMountPoint.cs
@@ -1,4 +1,4 @@
-namespace Perspex.Xaml.DataBinding.ChangeTracking
+namespace Perspex.Markup.Xaml.DataBinding.ChangeTracking
 {
     using System;
     using System.Reflection;
diff --git a/src/Markup/Perspex.Xaml/DataBinding/ChangeTracking/PropertyPath.cs b/src/Markup/Perspex.Markup.Xaml/DataBinding/ChangeTracking/PropertyPath.cs
similarity index 90%
rename from src/Markup/Perspex.Xaml/DataBinding/ChangeTracking/PropertyPath.cs
rename to src/Markup/Perspex.Markup.Xaml/DataBinding/ChangeTracking/PropertyPath.cs
index 9485af8b5b..9a08ee4354 100644
--- a/src/Markup/Perspex.Xaml/DataBinding/ChangeTracking/PropertyPath.cs
+++ b/src/Markup/Perspex.Markup.Xaml/DataBinding/ChangeTracking/PropertyPath.cs
@@ -1,4 +1,4 @@
-namespace Perspex.Xaml.DataBinding.ChangeTracking
+namespace Perspex.Markup.Xaml.DataBinding.ChangeTracking
 {
     public class PropertyPath
     {
diff --git a/src/Markup/Perspex.Xaml/DataBinding/ChangeTracking/TargettedProperty.cs b/src/Markup/Perspex.Markup.Xaml/DataBinding/ChangeTracking/TargettedProperty.cs
similarity index 93%
rename from src/Markup/Perspex.Xaml/DataBinding/ChangeTracking/TargettedProperty.cs
rename to src/Markup/Perspex.Markup.Xaml/DataBinding/ChangeTracking/TargettedProperty.cs
index 28913efc48..518d9fca64 100644
--- a/src/Markup/Perspex.Xaml/DataBinding/ChangeTracking/TargettedProperty.cs
+++ b/src/Markup/Perspex.Markup.Xaml/DataBinding/ChangeTracking/TargettedProperty.cs
@@ -1,4 +1,4 @@
-namespace Perspex.Xaml.DataBinding.ChangeTracking
+namespace Perspex.Markup.Xaml.DataBinding.ChangeTracking
 {
     using System;
     using System.Reflection;
diff --git a/src/Markup/Perspex.Xaml/DataBinding/DataContextChangeSynchronizer.cs b/src/Markup/Perspex.Markup.Xaml/DataBinding/DataContextChangeSynchronizer.cs
similarity index 99%
rename from src/Markup/Perspex.Xaml/DataBinding/DataContextChangeSynchronizer.cs
rename to src/Markup/Perspex.Markup.Xaml/DataBinding/DataContextChangeSynchronizer.cs
index 739f7d26b5..d0ff23c8dc 100644
--- a/src/Markup/Perspex.Xaml/DataBinding/DataContextChangeSynchronizer.cs
+++ b/src/Markup/Perspex.Markup.Xaml/DataBinding/DataContextChangeSynchronizer.cs
@@ -1,4 +1,4 @@
-namespace Perspex.Xaml.DataBinding
+namespace Perspex.Markup.Xaml.DataBinding
 {
     using System;
     using System.Diagnostics;
diff --git a/src/Markup/Perspex.Xaml/DataBinding/IPerspexPropertyBinder.cs b/src/Markup/Perspex.Markup.Xaml/DataBinding/IPerspexPropertyBinder.cs
similarity index 86%
rename from src/Markup/Perspex.Xaml/DataBinding/IPerspexPropertyBinder.cs
rename to src/Markup/Perspex.Markup.Xaml/DataBinding/IPerspexPropertyBinder.cs
index 13cc8c6da0..968c64ecb5 100644
--- a/src/Markup/Perspex.Xaml/DataBinding/IPerspexPropertyBinder.cs
+++ b/src/Markup/Perspex.Markup.Xaml/DataBinding/IPerspexPropertyBinder.cs
@@ -1,4 +1,4 @@
-namespace Perspex.Xaml.DataBinding
+namespace Perspex.Markup.Xaml.DataBinding
 {
     using System.Collections.Generic;
 
diff --git a/src/Markup/Perspex.Xaml/DataBinding/PerspexPropertyBinder.cs b/src/Markup/Perspex.Markup.Xaml/DataBinding/PerspexPropertyBinder.cs
similarity index 97%
rename from src/Markup/Perspex.Xaml/DataBinding/PerspexPropertyBinder.cs
rename to src/Markup/Perspex.Markup.Xaml/DataBinding/PerspexPropertyBinder.cs
index 00be05674c..7aaab8377d 100644
--- a/src/Markup/Perspex.Xaml/DataBinding/PerspexPropertyBinder.cs
+++ b/src/Markup/Perspex.Markup.Xaml/DataBinding/PerspexPropertyBinder.cs
@@ -1,4 +1,4 @@
-namespace Perspex.Xaml.DataBinding
+namespace Perspex.Markup.Xaml.DataBinding
 {
     using System;
     using System.Collections.Generic;
diff --git a/src/Markup/Perspex.Xaml/DataBinding/SourceBindingEndpoint.cs b/src/Markup/Perspex.Markup.Xaml/DataBinding/SourceBindingEndpoint.cs
similarity index 93%
rename from src/Markup/Perspex.Xaml/DataBinding/SourceBindingEndpoint.cs
rename to src/Markup/Perspex.Markup.Xaml/DataBinding/SourceBindingEndpoint.cs
index cc5ac9c2f5..8669e38086 100644
--- a/src/Markup/Perspex.Xaml/DataBinding/SourceBindingEndpoint.cs
+++ b/src/Markup/Perspex.Markup.Xaml/DataBinding/SourceBindingEndpoint.cs
@@ -1,4 +1,4 @@
-namespace Perspex.Xaml.DataBinding
+namespace Perspex.Markup.Xaml.DataBinding
 {
     using System;
     using System.ComponentModel;
diff --git a/src/Markup/Perspex.Xaml/DataBinding/TargetBindingEndpoint.cs b/src/Markup/Perspex.Markup.Xaml/DataBinding/TargetBindingEndpoint.cs
similarity index 87%
rename from src/Markup/Perspex.Xaml/DataBinding/TargetBindingEndpoint.cs
rename to src/Markup/Perspex.Markup.Xaml/DataBinding/TargetBindingEndpoint.cs
index 87d3f8ce0d..2143c264c3 100644
--- a/src/Markup/Perspex.Xaml/DataBinding/TargetBindingEndpoint.cs
+++ b/src/Markup/Perspex.Markup.Xaml/DataBinding/TargetBindingEndpoint.cs
@@ -1,4 +1,4 @@
-namespace Perspex.Xaml.DataBinding
+namespace Perspex.Markup.Xaml.DataBinding
 {
     public class TargetBindingEndpoint
     {
diff --git a/src/Markup/Perspex.Xaml/DataBinding/XamlBinding.cs b/src/Markup/Perspex.Markup.Xaml/DataBinding/XamlBinding.cs
similarity index 97%
rename from src/Markup/Perspex.Xaml/DataBinding/XamlBinding.cs
rename to src/Markup/Perspex.Markup.Xaml/DataBinding/XamlBinding.cs
index ce560d052f..7703fa4c23 100644
--- a/src/Markup/Perspex.Xaml/DataBinding/XamlBinding.cs
+++ b/src/Markup/Perspex.Markup.Xaml/DataBinding/XamlBinding.cs
@@ -1,4 +1,4 @@
-namespace Perspex.Xaml.DataBinding
+namespace Perspex.Markup.Xaml.DataBinding
 {
     using System;
     using System.Diagnostics;
diff --git a/src/Markup/Perspex.Xaml/DataBinding/XamlBindingDefinition.cs b/src/Markup/Perspex.Markup.Xaml/DataBinding/XamlBindingDefinition.cs
similarity index 94%
rename from src/Markup/Perspex.Xaml/DataBinding/XamlBindingDefinition.cs
rename to src/Markup/Perspex.Markup.Xaml/DataBinding/XamlBindingDefinition.cs
index 26847901b7..1505330cee 100644
--- a/src/Markup/Perspex.Xaml/DataBinding/XamlBindingDefinition.cs
+++ b/src/Markup/Perspex.Markup.Xaml/DataBinding/XamlBindingDefinition.cs
@@ -1,4 +1,4 @@
-namespace Perspex.Xaml.DataBinding
+namespace Perspex.Markup.Xaml.DataBinding
 {
     using ChangeTracking;
     using Controls;
diff --git a/src/Markup/Perspex.Xaml/MarkupExtensions/BindingExtension.cs b/src/Markup/Perspex.Markup.Xaml/MarkupExtensions/BindingExtension.cs
similarity index 96%
rename from src/Markup/Perspex.Xaml/MarkupExtensions/BindingExtension.cs
rename to src/Markup/Perspex.Markup.Xaml/MarkupExtensions/BindingExtension.cs
index e76839ab46..aacf80dfda 100644
--- a/src/Markup/Perspex.Xaml/MarkupExtensions/BindingExtension.cs
+++ b/src/Markup/Perspex.Markup.Xaml/MarkupExtensions/BindingExtension.cs
@@ -1,4 +1,4 @@
-namespace Perspex.Xaml.MarkupExtensions
+namespace Perspex.Markup.Xaml.MarkupExtensions
 {
     using System.Linq;
     using Controls;
diff --git a/src/Markup/Perspex.Xaml/MarkupExtensions/TypeExtension.cs b/src/Markup/Perspex.Markup.Xaml/MarkupExtensions/TypeExtension.cs
similarity index 95%
rename from src/Markup/Perspex.Xaml/MarkupExtensions/TypeExtension.cs
rename to src/Markup/Perspex.Markup.Xaml/MarkupExtensions/TypeExtension.cs
index ab5dc16e5e..8a8cff7b4c 100644
--- a/src/Markup/Perspex.Xaml/MarkupExtensions/TypeExtension.cs
+++ b/src/Markup/Perspex.Markup.Xaml/MarkupExtensions/TypeExtension.cs
@@ -1,4 +1,4 @@
-namespace Perspex.Xaml.MarkupExtensions
+namespace Perspex.Markup.Xaml.MarkupExtensions
 {
     using System;
     using Glass;
diff --git a/src/Markup/Perspex.Xaml/Perspex.Xaml.csproj b/src/Markup/Perspex.Markup.Xaml/Perspex.Markup.Xaml.csproj
similarity index 98%
rename from src/Markup/Perspex.Xaml/Perspex.Xaml.csproj
rename to src/Markup/Perspex.Markup.Xaml/Perspex.Markup.Xaml.csproj
index f5f7a7c1c4..5d7d97e26d 100644
--- a/src/Markup/Perspex.Xaml/Perspex.Xaml.csproj
+++ b/src/Markup/Perspex.Markup.Xaml/Perspex.Markup.Xaml.csproj
@@ -8,8 +8,8 @@
     <ProjectGuid>{3E53A01A-B331-47F3-B828-4A5717E77A24}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Perspex.Xaml</RootNamespace>
-    <AssemblyName>Perspex.Xaml</AssemblyName>
+    <RootNamespace>Perspex.Markup.Xaml</RootNamespace>
+    <AssemblyName>Perspex.Markup.Xaml</AssemblyName>
     <DefaultLanguage>en-US</DefaultLanguage>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
diff --git a/src/Markup/Perspex.Xaml/PerspexXamlLoader.cs b/src/Markup/Perspex.Markup.Xaml/PerspexXamlLoader.cs
similarity index 96%
rename from src/Markup/Perspex.Xaml/PerspexXamlLoader.cs
rename to src/Markup/Perspex.Markup.Xaml/PerspexXamlLoader.cs
index 297e40bf05..12aed169b9 100644
--- a/src/Markup/Perspex.Xaml/PerspexXamlLoader.cs
+++ b/src/Markup/Perspex.Markup.Xaml/PerspexXamlLoader.cs
@@ -4,12 +4,12 @@
 // </copyright>
 // -----------------------------------------------------------------------
 
-namespace Perspex.Xaml
+namespace Perspex.Markup.Xaml
 {
     using System;
     using System.Reflection;
     using OmniXaml;
-    using Perspex.Xaml.Context;
+    using Perspex.Markup.Xaml.Context;
     using Platform;
     using Splat;
 
diff --git a/src/Markup/Perspex.Xaml/Properties/AssemblyInfo.cs b/src/Markup/Perspex.Markup.Xaml/Properties/AssemblyInfo.cs
similarity index 86%
rename from src/Markup/Perspex.Xaml/Properties/AssemblyInfo.cs
rename to src/Markup/Perspex.Markup.Xaml/Properties/AssemblyInfo.cs
index 3df53cd169..d8a5eaab54 100644
--- a/src/Markup/Perspex.Xaml/Properties/AssemblyInfo.cs
+++ b/src/Markup/Perspex.Markup.Xaml/Properties/AssemblyInfo.cs
@@ -6,4 +6,4 @@
 
 using System.Reflection;
 
-[assembly: AssemblyTitle("Perspex.Xaml")]
+[assembly: AssemblyTitle("Perspex.Markup.Xaml")]
diff --git a/src/Markup/Perspex.Xaml/Templates/Template.cs b/src/Markup/Perspex.Markup.Xaml/Templates/Template.cs
similarity index 69%
rename from src/Markup/Perspex.Xaml/Templates/Template.cs
rename to src/Markup/Perspex.Markup.Xaml/Templates/Template.cs
index def98035f5..a617ecafb8 100644
--- a/src/Markup/Perspex.Xaml/Templates/Template.cs
+++ b/src/Markup/Perspex.Markup.Xaml/Templates/Template.cs
@@ -1,4 +1,4 @@
-namespace Perspex.Xaml.Templates
+namespace Perspex.Markup.Xaml.Templates
 {
     public class Template
     {
diff --git a/src/Markup/Perspex.Xaml/Templates/TemplateContent.cs b/src/Markup/Perspex.Markup.Xaml/Templates/TemplateContent.cs
similarity index 94%
rename from src/Markup/Perspex.Xaml/Templates/TemplateContent.cs
rename to src/Markup/Perspex.Markup.Xaml/Templates/TemplateContent.cs
index 76a5c4ff88..640ade0074 100644
--- a/src/Markup/Perspex.Xaml/Templates/TemplateContent.cs
+++ b/src/Markup/Perspex.Markup.Xaml/Templates/TemplateContent.cs
@@ -1,4 +1,4 @@
-namespace Perspex.Xaml.Templates
+namespace Perspex.Markup.Xaml.Templates
 {
     using System.Collections.Generic;
     using Context;
diff --git a/src/Markup/Perspex.Xaml/Templates/TemplateLoader.cs b/src/Markup/Perspex.Markup.Xaml/Templates/TemplateLoader.cs
similarity index 87%
rename from src/Markup/Perspex.Xaml/Templates/TemplateLoader.cs
rename to src/Markup/Perspex.Markup.Xaml/Templates/TemplateLoader.cs
index f3cd4e000a..b46cd84c44 100644
--- a/src/Markup/Perspex.Xaml/Templates/TemplateLoader.cs
+++ b/src/Markup/Perspex.Markup.Xaml/Templates/TemplateLoader.cs
@@ -1,4 +1,4 @@
-namespace Perspex.Xaml.Templates
+namespace Perspex.Markup.Xaml.Templates
 {
     using System.Collections.Generic;
     using OmniXaml;
diff --git a/src/Markup/Perspex.Xaml/Templates/XamlDataTemplate.cs b/src/Markup/Perspex.Markup.Xaml/Templates/XamlDataTemplate.cs
similarity index 96%
rename from src/Markup/Perspex.Xaml/Templates/XamlDataTemplate.cs
rename to src/Markup/Perspex.Markup.Xaml/Templates/XamlDataTemplate.cs
index cca2ed0172..44dfa42489 100644
--- a/src/Markup/Perspex.Xaml/Templates/XamlDataTemplate.cs
+++ b/src/Markup/Perspex.Markup.Xaml/Templates/XamlDataTemplate.cs
@@ -1,4 +1,4 @@
-namespace Perspex.Xaml.Templates
+namespace Perspex.Markup.Xaml.Templates
 {
     using System;
     using Controls.Templates;
diff --git a/src/Markup/Perspex.Xaml/app.config b/src/Markup/Perspex.Markup.Xaml/app.config
similarity index 100%
rename from src/Markup/Perspex.Xaml/app.config
rename to src/Markup/Perspex.Markup.Xaml/app.config
diff --git a/src/Markup/Perspex.Xaml/packages.config b/src/Markup/Perspex.Markup.Xaml/packages.config
similarity index 100%
rename from src/Markup/Perspex.Xaml/packages.config
rename to src/Markup/Perspex.Markup.Xaml/packages.config