diff --git a/src/Markup/Perspex.Markup.Xaml/Context/PerspexWiringContext.cs b/src/Markup/Perspex.Markup.Xaml/Context/PerspexWiringContext.cs
index 7ab5758f41..7fa4822da3 100644
--- a/src/Markup/Perspex.Markup.Xaml/Context/PerspexWiringContext.cs
+++ b/src/Markup/Perspex.Markup.Xaml/Context/PerspexWiringContext.cs
@@ -80,12 +80,12 @@ namespace Perspex.Markup.Xaml.Context
             var typeConverterProvider = new TypeConverterProvider();
             var converters = new[]
             {
-                new TypeConverterRegistration(typeof(Bitmap), new BitmapConverter()),
-                new TypeConverterRegistration(typeof(Brush), new BrushConverter()),
+                new TypeConverterRegistration(typeof(Bitmap), new BitmapTypeConverter()),
+                new TypeConverterRegistration(typeof(Brush), new BrushTypeConverter()),
                 new TypeConverterRegistration(typeof(ColumnDefinitions), new ColumnDefinitionsTypeConverter()),
                 new TypeConverterRegistration(typeof(GridLength), new GridLengthTypeConverter()),
                 new TypeConverterRegistration(typeof(RowDefinitions), new RowDefinitionsTypeConverter()),
-                new TypeConverterRegistration(typeof(Thickness), new ThicknessConverter()),
+                new TypeConverterRegistration(typeof(Thickness), new ThicknessTypeConverter()),
             };
 
             typeConverterProvider.AddAll(converters);
diff --git a/src/Markup/Perspex.Markup.Xaml/Converters/BitmapConverter.cs b/src/Markup/Perspex.Markup.Xaml/Converters/BitmapTypeConverter.cs
similarity index 94%
rename from src/Markup/Perspex.Markup.Xaml/Converters/BitmapConverter.cs
rename to src/Markup/Perspex.Markup.Xaml/Converters/BitmapTypeConverter.cs
index 392da12630..1aa1660079 100644
--- a/src/Markup/Perspex.Markup.Xaml/Converters/BitmapConverter.cs
+++ b/src/Markup/Perspex.Markup.Xaml/Converters/BitmapTypeConverter.cs
@@ -8,7 +8,7 @@ using Perspex.Media.Imaging;
 
 namespace Perspex.Markup.Xaml.Converters
 {
-    public class BitmapConverter : ITypeConverter
+    public class BitmapTypeConverter : ITypeConverter
     {
         public bool CanConvertFrom(IXamlTypeConverterContext context, Type sourceType)
         {
diff --git a/src/Markup/Perspex.Markup.Xaml/Converters/BrushConverter.cs b/src/Markup/Perspex.Markup.Xaml/Converters/BrushTypeConverter.cs
similarity index 94%
rename from src/Markup/Perspex.Markup.Xaml/Converters/BrushConverter.cs
rename to src/Markup/Perspex.Markup.Xaml/Converters/BrushTypeConverter.cs
index d734caf37a..197cb20a8d 100644
--- a/src/Markup/Perspex.Markup.Xaml/Converters/BrushConverter.cs
+++ b/src/Markup/Perspex.Markup.Xaml/Converters/BrushTypeConverter.cs
@@ -8,7 +8,7 @@ using Perspex.Media;
 
 namespace Perspex.Markup.Xaml.Converters
 {
-    public class BrushConverter : ITypeConverter
+    public class BrushTypeConverter : ITypeConverter
     {
         public bool CanConvertFrom(IXamlTypeConverterContext context, Type sourceType)
         {
diff --git a/src/Markup/Perspex.Markup.Xaml/Converters/ThicknessConverter.cs b/src/Markup/Perspex.Markup.Xaml/Converters/ThicknessTypeConverter.cs
similarity index 94%
rename from src/Markup/Perspex.Markup.Xaml/Converters/ThicknessConverter.cs
rename to src/Markup/Perspex.Markup.Xaml/Converters/ThicknessTypeConverter.cs
index a001913711..1e33525494 100644
--- a/src/Markup/Perspex.Markup.Xaml/Converters/ThicknessConverter.cs
+++ b/src/Markup/Perspex.Markup.Xaml/Converters/ThicknessTypeConverter.cs
@@ -7,7 +7,7 @@ using OmniXaml.TypeConversion;
 
 namespace Perspex.Markup.Xaml.Converters
 {
-    public class ThicknessConverter : ITypeConverter
+    public class ThicknessTypeConverter : 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 e146cac468..d2aaa43766 100644
--- a/src/Markup/Perspex.Markup.Xaml/Perspex.Markup.Xaml.csproj
+++ b/src/Markup/Perspex.Markup.Xaml/Perspex.Markup.Xaml.csproj
@@ -40,11 +40,11 @@
     </Compile>
     <Compile Include="Converters\RowDefinitionsTypeConverter.cs" />
     <Compile Include="Converters\ColumnDefinitionsTypeConverter.cs" />
-    <Compile Include="Converters\ThicknessConverter.cs" />
+    <Compile Include="Converters\ThicknessTypeConverter.cs" />
     <Compile Include="Context\PerspexWiringContext.cs" />
     <Compile Include="MarkupExtensions\BindingExtension.cs" />
-    <Compile Include="Converters\BrushConverter.cs" />
-    <Compile Include="Converters\BitmapConverter.cs" />
+    <Compile Include="Converters\BrushTypeConverter.cs" />
+    <Compile Include="Converters\BitmapTypeConverter.cs" />
     <Compile Include="Converters\GridLengthTypeConverter.cs" />
     <Compile Include="DataBinding\ChangeTracking\ObservablePropertyBranch.cs" />
     <Compile Include="DataBinding\ChangeTracking\PropertyMountPoint.cs" />