diff --git a/src/Essentials/src/Accelerometer/Accelerometer.uwp.cs b/src/Essentials/src/Accelerometer/Accelerometer.windows.cs
similarity index 100%
rename from src/Essentials/src/Accelerometer/Accelerometer.uwp.cs
rename to src/Essentials/src/Accelerometer/Accelerometer.windows.cs
diff --git a/src/Essentials/src/AppActions/AppActions.uwp.cs b/src/Essentials/src/AppActions/AppActions.windows.cs
old mode 100755
new mode 100644
similarity index 100%
rename from src/Essentials/src/AppActions/AppActions.uwp.cs
rename to src/Essentials/src/AppActions/AppActions.windows.cs
diff --git a/src/Essentials/src/AppInfo/AppInfo.uwp.cs b/src/Essentials/src/AppInfo/AppInfo.windows.cs
similarity index 100%
rename from src/Essentials/src/AppInfo/AppInfo.uwp.cs
rename to src/Essentials/src/AppInfo/AppInfo.windows.cs
diff --git a/src/Essentials/src/Barometer/Barometer.uwp.cs b/src/Essentials/src/Barometer/Barometer.windows.cs
similarity index 100%
rename from src/Essentials/src/Barometer/Barometer.uwp.cs
rename to src/Essentials/src/Barometer/Barometer.windows.cs
diff --git a/src/Essentials/src/Battery/Battery.uwp.cs b/src/Essentials/src/Battery/Battery.windows.cs
old mode 100755
new mode 100644
similarity index 100%
rename from src/Essentials/src/Battery/Battery.uwp.cs
rename to src/Essentials/src/Battery/Battery.windows.cs
diff --git a/src/Essentials/src/Browser/Browser.uwp.cs b/src/Essentials/src/Browser/Browser.windows.cs
old mode 100755
new mode 100644
similarity index 100%
rename from src/Essentials/src/Browser/Browser.uwp.cs
rename to src/Essentials/src/Browser/Browser.windows.cs
diff --git a/src/Essentials/src/Clipboard/Clipboard.uwp.cs b/src/Essentials/src/Clipboard/Clipboard.windows.cs
similarity index 100%
rename from src/Essentials/src/Clipboard/Clipboard.uwp.cs
rename to src/Essentials/src/Clipboard/Clipboard.windows.cs
diff --git a/src/Essentials/src/Compass/Compass.uwp.cs b/src/Essentials/src/Compass/Compass.windows.cs
similarity index 100%
rename from src/Essentials/src/Compass/Compass.uwp.cs
rename to src/Essentials/src/Compass/Compass.windows.cs
diff --git a/src/Essentials/src/Connectivity/Connectivity.Native.uwp.cs b/src/Essentials/src/Connectivity/Connectivity.Native.windows.cs
similarity index 100%
rename from src/Essentials/src/Connectivity/Connectivity.Native.uwp.cs
rename to src/Essentials/src/Connectivity/Connectivity.Native.windows.cs
diff --git a/src/Essentials/src/Connectivity/Connectivity.uwp.cs b/src/Essentials/src/Connectivity/Connectivity.windows.cs
similarity index 100%
rename from src/Essentials/src/Connectivity/Connectivity.uwp.cs
rename to src/Essentials/src/Connectivity/Connectivity.windows.cs
diff --git a/src/Essentials/src/Contacts/Contacts.uwp.cs b/src/Essentials/src/Contacts/Contacts.windows.cs
similarity index 100%
rename from src/Essentials/src/Contacts/Contacts.uwp.cs
rename to src/Essentials/src/Contacts/Contacts.windows.cs
diff --git a/src/Essentials/src/DeviceDisplay/DeviceDisplay.uwp.cs b/src/Essentials/src/DeviceDisplay/DeviceDisplay.windows.cs
similarity index 100%
rename from src/Essentials/src/DeviceDisplay/DeviceDisplay.uwp.cs
rename to src/Essentials/src/DeviceDisplay/DeviceDisplay.windows.cs
diff --git a/src/Essentials/src/DeviceInfo/DeviceInfo.uwp.cs b/src/Essentials/src/DeviceInfo/DeviceInfo.windows.cs
similarity index 100%
rename from src/Essentials/src/DeviceInfo/DeviceInfo.uwp.cs
rename to src/Essentials/src/DeviceInfo/DeviceInfo.windows.cs
diff --git a/src/Essentials/src/Email/Email.uwp.cs b/src/Essentials/src/Email/Email.windows.cs
similarity index 100%
rename from src/Essentials/src/Email/Email.uwp.cs
rename to src/Essentials/src/Email/Email.windows.cs
diff --git a/src/Essentials/src/Email/EmailHelper.uwp.cs b/src/Essentials/src/Email/EmailHelper.windows.cs
similarity index 100%
rename from src/Essentials/src/Email/EmailHelper.uwp.cs
rename to src/Essentials/src/Email/EmailHelper.windows.cs
diff --git a/src/Essentials/src/Essentials.csproj b/src/Essentials/src/Essentials.csproj
index a18835d6a7af..ba62867c4b97 100644
--- a/src/Essentials/src/Essentials.csproj
+++ b/src/Essentials/src/Essentials.csproj
@@ -36,8 +36,8 @@
     <Compile Include="**\*.netstandard.*.cs" Exclude="$(DefaultItemExcludes);$(DefaultExcludesInProjectFolder)" />
   </ItemGroup>
   <ItemGroup Condition=" $(TargetFramework.Contains('-windows')) ">
-    <Compile Include="**\*.uwp.cs" Exclude="$(DefaultItemExcludes);$(DefaultExcludesInProjectFolder)" />
-    <Compile Include="**\*.uwp.*.cs" Exclude="$(DefaultItemExcludes);$(DefaultExcludesInProjectFolder)" />
+    <Compile Include="**\*.windows.cs" Exclude="$(DefaultItemExcludes);$(DefaultExcludesInProjectFolder)" />
+    <Compile Include="**\*.windows.*.cs" Exclude="$(DefaultItemExcludes);$(DefaultExcludesInProjectFolder)" />
     <PackageReference Include="Microsoft.Web.WebView2" />
   </ItemGroup>
   <ItemGroup Condition=" '$(TargetPlatformIdentifier)' == 'android' ">
diff --git a/src/Essentials/src/FilePicker/FilePicker.uwp.cs b/src/Essentials/src/FilePicker/FilePicker.windows.cs
similarity index 100%
rename from src/Essentials/src/FilePicker/FilePicker.uwp.cs
rename to src/Essentials/src/FilePicker/FilePicker.windows.cs
diff --git a/src/Essentials/src/FileSystem/FileSystem.uwp.cs b/src/Essentials/src/FileSystem/FileSystem.windows.cs
similarity index 100%
rename from src/Essentials/src/FileSystem/FileSystem.uwp.cs
rename to src/Essentials/src/FileSystem/FileSystem.windows.cs
diff --git a/src/Essentials/src/FileSystem/FileSystemUtils.uwp.cs b/src/Essentials/src/FileSystem/FileSystemUtils.windows.cs
similarity index 100%
rename from src/Essentials/src/FileSystem/FileSystemUtils.uwp.cs
rename to src/Essentials/src/FileSystem/FileSystemUtils.windows.cs
diff --git a/src/Essentials/src/Flashlight/Flashlight.uwp.cs b/src/Essentials/src/Flashlight/Flashlight.windows.cs
similarity index 100%
rename from src/Essentials/src/Flashlight/Flashlight.uwp.cs
rename to src/Essentials/src/Flashlight/Flashlight.windows.cs
diff --git a/src/Essentials/src/Geocoding/Geocoding.uwp.cs b/src/Essentials/src/Geocoding/Geocoding.windows.cs
similarity index 100%
rename from src/Essentials/src/Geocoding/Geocoding.uwp.cs
rename to src/Essentials/src/Geocoding/Geocoding.windows.cs
diff --git a/src/Essentials/src/Geolocation/Geolocation.uwp.cs b/src/Essentials/src/Geolocation/Geolocation.windows.cs
similarity index 100%
rename from src/Essentials/src/Geolocation/Geolocation.uwp.cs
rename to src/Essentials/src/Geolocation/Geolocation.windows.cs
diff --git a/src/Essentials/src/Geolocation/GeolocationAccuracyExtensionMethods.uwp.cs b/src/Essentials/src/Geolocation/GeolocationAccuracyExtensionMethods.windows.cs
similarity index 100%
rename from src/Essentials/src/Geolocation/GeolocationAccuracyExtensionMethods.uwp.cs
rename to src/Essentials/src/Geolocation/GeolocationAccuracyExtensionMethods.windows.cs
diff --git a/src/Essentials/src/Geolocation/GeolocationListeningRequest.uwp.cs b/src/Essentials/src/Geolocation/GeolocationListeningRequest.windows.cs
similarity index 100%
rename from src/Essentials/src/Geolocation/GeolocationListeningRequest.uwp.cs
rename to src/Essentials/src/Geolocation/GeolocationListeningRequest.windows.cs
diff --git a/src/Essentials/src/Geolocation/GeolocationRequest.uwp.cs b/src/Essentials/src/Geolocation/GeolocationRequest.windows.cs
similarity index 100%
rename from src/Essentials/src/Geolocation/GeolocationRequest.uwp.cs
rename to src/Essentials/src/Geolocation/GeolocationRequest.windows.cs
diff --git a/src/Essentials/src/Gyroscope/Gyroscope.uwp.cs b/src/Essentials/src/Gyroscope/Gyroscope.windows.cs
similarity index 100%
rename from src/Essentials/src/Gyroscope/Gyroscope.uwp.cs
rename to src/Essentials/src/Gyroscope/Gyroscope.windows.cs
diff --git a/src/Essentials/src/HapticFeedback/HapticFeedback.uwp.cs b/src/Essentials/src/HapticFeedback/HapticFeedback.windows.cs
similarity index 100%
rename from src/Essentials/src/HapticFeedback/HapticFeedback.uwp.cs
rename to src/Essentials/src/HapticFeedback/HapticFeedback.windows.cs
diff --git a/src/Essentials/src/Launcher/Launcher.uwp.cs b/src/Essentials/src/Launcher/Launcher.windows.cs
similarity index 100%
rename from src/Essentials/src/Launcher/Launcher.uwp.cs
rename to src/Essentials/src/Launcher/Launcher.windows.cs
diff --git a/src/Essentials/src/Magnetometer/Magnetometer.uwp.cs b/src/Essentials/src/Magnetometer/Magnetometer.windows.cs
similarity index 100%
rename from src/Essentials/src/Magnetometer/Magnetometer.uwp.cs
rename to src/Essentials/src/Magnetometer/Magnetometer.windows.cs
diff --git a/src/Essentials/src/MainThread/MainThread.uwp.cs b/src/Essentials/src/MainThread/MainThread.windows.cs
similarity index 100%
rename from src/Essentials/src/MainThread/MainThread.uwp.cs
rename to src/Essentials/src/MainThread/MainThread.windows.cs
diff --git a/src/Essentials/src/Map/Map.uwp.cs b/src/Essentials/src/Map/Map.windows.cs
similarity index 100%
rename from src/Essentials/src/Map/Map.uwp.cs
rename to src/Essentials/src/Map/Map.windows.cs
diff --git a/src/Essentials/src/MediaPicker/MediaPicker.uwp.cs b/src/Essentials/src/MediaPicker/MediaPicker.windows.cs
similarity index 100%
rename from src/Essentials/src/MediaPicker/MediaPicker.uwp.cs
rename to src/Essentials/src/MediaPicker/MediaPicker.windows.cs
diff --git a/src/Essentials/src/OrientationSensor/OrientationSensor.uwp.cs b/src/Essentials/src/OrientationSensor/OrientationSensor.windows.cs
similarity index 100%
rename from src/Essentials/src/OrientationSensor/OrientationSensor.uwp.cs
rename to src/Essentials/src/OrientationSensor/OrientationSensor.windows.cs
diff --git a/src/Essentials/src/Permissions/Permissions.uwp.cs b/src/Essentials/src/Permissions/Permissions.windows.cs
similarity index 100%
rename from src/Essentials/src/Permissions/Permissions.uwp.cs
rename to src/Essentials/src/Permissions/Permissions.windows.cs
diff --git a/src/Essentials/src/PhoneDialer/PhoneDialer.uwp.cs b/src/Essentials/src/PhoneDialer/PhoneDialer.windows.cs
similarity index 100%
rename from src/Essentials/src/PhoneDialer/PhoneDialer.uwp.cs
rename to src/Essentials/src/PhoneDialer/PhoneDialer.windows.cs
diff --git a/src/Essentials/src/Platform/ActiveWindowTracker.uwp.cs b/src/Essentials/src/Platform/ActiveWindowTracker.windows.cs
similarity index 100%
rename from src/Essentials/src/Platform/ActiveWindowTracker.uwp.cs
rename to src/Essentials/src/Platform/ActiveWindowTracker.windows.cs
diff --git a/src/Essentials/src/Platform/PlatformMethods.uwp.cs b/src/Essentials/src/Platform/PlatformMethods.windows.cs
similarity index 100%
rename from src/Essentials/src/Platform/PlatformMethods.uwp.cs
rename to src/Essentials/src/Platform/PlatformMethods.windows.cs
diff --git a/src/Essentials/src/Platform/PlatformUtils.uwp.cs b/src/Essentials/src/Platform/PlatformUtils.windows.cs
similarity index 100%
rename from src/Essentials/src/Platform/PlatformUtils.uwp.cs
rename to src/Essentials/src/Platform/PlatformUtils.windows.cs
diff --git a/src/Essentials/src/Platform/WindowMessageEventArgs.uwp.cs b/src/Essentials/src/Platform/WindowMessageEventArgs.windows.cs
similarity index 100%
rename from src/Essentials/src/Platform/WindowMessageEventArgs.uwp.cs
rename to src/Essentials/src/Platform/WindowMessageEventArgs.windows.cs
diff --git a/src/Essentials/src/Platform/WindowMessageManager.uwp.cs b/src/Essentials/src/Platform/WindowMessageManager.windows.cs
similarity index 100%
rename from src/Essentials/src/Platform/WindowMessageManager.uwp.cs
rename to src/Essentials/src/Platform/WindowMessageManager.windows.cs
diff --git a/src/Essentials/src/Platform/WindowStateManager.uwp.cs b/src/Essentials/src/Platform/windowstateManager.windows.cs
similarity index 100%
rename from src/Essentials/src/Platform/WindowStateManager.uwp.cs
rename to src/Essentials/src/Platform/windowstateManager.windows.cs
diff --git a/src/Essentials/src/Preferences/Preferences.uwp.cs b/src/Essentials/src/Preferences/Preferences.windows.cs
similarity index 100%
rename from src/Essentials/src/Preferences/Preferences.uwp.cs
rename to src/Essentials/src/Preferences/Preferences.windows.cs
diff --git a/src/Essentials/src/Screenshot/Screenshot.uwp.cs b/src/Essentials/src/Screenshot/Screenshot.windows.cs
similarity index 100%
rename from src/Essentials/src/Screenshot/Screenshot.uwp.cs
rename to src/Essentials/src/Screenshot/Screenshot.windows.cs
diff --git a/src/Essentials/src/SecureStorage/SecureStorage.uwp.cs b/src/Essentials/src/SecureStorage/SecureStorage.windows.cs
similarity index 100%
rename from src/Essentials/src/SecureStorage/SecureStorage.uwp.cs
rename to src/Essentials/src/SecureStorage/SecureStorage.windows.cs
diff --git a/src/Essentials/src/SemanticScreenReader/SemanticScreenReader.uwp.cs b/src/Essentials/src/SemanticScreenReader/SemanticScreenReader.windows.cs
similarity index 100%
rename from src/Essentials/src/SemanticScreenReader/SemanticScreenReader.uwp.cs
rename to src/Essentials/src/SemanticScreenReader/SemanticScreenReader.windows.cs
diff --git a/src/Essentials/src/Share/Share.uwp.cs b/src/Essentials/src/Share/Share.windows.cs
similarity index 100%
rename from src/Essentials/src/Share/Share.uwp.cs
rename to src/Essentials/src/Share/Share.windows.cs
diff --git a/src/Essentials/src/Sms/Sms.uwp.cs b/src/Essentials/src/Sms/Sms.windows.cs
similarity index 100%
rename from src/Essentials/src/Sms/Sms.uwp.cs
rename to src/Essentials/src/Sms/Sms.windows.cs
diff --git a/src/Essentials/src/TextToSpeech/TextToSpeech.uwp.cs b/src/Essentials/src/TextToSpeech/TextToSpeech.windows.cs
similarity index 100%
rename from src/Essentials/src/TextToSpeech/TextToSpeech.uwp.cs
rename to src/Essentials/src/TextToSpeech/TextToSpeech.windows.cs
diff --git a/src/Essentials/src/Types/LocationExtensions.uwp.cs b/src/Essentials/src/Types/LocationExtensions.windows.cs
similarity index 100%
rename from src/Essentials/src/Types/LocationExtensions.uwp.cs
rename to src/Essentials/src/Types/LocationExtensions.windows.cs
diff --git a/src/Essentials/src/Types/PlacemarkExtensions.uwp.cs b/src/Essentials/src/Types/PlacemarkExtensions.windows.cs
similarity index 100%
rename from src/Essentials/src/Types/PlacemarkExtensions.uwp.cs
rename to src/Essentials/src/Types/PlacemarkExtensions.windows.cs
diff --git a/src/Essentials/src/Types/SensorSpeed.uwp.cs b/src/Essentials/src/Types/SensorSpeed.windows.cs
similarity index 100%
rename from src/Essentials/src/Types/SensorSpeed.uwp.cs
rename to src/Essentials/src/Types/SensorSpeed.windows.cs
diff --git a/src/Essentials/src/Vibration/Vibration.uwp.cs b/src/Essentials/src/Vibration/Vibration.windows.cs
similarity index 100%
rename from src/Essentials/src/Vibration/Vibration.uwp.cs
rename to src/Essentials/src/Vibration/Vibration.windows.cs
diff --git a/src/Essentials/src/WebAuthenticator/AppleSignInAuthenticator.netstandard.android.tvos.watchos.uwp.tizen.macos.cs b/src/Essentials/src/WebAuthenticator/AppleSignInAuthenticator.netstandard.android.tvos.watchos.windows.tizen.macos.cs
similarity index 100%
rename from src/Essentials/src/WebAuthenticator/AppleSignInAuthenticator.netstandard.android.tvos.watchos.uwp.tizen.macos.cs
rename to src/Essentials/src/WebAuthenticator/AppleSignInAuthenticator.netstandard.android.tvos.watchos.windows.tizen.macos.cs
diff --git a/src/Essentials/src/WebAuthenticator/WebAuthenticator.uwp.cs b/src/Essentials/src/WebAuthenticator/WebAuthenticator.windows.cs
similarity index 100%
rename from src/Essentials/src/WebAuthenticator/WebAuthenticator.uwp.cs
rename to src/Essentials/src/WebAuthenticator/WebAuthenticator.windows.cs
diff --git a/src/MultiTargeting.targets b/src/MultiTargeting.targets
index 01d6d8ff280f..1024b447ee4e 100644
--- a/src/MultiTargeting.targets
+++ b/src/MultiTargeting.targets
@@ -44,8 +44,8 @@
     <None Include="**\*.Windows.cs" Exclude="$(DefaultItemExcludes);$(DefaultExcludesInProjectFolder)" />
     <Compile Remove="**\Windows\**\*.cs" />
     <None Include="**\Windows\**\*.cs" Exclude="$(DefaultItemExcludes);$(DefaultExcludesInProjectFolder)" />
-    <Compile Remove="**\*.uwp.cs" />
-    <None Include="**\*.uwp.cs" Exclude="$(DefaultItemExcludes);$(DefaultExcludesInProjectFolder)" />
+    <Compile Remove="**\*.windows.cs" />
+    <None Include="**\*.windows.cs" Exclude="$(DefaultItemExcludes);$(DefaultExcludesInProjectFolder)" />
     <MauiXaml Remove="**\*.Windows.xaml" />
     <None Include="**\*.Windows.xaml" Exclude="$(DefaultItemExcludes);$(DefaultExcludesInProjectFolder)" />
     <Compile Remove="**\*.Windows.xaml.cs" />
@@ -56,8 +56,8 @@
     <None Include="**\Windows\**\*.xaml.cs" Exclude="$(DefaultItemExcludes);$(DefaultExcludesInProjectFolder)" />
   </ItemGroup>
   <ItemGroup Condition=" '$(_MauiTargetPlatformIsWindows)' != 'True' ">
-    <Compile Remove="**\*.uwp.cs" />
-    <None Include="**\*.uwp.cs" Exclude="$(DefaultItemExcludes);$(DefaultExcludesInProjectFolder)" />
+    <Compile Remove="**\*.windows.cs" />
+    <None Include="**\*.windows.cs" Exclude="$(DefaultItemExcludes);$(DefaultExcludesInProjectFolder)" />
   </ItemGroup>
   <ItemGroup Condition=" '$(_MauiTargetPlatformIsTizen)' != 'True' ">
     <Compile Remove="**\**\*.Tizen.cs" />