Renamed XamlBinding -> Binding

Had to also rename enclosing namespace from Binding to Data as classes
with same name as a namespace cause problems.

src/Markup/Perspex.Markup.Xaml/Context/PerspexAttachableXamlMember.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.Binding;
+using Perspex.Markup.Xaml.Data;
 using OmniXaml;
 using OmniXaml.Typing;
 using System.Reflection;

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.Binding;
+using Perspex.Markup.Xaml.Data;
 
 namespace Perspex.Markup.Xaml.Context
 {

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.Binding;
+using Perspex.Markup.Xaml.Data;
 using Perspex.Markup.Xaml.MarkupExtensions;
 using Perspex.Media;
 using Perspex.Media.Imaging;

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.Binding;
+using Perspex.Markup.Xaml.Data;
 using OmniXaml;
 using OmniXaml.Typing;
 

src/Markup/Perspex.Markup.Xaml/Context/PerspexXamlMemberValuePlugin.cs

@@ -9,7 +9,7 @@ using System.Runtime.CompilerServices;
 using Glass;
 using OmniXaml.ObjectAssembler;
 using OmniXaml.Typing;
-using Perspex.Markup.Xaml.Binding;
+using Perspex.Markup.Xaml.Data;
 using Perspex.Styling;
 
 namespace Perspex.Markup.Xaml.Context
@@ -39,9 +39,9 @@ namespace Perspex.Markup.Xaml.Context
 
         public override void SetValue(object instance, object value)
         {
-            if (value is XamlBinding)
+            if (value is Data.Binding)
             {
-                HandleXamlBindingDefinition(instance, (XamlBinding)value);
+                HandleXamlBindingDefinition(instance, (Data.Binding)value);
             }
             else if (IsPerspexProperty)
             {
@@ -68,9 +68,9 @@ namespace Perspex.Markup.Xaml.Context
             po.SetValue(pp, value);
         }
 
-        private void HandleXamlBindingDefinition(object instance, XamlBinding binding)
+        private void HandleXamlBindingDefinition(object instance, Data.Binding binding)
         {
-            if (_xamlMember.XamlType.UnderlyingType == typeof(XamlBinding))
+            if (_xamlMember.XamlType.UnderlyingType == typeof(Data.Binding))
             {
                 var property = instance.GetType().GetRuntimeProperty(_xamlMember.Name);
 
@@ -88,7 +88,7 @@ namespace Perspex.Markup.Xaml.Context
             }                
         }
 
-        private void ApplyBinding(object instance, XamlBinding binding)
+        private void ApplyBinding(object instance, Data.Binding binding)
         {
             var perspexObject = instance as PerspexObject;
             var attached = _xamlMember as PerspexAttachableXamlMember;
@@ -131,7 +131,7 @@ namespace Perspex.Markup.Xaml.Context
 
         private bool ValueRequiresSpecialHandling(object value)
         {
-            return value is XamlBinding || IsPerspexProperty;
+            return value is Data.Binding || IsPerspexProperty;
         }
 
         private bool IsPerspexProperty => PerspexProperty != null;

src/Markup/Perspex.Markup.Xaml/Context/PerspexXamlType.cs

@@ -5,7 +5,7 @@ using System;
 using System.Reflection;
 using OmniXaml;
 using OmniXaml.Typing;
-using Perspex.Markup.Xaml.Binding;
+using Perspex.Markup.Xaml.Data;
 
 namespace Perspex.Markup.Xaml.Context
 {

src/Markup/Perspex.Markup.Xaml/Binding/XamlBinding.cs → src/Markup/Perspex.Markup.Xaml/Data/Binding.cs

@@ -6,19 +6,19 @@ using System.Reactive.Linq;
 using System.Reactive.Subjects;
 using OmniXaml.TypeConversion;
 using Perspex.Controls;
-using Perspex.Markup.Binding;
+using Perspex.Markup.Data;
 
-namespace Perspex.Markup.Xaml.Binding
+namespace Perspex.Markup.Xaml.Data
 {
-    public class XamlBinding
+    public class Binding
     {
         private readonly ITypeConverterProvider _typeConverterProvider;
 
-        public XamlBinding()
+        public Binding()
         {
         }
 
-        public XamlBinding(ITypeConverterProvider typeConverterProvider)
+        public Binding(ITypeConverterProvider typeConverterProvider)
         {
             _typeConverterProvider = typeConverterProvider;
         }

src/Markup/Perspex.Markup.Xaml/Binding/RelativeSource.cs → src/Markup/Perspex.Markup.Xaml/Data/RelativeSource.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.Binding
+namespace Perspex.Markup.Xaml.Data
 {
     public enum RelativeSourceMode
     {

src/Markup/Perspex.Markup.Xaml/Binding/SourceBindingEndpoint.cs → src/Markup/Perspex.Markup.Xaml/Data/SourceBindingEndpoint.cs

@@ -4,7 +4,7 @@
 using System;
 using System.ComponentModel;
 
-namespace Perspex.Markup.Xaml.Binding
+namespace Perspex.Markup.Xaml.Data
 {
     public class SourceBindingEndpoint
     {

src/Markup/Perspex.Markup.Xaml/Binding/TargetBindingEndpoint.cs → src/Markup/Perspex.Markup.Xaml/Data/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.Binding
+namespace Perspex.Markup.Xaml.Data
 {
     public class TargetBindingEndpoint
     {

src/Markup/Perspex.Markup.Xaml/MarkupExtensions/BindingExtension.cs

@@ -2,7 +2,7 @@
 // Licensed under the MIT license. See licence.md file in the project root for full license information.
 
 using OmniXaml;
-using Perspex.Markup.Xaml.Binding;
+using Perspex.Markup.Xaml.Data;
 
 namespace Perspex.Markup.Xaml.MarkupExtensions
 {
@@ -19,7 +19,7 @@ namespace Perspex.Markup.Xaml.MarkupExtensions
 
         public override object ProvideValue(MarkupExtensionContext extensionContext)
         {
-            return new XamlBinding
+            return new Data.Binding
             {
                 Mode = Mode,
                 SourcePropertyPath = Path,

src/Markup/Perspex.Markup.Xaml/MarkupExtensions/TemplateBindingExtension.cs

@@ -2,7 +2,7 @@
 // Licensed under the MIT license. See licence.md file in the project root for full license information.
 
 using OmniXaml;
-using Perspex.Markup.Xaml.Binding;
+using Perspex.Markup.Xaml.Data;
 
 namespace Perspex.Markup.Xaml.MarkupExtensions
 {
@@ -19,7 +19,7 @@ namespace Perspex.Markup.Xaml.MarkupExtensions
 
         public override object ProvideValue(MarkupExtensionContext extensionContext)
         {
-            return new XamlBinding
+            return new Data.Binding
             {
                 Mode = Mode,
                 Priority = BindingPriority.TemplatedParent,

src/Markup/Perspex.Markup.Xaml/Perspex.Markup.Xaml.csproj

@@ -38,10 +38,10 @@
     <Compile Include="..\..\Shared\SharedAssemblyInfo.cs">
       <Link>Properties\SharedAssemblyInfo.cs</Link>
     </Compile>
-    <Compile Include="Binding\RelativeSource.cs" />
-    <Compile Include="Binding\SourceBindingEndpoint.cs" />
-    <Compile Include="Binding\TargetBindingEndpoint.cs" />
-    <Compile Include="Binding\XamlBinding.cs" />
+    <Compile Include="Data\RelativeSource.cs" />
+    <Compile Include="Data\SourceBindingEndpoint.cs" />
+    <Compile Include="Data\TargetBindingEndpoint.cs" />
+    <Compile Include="Data\Binding.cs" />
     <Compile Include="Context\PerspexAttachableXamlMember.cs" />
     <Compile Include="Context\PerspexContentPropertyProvider.cs" />
     <Compile Include="Converters\MemberSelectorTypeConverter.cs" />

src/Markup/Perspex.Markup.Xaml/Templates/TreeDataTemplate.cs

@@ -6,8 +6,8 @@ using System.Collections;
 using System.Reactive.Linq;
 using Perspex.Controls;
 using Perspex.Controls.Templates;
-using Perspex.Markup.Binding;
-using Perspex.Markup.Xaml.Binding;
+using Perspex.Markup.Data;
+using Perspex.Markup.Xaml.Data;
 using Perspex.Metadata;
 
 namespace Perspex.Markup.Xaml.Templates
@@ -19,7 +19,7 @@ namespace Perspex.Markup.Xaml.Templates
         [Content]
         public TemplateContent Content { get; set; }
 
-        public XamlBinding ItemsSource { get; set; }
+        public Binding ItemsSource { get; set; }
 
         public bool Match(object data)
         {

src/Markup/Perspex.Markup/Binding/ExpressionNode.cs → src/Markup/Perspex.Markup/Data/ExpressionNode.cs

@@ -4,7 +4,7 @@
 using System;
 using System.Reactive.Subjects;
 
-namespace Perspex.Markup.Binding
+namespace Perspex.Markup.Data
 {
     internal abstract class ExpressionNode : IObservable<object>
     {

src/Markup/Perspex.Markup/Binding/ExpressionNodeBuilder.cs → src/Markup/Perspex.Markup/Data/ExpressionNodeBuilder.cs

@@ -2,9 +2,9 @@
 // Licensed under the MIT license. See licence.md file in the project root for full license information.
 
 using System;
-using Perspex.Markup.Binding.Parsers;
+using Perspex.Markup.Data.Parsers;
 
-namespace Perspex.Markup.Binding
+namespace Perspex.Markup.Data
 {
     internal static class ExpressionNodeBuilder
     {

src/Markup/Perspex.Markup/Binding/ExpressionObserver.cs → src/Markup/Perspex.Markup/Data/ExpressionObserver.cs

@@ -5,7 +5,7 @@ using System;
 using System.Reactive;
 using System.Reactive.Disposables;
 
-namespace Perspex.Markup.Binding
+namespace Perspex.Markup.Data
 {
     /// <summary>
     /// Observes and sets the value of an expression on an object.

src/Markup/Perspex.Markup/Binding/ExpressionParseException.cs → src/Markup/Perspex.Markup/Data/ExpressionParseException.cs

@@ -2,9 +2,9 @@
 // Licensed under the MIT license. See licence.md file in the project root for full license information.
 
 using System;
-using Perspex.Markup.Binding.Parsers;
+using Perspex.Markup.Data.Parsers;
 
-namespace Perspex.Markup.Binding
+namespace Perspex.Markup.Data
 {
     public class ExpressionParseException : Exception
     {

src/Markup/Perspex.Markup/Binding/ExpressionSubject.cs → src/Markup/Perspex.Markup/Data/ExpressionSubject.cs

@@ -7,7 +7,7 @@ using System.Reactive.Linq;
 using System.Reactive.Subjects;
 using Perspex.Utilities;
 
-namespace Perspex.Markup.Binding
+namespace Perspex.Markup.Data
 {
     /// <summary>
     /// Turns an <see cref="ExpressionObserver"/> into a subject that can be bound two-way with

src/Markup/Perspex.Markup/Binding/IndexerNode.cs → src/Markup/Perspex.Markup/Data/IndexerNode.cs

@@ -8,7 +8,7 @@ using System.Collections.Specialized;
 using System.Linq;
 using System.Reflection;
 
-namespace Perspex.Markup.Binding
+namespace Perspex.Markup.Data
 {
     internal class IndexerNode : ExpressionNode
     {

src/Markup/Perspex.Markup/Binding/LogicalNotNode.cs → src/Markup/Perspex.Markup/Data/LogicalNotNode.cs

@@ -5,7 +5,7 @@ using System;
 using System.Globalization;
 using System.Reactive.Linq;
 
-namespace Perspex.Markup.Binding
+namespace Perspex.Markup.Data
 {
     internal class LogicalNotNode : ExpressionNode
     {

src/Markup/Perspex.Markup/Binding/Parsers/ArgumentListParser.cs → src/Markup/Perspex.Markup/Data/Parsers/ArgumentListParser.cs

@@ -4,7 +4,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace Perspex.Markup.Binding.Parsers
+namespace Perspex.Markup.Data.Parsers
 {
     internal static class ArgumentListParser
     {

src/Markup/Perspex.Markup/Binding/Parsers/ExpressionParser.cs → src/Markup/Perspex.Markup/Data/Parsers/ExpressionParser.cs

@@ -5,7 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 
-namespace Perspex.Markup.Binding.Parsers
+namespace Perspex.Markup.Data.Parsers
 {
     internal static class ExpressionParser
     {

src/Markup/Perspex.Markup/Binding/Parsers/IdentifierParser.cs → src/Markup/Perspex.Markup/Data/Parsers/IdentifierParser.cs

@@ -4,7 +4,7 @@
 using System.Globalization;
 using System.Text;
 
-namespace Perspex.Markup.Binding.Parsers
+namespace Perspex.Markup.Data.Parsers
 {
     internal static class IdentifierParser
     {

src/Markup/Perspex.Markup/Binding/Parsers/LiteralParser.cs → src/Markup/Perspex.Markup/Data/Parsers/LiteralParser.cs

@@ -4,7 +4,7 @@
 using System.Globalization;
 using System.Text;
 
-namespace Perspex.Markup.Binding.Parsers
+namespace Perspex.Markup.Data.Parsers
 {
     internal static class LiteralParser
     {

src/Markup/Perspex.Markup/Binding/Parsers/Reader.cs → src/Markup/Perspex.Markup/Data/Parsers/Reader.cs

@@ -3,7 +3,7 @@
 
 using System;
 
-namespace Perspex.Markup.Binding.Parsers
+namespace Perspex.Markup.Data.Parsers
 {
     internal class Reader
     {

src/Markup/Perspex.Markup/Binding/PropertyAccessorNode.cs → src/Markup/Perspex.Markup/Data/PropertyAccessorNode.cs

@@ -9,7 +9,7 @@ using System.Threading;
 using System.Threading.Tasks;
 using System.Windows.Input;
 
-namespace Perspex.Markup.Binding
+namespace Perspex.Markup.Data
 {
     internal class PropertyAccessorNode : ExpressionNode
     {

src/Markup/Perspex.Markup/Perspex.Markup.csproj

@@ -36,19 +36,19 @@
     <DocumentationFile>bin\Release\Perspex.Markup.XML</DocumentationFile>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="Binding\ExpressionNodeBuilder.cs" />
-    <Compile Include="Binding\ExpressionParseException.cs" />
-    <Compile Include="Binding\ExpressionSubject.cs" />
-    <Compile Include="Binding\LogicalNotNode.cs" />
-    <Compile Include="Binding\IndexerNode.cs" />
-    <Compile Include="Binding\Parsers\ArgumentListParser.cs" />
-    <Compile Include="Binding\Parsers\LiteralParser.cs" />
-    <Compile Include="Binding\Parsers\IdentifierParser.cs" />
-    <Compile Include="Binding\Parsers\ExpressionParser.cs" />
-    <Compile Include="Binding\Parsers\Reader.cs" />
-    <Compile Include="Binding\PropertyAccessorNode.cs" />
-    <Compile Include="Binding\ExpressionNode.cs" />
-    <Compile Include="Binding\ExpressionObserver.cs" />
+    <Compile Include="Data\ExpressionNodeBuilder.cs" />
+    <Compile Include="Data\ExpressionParseException.cs" />
+    <Compile Include="Data\ExpressionSubject.cs" />
+    <Compile Include="Data\LogicalNotNode.cs" />
+    <Compile Include="Data\IndexerNode.cs" />
+    <Compile Include="Data\Parsers\ArgumentListParser.cs" />
+    <Compile Include="Data\Parsers\LiteralParser.cs" />
+    <Compile Include="Data\Parsers\IdentifierParser.cs" />
+    <Compile Include="Data\Parsers\ExpressionParser.cs" />
+    <Compile Include="Data\Parsers\Reader.cs" />
+    <Compile Include="Data\PropertyAccessorNode.cs" />
+    <Compile Include="Data\ExpressionNode.cs" />
+    <Compile Include="Data\ExpressionObserver.cs" />
     <Compile Include="DefaultValueConverter.cs" />
     <Compile Include="IValueConverter.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />

tests/Perspex.Controls.UnitTests/Primitives/SelectingItemsControlTests_Multiple.cs

@@ -9,7 +9,7 @@ using Perspex.Collections;
 using Perspex.Controls.Presenters;
 using Perspex.Controls.Primitives;
 using Perspex.Controls.Templates;
-using Perspex.Markup.Xaml.Binding;
+using Perspex.Markup.Xaml.Data;
 using Xunit;
 
 namespace Perspex.Controls.UnitTests.Primitives
@@ -401,13 +401,13 @@ namespace Perspex.Controls.UnitTests.Primitives
             var vm = new OldDataContextViewModel();
             var target = new TestSelector();
 
-            var itemsBinding = new XamlBinding
+            var itemsBinding = new Binding
             {
                 SourcePropertyPath = "Items",
                 Mode = BindingMode.OneWay,
             };
 
-            var selectedItemsBinding = new XamlBinding
+            var selectedItemsBinding = new Binding
             {
                 SourcePropertyPath = "SelectedItems",
                 Mode = BindingMode.OneWay,

tests/Perspex.Markup.UnitTests/Binding/ExpressionNodeBuilderTests.cs

@@ -3,7 +3,7 @@
 
 using System.Collections.Generic;
 using System.Linq;
-using Perspex.Markup.Binding;
+using Perspex.Markup.Data;
 using Xunit;
 
 namespace Perspex.Markup.UnitTests.Binding

tests/Perspex.Markup.UnitTests/Binding/ExpressionNodeBuilderTests_Errors.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.Binding;
+using Perspex.Markup.Data;
 using Xunit;
 
 namespace Perspex.Markup.UnitTests.Binding

tests/Perspex.Markup.UnitTests/Binding/ExpressionObserverTests_Indexer.cs

@@ -5,7 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Reactive.Linq;
-using Perspex.Markup.Binding;
+using Perspex.Markup.Data;
 using Xunit;
 
 namespace Perspex.Markup.UnitTests.Binding

tests/Perspex.Markup.UnitTests/Binding/ExpressionObserverTests_Negation.cs

@@ -3,7 +3,7 @@
 
 using System;
 using System.Reactive.Linq;
-using Perspex.Markup.Binding;
+using Perspex.Markup.Data;
 using Xunit;
 
 namespace Perspex.Markup.UnitTests.Binding

tests/Perspex.Markup.UnitTests/Binding/ExpressionObserverTests_Observable.cs

@@ -5,7 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.Reactive.Linq;
 using System.Reactive.Subjects;
-using Perspex.Markup.Binding;
+using Perspex.Markup.Data;
 using Xunit;
 
 namespace Perspex.Markup.UnitTests.Binding

tests/Perspex.Markup.UnitTests/Binding/ExpressionObserverTests_Property.cs

@@ -5,7 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.Reactive.Linq;
 using System.Reactive.Subjects;
-using Perspex.Markup.Binding;
+using Perspex.Markup.Data;
 using Xunit;
 
 namespace Perspex.Markup.UnitTests.Binding

tests/Perspex.Markup.UnitTests/Binding/ExpressionObserverTests_SetValue.cs

@@ -4,7 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.Reactive.Linq;
-using Perspex.Markup.Binding;
+using Perspex.Markup.Data;
 using Xunit;
 
 namespace Perspex.Markup.UnitTests.Binding

tests/Perspex.Markup.UnitTests/Binding/ExpressionObserverTests_Task.cs

@@ -6,7 +6,7 @@ using System.Collections.Generic;
 using System.Reactive.Linq;
 using System.Threading;
 using System.Threading.Tasks;
-using Perspex.Markup.Binding;
+using Perspex.Markup.Data;
 using Xunit;
 
 namespace Perspex.Markup.UnitTests.Binding

tests/Perspex.Markup.UnitTests/Binding/ExpressionSubjectTests.cs

@@ -2,7 +2,7 @@
 // Licensed under the MIT license. See licence.md file in the project root for full license information.
 
 using System.Reactive.Linq;
-using Perspex.Markup.Binding;
+using Perspex.Markup.Data;
 using Xunit;
 
 namespace Perspex.Markup.UnitTests.Binding

tests/Perspex.Markup.Xaml.UnitTests/Binding/XamlBindingTests.cs → tests/Perspex.Markup.Xaml.UnitTests/Data/BindingTests.cs

@@ -6,18 +6,18 @@ using System.Reactive.Linq;
 using System.Reactive.Subjects;
 using Moq;
 using Perspex.Controls;
-using Perspex.Markup.Xaml.Binding;
+using Perspex.Markup.Xaml.Data;
 using Xunit;
 
-namespace Perspex.Markup.Xaml.UnitTests.Binding
+namespace Perspex.Markup.Xaml.UnitTests.Data
 {
-    public class XamlBindingTests
+    public class BindingTests
     {
         [Fact]
         public void OneWay_Binding_Should_Be_Set_Up()
         {
             var target = CreateTarget();
-            var binding = new XamlBinding
+            var binding = new Binding
             {
                 SourcePropertyPath = "Foo",
                 Mode = BindingMode.OneWay,
@@ -35,7 +35,7 @@ namespace Perspex.Markup.Xaml.UnitTests.Binding
         public void TwoWay_Binding_Should_Be_Set_Up()
         {
             var target = CreateTarget();
-            var binding = new XamlBinding
+            var binding = new Binding
             {
                 SourcePropertyPath = "Foo",
                 Mode = BindingMode.TwoWay,
@@ -55,7 +55,7 @@ namespace Perspex.Markup.Xaml.UnitTests.Binding
             var dataContext = new BehaviorSubject<object>(null);
             var expression = new BehaviorSubject<object>(null);
             var target = CreateTarget(dataContext: dataContext);
-            var binding = new XamlBinding
+            var binding = new Binding
             {
                 SourcePropertyPath = "Foo",
                 Mode = BindingMode.OneTime,
@@ -84,7 +84,7 @@ namespace Perspex.Markup.Xaml.UnitTests.Binding
             var textObservable = new Mock<IObservable<string>>();
             var expression = new Mock<ISubject<object>>();
             var target = CreateTarget(text: textObservable.Object);
-            var binding = new XamlBinding
+            var binding = new Binding
             {
                 SourcePropertyPath = "Foo",
                 Mode = BindingMode.OneWayToSource,
@@ -99,7 +99,7 @@ namespace Perspex.Markup.Xaml.UnitTests.Binding
         public void Default_BindingMode_Should_Be_Used()
         {
             var target = CreateTarget(null);
-            var binding = new XamlBinding
+            var binding = new Binding
             {
                 SourcePropertyPath = "Foo",
             };
@@ -124,7 +124,7 @@ namespace Perspex.Markup.Xaml.UnitTests.Binding
                 DataContext = parentDataContext,
             };
 
-            var binding = new XamlBinding
+            var binding = new Binding
             {
                 SourcePropertyPath = "Header",
             };
@@ -156,13 +156,13 @@ namespace Perspex.Markup.Xaml.UnitTests.Binding
             var vm = new OldDataContextViewModel();
             var target = new OldDataContextTest();
 
-            var fooBinding = new XamlBinding
+            var fooBinding = new Binding
             {
                 SourcePropertyPath = "Foo",
                 Mode = BindingMode.TwoWay,
             };
 
-            var barBinding = new XamlBinding
+            var barBinding = new Binding
             {
                 SourcePropertyPath = "Bar",
                 Mode = BindingMode.TwoWay,

tests/Perspex.Markup.Xaml.UnitTests/Binding/XamlBindingTests_TemplatedParent.cs → tests/Perspex.Markup.Xaml.UnitTests/Data/BindingTests_TemplatedParent.cs

@@ -6,19 +6,19 @@ using System.Reactive.Linq;
 using System.Reactive.Subjects;
 using Moq;
 using Perspex.Controls;
-using Perspex.Markup.Xaml.Binding;
+using Perspex.Markup.Xaml.Data;
 using Perspex.Styling;
 using Xunit;
 
-namespace Perspex.Markup.Xaml.UnitTests.Binding
+namespace Perspex.Markup.Xaml.UnitTests.Data
 {
-    public class XamlBindingTests_TemplatedParent
+    public class BindingTests_TemplatedParent
     {
         [Fact]
         public void OneWay_Binding_Should_Be_Set_Up()
         {
             var target = CreateTarget();
-            var binding = new XamlBinding
+            var binding = new Binding
             {
                 Mode = BindingMode.OneWay,
                 RelativeSource = new RelativeSource(RelativeSourceMode.TemplatedParent),
@@ -38,7 +38,7 @@ namespace Perspex.Markup.Xaml.UnitTests.Binding
         public void TwoWay_Binding_Should_Be_Set_Up()
         {
             var target = CreateTarget();
-            var binding = new XamlBinding
+            var binding = new Binding
             {
                 Mode = BindingMode.TwoWay,
                 RelativeSource = new RelativeSource(RelativeSourceMode.TemplatedParent),
@@ -60,7 +60,7 @@ namespace Perspex.Markup.Xaml.UnitTests.Binding
             var textObservable = new Mock<IObservable<string>>();
             var expression = new Mock<ISubject<object>>();
             var target = CreateTarget(text: textObservable.Object);
-            var binding = new XamlBinding
+            var binding = new Binding
             {
                 SourcePropertyPath = "Foo",
                 Mode = BindingMode.OneWayToSource,

tests/Perspex.Markup.Xaml.UnitTests/Perspex.Markup.Xaml.UnitTests.csproj

@@ -88,8 +88,8 @@
     <Otherwise />
   </Choose>
   <ItemGroup>
-    <Compile Include="Binding\XamlBindingTests_TemplatedParent.cs" />
-    <Compile Include="Binding\XamlBindingTests.cs" />
+    <Compile Include="Data\BindingTests_TemplatedParent.cs" />
+    <Compile Include="Data\BindingTests.cs" />
     <Compile Include="Converters\PerspexPropertyConverterTest.cs" />
     <Compile Include="Parsers\SelectorGrammarTests.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />