diff --git a/src/Avalonia.Base/Data/Converters/StringFormatConverter.cs b/src/Avalonia.Base/Data/Converters/StringFormatValueConverter.cs
similarity index 85%
rename from src/Avalonia.Base/Data/Converters/StringFormatConverter.cs
rename to src/Avalonia.Base/Data/Converters/StringFormatValueConverter.cs
index 67ecacd1c7..3703929356 100644
--- a/src/Avalonia.Base/Data/Converters/StringFormatConverter.cs
+++ b/src/Avalonia.Base/Data/Converters/StringFormatValueConverter.cs
@@ -3,9 +3,9 @@ using System.Globalization;
 
 namespace Avalonia.Data.Converters
 {
-    public class StringFormatConverter : IValueConverter
+    public class StringFormatValueConverter : IValueConverter
     {
-        public StringFormatConverter(string format, IValueConverter inner)
+        public StringFormatValueConverter(string format, IValueConverter inner)
         {
             Contract.Requires<ArgumentNullException>(format != null);
 
diff --git a/src/Markup/Avalonia.Markup/Data/Binding.cs b/src/Markup/Avalonia.Markup/Data/Binding.cs
index a39dbe72cd..62cff4d768 100644
--- a/src/Markup/Avalonia.Markup/Data/Binding.cs
+++ b/src/Markup/Avalonia.Markup/Data/Binding.cs
@@ -172,7 +172,7 @@ namespace Avalonia.Data
             if (!string.IsNullOrWhiteSpace(StringFormat) && 
                 (targetType == typeof(string) || targetType == typeof(object)))
             {
-                converter = new StringFormatConverter(StringFormat, converter);
+                converter = new StringFormatValueConverter(StringFormat, converter);
             }
 
             var subject = new BindingExpression(
diff --git a/tests/Avalonia.Markup.UnitTests/Data/BindingTests_Converters.cs b/tests/Avalonia.Markup.UnitTests/Data/BindingTests_Converters.cs
index 814618d764..e98f9f895c 100644
--- a/tests/Avalonia.Markup.UnitTests/Data/BindingTests_Converters.cs
+++ b/tests/Avalonia.Markup.UnitTests/Data/BindingTests_Converters.cs
@@ -51,7 +51,7 @@ namespace Avalonia.Markup.UnitTests.Data
                     textBlock,
                     TextBlock.TextProperty).Observable;
 
-                Assert.IsType<StringFormatConverter>(expressionObserver.Converter);
+                Assert.IsType<StringFormatValueConverter>(expressionObserver.Converter);
             }
         }
 
@@ -74,7 +74,7 @@ namespace Avalonia.Markup.UnitTests.Data
                     textBlock,
                     TextBlock.TagProperty).Observable;
 
-                Assert.IsType<StringFormatConverter>(expressionObserver.Converter);
+                Assert.IsType<StringFormatValueConverter>(expressionObserver.Converter);
             }
         }