diff --git a/unicodetools/src/main/java/org/unicode/text/UCD/UCD_Names.java b/unicodetools/src/main/java/org/unicode/text/UCD/UCD_Names.java
index c48269675..0f12b0ffc 100644
--- a/unicodetools/src/main/java/org/unicode/text/UCD/UCD_Names.java
+++ b/unicodetools/src/main/java/org/unicode/text/UCD/UCD_Names.java
@@ -414,19 +414,19 @@ public final class UCD_Names implements UCD_Types {
         // Unicode 15
         "Kawi",
         "Nag_Mundari",
-        // A future version of Unicode
-        "Sunuwar",
-        "Tulu_Tigalari",
-        "Kirat_Rai",
-        "Todhri",
+        // Unicode 16
         "Garay",
         "Gurung_Khema",
+        "Kirat_Rai",
         "Ol_Onal",
+        "Sunuwar",
+        "Todhri",
+        "Tulu_Tigalari",
         // Provisionally assigned
-        "Sidetic",
         "Chisoi",
-        "Tolong_Siki",
+        "Sidetic",
         "Tai_Yo",
+        "Tolong_Siki",
     };
 
     public static final Relation<String, String> EXTRA_SCRIPT =
@@ -611,19 +611,19 @@ public final class UCD_Names implements UCD_Types {
         // Unicode 15
         "Kawi",
         "Nagm",
-        // A future version of Unicode
-        "Qaba",
-        "Qabb",
-        "Qabc",
-        "Qabd",
-        "Qabe",
-        "Qabf",
-        "Qabg",
+        // Unicode 16
+        "Gara",
+        "Gukh",
+        "Krai",
+        "Onao",
+        "Sunu",
+        "Todr",
+        "Tutg",
         // Provisionally assigned
-        "Qabh",
-        "Qabi",
-        "Qabj",
-        "Qabk",
+        "Chis",
+        "Sidt",
+        "Tayo",
+        "Tols",
     };
 
     static final String[] SHORT_AGE = {
diff --git a/unicodetools/src/main/java/org/unicode/text/UCD/UCD_Types.java b/unicodetools/src/main/java/org/unicode/text/UCD/UCD_Types.java
index 6f5a76340..972753c37 100644
--- a/unicodetools/src/main/java/org/unicode/text/UCD/UCD_Types.java
+++ b/unicodetools/src/main/java/org/unicode/text/UCD/UCD_Types.java
@@ -599,20 +599,20 @@ public interface UCD_Types {
             // Unicode 15
             Kawi = 164,
             Nag_Mundari = 165,
-            // A future version of Unicode
-            Sunuwar = 166,
-            Tulu_Tigalari = 167,
+            // Unicode 16
+            Garay = 166,
+            Gurung_Khema = 167,
             Kirat_Rai = 168,
-            Todhri = 169,
-            Garay = 170,
-            Gurung_Khema = 171,
-            Ol_Onal = 172,
+            Ol_Onal = 169,
+            Sunuwar = 170,
+            Todhri = 171,
+            Tulu_Tigalari = 172,
             // Provisionally assigned
-            Sidetic = 173,
-            Chisoi = 174,
-            Tolong_Siki = 175,
-            Tai_Yo = 176,
-            LIMIT_SCRIPT = Tai_Yo + 1;
+            Chisoi = 173,
+            Sidetic = 174,
+            Tai_Yo = 175,
+            Tolong_Siki = 176,
+            LIMIT_SCRIPT = Tolong_Siki + 1;
 
     // Bidi_Paired_Bracket_Type
     public static final byte BPT_N = 0, BPT_O = 1, BPT_C = 2, LIMIT_BPT = 3;