diff --git a/csharp/src/Google.Protobuf/Reflection/FeatureSetDescriptor.g.cs b/csharp/src/Google.Protobuf/Reflection/FeatureSetDescriptor.g.cs
deleted file mode 100644
index 208ce1fcb631..000000000000
--- a/csharp/src/Google.Protobuf/Reflection/FeatureSetDescriptor.g.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file or at
-// https://developers.google.com/open-source/licenses/bsd
-#endregion
-
-namespace Google.Protobuf.Reflection;
-
-internal sealed partial class FeatureSetDescriptor
-{
-    // Canonical serialized form of the edition defaults, generated by embed_edition_defaults.
-    private const string DefaultsBase64 =
-        "ChMYhAciACoMCAEQAhgCIAMoATACChMY5wciACoMCAIQARgBIAIoATABChMY6AciDAgBEAEYASACKAEwASoAIOYHKOgH";
-}
diff --git a/docs/upb/design.md b/docs/upb/design.md
index e51d79215db3..a2252df82da8 100644
--- a/docs/upb/design.md
+++ b/docs/upb/design.md
@@ -237,12 +237,12 @@ because both the code size and the runtime memory overhead will be less than
 
 There are three main ways of loading a MiniTable:
 
-1.  **From C generated code:** The upb code generator can emit `.upb.c` files that
-    contain the MiniTables as global constant variables. When the main program
-    links against these, the MiniTable will be placed into `.rodata` (or
-    `.data.rel.ro`) in the binary. The MiniTable can then be obtained from a
-    generated function. In Blaze/Bazel these files can be generated and linked
-    using the `upb_proto_library()` rule.
+1.  **From C generated code:** The upb code generator can emit
+    `.upb_minitable.c` files that contain the MiniTables as global constant
+    variables. When the main program links against these, the MiniTable will be
+    placed into `.rodata` (or `.data.rel.ro`) in the binary. The MiniTable can
+    then be obtained from a generated function. In Blaze/Bazel these files can
+    be generated and linked using the `upb_minitable_proto_library()` rule.
 2.  **From MiniDescriptors:** The user can build MiniDescriptors into MiniTables
     at runtime. MiniDescriptors are a compact upb-specific wire format designed
     specially for this purpose. The user can call `upb_MiniTable_Build()` at