diff --git a/Tests/Perspex.Markup.Xaml.UnitTests/Converters/PerspexPropertyConverterTest.cs b/Tests/Perspex.Markup.Xaml.UnitTests/Converters/PerspexPropertyConverterTest.cs
index 3193c0d459..ebf192679a 100644
--- a/Tests/Perspex.Markup.Xaml.UnitTests/Converters/PerspexPropertyConverterTest.cs
+++ b/Tests/Perspex.Markup.Xaml.UnitTests/Converters/PerspexPropertyConverterTest.cs
@@ -22,7 +22,7 @@ namespace Perspex.Markup.Xaml.UnitTests.Converters
         [Fact]
         public void ConvertFrom_Finds_Fully_Qualified_Property()
         {
-            var target = new PerspexPropertyConverter();
+            var target = new PerspexPropertyTypeConverter();
             var context = CreateContext();
             var result = target.ConvertFrom(context, null, "Class1.Foo");
         }
@@ -30,7 +30,7 @@ namespace Perspex.Markup.Xaml.UnitTests.Converters
         [Fact]
         public void ConvertFrom_Finds_Attached_Property()
         {
-            var target = new PerspexPropertyConverter();
+            var target = new PerspexPropertyTypeConverter();
             var context = CreateContext();
             var result = target.ConvertFrom(context, null, "AttachedOwner.Attached");
         }
diff --git a/src/Markup/Perspex.Markup.Xaml/Context/PerspexWiringContext.cs b/src/Markup/Perspex.Markup.Xaml/Context/PerspexWiringContext.cs
index 03b06bb038..2a84eebd70 100644
--- a/src/Markup/Perspex.Markup.Xaml/Context/PerspexWiringContext.cs
+++ b/src/Markup/Perspex.Markup.Xaml/Context/PerspexWiringContext.cs
@@ -77,13 +77,13 @@ namespace Perspex.Markup.Xaml.Context
             {
                 new TypeConverterRegistration(typeof(Bitmap), new BitmapTypeConverter()),
                 new TypeConverterRegistration(typeof(Brush), new BrushTypeConverter()),
-                new TypeConverterRegistration(typeof(Classes), new ClassesConverter()),
+                new TypeConverterRegistration(typeof(Classes), new ClassesTypeConverter()),
                 new TypeConverterRegistration(typeof(ColumnDefinitions), new ColumnDefinitionsTypeConverter()),
                 new TypeConverterRegistration(typeof(GridLength), new GridLengthTypeConverter()),
-                new TypeConverterRegistration(typeof(PerspexProperty), new PerspexPropertyConverter()),
+                new TypeConverterRegistration(typeof(PerspexProperty), new PerspexPropertyTypeConverter()),
                 new TypeConverterRegistration(typeof(RowDefinitions), new RowDefinitionsTypeConverter()),
                 new TypeConverterRegistration(typeof(Thickness), new ThicknessTypeConverter()),
-                new TypeConverterRegistration(typeof(Selector), new SelectorConverter()),
+                new TypeConverterRegistration(typeof(Selector), new SelectorTypeConverter()),
             };
 
             typeConverterProvider.AddAll(converters);
diff --git a/src/Markup/Perspex.Markup.Xaml/Converters/ClassesConverter.cs b/src/Markup/Perspex.Markup.Xaml/Converters/ClassesTypeConverter.cs
similarity index 94%
rename from src/Markup/Perspex.Markup.Xaml/Converters/ClassesConverter.cs
rename to src/Markup/Perspex.Markup.Xaml/Converters/ClassesTypeConverter.cs
index e4729a9aa8..3f49bc04fe 100644
--- a/src/Markup/Perspex.Markup.Xaml/Converters/ClassesConverter.cs
+++ b/src/Markup/Perspex.Markup.Xaml/Converters/ClassesTypeConverter.cs
@@ -8,7 +8,7 @@ using Perspex.Styling;
 
 namespace Perspex.Markup.Xaml.Converters
 {
-    public class ClassesConverter : ITypeConverter
+    public class ClassesTypeConverter : ITypeConverter
     {
         public bool CanConvertFrom(IXamlTypeConverterContext context, Type sourceType)
         {
diff --git a/src/Markup/Perspex.Markup.Xaml/Converters/PerspexPropertyConverter.cs b/src/Markup/Perspex.Markup.Xaml/Converters/PerspexPropertyTypeConverter.cs
similarity index 97%
rename from src/Markup/Perspex.Markup.Xaml/Converters/PerspexPropertyConverter.cs
rename to src/Markup/Perspex.Markup.Xaml/Converters/PerspexPropertyTypeConverter.cs
index ad10495bb9..4ee57111b2 100644
--- a/src/Markup/Perspex.Markup.Xaml/Converters/PerspexPropertyConverter.cs
+++ b/src/Markup/Perspex.Markup.Xaml/Converters/PerspexPropertyTypeConverter.cs
@@ -10,7 +10,7 @@ using Perspex.Styling;
 
 namespace Perspex.Markup.Xaml.Converters
 {
-    public class PerspexPropertyConverter : ITypeConverter
+    public class PerspexPropertyTypeConverter : ITypeConverter
     {
         public bool CanConvertFrom(IXamlTypeConverterContext context, Type sourceType)
         {
diff --git a/src/Markup/Perspex.Markup.Xaml/Converters/SelectorConverter.cs b/src/Markup/Perspex.Markup.Xaml/Converters/SelectorTypeConverter.cs
similarity index 95%
rename from src/Markup/Perspex.Markup.Xaml/Converters/SelectorConverter.cs
rename to src/Markup/Perspex.Markup.Xaml/Converters/SelectorTypeConverter.cs
index dfe858d065..0d78938dae 100644
--- a/src/Markup/Perspex.Markup.Xaml/Converters/SelectorConverter.cs
+++ b/src/Markup/Perspex.Markup.Xaml/Converters/SelectorTypeConverter.cs
@@ -8,7 +8,7 @@ using Perspex.Markup.Xaml.Parsers;
 
 namespace Perspex.Markup.Xaml.Converters
 {
-    public class SelectorConverter : ITypeConverter
+    public class SelectorTypeConverter : ITypeConverter
     {
         public bool CanConvertFrom(IXamlTypeConverterContext context, Type sourceType)
         {
diff --git a/src/Markup/Perspex.Markup.Xaml/Perspex.Markup.Xaml.csproj b/src/Markup/Perspex.Markup.Xaml/Perspex.Markup.Xaml.csproj
index dae0413aa3..4825f4bf81 100644
--- a/src/Markup/Perspex.Markup.Xaml/Perspex.Markup.Xaml.csproj
+++ b/src/Markup/Perspex.Markup.Xaml/Perspex.Markup.Xaml.csproj
@@ -38,12 +38,12 @@
     <Compile Include="..\..\Shared\SharedAssemblyInfo.cs">
       <Link>Properties\SharedAssemblyInfo.cs</Link>
     </Compile>
-    <Compile Include="Converters\ClassesConverter.cs" />
+    <Compile Include="Converters\ClassesTypeConverter.cs" />
     <Compile Include="Converters\RowDefinitionsTypeConverter.cs" />
     <Compile Include="Converters\ColumnDefinitionsTypeConverter.cs" />
     <Compile Include="Converters\ThicknessTypeConverter.cs" />
-    <Compile Include="Converters\PerspexPropertyConverter.cs" />
-    <Compile Include="Converters\SelectorConverter.cs" />
+    <Compile Include="Converters\PerspexPropertyTypeConverter.cs" />
+    <Compile Include="Converters\SelectorTypeConverter.cs" />
     <Compile Include="Context\PerspexWiringContext.cs" />
     <Compile Include="MarkupExtensions\BindingExtension.cs" />
     <Compile Include="Converters\BrushTypeConverter.cs" />