diff --git a/Avalonia.sln b/Avalonia.sln
index 9670327d67..0bae725d33 100644
--- a/Avalonia.sln
+++ b/Avalonia.sln
@@ -135,7 +135,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Linux", "Linux", "{86C53C40
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.LinuxFramebuffer", "src\Linux\Avalonia.LinuxFramebuffer\Avalonia.LinuxFramebuffer.csproj", "{854568D5-13D1-4B4F-B50D-534DC7EFD3C9}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Win32.Interop", "src\Windows\Avalonia.Win32.Interop\Avalonia.Win32.Interop.csproj", "{CBC4FF2F-92D4-420B-BE21-9FE0B930B04E}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Win32.Interoperability", "src\Windows\Avalonia.Win32.Interoperability\Avalonia.Win32.Interoperability.csproj", "{CBC4FF2F-92D4-420B-BE21-9FE0B930B04E}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Skia.RenderTests", "tests\Avalonia.Skia.RenderTests\Avalonia.Skia.RenderTests.csproj", "{E1582370-37B3-403C-917F-8209551B1634}"
 EndProject
@@ -251,6 +251,7 @@ EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Generators.Sandbox", "samples\Generators.Sandbox\Generators.Sandbox.csproj", "{A82AD1BC-EBE6-4FC3-A13B-D52A50297533}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AppWithoutLifetime", "samples\AppWithoutLifetime\AppWithoutLifetime.csproj", "{F8928267-688E-4A51-989C-612A72446D33}"
+EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SafeAreaDemo", "samples\SafeAreaDemo\SafeAreaDemo.csproj", "{6B60A970-D5D2-49C2-8BAB-F9C7973B74B6}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SafeAreaDemo.Android", "samples\SafeAreaDemo.Android\SafeAreaDemo.Android.csproj", "{22E3BC08-EAF7-4889-BDC4-B4D3046C4E2D}"
diff --git a/samples/interop/WindowsInteropTest/EmbedToWpfDemo.xaml b/samples/interop/WindowsInteropTest/EmbedToWpfDemo.xaml
index 1d8dc32a69..f7ad18d569 100644
--- a/samples/interop/WindowsInteropTest/EmbedToWpfDemo.xaml
+++ b/samples/interop/WindowsInteropTest/EmbedToWpfDemo.xaml
@@ -6,7 +6,7 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
              xmlns:local="clr-namespace:WindowsInteropTest"
              xmlns:embedding="clr-namespace:Avalonia.Win32.Embedding;assembly=Avalonia.Win32"
-             xmlns:wpf="clr-namespace:Avalonia.Win32.Interop.Wpf;assembly=Avalonia.Win32.Interop"
+             xmlns:wpf="clr-namespace:Avalonia.Win32.Interop.Wpf;assembly=Avalonia.Win32.Interoperability"
              mc:Ignorable="d" 
              d:DesignHeight="400" d:DesignWidth="400" MinWidth="500" MinHeight="400">
     <DockPanel>
diff --git a/samples/interop/WindowsInteropTest/WindowsInteropTest.csproj b/samples/interop/WindowsInteropTest/WindowsInteropTest.csproj
index 95f77f6df9..e33091680e 100644
--- a/samples/interop/WindowsInteropTest/WindowsInteropTest.csproj
+++ b/samples/interop/WindowsInteropTest/WindowsInteropTest.csproj
@@ -9,7 +9,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\..\..\src\Avalonia.Diagnostics\Avalonia.Diagnostics.csproj" />
-    <ProjectReference Include="..\..\..\src\Windows\Avalonia.Win32.Interop\Avalonia.Win32.Interop.csproj" />
+    <ProjectReference Include="..\..\..\src\Windows\Avalonia.Win32.Interoperability\Avalonia.Win32.Interoperability.csproj" />
     <ProjectReference Include="..\..\ControlCatalog\ControlCatalog.csproj" />
   </ItemGroup>
 </Project>
diff --git a/src/Windows/Avalonia.Direct2D1/Avalonia.Direct2D1.csproj b/src/Windows/Avalonia.Direct2D1/Avalonia.Direct2D1.csproj
index 3c2d7b3322..bbe2a92074 100644
--- a/src/Windows/Avalonia.Direct2D1/Avalonia.Direct2D1.csproj
+++ b/src/Windows/Avalonia.Direct2D1/Avalonia.Direct2D1.csproj
@@ -17,7 +17,7 @@
   <ItemGroup Label="InternalsVisibleTo">
     <InternalsVisibleTo Include="Avalonia.Direct2D1.RenderTests, PublicKey=$(AvaloniaPublicKey)" />
     <InternalsVisibleTo Include="Avalonia.Direct2D1.UnitTests, PublicKey=$(AvaloniaPublicKey)" />
-    <InternalsVisibleTo Include="Avalonia.Win32.Interop, PublicKey=$(AvaloniaPublicKey)"/>
+    <InternalsVisibleTo Include="Avalonia.Win32.Interoperability, PublicKey=$(AvaloniaPublicKey)"/>
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Windows/Avalonia.Win32.Interop/Avalonia.Win32.Interop.csproj b/src/Windows/Avalonia.Win32.Interoperability/Avalonia.Win32.Interoperability.csproj
similarity index 91%
rename from src/Windows/Avalonia.Win32.Interop/Avalonia.Win32.Interop.csproj
rename to src/Windows/Avalonia.Win32.Interoperability/Avalonia.Win32.Interoperability.csproj
index 6ee33b370a..9565bd86be 100644
--- a/src/Windows/Avalonia.Win32.Interop/Avalonia.Win32.Interop.csproj
+++ b/src/Windows/Avalonia.Win32.Interoperability/Avalonia.Win32.Interoperability.csproj
@@ -5,7 +5,6 @@
     <UseWpf>true</UseWpf>
     <UseWindowsForms>true</UseWindowsForms>
     <UseDirect3D9>true</UseDirect3D9>
-    <PackageId>Avalonia.Win32.Interoperability</PackageId>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\packages\Avalonia\Avalonia.csproj" />
diff --git a/src/Windows/Avalonia.Win32.Interop/WinForms/WinFormsAvaloniaControlHost.cs b/src/Windows/Avalonia.Win32.Interoperability/WinForms/WinFormsAvaloniaControlHost.cs
similarity index 97%
rename from src/Windows/Avalonia.Win32.Interop/WinForms/WinFormsAvaloniaControlHost.cs
rename to src/Windows/Avalonia.Win32.Interoperability/WinForms/WinFormsAvaloniaControlHost.cs
index f61466ead3..d04984811a 100644
--- a/src/Windows/Avalonia.Win32.Interop/WinForms/WinFormsAvaloniaControlHost.cs
+++ b/src/Windows/Avalonia.Win32.Interoperability/WinForms/WinFormsAvaloniaControlHost.cs
@@ -2,9 +2,10 @@
 using System.ComponentModel;
 using System.Windows.Forms;
 using Avalonia.Controls.Embedding;
+using Avalonia.Win32.Interop;
 using WinFormsControl = System.Windows.Forms.Control;
 
-namespace Avalonia.Win32.Interop
+namespace Avalonia.Win32.Interoperability
 {
     /// <summary>
     /// An element that allows you to host a Avalonia control on a Windows Forms page.
diff --git a/src/Windows/Avalonia.Win32.Interop/Wpf/CursorShim.cs b/src/Windows/Avalonia.Win32.Interoperability/Wpf/CursorShim.cs
similarity index 95%
rename from src/Windows/Avalonia.Win32.Interop/Wpf/CursorShim.cs
rename to src/Windows/Avalonia.Win32.Interoperability/Wpf/CursorShim.cs
index fb94509c16..a019f72cd8 100644
--- a/src/Windows/Avalonia.Win32.Interop/Wpf/CursorShim.cs
+++ b/src/Windows/Avalonia.Win32.Interoperability/Wpf/CursorShim.cs
@@ -5,7 +5,7 @@ using System.Runtime.InteropServices;
 using System.Runtime.Serialization;
 using System.Windows.Input;
 
-namespace Avalonia.Win32.Interop.Wpf
+namespace Avalonia.Win32.Interoperability.Wpf
 {
     internal static class CursorShim
     {
diff --git a/src/Windows/Avalonia.Win32.Interop/Wpf/Direct2DImageSurface.cs b/src/Windows/Avalonia.Win32.Interoperability/Wpf/Direct2DImageSurface.cs
similarity index 99%
rename from src/Windows/Avalonia.Win32.Interop/Wpf/Direct2DImageSurface.cs
rename to src/Windows/Avalonia.Win32.Interoperability/Wpf/Direct2DImageSurface.cs
index f3c6d55444..a19fd4d3a6 100644
--- a/src/Windows/Avalonia.Win32.Interop/Wpf/Direct2DImageSurface.cs
+++ b/src/Windows/Avalonia.Win32.Interoperability/Wpf/Direct2DImageSurface.cs
@@ -16,7 +16,7 @@ using RenderTarget = SharpDX.Direct2D1.RenderTarget;
 using Surface = SharpDX.DXGI.Surface;
 using Usage = SharpDX.Direct3D9.Usage;
 
-namespace Avalonia.Win32.Interop.Wpf
+namespace Avalonia.Win32.Interoperability.Wpf
 {
     internal class Direct2DImageSurface : IExternalDirect2DRenderTargetSurface, IDisposable
     {
diff --git a/src/Windows/Avalonia.Win32.Interop/Wpf/IntSize.cs b/src/Windows/Avalonia.Win32.Interoperability/Wpf/IntSize.cs
similarity index 96%
rename from src/Windows/Avalonia.Win32.Interop/Wpf/IntSize.cs
rename to src/Windows/Avalonia.Win32.Interoperability/Wpf/IntSize.cs
index 6feb204c52..a65313b6a9 100644
--- a/src/Windows/Avalonia.Win32.Interop/Wpf/IntSize.cs
+++ b/src/Windows/Avalonia.Win32.Interoperability/Wpf/IntSize.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace Avalonia.Win32.Interop.Wpf
+namespace Avalonia.Win32.Interoperability.Wpf
 {
     internal struct IntSize : IEquatable<IntSize>
     {
diff --git a/src/Windows/Avalonia.Win32.Interop/Wpf/WpfAvaloniaHost.cs b/src/Windows/Avalonia.Win32.Interoperability/Wpf/WpfAvaloniaHost.cs
similarity index 97%
rename from src/Windows/Avalonia.Win32.Interop/Wpf/WpfAvaloniaHost.cs
rename to src/Windows/Avalonia.Win32.Interoperability/Wpf/WpfAvaloniaHost.cs
index b2b53f301b..1ca6abe033 100644
--- a/src/Windows/Avalonia.Win32.Interop/Wpf/WpfAvaloniaHost.cs
+++ b/src/Windows/Avalonia.Win32.Interoperability/Wpf/WpfAvaloniaHost.cs
@@ -2,10 +2,10 @@
 using System.Threading;
 using System.Windows;
 using System.Windows.Markup;
-using Avalonia.Win32.Interop.Wpf;
+using Avalonia.Win32.Interoperability.Wpf;
 using AvControl = Avalonia.Controls.Control;
 
-namespace Avalonia.Win32.Interop
+namespace Avalonia.Win32.Interoperability
 {
     /// <summary>
     /// An element that allows you to host a Avalonia control on a WPF page.
diff --git a/src/Windows/Avalonia.Win32.Interop/Wpf/WpfInteropExtensions.cs b/src/Windows/Avalonia.Win32.Interoperability/Wpf/WpfInteropExtensions.cs
similarity index 93%
rename from src/Windows/Avalonia.Win32.Interop/Wpf/WpfInteropExtensions.cs
rename to src/Windows/Avalonia.Win32.Interoperability/Wpf/WpfInteropExtensions.cs
index a9955e64cc..a2d7c5dcd7 100644
--- a/src/Windows/Avalonia.Win32.Interop/Wpf/WpfInteropExtensions.cs
+++ b/src/Windows/Avalonia.Win32.Interoperability/Wpf/WpfInteropExtensions.cs
@@ -1,4 +1,4 @@
-namespace Avalonia.Win32.Interop.Wpf
+namespace Avalonia.Win32.Interoperability.Wpf
 {
     internal static class WpfInteropExtensions
     {
diff --git a/src/Windows/Avalonia.Win32.Interop/Wpf/WpfMouseDevice.cs b/src/Windows/Avalonia.Win32.Interoperability/Wpf/WpfMouseDevice.cs
similarity index 96%
rename from src/Windows/Avalonia.Win32.Interop/Wpf/WpfMouseDevice.cs
rename to src/Windows/Avalonia.Win32.Interoperability/Wpf/WpfMouseDevice.cs
index e13505fd39..e47631c06f 100644
--- a/src/Windows/Avalonia.Win32.Interop/Wpf/WpfMouseDevice.cs
+++ b/src/Windows/Avalonia.Win32.Interoperability/Wpf/WpfMouseDevice.cs
@@ -3,7 +3,7 @@ using Avalonia.Controls.Embedding;
 using Avalonia.Input;
 using Avalonia.VisualTree;
 
-namespace Avalonia.Win32.Interop.Wpf
+namespace Avalonia.Win32.Interoperability.Wpf
 {
     internal class WpfMouseDevice : MouseDevice
     {
diff --git a/src/Windows/Avalonia.Win32.Interop/Wpf/WpfTopLevelImpl.cs b/src/Windows/Avalonia.Win32.Interoperability/Wpf/WpfTopLevelImpl.cs
similarity index 99%
rename from src/Windows/Avalonia.Win32.Interop/Wpf/WpfTopLevelImpl.cs
rename to src/Windows/Avalonia.Win32.Interoperability/Wpf/WpfTopLevelImpl.cs
index d554451ba4..e46f029089 100644
--- a/src/Windows/Avalonia.Win32.Interop/Wpf/WpfTopLevelImpl.cs
+++ b/src/Windows/Avalonia.Win32.Interoperability/Wpf/WpfTopLevelImpl.cs
@@ -13,11 +13,12 @@ using Avalonia.Layout;
 using Avalonia.Platform;
 using Avalonia.Rendering;
 using Avalonia.Rendering.Composition;
+using Avalonia.Win32.Interop;
 using Key = Avalonia.Input.Key;
 using KeyEventArgs = System.Windows.Input.KeyEventArgs;
 using MouseButton = System.Windows.Input.MouseButton;
 
-namespace Avalonia.Win32.Interop.Wpf
+namespace Avalonia.Win32.Interoperability.Wpf
 {
     internal class WpfTopLevelImpl : FrameworkElement, ITopLevelImpl
     {
diff --git a/src/Windows/Avalonia.Win32.Interop/Wpf/WritableBitmapSurface.cs b/src/Windows/Avalonia.Win32.Interoperability/Wpf/WritableBitmapSurface.cs
similarity index 98%
rename from src/Windows/Avalonia.Win32.Interop/Wpf/WritableBitmapSurface.cs
rename to src/Windows/Avalonia.Win32.Interoperability/Wpf/WritableBitmapSurface.cs
index 8aed6be15b..6a0fac3472 100644
--- a/src/Windows/Avalonia.Win32.Interop/Wpf/WritableBitmapSurface.cs
+++ b/src/Windows/Avalonia.Win32.Interoperability/Wpf/WritableBitmapSurface.cs
@@ -6,7 +6,7 @@ using Avalonia.Controls.Platform.Surfaces;
 using Avalonia.Platform;
 using PixelFormat = Avalonia.Platform.PixelFormat;
 
-namespace Avalonia.Win32.Interop.Wpf
+namespace Avalonia.Win32.Interoperability.Wpf
 {
     internal class WritableBitmapSurface : IFramebufferPlatformSurface
     {
diff --git a/src/Windows/Avalonia.Win32/Avalonia.Win32.csproj b/src/Windows/Avalonia.Win32/Avalonia.Win32.csproj
index 61f5996a94..2384ef6b6c 100644
--- a/src/Windows/Avalonia.Win32/Avalonia.Win32.csproj
+++ b/src/Windows/Avalonia.Win32/Avalonia.Win32.csproj
@@ -27,7 +27,7 @@
     <NoWarn>$(NoWarn);CA1416</NoWarn>
   </PropertyGroup>
   <ItemGroup>
-    <InternalsVisibleTo Include="Avalonia.Win32.Interop, PublicKey=$(AvaloniaPublicKey)" />
+    <InternalsVisibleTo Include="Avalonia.Win32.Interoperability, PublicKey=$(AvaloniaPublicKey)" />
     <InternalsVisibleTo Include="Avalonia.Direct2D1, PublicKey=$(AvaloniaPublicKey)" />
   </ItemGroup>
 </Project>