diff --git a/src/Avalonia.Controls/Image.cs b/src/Avalonia.Controls/Image.cs
index ffccfdf081..50e4f1515e 100644
--- a/src/Avalonia.Controls/Image.cs
+++ b/src/Avalonia.Controls/Image.cs
@@ -68,7 +68,7 @@ namespace Avalonia.Controls
                 Rect sourceRect = new Rect(sourceSize)
                     .CenterRect(new Rect(destRect.Size / scale));
 
-                var scalingMode = RenderOptions.GetBitmapScalingMode(this);
+                var scalingMode = RenderOptions.GetBitmapInterpolationMode(this);
 
                 context.DrawImage(source, 1, sourceRect, destRect, scalingMode);
             }
diff --git a/src/Avalonia.Visuals/Media/RenderOptions.cs b/src/Avalonia.Visuals/Media/RenderOptions.cs
index 7efe1c7349..b38ba3f9c9 100644
--- a/src/Avalonia.Visuals/Media/RenderOptions.cs
+++ b/src/Avalonia.Visuals/Media/RenderOptions.cs
@@ -3,12 +3,12 @@
 
 using Avalonia.Visuals.Media.Imaging;
 
-namespace Avalonia.Visuals.Media
+namespace Avalonia.Media
 { 
     public class RenderOptions
     {
         /// <summary>
-        /// Defines the <see cref="Imaging.BitmapInterpolationMode"/> property.
+        /// Defines the <see cref="Visuals.Media.Imaging.BitmapInterpolationMode"/> property.
         /// </summary>
         public static readonly StyledProperty<BitmapInterpolationMode> BitmapInterpolationMode =
             AvaloniaProperty.RegisterAttached<RenderOptions, AvaloniaObject, BitmapInterpolationMode>(
@@ -20,7 +20,7 @@ namespace Avalonia.Visuals.Media
         /// </summary>
         /// <param name="element">The control.</param>
         /// <returns>The control's left coordinate.</returns>
-        public static BitmapInterpolationMode GetBitmapScalingMode(AvaloniaObject element)
+        public static BitmapInterpolationMode GetBitmapInterpolationMode(AvaloniaObject element)
         {
             return element.GetValue(BitmapInterpolationMode);
         }
@@ -30,7 +30,7 @@ namespace Avalonia.Visuals.Media
         /// </summary>
         /// <param name="element">The control.</param>
         /// <param name="value">The left value.</param>
-        public static void SetBitmapScalingMode(AvaloniaObject element, BitmapInterpolationMode value)
+        public static void SetBitmapInterpolationMode(AvaloniaObject element, BitmapInterpolationMode value)
         {
             element.SetValue(BitmapInterpolationMode, value);
         }
diff --git a/src/Avalonia.Visuals/Media/TileBrush.cs b/src/Avalonia.Visuals/Media/TileBrush.cs
index 5a6da8f2e1..506b406856 100644
--- a/src/Avalonia.Visuals/Media/TileBrush.cs
+++ b/src/Avalonia.Visuals/Media/TileBrush.cs
@@ -141,8 +141,8 @@ namespace Avalonia.Media
         /// </value>
         public BitmapInterpolationMode BitmapInterpolationMode
         {
-            get { return RenderOptions.GetBitmapScalingMode(this); }
-            set { RenderOptions.SetBitmapScalingMode(this, value); }
+            get { return RenderOptions.GetBitmapInterpolationMode(this); }
+            set { RenderOptions.SetBitmapInterpolationMode(this, value); }
         }
     }
 }