diff --git a/MapControl/Avalonia/Map.cs b/MapControl/Avalonia/Map.Avalonia.cs
similarity index 100%
rename from MapControl/Avalonia/Map.cs
rename to MapControl/Avalonia/Map.Avalonia.cs
diff --git a/MapControl/Avalonia/MapBase.cs b/MapControl/Avalonia/MapBase.Avalonia.cs
similarity index 100%
rename from MapControl/Avalonia/MapBase.cs
rename to MapControl/Avalonia/MapBase.Avalonia.cs
diff --git a/MapControl/Avalonia/MapControl.Avalonia.csproj b/MapControl/Avalonia/MapControl.Avalonia.csproj
index 580e84d7..e0d0e853 100644
--- a/MapControl/Avalonia/MapControl.Avalonia.csproj
+++ b/MapControl/Avalonia/MapControl.Avalonia.csproj
@@ -30,7 +30,7 @@
       <Compile Include="..\Shared\ViewportChangedEventArgs.cs" Link="ViewportChangedEventArgs.cs" />
       <Compile Include="..\Shared\ViewRect.cs" Link="ViewRect.cs" />
       <Compile Include="..\Shared\WebMercatorProjection.cs" Link="WebMercatorProjection.cs" />
-      <Compile Include="..\WPF\TypeConverters.cs" Link="TypeConverters.cs" />
+      <Compile Include="..\WPF\TypeConverters.WPF.cs" Link="TypeConverters.WPF.cs" />
     </ItemGroup>
 
     <ItemGroup>
diff --git a/MapControl/Avalonia/MapPanel.cs b/MapControl/Avalonia/MapPanel.Avalonia.cs
similarity index 100%
rename from MapControl/Avalonia/MapPanel.cs
rename to MapControl/Avalonia/MapPanel.Avalonia.cs
diff --git a/MapControl/Avalonia/MapTileLayer.cs b/MapControl/Avalonia/MapTileLayer.Avalonia.cs
similarity index 100%
rename from MapControl/Avalonia/MapTileLayer.cs
rename to MapControl/Avalonia/MapTileLayer.Avalonia.cs
diff --git a/MapControl/Avalonia/MapTileLayerBase.cs b/MapControl/Avalonia/MapTileLayerBase.Avalonia.cs
similarity index 100%
rename from MapControl/Avalonia/MapTileLayerBase.cs
rename to MapControl/Avalonia/MapTileLayerBase.Avalonia.cs
diff --git a/MapControl/Avalonia/ViewTransform.cs b/MapControl/Avalonia/ViewTransform.Avalonia.cs
similarity index 100%
rename from MapControl/Avalonia/ViewTransform.cs
rename to MapControl/Avalonia/ViewTransform.Avalonia.cs
diff --git a/MapControl/WPF/TypeConverters.cs b/MapControl/WPF/TypeConverters.WPF.cs
similarity index 100%
rename from MapControl/WPF/TypeConverters.cs
rename to MapControl/WPF/TypeConverters.WPF.cs