diff --git a/Documentation/workflow/HowToAddNewApiLevel.md b/Documentation/workflow/HowToAddNewApiLevel.md
index 570a12d7381..d8fdd239207 100644
--- a/Documentation/workflow/HowToAddNewApiLevel.md
+++ b/Documentation/workflow/HowToAddNewApiLevel.md
@@ -40,6 +40,7 @@ the new platform will be downloaded to your local Android SDK.
 - Read the note at the bottom of `/src/Mono.Android/metadata` that has a few lines that must be 
   copy/pasted for new API levels
 - Add required metadata fixes in `/src/Mono.Android/metadata` until `Mono.Android.csproj` builds
+  - Check that new package/namespaces are properly cased
   
 ### ApiCompat
 
diff --git a/build-tools/xaprepare/xaprepare/ConfigAndData/Dependencies/AndroidToolchain.cs b/build-tools/xaprepare/xaprepare/ConfigAndData/Dependencies/AndroidToolchain.cs
index 01263d460e2..40df0a9e157 100644
--- a/build-tools/xaprepare/xaprepare/ConfigAndData/Dependencies/AndroidToolchain.cs
+++ b/build-tools/xaprepare/xaprepare/ConfigAndData/Dependencies/AndroidToolchain.cs
@@ -62,7 +62,7 @@ public AndroidToolchain ()
 				new AndroidPlatformComponent ("platform-28_r04",   apiLevel: "28", pkgRevision: "4"),
 				new AndroidPlatformComponent ("platform-29_r01",   apiLevel: "29", pkgRevision: "1"),
 				new AndroidPlatformComponent ("platform-30_r01",   apiLevel: "30", pkgRevision: "1"),
-				new AndroidPlatformComponent ("platform-S_r02",    apiLevel: "S",  pkgRevision: "2"),
+				new AndroidPlatformComponent ("platform-S_r03",    apiLevel: "S",  pkgRevision: "3"),
 
 				new AndroidToolchainComponent ("sources-30_r01",   destDir: Path.Combine ("platforms", $"android-30", "src"), pkgRevision: "1", dependencyType: AndroidToolchainComponentType.BuildDependency),
 
diff --git a/src/Mono.Android/metadata b/src/Mono.Android/metadata
index 3f09fd1bd1d..36753ac235d 100644
--- a/src/Mono.Android/metadata
+++ b/src/Mono.Android/metadata
@@ -1643,6 +1643,14 @@
   <attr api-since="31" path="/api/package[@name='android.location']/*[@name='LocationManager']/method[@name='addTestProvider']/parameter[@name='powerUsage']" name="name">powerRequirement</attr>
   <attr api-since="31" path="/api/package[@name='java.math']/*[@name='RoundingMode']/method[@name='valueOf']/parameter[@name='rm']" name="name">mode</attr>
 
+  <!-- Rename Namespaces -->
+  <attr api-since="31" path="/api/package[@name='android.app.appsearch']" name="managedName">Android.App.AppSearch</attr>
+  <attr api-since="31" path="/api/package[@name='android.app.appsearch.exceptions']" name="managedName">Android.App.AppSearch.Exceptions</attr>
+  <attr api-since="31" path="/api/package[@name='android.location.provider']" name="managedName">Android.Locations.Provider</attr>
+  <attr api-since="31" path="/api/package[@name='android.net.ipsec.ike']" name="managedName">Android.Net.IpSec.Ike</attr>
+  <attr api-since="31" path="/api/package[@name='android.net.ipsec.ike.exceptions']" name="managedName">Android.Net.IpSec.Ike.Exceptions</attr>
+  <attr api-since="31" path="/api/package[@name='android.view.displayhash']" name="managedName">Android.Views.DisplayHash</attr>
+
   <!-- These interfaces contain constants users need to reference, but the interfaces are protected, nested in a sealed type. -->
   <!-- C# won't let you access protected types in a sealed type, so make them public so they can be used by user code. -->
   <attr api-since="30" path="/api/package[@name='android.provider']/interface[contains(@name, 'Contract.') and contains(@name, 'Columns') and @visibility='protected']" name="visibility">public</attr>
diff --git a/tests/api-compatibility/acceptable-breakages-v11.0.99.txt b/tests/api-compatibility/acceptable-breakages-v11.0.99.txt
index 0c7996f3f69..ae429a610f4 100644
--- a/tests/api-compatibility/acceptable-breakages-v11.0.99.txt
+++ b/tests/api-compatibility/acceptable-breakages-v11.0.99.txt
@@ -3,3 +3,6 @@ CannotChangeAttribute : Attribute 'System.ObsoleteAttribute' on 'System.Int32 An
 CannotChangeAttribute : Attribute 'System.ObsoleteAttribute' on 'System.String Android.Provider.ContactsContract.DataColumns.CarrierPresence' changed from '[ObsoleteAttribute("Use 'Android.Provider.ContactsContract.IDataColumns.CarrierPresence'. This class will be removed in a future release.")]' in the contract to '[ObsoleteAttribute("deprecated")]' in the implementation.
 InterfacesShouldHaveSameMembers : Interface member 'public System.Boolean Java.Lang.IDeprecated.ForRemoval()' is present in the implementation but not in the contract.
 InterfacesShouldHaveSameMembers : Interface member 'public System.String Java.Lang.IDeprecated.Since()' is present in the implementation but not in the contract.
+CannotChangeAttribute : Attribute 'System.ObsoleteAttribute' on 'System.String Android.Provider.MediaStore.Audio.PlaylistsColumns.DateAdded' changed from '[ObsoleteAttribute("Use 'Android.Provider.MediaStore.Audio.IPlaylistsColumns.DateAdded'. This class will be removed in a future release.")]' in the contract to '[ObsoleteAttribute("deprecated")]' in the implementation.
+CannotChangeAttribute : Attribute 'System.ObsoleteAttribute' on 'System.String Android.Provider.MediaStore.Audio.PlaylistsColumns.DateModified' changed from '[ObsoleteAttribute("Use 'Android.Provider.MediaStore.Audio.IPlaylistsColumns.DateModified'. This class will be removed in a future release.")]' in the contract to '[ObsoleteAttribute("deprecated")]' in the implementation.
+CannotChangeAttribute : Attribute 'System.ObsoleteAttribute' on 'System.String Android.Provider.MediaStore.Audio.PlaylistsColumns.Name' changed from '[ObsoleteAttribute("Use 'Android.Provider.MediaStore.Audio.IPlaylistsColumns.Name'. This class will be removed in a future release.")]' in the contract to '[ObsoleteAttribute("deprecated")]' in the implementation.