diff --git a/Documentation/release-notes/4011.md b/Documentation/release-notes/4011.md
new file mode 100644
index 00000000000..68f57beffe4
--- /dev/null
+++ b/Documentation/release-notes/4011.md
@@ -0,0 +1,6 @@
+### Issues fixed
+
+  * [GitHub PR 4011](https://github.com/xamarin/xamarin-android/pull/4011):
+    The old *Q* nickname from the Android 10 preview versions was still being
+    shown for Android 10 in the Visual Studio project property pages and the
+    Android SDK Manager.
diff --git a/build-tools/xaprepare/xaprepare/ConfigAndData/BuildAndroidPlatforms.cs b/build-tools/xaprepare/xaprepare/ConfigAndData/BuildAndroidPlatforms.cs
index 5ee8ecbda6e..5255e15a357 100644
--- a/build-tools/xaprepare/xaprepare/ConfigAndData/BuildAndroidPlatforms.cs
+++ b/build-tools/xaprepare/xaprepare/ConfigAndData/BuildAndroidPlatforms.cs
@@ -37,7 +37,7 @@ class BuildAndroidPlatforms
 			new AndroidPlatform (apiName: "Oreo",                   apiLevel: 26, platformID: "26",  include: "v8.0",    framework: "v8.0"),
 			new AndroidPlatform (apiName: "Oreo",                   apiLevel: 27, platformID: "27",  include: "v8.1",    framework: "v8.1"),
 			new AndroidPlatform (apiName: "Pie",                    apiLevel: 28, platformID: "28",  include: "v9.0",    framework: "v9.0"),
-			new AndroidPlatform (apiName: "Q",                      apiLevel: 29, platformID: "29",  include: "v10.0",   framework: "v10.0"),
+			new AndroidPlatform (apiName: "",                       apiLevel: 29, platformID: "29",  include: "v10.0",   framework: "v10.0"),
 		};
 
 		public static readonly Dictionary<string, uint> NdkMinimumAPI = new Dictionary<string, uint> {