diff --git a/src/Markup/Perspex.Markup.Xaml/DataBinding/IPerspexPropertyBinder.cs b/src/Markup/Perspex.Markup.Xaml/Binding/IPerspexPropertyBinder.cs
similarity index 92%
rename from src/Markup/Perspex.Markup.Xaml/DataBinding/IPerspexPropertyBinder.cs
rename to src/Markup/Perspex.Markup.Xaml/Binding/IPerspexPropertyBinder.cs
index 40d349e00d..a98f32e7f1 100644
--- a/src/Markup/Perspex.Markup.Xaml/DataBinding/IPerspexPropertyBinder.cs
+++ b/src/Markup/Perspex.Markup.Xaml/Binding/IPerspexPropertyBinder.cs
@@ -4,7 +4,7 @@
 using System.Collections.Generic;
 using OmniXaml.TypeConversion;
 
-namespace Perspex.Markup.Xaml.DataBinding
+namespace Perspex.Markup.Xaml.Binding
 {
     public interface IPerspexPropertyBinder
     {
diff --git a/src/Markup/Perspex.Markup.Xaml/DataBinding/PerspexPropertyBinder.cs b/src/Markup/Perspex.Markup.Xaml/Binding/PerspexPropertyBinder.cs
similarity index 97%
rename from src/Markup/Perspex.Markup.Xaml/DataBinding/PerspexPropertyBinder.cs
rename to src/Markup/Perspex.Markup.Xaml/Binding/PerspexPropertyBinder.cs
index 916e3edd85..b0e2029ee0 100644
--- a/src/Markup/Perspex.Markup.Xaml/DataBinding/PerspexPropertyBinder.cs
+++ b/src/Markup/Perspex.Markup.Xaml/Binding/PerspexPropertyBinder.cs
@@ -6,7 +6,7 @@ using System.Collections.Generic;
 using System.Linq;
 using OmniXaml.TypeConversion;
 
-namespace Perspex.Markup.Xaml.DataBinding
+namespace Perspex.Markup.Xaml.Binding
 {
     public class PerspexPropertyBinder : IPerspexPropertyBinder
     {
diff --git a/src/Markup/Perspex.Markup.Xaml/DataBinding/SourceBindingEndpoint.cs b/src/Markup/Perspex.Markup.Xaml/Binding/SourceBindingEndpoint.cs
similarity index 94%
rename from src/Markup/Perspex.Markup.Xaml/DataBinding/SourceBindingEndpoint.cs
rename to src/Markup/Perspex.Markup.Xaml/Binding/SourceBindingEndpoint.cs
index 3ed6304049..60b03f31ce 100644
--- a/src/Markup/Perspex.Markup.Xaml/DataBinding/SourceBindingEndpoint.cs
+++ b/src/Markup/Perspex.Markup.Xaml/Binding/SourceBindingEndpoint.cs
@@ -4,7 +4,7 @@
 using System;
 using System.ComponentModel;
 
-namespace Perspex.Markup.Xaml.DataBinding
+namespace Perspex.Markup.Xaml.Binding
 {
     public class SourceBindingEndpoint
     {
diff --git a/src/Markup/Perspex.Markup.Xaml/DataBinding/TargetBindingEndpoint.cs b/src/Markup/Perspex.Markup.Xaml/Binding/TargetBindingEndpoint.cs
similarity index 91%
rename from src/Markup/Perspex.Markup.Xaml/DataBinding/TargetBindingEndpoint.cs
rename to src/Markup/Perspex.Markup.Xaml/Binding/TargetBindingEndpoint.cs
index aff0f63ec6..316dcddcc4 100644
--- a/src/Markup/Perspex.Markup.Xaml/DataBinding/TargetBindingEndpoint.cs
+++ b/src/Markup/Perspex.Markup.Xaml/Binding/TargetBindingEndpoint.cs
@@ -1,7 +1,7 @@
 // Copyright (c) The Perspex Project. All rights reserved.
 // Licensed under the MIT license. See licence.md file in the project root for full license information.
 
-namespace Perspex.Markup.Xaml.DataBinding
+namespace Perspex.Markup.Xaml.Binding
 {
     public class TargetBindingEndpoint
     {
diff --git a/src/Markup/Perspex.Markup.Xaml/DataBinding/XamlBinding.cs b/src/Markup/Perspex.Markup.Xaml/Binding/XamlBinding.cs
similarity index 97%
rename from src/Markup/Perspex.Markup.Xaml/DataBinding/XamlBinding.cs
rename to src/Markup/Perspex.Markup.Xaml/Binding/XamlBinding.cs
index 330a835fc6..8204b55d17 100644
--- a/src/Markup/Perspex.Markup.Xaml/DataBinding/XamlBinding.cs
+++ b/src/Markup/Perspex.Markup.Xaml/Binding/XamlBinding.cs
@@ -6,7 +6,7 @@ using System.Reactive.Linq;
 using OmniXaml.TypeConversion;
 using Perspex.Markup.Binding;
 
-namespace Perspex.Markup.Xaml.DataBinding
+namespace Perspex.Markup.Xaml.Binding
 {
     public class XamlBinding
     {
diff --git a/src/Markup/Perspex.Markup.Xaml/DataBinding/XamlBindingDefinition.cs b/src/Markup/Perspex.Markup.Xaml/Binding/XamlBindingDefinition.cs
similarity index 94%
rename from src/Markup/Perspex.Markup.Xaml/DataBinding/XamlBindingDefinition.cs
rename to src/Markup/Perspex.Markup.Xaml/Binding/XamlBindingDefinition.cs
index 4cbd3bfe1e..da0c6d633e 100644
--- a/src/Markup/Perspex.Markup.Xaml/DataBinding/XamlBindingDefinition.cs
+++ b/src/Markup/Perspex.Markup.Xaml/Binding/XamlBindingDefinition.cs
@@ -3,7 +3,7 @@
 
 using Perspex.Controls;
 
-namespace Perspex.Markup.Xaml.DataBinding
+namespace Perspex.Markup.Xaml.Binding
 {
     public class XamlBindingDefinition
     {
diff --git a/src/Markup/Perspex.Markup.Xaml/Context/PerspexTypeRepository.cs b/src/Markup/Perspex.Markup.Xaml/Context/PerspexTypeRepository.cs
index 4d32ee8658..f0dcf0a444 100644
--- a/src/Markup/Perspex.Markup.Xaml/Context/PerspexTypeRepository.cs
+++ b/src/Markup/Perspex.Markup.Xaml/Context/PerspexTypeRepository.cs
@@ -5,7 +5,7 @@ using System;
 using Glass;
 using OmniXaml;
 using OmniXaml.Typing;
-using Perspex.Markup.Xaml.DataBinding;
+using Perspex.Markup.Xaml.Binding;
 
 namespace Perspex.Markup.Xaml.Context
 {
diff --git a/src/Markup/Perspex.Markup.Xaml/Context/PerspexWiringContext.cs b/src/Markup/Perspex.Markup.Xaml/Context/PerspexWiringContext.cs
index 933a39dbe4..c5373e031a 100644
--- a/src/Markup/Perspex.Markup.Xaml/Context/PerspexWiringContext.cs
+++ b/src/Markup/Perspex.Markup.Xaml/Context/PerspexWiringContext.cs
@@ -15,7 +15,7 @@ using Perspex.Controls;
 using Perspex.Input;
 using Perspex.Markup.Xaml.Templates;
 using Perspex.Markup.Xaml.Converters;
-using Perspex.Markup.Xaml.DataBinding;
+using Perspex.Markup.Xaml.Binding;
 using Perspex.Markup.Xaml.MarkupExtensions;
 using Perspex.Media;
 using Perspex.Media.Imaging;
diff --git a/src/Markup/Perspex.Markup.Xaml/Context/PerspexXamlMember.cs b/src/Markup/Perspex.Markup.Xaml/Context/PerspexXamlMember.cs
index dc4c4cbde2..172911a6f2 100644
--- a/src/Markup/Perspex.Markup.Xaml/Context/PerspexXamlMember.cs
+++ b/src/Markup/Perspex.Markup.Xaml/Context/PerspexXamlMember.cs
@@ -1,7 +1,7 @@
 // Copyright (c) The Perspex Project. All rights reserved.
 // Licensed under the MIT license. See licence.md file in the project root for full license information.
 
-using Perspex.Markup.Xaml.DataBinding;
+using Perspex.Markup.Xaml.Binding;
 using OmniXaml;
 using OmniXaml.Typing;
 
diff --git a/src/Markup/Perspex.Markup.Xaml/Context/PerspexXamlMemberValuePlugin.cs b/src/Markup/Perspex.Markup.Xaml/Context/PerspexXamlMemberValuePlugin.cs
index f978ecaa69..908fcd22fe 100644
--- a/src/Markup/Perspex.Markup.Xaml/Context/PerspexXamlMemberValuePlugin.cs
+++ b/src/Markup/Perspex.Markup.Xaml/Context/PerspexXamlMemberValuePlugin.cs
@@ -7,7 +7,7 @@ using Glass;
 using OmniXaml.ObjectAssembler;
 using OmniXaml.Typing;
 using Perspex.Controls;
-using Perspex.Markup.Xaml.DataBinding;
+using Perspex.Markup.Xaml.Binding;
 using Perspex.Styling;
 
 namespace Perspex.Markup.Xaml.Context
diff --git a/src/Markup/Perspex.Markup.Xaml/Context/PerspexXamlType.cs b/src/Markup/Perspex.Markup.Xaml/Context/PerspexXamlType.cs
index 827f6f3827..29de09c241 100644
--- a/src/Markup/Perspex.Markup.Xaml/Context/PerspexXamlType.cs
+++ b/src/Markup/Perspex.Markup.Xaml/Context/PerspexXamlType.cs
@@ -4,7 +4,7 @@
 using System;
 using OmniXaml;
 using OmniXaml.Typing;
-using Perspex.Markup.Xaml.DataBinding;
+using Perspex.Markup.Xaml.Binding;
 
 namespace Perspex.Markup.Xaml.Context
 {
diff --git a/src/Markup/Perspex.Markup.Xaml/MarkupExtensions/BindingExtension.cs b/src/Markup/Perspex.Markup.Xaml/MarkupExtensions/BindingExtension.cs
index 55f2b1ee4a..5c124de956 100644
--- a/src/Markup/Perspex.Markup.Xaml/MarkupExtensions/BindingExtension.cs
+++ b/src/Markup/Perspex.Markup.Xaml/MarkupExtensions/BindingExtension.cs
@@ -4,7 +4,7 @@
 using System.Linq;
 using OmniXaml;
 using Perspex.Controls;
-using Perspex.Markup.Xaml.DataBinding;
+using Perspex.Markup.Xaml.Binding;
 
 namespace Perspex.Markup.Xaml.MarkupExtensions
 {
diff --git a/src/Markup/Perspex.Markup.Xaml/Perspex.Markup.Xaml.csproj b/src/Markup/Perspex.Markup.Xaml/Perspex.Markup.Xaml.csproj
index a117474005..7bfc7dc51a 100644
--- a/src/Markup/Perspex.Markup.Xaml/Perspex.Markup.Xaml.csproj
+++ b/src/Markup/Perspex.Markup.Xaml/Perspex.Markup.Xaml.csproj
@@ -38,6 +38,12 @@
     <Compile Include="..\..\Shared\SharedAssemblyInfo.cs">
       <Link>Properties\SharedAssemblyInfo.cs</Link>
     </Compile>
+    <Compile Include="Binding\IPerspexPropertyBinder.cs" />
+    <Compile Include="Binding\PerspexPropertyBinder.cs" />
+    <Compile Include="Binding\SourceBindingEndpoint.cs" />
+    <Compile Include="Binding\TargetBindingEndpoint.cs" />
+    <Compile Include="Binding\XamlBinding.cs" />
+    <Compile Include="Binding\XamlBindingDefinition.cs" />
     <Compile Include="Converters\ColorTypeConverter.cs" />
     <Compile Include="Converters\KeyGestureConverter.cs" />
     <Compile Include="Converters\RelativePointTypeConverter.cs" />
@@ -224,12 +230,6 @@
     <Compile Include="Parsers\SelectorParser.cs" />
     <Compile Include="Parsers\SelectorGrammar.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="DataBinding\IPerspexPropertyBinder.cs" />
-    <Compile Include="DataBinding\PerspexPropertyBinder.cs" />
-    <Compile Include="DataBinding\SourceBindingEndpoint.cs" />
-    <Compile Include="DataBinding\TargetBindingEndpoint.cs" />
-    <Compile Include="DataBinding\XamlBinding.cs" />
-    <Compile Include="DataBinding\XamlBindingDefinition.cs" />
     <Compile Include="Templates\TemplateLoader.cs" />
     <Compile Include="Templates\Template.cs" />
     <Compile Include="Templates\TemplateContent.cs" />
diff --git a/src/Markup/Perspex.Markup.Xaml/Templates/TreeDataTemplate.cs b/src/Markup/Perspex.Markup.Xaml/Templates/TreeDataTemplate.cs
index e66d12ba75..23955b7682 100644
--- a/src/Markup/Perspex.Markup.Xaml/Templates/TreeDataTemplate.cs
+++ b/src/Markup/Perspex.Markup.Xaml/Templates/TreeDataTemplate.cs
@@ -6,7 +6,7 @@ using System.Collections;
 using OmniXaml.Attributes;
 using Perspex.Controls;
 using Perspex.Controls.Templates;
-using Perspex.Markup.Xaml.DataBinding;
+using Perspex.Markup.Xaml.Binding;
 
 namespace Perspex.Markup.Xaml.Templates
 {
diff --git a/tests/Perspex.Markup.Xaml.UnitTests/BinderTest.cs b/tests/Perspex.Markup.Xaml.UnitTests/BinderTest.cs
index 4a421bce2f..a39f4b0667 100644
--- a/tests/Perspex.Markup.Xaml.UnitTests/BinderTest.cs
+++ b/tests/Perspex.Markup.Xaml.UnitTests/BinderTest.cs
@@ -3,7 +3,7 @@
 
 using System;
 using Moq;
-using Perspex.Markup.Xaml.DataBinding;
+using Perspex.Markup.Xaml.Binding;
 using OmniXaml.TypeConversion;
 using Xunit;
 
diff --git a/tests/Perspex.Markup.Xaml.UnitTests/BindingDefinitionBuilder.cs b/tests/Perspex.Markup.Xaml.UnitTests/BindingDefinitionBuilder.cs
index 985850e3e9..7e986201e3 100644
--- a/tests/Perspex.Markup.Xaml.UnitTests/BindingDefinitionBuilder.cs
+++ b/tests/Perspex.Markup.Xaml.UnitTests/BindingDefinitionBuilder.cs
@@ -2,7 +2,7 @@
 // Licensed under the MIT license. See licence.md file in the project root for full license information.
 
 using Perspex.Controls;
-using Perspex.Markup.Xaml.DataBinding;
+using Perspex.Markup.Xaml.Binding;
 
 namespace Perspex.Xaml.Base.UnitTest
 {
diff --git a/tests/Perspex.Markup.Xaml.UnitTests/XamlBindingTest.cs b/tests/Perspex.Markup.Xaml.UnitTests/XamlBindingTest.cs
index fcd90f6333..6e0d14d5cf 100644
--- a/tests/Perspex.Markup.Xaml.UnitTests/XamlBindingTest.cs
+++ b/tests/Perspex.Markup.Xaml.UnitTests/XamlBindingTest.cs
@@ -2,7 +2,7 @@
 // Licensed under the MIT license. See licence.md file in the project root for full license information.
 
 using Moq;
-using Perspex.Markup.Xaml.DataBinding;
+using Perspex.Markup.Xaml.Binding;
 using OmniXaml.TypeConversion;
 using Xunit;