diff --git a/src/Android/Perspex.Android/AndroidPlatform.cs b/src/Android/Perspex.Android/AndroidPlatform.cs
index 9276cba150..4b02a14aa0 100644
--- a/src/Android/Perspex.Android/AndroidPlatform.cs
+++ b/src/Android/Perspex.Android/AndroidPlatform.cs
@@ -57,7 +57,7 @@ namespace Perspex.Android
             return new WindowImpl();
         }
 
-        public IWindowImpl CreateDesignerFriendlyWindow()
+        public IWindowImpl CreateEmbeddableWindow()
         {
             throw new NotImplementedException();
         }
diff --git a/src/Gtk/Perspex.Gtk/GtkPlatform.cs b/src/Gtk/Perspex.Gtk/GtkPlatform.cs
index 014048854d..b8a6d5c511 100644
--- a/src/Gtk/Perspex.Gtk/GtkPlatform.cs
+++ b/src/Gtk/Perspex.Gtk/GtkPlatform.cs
@@ -90,7 +90,7 @@ namespace Perspex.Gtk
             return new WindowImpl();
         }
 
-        public IWindowImpl CreateDesignerFriendlyWindow()
+        public IWindowImpl CreateEmbeddableWindow()
         {
             throw new NotSupportedException();
         }
diff --git a/src/Perspex.Controls/Platform/IWindowingPlatform.cs b/src/Perspex.Controls/Platform/IWindowingPlatform.cs
index 99176b720e..5a12fbdeb2 100644
--- a/src/Perspex.Controls/Platform/IWindowingPlatform.cs
+++ b/src/Perspex.Controls/Platform/IWindowingPlatform.cs
@@ -9,7 +9,7 @@ namespace Perspex.Platform
     public interface IWindowingPlatform
     {
         IWindowImpl CreateWindow();
-        IWindowImpl CreateDesignerFriendlyWindow();
+        IWindowImpl CreateEmbeddableWindow();
         IPopupImpl CreatePopup();
     }
 }
diff --git a/src/Perspex.Controls/Platform/PlatformManager.cs b/src/Perspex.Controls/Platform/PlatformManager.cs
index 383eecd5c7..1e13b926c0 100644
--- a/src/Perspex.Controls/Platform/PlatformManager.cs
+++ b/src/Perspex.Controls/Platform/PlatformManager.cs
@@ -184,7 +184,7 @@ namespace Perspex.Controls.Platform
         {
             var platform = PerspexLocator.Current.GetService<IWindowingPlatform>();
             return
-                new WindowDecorator(s_designerMode ? platform.CreateDesignerFriendlyWindow() : platform.CreateWindow());
+                new WindowDecorator(s_designerMode ? platform.CreateEmbeddableWindow() : platform.CreateWindow());
         }
 
         public static IPopupImpl CreatePopup()
diff --git a/src/Windows/Perspex.Win32/Win32Platform.cs b/src/Windows/Perspex.Win32/Win32Platform.cs
index 5c8c475f17..89c6646b0c 100644
--- a/src/Windows/Perspex.Win32/Win32Platform.cs
+++ b/src/Windows/Perspex.Win32/Win32Platform.cs
@@ -163,7 +163,7 @@ namespace Perspex.Win32
             return new WindowImpl();
         }
 
-        public IWindowImpl CreateDesignerFriendlyWindow()
+        public IWindowImpl CreateEmbeddableWindow()
         {
             return new EmbeddedWindowImpl();
         }
diff --git a/src/iOS/Perspex.iOS/PerspexAppDelegate.cs b/src/iOS/Perspex.iOS/PerspexAppDelegate.cs
index e526f3a69c..3a8c2e00df 100644
--- a/src/iOS/Perspex.iOS/PerspexAppDelegate.cs
+++ b/src/iOS/Perspex.iOS/PerspexAppDelegate.cs
@@ -61,7 +61,7 @@ namespace Perspex.iOS
                 return _window;
             }
 
-            public IWindowImpl CreateDesignerFriendlyWindow()
+            public IWindowImpl CreateEmbeddableWindow()
             {
                 throw new NotImplementedException();
             }
diff --git a/tests/Perspex.Controls.UnitTests/Primitives/WindowingPlatformMock.cs b/tests/Perspex.Controls.UnitTests/Primitives/WindowingPlatformMock.cs
index 6dde6ef4d1..5169ebfa65 100644
--- a/tests/Perspex.Controls.UnitTests/Primitives/WindowingPlatformMock.cs
+++ b/tests/Perspex.Controls.UnitTests/Primitives/WindowingPlatformMock.cs
@@ -20,7 +20,7 @@ namespace Perspex.Controls.UnitTests.Primitives
             return _windowImpl?.Invoke() ?? new Mock<IWindowImpl>().Object;
         }
 
-        public IWindowImpl CreateDesignerFriendlyWindow()
+        public IWindowImpl CreateEmbeddableWindow()
         {
             throw new NotImplementedException();
         }