From fc18bcb05fd64d2506142a7fa4d95dcb463f0e6d Mon Sep 17 00:00:00 2001
From: DraganBesevic <dragan@unicode.org>
Date: Wed, 13 Mar 2024 15:20:04 -0700
Subject: [PATCH] ICU-22534 Integrate CLDR 45 release alpha 3, part 2, data
 files

---
 icu4c/source/data/curr/ks.txt                 |   6 +-
 icu4c/source/data/curr/supplementalData.txt   |   8 +-
 icu4c/source/data/lang/ks.txt                 |  58 +++----
 icu4c/source/data/locales/en_001.txt          |   1 +
 icu4c/source/data/locales/en_AU.txt           |   2 -
 icu4c/source/data/locales/en_CA.txt           |   2 +-
 icu4c/source/data/locales/en_GB.txt           |   8 -
 icu4c/source/data/locales/en_IN.txt           |   8 -
 icu4c/source/data/locales/ks.txt              |  16 +-
 icu4c/source/data/locales/uk.txt              |   4 +-
 icu4c/source/data/misc/supplementalData.txt   |  59 +------
 icu4c/source/data/region/ks.txt               |   2 +-
 icu4c/source/data/zone/ks.txt                 |  14 +-
 icu4c/source/data/zone/ku.txt                 |   6 -
 icu4c/source/data/zone/nl.txt                 | 160 +++++++++---------
 .../cldr/localeIdentifiers/likelySubtags.txt  |   6 +-
 .../localeCanonicalization.txt                |   4 +-
 .../localeIdentifiers/localeDisplayName.txt   |   4 +-
 .../test/testdata/cldr/personNameTest/af.txt  |   6 +-
 .../test/testdata/cldr/personNameTest/am.txt  |   6 +-
 .../test/testdata/cldr/personNameTest/ar.txt  |   6 +-
 .../test/testdata/cldr/personNameTest/as.txt  |   6 +-
 .../test/testdata/cldr/personNameTest/az.txt  |   6 +-
 .../test/testdata/cldr/personNameTest/be.txt  |   6 +-
 .../test/testdata/cldr/personNameTest/bg.txt  |   6 +-
 .../test/testdata/cldr/personNameTest/bn.txt  |   6 +-
 .../test/testdata/cldr/personNameTest/bs.txt  |   6 +-
 .../test/testdata/cldr/personNameTest/ca.txt  |   6 +-
 .../test/testdata/cldr/personNameTest/chr.txt |   6 +-
 .../test/testdata/cldr/personNameTest/cs.txt  |   6 +-
 .../test/testdata/cldr/personNameTest/cy.txt  |   6 +-
 .../test/testdata/cldr/personNameTest/da.txt  |   6 +-
 .../test/testdata/cldr/personNameTest/de.txt  |   6 +-
 .../test/testdata/cldr/personNameTest/dsb.txt |   6 +-
 .../test/testdata/cldr/personNameTest/el.txt  |   6 +-
 .../test/testdata/cldr/personNameTest/en.txt  |   6 +-
 .../test/testdata/cldr/personNameTest/es.txt  |   6 +-
 .../test/testdata/cldr/personNameTest/et.txt  |   6 +-
 .../test/testdata/cldr/personNameTest/eu.txt  |   6 +-
 .../test/testdata/cldr/personNameTest/fa.txt  |   6 +-
 .../test/testdata/cldr/personNameTest/fi.txt  |   6 +-
 .../test/testdata/cldr/personNameTest/fil.txt |   6 +-
 .../test/testdata/cldr/personNameTest/fr.txt  |   6 +-
 .../test/testdata/cldr/personNameTest/ga.txt  |   6 +-
 .../test/testdata/cldr/personNameTest/gd.txt  |   6 +-
 .../test/testdata/cldr/personNameTest/gl.txt  |   6 +-
 .../test/testdata/cldr/personNameTest/gu.txt  |   6 +-
 .../test/testdata/cldr/personNameTest/ha.txt  |   6 +-
 .../test/testdata/cldr/personNameTest/he.txt  |   6 +-
 .../test/testdata/cldr/personNameTest/hi.txt  |   6 +-
 .../testdata/cldr/personNameTest/hi_Latn.txt  |   6 +-
 .../test/testdata/cldr/personNameTest/hr.txt  |   6 +-
 .../test/testdata/cldr/personNameTest/hsb.txt |   6 +-
 .../test/testdata/cldr/personNameTest/hu.txt  |   6 +-
 .../test/testdata/cldr/personNameTest/hy.txt  |   6 +-
 .../test/testdata/cldr/personNameTest/id.txt  |   6 +-
 .../test/testdata/cldr/personNameTest/ig.txt  |   6 +-
 .../test/testdata/cldr/personNameTest/is.txt  |   6 +-
 .../test/testdata/cldr/personNameTest/it.txt  |   6 +-
 .../test/testdata/cldr/personNameTest/ja.txt  |   6 +-
 .../test/testdata/cldr/personNameTest/jv.txt  |   6 +-
 .../test/testdata/cldr/personNameTest/ka.txt  |   6 +-
 .../test/testdata/cldr/personNameTest/kk.txt  |   6 +-
 .../test/testdata/cldr/personNameTest/km.txt  |   6 +-
 .../test/testdata/cldr/personNameTest/kn.txt  |   6 +-
 .../test/testdata/cldr/personNameTest/ko.txt  |   6 +-
 .../test/testdata/cldr/personNameTest/kok.txt |   6 +-
 .../test/testdata/cldr/personNameTest/ky.txt  |   6 +-
 .../test/testdata/cldr/personNameTest/lo.txt  |   6 +-
 .../test/testdata/cldr/personNameTest/lt.txt  |   6 +-
 .../test/testdata/cldr/personNameTest/lv.txt  |   6 +-
 .../test/testdata/cldr/personNameTest/mk.txt  |   6 +-
 .../test/testdata/cldr/personNameTest/ml.txt  |   6 +-
 .../test/testdata/cldr/personNameTest/mn.txt  |   6 +-
 .../test/testdata/cldr/personNameTest/mr.txt  |   6 +-
 .../test/testdata/cldr/personNameTest/ms.txt  |   6 +-
 .../test/testdata/cldr/personNameTest/my.txt  |   6 +-
 .../test/testdata/cldr/personNameTest/ne.txt  |   6 +-
 .../test/testdata/cldr/personNameTest/nl.txt  |   6 +-
 .../test/testdata/cldr/personNameTest/nn.txt  |   6 +-
 .../test/testdata/cldr/personNameTest/no.txt  |   6 +-
 .../test/testdata/cldr/personNameTest/or.txt  |   6 +-
 .../test/testdata/cldr/personNameTest/pa.txt  |   6 +-
 .../test/testdata/cldr/personNameTest/pl.txt  |   6 +-
 .../test/testdata/cldr/personNameTest/ps.txt  |   6 +-
 .../test/testdata/cldr/personNameTest/pt.txt  |   6 +-
 .../test/testdata/cldr/personNameTest/qu.txt  |   6 +-
 .../test/testdata/cldr/personNameTest/ro.txt  |   6 +-
 .../test/testdata/cldr/personNameTest/ru.txt  |   6 +-
 .../test/testdata/cldr/personNameTest/sc.txt  |   6 +-
 .../test/testdata/cldr/personNameTest/sd.txt  |   6 +-
 .../test/testdata/cldr/personNameTest/si.txt  |   6 +-
 .../test/testdata/cldr/personNameTest/sk.txt  |   6 +-
 .../test/testdata/cldr/personNameTest/sl.txt  |   6 +-
 .../test/testdata/cldr/personNameTest/so.txt  |   6 +-
 .../test/testdata/cldr/personNameTest/sq.txt  |   6 +-
 .../test/testdata/cldr/personNameTest/sr.txt  |   6 +-
 .../testdata/cldr/personNameTest/sr_Latn.txt  |   6 +-
 .../test/testdata/cldr/personNameTest/sv.txt  |   6 +-
 .../test/testdata/cldr/personNameTest/sw.txt  |   6 +-
 .../test/testdata/cldr/personNameTest/ta.txt  |   6 +-
 .../test/testdata/cldr/personNameTest/te.txt  |   6 +-
 .../test/testdata/cldr/personNameTest/tg.txt  |   6 +-
 .../test/testdata/cldr/personNameTest/th.txt  |   6 +-
 .../test/testdata/cldr/personNameTest/ti.txt  |   6 +-
 .../test/testdata/cldr/personNameTest/tk.txt  |   6 +-
 .../test/testdata/cldr/personNameTest/tr.txt  |   6 +-
 .../test/testdata/cldr/personNameTest/uk.txt  |   6 +-
 .../test/testdata/cldr/personNameTest/ur.txt  |   6 +-
 .../test/testdata/cldr/personNameTest/uz.txt  |   6 +-
 .../test/testdata/cldr/personNameTest/vi.txt  |   6 +-
 .../test/testdata/cldr/personNameTest/wo.txt  |   6 +-
 .../test/testdata/cldr/personNameTest/yo.txt  |   6 +-
 .../test/testdata/cldr/personNameTest/yue.txt |   6 +-
 .../testdata/cldr/personNameTest/yue_Hans.txt |   6 +-
 .../test/testdata/cldr/personNameTest/zh.txt  |   6 +-
 .../testdata/cldr/personNameTest/zh_Hant.txt  |   6 +-
 .../test/testdata/cldr/personNameTest/zu.txt  |   6 +-
 .../cldr/units/unitPreferencesTest.txt        |   4 +-
 .../test/testdata/cldr/units/unitsTest.txt    |   9 +-
 .../cldr/localeIdentifiers/likelySubtags.txt  |   6 +-
 .../localeCanonicalization.txt                |   4 +-
 .../localeIdentifiers/localeDisplayName.txt   |   4 +-
 .../icu/dev/data/cldr/personNameTest/af.txt   |   6 +-
 .../icu/dev/data/cldr/personNameTest/am.txt   |   6 +-
 .../icu/dev/data/cldr/personNameTest/ar.txt   |   6 +-
 .../icu/dev/data/cldr/personNameTest/as.txt   |   6 +-
 .../icu/dev/data/cldr/personNameTest/az.txt   |   6 +-
 .../icu/dev/data/cldr/personNameTest/be.txt   |   6 +-
 .../icu/dev/data/cldr/personNameTest/bg.txt   |   6 +-
 .../icu/dev/data/cldr/personNameTest/bn.txt   |   6 +-
 .../icu/dev/data/cldr/personNameTest/bs.txt   |   6 +-
 .../icu/dev/data/cldr/personNameTest/ca.txt   |   6 +-
 .../icu/dev/data/cldr/personNameTest/chr.txt  |   6 +-
 .../icu/dev/data/cldr/personNameTest/cs.txt   |   6 +-
 .../icu/dev/data/cldr/personNameTest/cy.txt   |   6 +-
 .../icu/dev/data/cldr/personNameTest/da.txt   |   6 +-
 .../icu/dev/data/cldr/personNameTest/de.txt   |   6 +-
 .../icu/dev/data/cldr/personNameTest/dsb.txt  |   6 +-
 .../icu/dev/data/cldr/personNameTest/el.txt   |   6 +-
 .../icu/dev/data/cldr/personNameTest/en.txt   |   6 +-
 .../icu/dev/data/cldr/personNameTest/es.txt   |   6 +-
 .../icu/dev/data/cldr/personNameTest/et.txt   |   6 +-
 .../icu/dev/data/cldr/personNameTest/eu.txt   |   6 +-
 .../icu/dev/data/cldr/personNameTest/fa.txt   |   6 +-
 .../icu/dev/data/cldr/personNameTest/fi.txt   |   6 +-
 .../icu/dev/data/cldr/personNameTest/fil.txt  |   6 +-
 .../icu/dev/data/cldr/personNameTest/fr.txt   |   6 +-
 .../icu/dev/data/cldr/personNameTest/ga.txt   |   6 +-
 .../icu/dev/data/cldr/personNameTest/gd.txt   |   6 +-
 .../icu/dev/data/cldr/personNameTest/gl.txt   |   6 +-
 .../icu/dev/data/cldr/personNameTest/gu.txt   |   6 +-
 .../icu/dev/data/cldr/personNameTest/ha.txt   |   6 +-
 .../icu/dev/data/cldr/personNameTest/he.txt   |   6 +-
 .../icu/dev/data/cldr/personNameTest/hi.txt   |   6 +-
 .../dev/data/cldr/personNameTest/hi_Latn.txt  |   6 +-
 .../icu/dev/data/cldr/personNameTest/hr.txt   |   6 +-
 .../icu/dev/data/cldr/personNameTest/hsb.txt  |   6 +-
 .../icu/dev/data/cldr/personNameTest/hu.txt   |   6 +-
 .../icu/dev/data/cldr/personNameTest/hy.txt   |   6 +-
 .../icu/dev/data/cldr/personNameTest/id.txt   |   6 +-
 .../icu/dev/data/cldr/personNameTest/ig.txt   |   6 +-
 .../icu/dev/data/cldr/personNameTest/is.txt   |   6 +-
 .../icu/dev/data/cldr/personNameTest/it.txt   |   6 +-
 .../icu/dev/data/cldr/personNameTest/ja.txt   |   6 +-
 .../icu/dev/data/cldr/personNameTest/jv.txt   |   6 +-
 .../icu/dev/data/cldr/personNameTest/ka.txt   |   6 +-
 .../icu/dev/data/cldr/personNameTest/kk.txt   |   6 +-
 .../icu/dev/data/cldr/personNameTest/km.txt   |   6 +-
 .../icu/dev/data/cldr/personNameTest/kn.txt   |   6 +-
 .../icu/dev/data/cldr/personNameTest/ko.txt   |   6 +-
 .../icu/dev/data/cldr/personNameTest/kok.txt  |   6 +-
 .../icu/dev/data/cldr/personNameTest/ky.txt   |   6 +-
 .../icu/dev/data/cldr/personNameTest/lo.txt   |   6 +-
 .../icu/dev/data/cldr/personNameTest/lt.txt   |   6 +-
 .../icu/dev/data/cldr/personNameTest/lv.txt   |   6 +-
 .../icu/dev/data/cldr/personNameTest/mk.txt   |   6 +-
 .../icu/dev/data/cldr/personNameTest/ml.txt   |   6 +-
 .../icu/dev/data/cldr/personNameTest/mn.txt   |   6 +-
 .../icu/dev/data/cldr/personNameTest/mr.txt   |   6 +-
 .../icu/dev/data/cldr/personNameTest/ms.txt   |   6 +-
 .../icu/dev/data/cldr/personNameTest/my.txt   |   6 +-
 .../icu/dev/data/cldr/personNameTest/ne.txt   |   6 +-
 .../icu/dev/data/cldr/personNameTest/nl.txt   |   6 +-
 .../icu/dev/data/cldr/personNameTest/nn.txt   |   6 +-
 .../icu/dev/data/cldr/personNameTest/no.txt   |   6 +-
 .../icu/dev/data/cldr/personNameTest/or.txt   |   6 +-
 .../icu/dev/data/cldr/personNameTest/pa.txt   |   6 +-
 .../icu/dev/data/cldr/personNameTest/pl.txt   |   6 +-
 .../icu/dev/data/cldr/personNameTest/ps.txt   |   6 +-
 .../icu/dev/data/cldr/personNameTest/pt.txt   |   6 +-
 .../icu/dev/data/cldr/personNameTest/qu.txt   |   6 +-
 .../icu/dev/data/cldr/personNameTest/ro.txt   |   6 +-
 .../icu/dev/data/cldr/personNameTest/ru.txt   |   6 +-
 .../icu/dev/data/cldr/personNameTest/sc.txt   |   6 +-
 .../icu/dev/data/cldr/personNameTest/sd.txt   |   6 +-
 .../icu/dev/data/cldr/personNameTest/si.txt   |   6 +-
 .../icu/dev/data/cldr/personNameTest/sk.txt   |   6 +-
 .../icu/dev/data/cldr/personNameTest/sl.txt   |   6 +-
 .../icu/dev/data/cldr/personNameTest/so.txt   |   6 +-
 .../icu/dev/data/cldr/personNameTest/sq.txt   |   6 +-
 .../icu/dev/data/cldr/personNameTest/sr.txt   |   6 +-
 .../dev/data/cldr/personNameTest/sr_Latn.txt  |   6 +-
 .../icu/dev/data/cldr/personNameTest/sv.txt   |   6 +-
 .../icu/dev/data/cldr/personNameTest/sw.txt   |   6 +-
 .../icu/dev/data/cldr/personNameTest/ta.txt   |   6 +-
 .../icu/dev/data/cldr/personNameTest/te.txt   |   6 +-
 .../icu/dev/data/cldr/personNameTest/tg.txt   |   6 +-
 .../icu/dev/data/cldr/personNameTest/th.txt   |   6 +-
 .../icu/dev/data/cldr/personNameTest/ti.txt   |   6 +-
 .../icu/dev/data/cldr/personNameTest/tk.txt   |   6 +-
 .../icu/dev/data/cldr/personNameTest/tr.txt   |   6 +-
 .../icu/dev/data/cldr/personNameTest/uk.txt   |   6 +-
 .../icu/dev/data/cldr/personNameTest/ur.txt   |   6 +-
 .../icu/dev/data/cldr/personNameTest/uz.txt   |   6 +-
 .../icu/dev/data/cldr/personNameTest/vi.txt   |   6 +-
 .../icu/dev/data/cldr/personNameTest/wo.txt   |   6 +-
 .../icu/dev/data/cldr/personNameTest/yo.txt   |   6 +-
 .../icu/dev/data/cldr/personNameTest/yue.txt  |   6 +-
 .../dev/data/cldr/personNameTest/yue_Hans.txt |   6 +-
 .../icu/dev/data/cldr/personNameTest/zh.txt   |   6 +-
 .../dev/data/cldr/personNameTest/zh_Hant.txt  |   6 +-
 .../icu/dev/data/cldr/personNameTest/zu.txt   |   6 +-
 .../data/cldr/units/unitPreferencesTest.txt   |   4 +-
 .../ibm/icu/dev/data/cldr/units/unitsTest.txt |   9 +-
 225 files changed, 572 insertions(+), 1036 deletions(-)

diff --git a/icu4c/source/data/curr/ks.txt b/icu4c/source/data/curr/ks.txt
index 68620746e24..eebc1e03f69 100644
--- a/icu4c/source/data/curr/ks.txt
+++ b/icu4c/source/data/curr/ks.txt
@@ -389,11 +389,11 @@ ks{
         }
         ILS{
             "₪",
-            "اِزرٲیِلی نٔوۍ شؠقٕل",
+            "اِزرٲیِلی نٔوؠ شؠقٕل",
         }
         INR{
             "₹",
-            "ہِندُستٲنۍ رۄپَے",
+            "ہِندُستٲنؠ رۄپَے",
         }
         IQD{
             "IQD",
@@ -665,7 +665,7 @@ ks{
         }
         PKR{
             "PKR",
-            "پاکِستٲنۍ رۄپَے",
+            "پاکِستٲنؠ رۄپَے",
         }
         PLN{
             "PLN",
diff --git a/icu4c/source/data/curr/supplementalData.txt b/icu4c/source/data/curr/supplementalData.txt
index ee707b6bc4f..5e89896a520 100644
--- a/icu4c/source/data/curr/supplementalData.txt
+++ b/icu4c/source/data/curr/supplementalData.txt
@@ -1200,7 +1200,7 @@ supplementalData:table(nofallback){
             {
                 from:intvector{
                     398,
-                    -1848751104,
+                    -1834351104,
                 }
                 id{"XCG"}
             }
@@ -1212,7 +1212,7 @@ supplementalData:table(nofallback){
                 id{"ANG"}
                 to:intvector{
                     400,
-                    1805081599,
+                    1819481599,
                 }
             }
         }
@@ -3961,7 +3961,7 @@ supplementalData:table(nofallback){
             {
                 from:intvector{
                     398,
-                    -1848751104,
+                    -1834351104,
                 }
                 id{"XCG"}
             }
@@ -3973,7 +3973,7 @@ supplementalData:table(nofallback){
                 id{"ANG"}
                 to:intvector{
                     400,
-                    1805081599,
+                    1819481599,
                 }
             }
         }
diff --git a/icu4c/source/data/lang/ks.txt b/icu4c/source/data/lang/ks.txt
index e90cb4b74fa..73878719174 100644
--- a/icu4c/source/data/lang/ks.txt
+++ b/icu4c/source/data/lang/ks.txt
@@ -31,7 +31,7 @@ ks{
         arn{"ایرو کونِیَن"}
         arp{"اَراپاہو"}
         arw{"اَراوَک"}
-        as{"اسٲمۍ"}
+        as{"اسٲمؠ"}
         ast{"ایسٹوٗریَن"}
         av{"اَوارِک"}
         awa{"اَوَدی"}
@@ -51,7 +51,7 @@ ks{
         bin{"بِنی"}
         bla{"سِکسِکا"}
         bm{"بَمبارا"}
-        bn{"بَنگٲلۍ"}
+        bn{"بَنگٲلؠ"}
         bo{"تِبتی"}
         br{"بریٹَن"}
         bra{"برج"}
@@ -107,12 +107,12 @@ ks{
         eka{"ایکاجُک"}
         el{"یوٗنٲنی"}
         elx{"ایلامایِٹ"}
-        en{"اَنگیٖزۍ"}
-        en_AU{"آسٹریلیَن اَنگریٖزۍ"}
-        en_CA{"کینَڈِیٲیی اَنگریٖزۍ"}
-        en_GB{"بَرطانوی اَنگریٖزۍ"}
-        en_US{"امریٖکی اَنٛگریٖزۍ"}
-        enm{"وَسطی اَنگریٖزۍ"}
+        en{"اَنگیٖزؠ"}
+        en_AU{"آسٹریلیَن اَنگریٖزؠ"}
+        en_CA{"کینَڈِیٲیی اَنگریٖزؠ"}
+        en_GB{"بَرطانوی اَنگریٖزؠ"}
+        en_US{"امریٖکی اَنٛگریٖزؠ"}
+        enm{"وَسطی اَنگریٖزؠ"}
         eo{"ایسپَرینٹو"}
         es{"ہسپانوی"}
         es_419{"لاطیٖنی امریٖکی ہسپانوی"}
@@ -162,7 +162,7 @@ ks{
         ha{"ہاوسا"}
         hai{"ہَیدا"}
         haw{"ہوایِیَن"}
-        he{"عبرٲنۍ"}
+        he{"عبرٲنؠ"}
         hi{"ہِندی"}
         hil{"ہِلیٖگینَن"}
         hit{"ہِتایِت"}
@@ -188,7 +188,7 @@ ks{
         is{"آیِسلینڈِک"}
         it{"اِطالوی"}
         iu{"اِنُکتِتوٗ"}
-        ja{"جاپٲنۍ"}
+        ja{"جاپٲنؠ"}
         jbo{"لوجبان"}
         jpr{"جوڈیو فارسی"}
         jrb{"جوڈیو عربی"}
@@ -270,7 +270,7 @@ ks{
         mni{"مَنیپوٗری"}
         moh{"موہاک"}
         mos{"موسی"}
-        mr{"مَرٲٹھۍ"}
+        mr{"مَرٲٹھؠ"}
         ms{"مَلَے"}
         mt{"مَلتیٖس"}
         mul{"واریاہ زبان"}
@@ -284,7 +284,7 @@ ks{
         nb{"ناروییَن بوکمال"}
         nd{"شُمال ڈَبیل"}
         nds{"بۆنِم جٔرمَن"}
-        ne{"نیپٲلۍ"}
+        ne{"نیپٲلؠ"}
         new{"نیواری"}
         ng{"ڈونگا"}
         nia{"نِیاس"}
@@ -312,7 +312,7 @@ ks{
         os{"اۆسیٹِک"}
         osa{"اۆسیج"}
         ota{"اوٹومَن تُرکِش"}
-        pa{"پَنجٲبۍ"}
+        pa{"پَنجٲبؠ"}
         pag{"پَنگاسِنَن"}
         pal{"پَہلَوی"}
         pam{"پَمپَنگا"}
@@ -329,7 +329,7 @@ ks{
         pt_BR{"برازیٖلی پُرتَگیٖز"}
         pt_PT{"یوٗرپی پُرتَگیٖز"}
         qu{"کُویشُوا"}
-        raj{"راجِستھٲنۍ"}
+        raj{"راجِستھٲنؠ"}
         rap{"رَپانوی"}
         rar{"رَروٹونگَن"}
         rm{"رومانش"}
@@ -415,7 +415,7 @@ ks{
         uga{"اُگارتِک"}
         uk{"یوٗکرینیٲیی"}
         umb{"یُمبُندوٗ"}
-        und{"اَنزٲنۍ یا نَہ لَگہٕہار زبان"}
+        und{"اَنزٲنؠ یا نَہ لَگہٕہار زبان"}
         ur{"اُردوٗ"}
         uz{"اُزبیک"}
         vai{"واے"}
@@ -453,8 +453,8 @@ ks{
         zh{"چیٖنی، مینڈارن"}
     }
     Languages%short{
-        en_GB{"UK اَنٛگریٖزۍ"}
-        en_US{"US اَنٛگریٖزۍ"}
+        en_GB{"UK اَنٛگریٖزؠ"}
+        en_US{"US اَنٛگریٖزؠ"}
     }
     Scripts{
         Arab{"عربی"}
@@ -463,7 +463,7 @@ ks{
         Avst{"اَویستَن"}
         Bali{"بالَنیٖز"}
         Batk{"باتَک"}
-        Beng{"بینگٲلۍ"}
+        Beng{"بینگٲلؠ"}
         Blis{"بِلِس سِمبلز"}
         Bopo{"بوپوموفو"}
         Brah{"براہمی"}
@@ -491,17 +491,17 @@ ks{
         Goth{"گوتھِک"}
         Grek{"گرَنتھا"}
         Gujr{"گریٖک"}
-        Guru{"گُجرٲتۍ"}
+        Guru{"گُجرٲتؠ"}
         Hang{"ہانگُل"}
         Hani{"ہان"}
         Hano{"ہانُنوٗ"}
         Hans{
             "سَہل ﴿ترجمع اِشارٕ: یِم ورژن رَسم الخط ہُک ناؤ چھُ چیٖنی باپتھ زَبانٕ نا"
-            "ؤ کِس مجموعَس سٕتۍ اِستعمال یِوان کرنٕہ۔﴾"
+            "ؤ کِس مجموعَس سٕتؠ اِستعمال یِوان کرنٕہ۔﴾"
         }
         Hant{
             "رِوٲجی ﴿ترجمع اِشارٕ: یِم ورژن رَسم الخط ہُک ناؤ چھُ چیٖنی باپتھ زَبانٕ "
-            "ناؤ کِس مجموعَس سٕتۍ اِستعمال یِوان کرنٕہ۔﴾"
+            "ناؤ کِس مجموعَس سٕتؠ اِستعمال یِوان کرنٕہ۔﴾"
         }
         Hebr{"ہِبرِو"}
         Hira{"ہیٖراگانا"}
@@ -603,7 +603,7 @@ ks{
             hebrew{"ہِبرِو کیلنڑَر"}
             indian{"انڈین نیشنل کیلنڈر"}
             iso8601{"ISO-8601 کیلنڈر"}
-            japanese{"جاپٲنۍ کیلنڑَر"}
+            japanese{"جاپٲنؠ کیلنڑَر"}
             roc{"جموٗریٲتی چیٖنی کیلَنڑَر"}
         }
         collation{
@@ -628,22 +628,22 @@ ks{
         1996{"جٔرمَن عِلمہِ ہِجا ۱۹۹۶سُک"}
         AREVELA{"مَشرِقی اَمریٖکا"}
         BAKU1926{"جٔمع کٔرِتھ تُرکی لاطیٖنی اَچھر"}
-        BISKE{"سین جارجِیو/بِلا بوٗلۍ"}
+        BISKE{"سین جارجِیو/بِلا بوٗلؠ"}
         FONIPA{"آوازیات"}
         FONUPA{"یوٗ پی اے آوازِیات"}
-        LIPAW{"روٗسی زَبانہِ ہِنز لِپوواز بوٗلۍ"}
+        LIPAW{"روٗسی زَبانہِ ہِنز لِپوواز بوٗلؠ"}
         MONOTON{"اَکٔے لہجہٕ واجؠن زَبان"}
-        NEDIS{"نؠٹِسون بوٗلۍ"}
-        NJIVA{"نیجِوا بوٗلۍ"}
-        OSOJS{"اُشیکو/اوسوجین بوٗلۍ"}
+        NEDIS{"نؠٹِسون بوٗلؠ"}
+        NJIVA{"نیجِوا بوٗلؠ"}
+        OSOJS{"اُشیکو/اوسوجین بوٗلؠ"}
         POLYTON{"واریاہ لہجہٕ واجؠن زَبان"}
         POSIX{"کَمپیوٗٹَر"}
         REVISED{"دُبارٕ دۄہراونہٕ آمُت عِلمہِ ہِجا"}
         ROZAJ{"روٗسی"}
         SAAHO{"سوہو"}
-        SCOTLAND{"سُکاٹِش مَیعٲری اَنگریٖزۍ"}
+        SCOTLAND{"سُکاٹِش مَیعٲری اَنگریٖزؠ"}
         SCOUSE{"سِکوس"}
-        SOLBA{"ثٹولوِزا/سولبِکا بوٗلۍ"}
+        SOLBA{"ثٹولوِزا/سولبِکا بوٗلؠ"}
         TARASK{"تاراسکیٖوِکا علمہ ہِجاِ"}
     }
     codePatterns{
diff --git a/icu4c/source/data/locales/en_001.txt b/icu4c/source/data/locales/en_001.txt
index 30e3789dc63..04cf13528b1 100644
--- a/icu4c/source/data/locales/en_001.txt
+++ b/icu4c/source/data/locales/en_001.txt
@@ -274,6 +274,7 @@ en_001{
                         pm{"pm"}
                     }
                     narrow{
+                        am{"am"}
                         pm{"pm"}
                     }
                     wide{
diff --git a/icu4c/source/data/locales/en_AU.txt b/icu4c/source/data/locales/en_AU.txt
index 924036bca8f..0fb72a58b2d 100644
--- a/icu4c/source/data/locales/en_AU.txt
+++ b/icu4c/source/data/locales/en_AU.txt
@@ -161,9 +161,7 @@ en_AU{
                         noon{"midday"}
                     }
                     narrow{
-                        am{"am"}
                         noon{"midday"}
-                        pm{"pm"}
                     }
                     wide{
                         noon{"midday"}
diff --git a/icu4c/source/data/locales/en_CA.txt b/icu4c/source/data/locales/en_CA.txt
index 907e82a6ad9..358b55eaafa 100644
--- a/icu4c/source/data/locales/en_CA.txt
+++ b/icu4c/source/data/locales/en_CA.txt
@@ -244,7 +244,7 @@ en_CA{
                     }
                     narrow{
                         afternoon1{"aft"}
-                        am{"a.m."}
+                        am{"am"}
                         evening1{"eve"}
                         midnight{"mid"}
                         morning1{"mor"}
diff --git a/icu4c/source/data/locales/en_GB.txt b/icu4c/source/data/locales/en_GB.txt
index 86230e0766d..8a076a01829 100644
--- a/icu4c/source/data/locales/en_GB.txt
+++ b/icu4c/source/data/locales/en_GB.txt
@@ -86,14 +86,6 @@ en_GB{
                 yMMMEEEEd{"EEEE d MMM y"}
                 yMMMMEEEEd{"EEEE d MMMM y"}
             }
-            dayPeriod{
-                stand-alone{
-                    narrow{
-                        am{"am"}
-                        pm{"pm"}
-                    }
-                }
-            }
             intervalFormats{
                 GyMMMEEEEd{
                     G{"EEEE d MMM y G – EEEE d MMM y G"}
diff --git a/icu4c/source/data/locales/en_IN.txt b/icu4c/source/data/locales/en_IN.txt
index 49ceaf12252..98f204fac39 100644
--- a/icu4c/source/data/locales/en_IN.txt
+++ b/icu4c/source/data/locales/en_IN.txt
@@ -298,14 +298,6 @@ en_IN{
                 yMMMMEEEEd{"EEEE d MMMM, y"}
                 yMd{"d/M/y"}
             }
-            dayPeriod{
-                stand-alone{
-                    narrow{
-                        am{"am"}
-                        pm{"pm"}
-                    }
-                }
-            }
             intervalFormats{
                 GyMMMEEEEd{
                     G{"EEEE d MMM y G – EEEE d MMM y G"}
diff --git a/icu4c/source/data/locales/ks.txt b/icu4c/source/data/locales/ks.txt
index b83d15a017e..6f81a78cd59 100644
--- a/icu4c/source/data/locales/ks.txt
+++ b/icu4c/source/data/locales/ks.txt
@@ -5,7 +5,7 @@ ks{
     AuxExemplarCharacters{"[\u200E\u200F َ ُ ِ ٔ ٕ ٟ ٖ ٗ ئ]"}
     ExemplarCharacters{
         "[ء آ أ ٲ ؤ ا ب پ ت ث ٹ ج چ ح خ د ذ ڈ ر ز ڑ ژ س ش ص ض ط ظ ع غ ف ق ک گ ل م ن ں"
-        " ھ ہ و ۄ ۆ ی ۍ ؠ ے]"
+        " ھ ہ و ۄ ۆ ی ؠ ے]"
     }
     ExemplarCharactersNumbers{"[\u200E \\- ‑ , ٫ ٬ . % ‰ + 0۰ 1۱ 2۲ 3۳ 4۴ 5۵ 6۶ 7۷ 8۸ 9۹]"}
     ExemplarCharactersPunctuation{"[\\- ‐‑ – — , ; \\: ! ? . … '‘’ \u0022“” ( ) \\[ \\] § @ * / \\& # † ‡ ′ ″]"}
@@ -53,8 +53,8 @@ ks{
                 "{1}, {0}",
             }
             DateTimePatterns%atTime{
-                "{0} پٮ۪ٹھۍ {1}",
-                "{0} پٮ۪ٹھۍ {1}",
+                "{0} پٮ۪ٹھؠ {1}",
+                "{0} پٮ۪ٹھؠ {1}",
                 "{1}, {0}",
                 "{1}, {0}",
             }
@@ -213,8 +213,8 @@ ks{
                 "{1}, {0}",
             }
             DateTimePatterns%atTime{
-                "{0} پٮ۪ٹھۍ {1}",
-                "{0} پٮ۪ٹھۍ {1}",
+                "{0} پٮ۪ٹھؠ {1}",
+                "{0} پٮ۪ٹھؠ {1}",
                 "{1}, {0}",
                 "{1}, {0}",
             }
@@ -547,9 +547,9 @@ ks{
         month{
             dn{"رؠتھ"}
             relative{
-                "-1"{"پٔتِم ریتھۍ"}
-                "0"{"یٕہ ریتھۍ"}
-                "1"{"نو ریتھۍ"}
+                "-1"{"پٔتِم ریتھؠ"}
+                "0"{"یٕہ ریتھؠ"}
+                "1"{"نو ریتھؠ"}
             }
         }
         quarter{
diff --git a/icu4c/source/data/locales/uk.txt b/icu4c/source/data/locales/uk.txt
index 7a58a9fc47b..26248e62f86 100644
--- a/icu4c/source/data/locales/uk.txt
+++ b/icu4c/source/data/locales/uk.txt
@@ -392,7 +392,7 @@ uk{
                 "HH:mm:ss z",
                 "HH:mm:ss",
                 "HH:mm",
-                "EEEE, d MMMM y 'р'. G",
+                "cccc, d MMMM y 'р'. G",
                 "d MMMM y 'р'. G",
                 "d MMM y 'р'. G",
                 "dd.MM.yy GGGGG",
@@ -572,7 +572,7 @@ uk{
                 "HH:mm:ss z",
                 "HH:mm:ss",
                 "HH:mm",
-                "EEEE, d MMMM y 'р'.",
+                "cccc, d MMMM y 'р'.",
                 "d MMMM y 'р'.",
                 "d MMM y 'р'.",
                 "dd.MM.yy",
diff --git a/icu4c/source/data/misc/supplementalData.txt b/icu4c/source/data/misc/supplementalData.txt
index e5c39b6abc0..10269b90a62 100644
--- a/icu4c/source/data/misc/supplementalData.txt
+++ b/icu4c/source/data/misc/supplementalData.txt
@@ -4434,6 +4434,7 @@ supplementalData:table(nofallback){
                 "ADP",
                 "AFA",
                 "ALK",
+                "ANG",
                 "AOK",
                 "AON",
                 "AOR",
@@ -4468,6 +4469,7 @@ supplementalData:table(nofallback){
                 "COU",
                 "CSD",
                 "CSK",
+                "CUC",
                 "CYP",
                 "DDM",
                 "DEM",
@@ -4578,7 +4580,6 @@ supplementalData:table(nofallback){
                 "AFN",
                 "ALL",
                 "AMD",
-                "ANG",
                 "AOA",
                 "ARS",
                 "AUD",
@@ -4606,7 +4607,6 @@ supplementalData:table(nofallback){
                 "CNY",
                 "COP",
                 "CRC",
-                "CUC",
                 "CUP",
                 "CVE",
                 "CZK",
@@ -7830,6 +7830,7 @@ supplementalData:table(nofallback){
                 "Aghb",
                 "Ahom",
                 "Arab",
+                "Aran",
                 "Armi",
                 "Armn",
                 "Avst",
@@ -7853,6 +7854,7 @@ supplementalData:table(nofallback){
                 "Cpmn",
                 "Cprt",
                 "Cyrl",
+                "Cyrs",
                 "Deva",
                 "Diak",
                 "Dogr",
@@ -7900,6 +7902,7 @@ supplementalData:table(nofallback){
                 "Kthi",
                 "Lana",
                 "Laoo",
+                "Latf~g",
                 "Latn",
                 "Lepc",
                 "Limb",
@@ -7965,6 +7968,9 @@ supplementalData:table(nofallback){
                 "Sund",
                 "Sylo",
                 "Syrc",
+                "Syre",
+                "Syrj",
+                "Syrn",
                 "Tagb",
                 "Takr",
                 "Tale",
@@ -7998,7 +8004,6 @@ supplementalData:table(nofallback){
                 "Qaaj~p",
             }
             special{
-                "Aran",
                 "Qaag",
                 "Zinh",
                 "Zmth",
@@ -20419,54 +20424,6 @@ supplementalData:table(nofallback){
             "pt_ST",
             "pt_TL",
         }
-        root{
-            "az_Arab",
-            "az_Cyrl",
-            "bal_Latn",
-            "blt_Latn",
-            "bm_Nkoo",
-            "bs_Cyrl",
-            "byn_Latn",
-            "cu_Glag",
-            "dje_Arab",
-            "dyo_Arab",
-            "en_Dsrt",
-            "en_Shaw",
-            "ff_Adlm",
-            "ff_Arab",
-            "ha_Arab",
-            "iu_Latn",
-            "kk_Arab",
-            "ks_Deva",
-            "ku_Arab",
-            "kxv_Deva",
-            "kxv_Orya",
-            "kxv_Telu",
-            "ky_Arab",
-            "ky_Latn",
-            "ml_Arab",
-            "mn_Mong",
-            "mni_Mtei",
-            "ms_Arab",
-            "pa_Arab",
-            "sat_Deva",
-            "sd_Deva",
-            "sd_Khoj",
-            "sd_Sind",
-            "shi_Latn",
-            "so_Arab",
-            "sr_Latn",
-            "sw_Arab",
-            "tg_Arab",
-            "ug_Cyrl",
-            "uz_Arab",
-            "uz_Cyrl",
-            "vai_Latn",
-            "wo_Arab",
-            "yo_Arab",
-            "yue_Hans",
-            "zh_Hant",
-        }
         zh_Hant_HK{"zh_Hant_MO"}
     }
     personNamesDefaults{
diff --git a/icu4c/source/data/region/ks.txt b/icu4c/source/data/region/ks.txt
index 9027773daed..c39378c4ebe 100644
--- a/icu4c/source/data/region/ks.txt
+++ b/icu4c/source/data/region/ks.txt
@@ -220,7 +220,7 @@ ks{
         PK{"پاکِستان"}
         PL{"پولینڈ"}
         PM{"سینٹ پیٖری تہٕ موکیلِیَن"}
-        PN{"پِٹکیرٕنۍ جٔزیٖرٕ"}
+        PN{"پِٹکیرٕنؠ جٔزیٖرٕ"}
         PR{"پٔرٹو رِکو"}
         PS{"فلسطینی علاقٕہ"}
         PT{"پُرتِگال"}
diff --git a/icu4c/source/data/zone/ks.txt b/icu4c/source/data/zone/ks.txt
index 1a31a8808e4..fa16b81527b 100644
--- a/icu4c/source/data/zone/ks.txt
+++ b/icu4c/source/data/zone/ks.txt
@@ -1551,7 +1551,7 @@ ks{
             ls{"ہِندوستان"}
         }
         "meta:Indian_Ocean"{
-            ls{"ہِندوستٲنۍ اوشَن ٹائم"}
+            ls{"ہِندوستٲنؠ اوشَن ٹائم"}
         }
         "meta:Indochina"{
             ls{"اِنڑوچَینا ٹایِم"}
@@ -1567,8 +1567,8 @@ ks{
         }
         "meta:Iran"{
             ld{"اِیٖرٲنی سَمَر ٹایِم"}
-            lg{"اِیٖرٲنۍ ٹایِم"}
-            ls{"اِیٖرٲنۍ سٹینڑاڑ ٹایِم"}
+            lg{"اِیٖرٲنؠ ٹایِم"}
+            ls{"اِیٖرٲنؠ سٹینڑاڑ ٹایِم"}
         }
         "meta:Irkutsk"{
             ld{"اِرکُٹسک سَمَر ٹایِم"}
@@ -1581,9 +1581,9 @@ ks{
             ls{"اِسرٲیِلی سٹینڈرڈ ٹایِم"}
         }
         "meta:Japan"{
-            ld{"جاپٲنۍ ڑےلایِٔٹ ٹایِم"}
-            lg{"جاپٲنۍ ٹایِم"}
-            ls{"جاپٲنۍ سٹینڈرڈ ٹایِم"}
+            ld{"جاپٲنؠ ڑےلایِٔٹ ٹایِم"}
+            lg{"جاپٲنؠ ٹایِم"}
+            ls{"جاپٲنؠ سٹینڈرڈ ٹایِم"}
         }
         "meta:Kamchatka"{
             ld{"کَمچَٹکا سَمَر ٹایِم"}
@@ -1675,7 +1675,7 @@ ks{
             ls{"نَعوٗروٗ ٹایِم"}
         }
         "meta:Nepal"{
-            ls{"نؠپٲلۍ ٹایِم"}
+            ls{"نؠپٲلؠ ٹایِم"}
         }
         "meta:New_Caledonia"{
             ld{"نِو کیلؠڑونِیس سَمَر ٹایِم"}
diff --git a/icu4c/source/data/zone/ku.txt b/icu4c/source/data/zone/ku.txt
index 2e5acabd542..e7ded2f4883 100644
--- a/icu4c/source/data/zone/ku.txt
+++ b/icu4c/source/data/zone/ku.txt
@@ -833,9 +833,6 @@ ku{
             ld{"Saeta Havînê ya Pasîfîka Meksîkayê"}
             lg{"Saeta Pasîfîka Meksîkayê"}
             ls{"Saeta Standard a Pasîfîka Meksîkayê"}
-            sd{"SHPM"}
-            sg{"SPM"}
-            ss{"SSPM"}
         }
         "meta:Mongolia"{
             ld{"Saeta Havînê ya Ûlanbatarê"}
@@ -930,9 +927,6 @@ ku{
             ld{"Saeta Havînê ya Saint Pierre û Miquelonê"}
             lg{"Saeta Saint Pierre û Miquelonê"}
             ls{"Saeta Standard a Saint Pierre û Miquelonê"}
-            sd{"SHSPM"}
-            sg{"SSPM"}
-            ss{"SSSPM"}
         }
         "meta:Pitcairn"{
             ls{"Saeta Pitcairnê"}
diff --git a/icu4c/source/data/zone/nl.txt b/icu4c/source/data/zone/nl.txt
index 72e4f512ba0..022c04c255d 100644
--- a/icu4c/source/data/zone/nl.txt
+++ b/icu4c/source/data/zone/nl.txt
@@ -330,9 +330,9 @@ nl{
             ls{"West-Afrikaanse standaardtijd"}
         }
         "meta:Alaska"{
-            ld{"Alaska Daylight Time"}
-            lg{"Alaska Time"}
-            ls{"Alaska Standard Time"}
+            ld{"Alaska-zomertijd"}
+            lg{"Alaska-tijd"}
+            ls{"Alaska-standaardtijd"}
             sd{"AKDT"}
             sg{"AKT"}
             ss{"AKST"}
@@ -343,38 +343,38 @@ nl{
             ls{"Alma-Ata-standaardtijd"}
         }
         "meta:Amazon"{
-            ld{"Amazon Summer Time"}
-            lg{"Amazon Time"}
-            ls{"Amazon Standard Time"}
+            ld{"Amazone-zomertijd"}
+            lg{"Amazone-tijd"}
+            ls{"Amazone-standaardtijd"}
         }
         "meta:America_Central"{
-            ld{"Central Daylight Time"}
-            lg{"Central Time"}
-            ls{"Central Standard Time"}
+            ld{"Central-zomertijd"}
+            lg{"Central-tijd"}
+            ls{"Central-standaardtijd"}
             sd{"CDT"}
             sg{"CT"}
             ss{"CST"}
         }
         "meta:America_Eastern"{
-            ld{"Eastern Daylight Time"}
-            lg{"Eastern Time"}
-            ls{"Eastern Standard Time"}
+            ld{"Eastern-zomertijd"}
+            lg{"Eastern-tijd"}
+            ls{"Eastern-standaardtijd"}
             sd{"EDT"}
             sg{"ET"}
             ss{"EST"}
         }
         "meta:America_Mountain"{
-            ld{"Mountain Daylight Time"}
-            lg{"Mountain Time"}
-            ls{"Mountain Standard Time"}
+            ld{"Mountain-zomertijd"}
+            lg{"Mountain-tijd"}
+            ls{"Mountain-standaardtijd"}
             sd{"MDT"}
             sg{"MT"}
             ss{"MST"}
         }
         "meta:America_Pacific"{
-            ld{"Pacific Daylight Time"}
-            lg{"Pacific Time"}
-            ls{"Pacific Standard Time"}
+            ld{"Pacific-zomertijd"}
+            lg{"Pacific-tijd"}
+            ls{"Pacific-standaardtijd"}
             sd{"PDT"}
             sg{"PT"}
             ss{"PST"}
@@ -405,14 +405,14 @@ nl{
             ls{"Arabische standaardtijd"}
         }
         "meta:Argentina"{
-            ld{"Argentina Summer Time"}
-            lg{"Argentina Time"}
-            ls{"Argentina Standard Time"}
+            ld{"Argentijnse zomertijd"}
+            lg{"Argentijnse tijd"}
+            ls{"Argentijnse standaardtijd"}
         }
         "meta:Argentina_Western"{
-            ld{"Western Argentina Summer Time"}
-            lg{"Western Argentina Time"}
-            ls{"Western Argentina Standard Time"}
+            ld{"West-Argentijnse zomertijd"}
+            lg{"West-Argentijnse tijd"}
+            ls{"West-Argentijnse standaardtijd"}
         }
         "meta:Armenia"{
             ld{"Armeense zomertijd"}
@@ -420,9 +420,9 @@ nl{
             ls{"Armeense standaardtijd"}
         }
         "meta:Atlantic"{
-            ld{"Atlantic Daylight Time"}
-            lg{"Atlantic Time"}
-            ls{"Atlantic Standard Time"}
+            ld{"Atlantic-zomertijd"}
+            lg{"Atlantic-tijd"}
+            ls{"Atlantic-standaardtijd"}
             sd{"ADT"}
             sg{"AT"}
             ss{"AST"}
@@ -466,12 +466,12 @@ nl{
             ls{"Bhutaanse tijd"}
         }
         "meta:Bolivia"{
-            ls{"Bolivia Time"}
+            ls{"Boliviaanse tijd"}
         }
         "meta:Brasilia"{
-            ld{"Brasilia Summer Time"}
-            lg{"Brasilia Time"}
-            ls{"Brasilia Standard Time"}
+            ld{"Braziliaanse zomertijd"}
+            lg{"Braziliaanse tijd"}
+            ls{"Braziliaanse standaardtijd"}
         }
         "meta:Brunei"{
             ls{"Bruneise tijd"}
@@ -493,9 +493,9 @@ nl{
             ls{"Chatham-standaardtijd"}
         }
         "meta:Chile"{
-            ld{"Chile Summer Time"}
-            lg{"Chile Time"}
-            ls{"Chile Standard Time"}
+            ld{"Chileense zomertijd"}
+            lg{"Chileense tijd"}
+            ls{"Chileense standaardtijd"}
         }
         "meta:China"{
             ld{"Chinese zomertijd"}
@@ -514,9 +514,9 @@ nl{
             ls{"Cocoseilandse tijd"}
         }
         "meta:Colombia"{
-            ld{"Colombia Summer Time"}
-            lg{"Colombia Time"}
-            ls{"Colombia Standard Time"}
+            ld{"Colombiaanse zomertijd"}
+            lg{"Colombiaanse tijd"}
+            ls{"Colombiaanse standaardtijd"}
         }
         "meta:Cook"{
             ld{"Cookeilandse halve zomertijd"}
@@ -524,9 +524,9 @@ nl{
             ls{"Cookeilandse standaardtijd"}
         }
         "meta:Cuba"{
-            ld{"Cuba Daylight Time"}
-            lg{"Cuba Time"}
-            ls{"Cuba Standard Time"}
+            ld{"Cubaanse zomertijd"}
+            lg{"Cubaanse tijd"}
+            ls{"Cubaanse standaardtijd"}
         }
         "meta:Davis"{
             ls{"Davis-tijd"}
@@ -538,12 +538,12 @@ nl{
             ls{"Oost-Timorese tijd"}
         }
         "meta:Easter"{
-            ld{"Easter Island Summer Time"}
-            lg{"Easter Island Time"}
-            ls{"Easter Island Standard Time"}
+            ld{"Paaseilandse zomertijd"}
+            lg{"Paaseilandse tijd"}
+            ls{"Paaseilandse standaardtijd"}
         }
         "meta:Ecuador"{
-            ls{"Ecuador Time"}
+            ls{"Ecuadoraanse tijd"}
         }
         "meta:Europe_Central"{
             ld{"Midden-Europese zomertijd"}
@@ -573,9 +573,9 @@ nl{
             ss{"WET"}
         }
         "meta:Falkland"{
-            ld{"Falkland Islands Summer Time"}
-            lg{"Falkland Islands Time"}
-            ls{"Falkland Islands Standard Time"}
+            ld{"Falklandeilandse zomertijd"}
+            lg{"Falklandeilandse tijd"}
+            ls{"Falklandeilandse standaardtijd"}
         }
         "meta:Fiji"{
             ld{"Fijische zomertijd"}
@@ -583,7 +583,7 @@ nl{
             ls{"Fijische standaardtijd"}
         }
         "meta:French_Guiana"{
-            ls{"French Guiana Time"}
+            ls{"Frans-Guyaanse tijd"}
         }
         "meta:French_Southern"{
             ls{"Franse zuidelijke en Antarctische tijd"}
@@ -593,7 +593,7 @@ nl{
             ss{"GMT"}
         }
         "meta:Galapagos"{
-            ls{"Galapagos Time"}
+            ls{"Galapagoseilandse tijd"}
         }
         "meta:Gambier"{
             ls{"Gambiereilandse tijd"}
@@ -607,14 +607,14 @@ nl{
             ls{"Gilberteilandse tijd"}
         }
         "meta:Greenland_Eastern"{
-            ld{"East Greenland Summer Time"}
-            lg{"East Greenland Time"}
-            ls{"East Greenland Standard Time"}
+            ld{"Oost-Groenlandse zomertijd"}
+            lg{"Oost-Groenlandse tijd"}
+            ls{"Oost-Groenlandse standaardtijd"}
         }
         "meta:Greenland_Western"{
-            ld{"West Greenland Summer Time"}
-            lg{"West Greenland Time"}
-            ls{"West Greenland Standard Time"}
+            ld{"West-Groenlandse zomertijd"}
+            lg{"West-Groenlandse tijd"}
+            ls{"West-Groenlandse standaardtijd"}
         }
         "meta:Guam"{
             ls{"Guamese standaardtijd"}
@@ -623,12 +623,12 @@ nl{
             ls{"Golf-standaardtijd"}
         }
         "meta:Guyana"{
-            ls{"Guyana Time"}
+            ls{"Guyaanse tijd"}
         }
         "meta:Hawaii_Aleutian"{
-            ld{"Hawaii-Aleutian Daylight Time"}
-            lg{"Hawaii-Aleutian Time"}
-            ls{"Hawaii-Aleutian Standard Time"}
+            ld{"Hawaii-Aleoetische zomertijd"}
+            lg{"Hawaii-Aleoetische tijd"}
+            ls{"Hawaii-Aleoetische standaardtijd"}
             sd{"HADT"}
             sg{"HAT"}
             ss{"HAST"}
@@ -750,9 +750,9 @@ nl{
             ls{"Mawson-tijd"}
         }
         "meta:Mexico_Pacific"{
-            ld{"Mexican Pacific Daylight Time"}
-            lg{"Mexican Pacific Time"}
-            ls{"Mexican Pacific Standard Time"}
+            ld{"Mexicaanse Pacific-zomertijd"}
+            lg{"Mexicaanse Pacific-tijd"}
+            ls{"Mexicaanse Pacific-standaardtijd"}
         }
         "meta:Mongolia"{
             ld{"Ulaanbaatar-zomertijd"}
@@ -784,9 +784,9 @@ nl{
             ls{"Nieuw-Zeelandse standaardtijd"}
         }
         "meta:Newfoundland"{
-            ld{"Newfoundland Daylight Time"}
-            lg{"Newfoundland Time"}
-            ls{"Newfoundland Standard Time"}
+            ld{"Newfoundland-zomertijd"}
+            lg{"Newfoundland-tijd"}
+            ls{"Newfoundland-standaardtijd"}
         }
         "meta:Niue"{
             ls{"Niuese tijd"}
@@ -797,9 +797,9 @@ nl{
             ls{"Norfolkeilandse standaardtijd"}
         }
         "meta:Noronha"{
-            ld{"Fernando de Noronha Summer Time"}
-            lg{"Fernando de Noronha Time"}
-            ls{"Fernando de Noronha Standard Time"}
+            ld{"Fernando de Noronha-zomertijd"}
+            lg{"Fernando de Noronha-tijd"}
+            ls{"Fernando de Noronha-standaardtijd"}
         }
         "meta:North_Mariana"{
             ls{"Noordelijk Mariaanse tijd"}
@@ -826,14 +826,14 @@ nl{
             ls{"Papoea-Nieuw-Guineese tijd"}
         }
         "meta:Paraguay"{
-            ld{"Paraguay Summer Time"}
-            lg{"Paraguay Time"}
-            ls{"Paraguay Standard Time"}
+            ld{"Paraguayaanse zomertijd"}
+            lg{"Paraguayaanse tijd"}
+            ls{"Paraguayaanse standaardtijd"}
         }
         "meta:Peru"{
-            ld{"Peru Summer Time"}
-            lg{"Peru Time"}
-            ls{"Peru Standard Time"}
+            ld{"Peruaanse zomertijd"}
+            lg{"Peruaanse tijd"}
+            ls{"Peruaanse standaardtijd"}
         }
         "meta:Philippines"{
             ld{"Filipijnse zomertijd"}
@@ -844,9 +844,9 @@ nl{
             ls{"Phoenixeilandse tijd"}
         }
         "meta:Pierre_Miquelon"{
-            ld{"St. Pierre & Miquelon Daylight Time"}
-            lg{"St. Pierre & Miquelon Time"}
-            ls{"St. Pierre & Miquelon Standard Time"}
+            ld{"Saint Pierre en Miquelon-zomertijd"}
+            lg{"Saint Pierre en Miquelon-tijd"}
+            ls{"Saint Pierre en Miquelon-standaardtijd"}
         }
         "meta:Pitcairn"{
             ls{"Pitcairneilandse tijd"}
@@ -933,8 +933,8 @@ nl{
         }
         "meta:Uruguay"{
             ld{"Uruguayaanse zomertijd"}
-            lg{"Uruguay Time"}
-            ls{"Uruguay Standard Time"}
+            lg{"Uruguayaanse tijd"}
+            ls{"Uruguayaanse standaardtijd"}
         }
         "meta:Uzbekistan"{
             ld{"Oezbeekse zomertijd"}
@@ -979,7 +979,7 @@ nl{
             ls{"Jekaterinenburg-standaardtijd"}
         }
         "meta:Yukon"{
-            ls{"Yukon Time"}
+            ls{"Yukon-tijd"}
         }
         regionFormat{"tijd in {0}"}
         regionFormatDaylight{"zomertijd in {0}"}
diff --git a/icu4c/source/test/testdata/cldr/localeIdentifiers/likelySubtags.txt b/icu4c/source/test/testdata/cldr/localeIdentifiers/likelySubtags.txt
index 1f9e3557fff..b78342d301a 100644
--- a/icu4c/source/test/testdata/cldr/localeIdentifiers/likelySubtags.txt
+++ b/icu4c/source/test/testdata/cldr/localeIdentifiers/likelySubtags.txt
@@ -1,7 +1,7 @@
 # Test data for Likely Subtags
-#  Copyright © 1991-2023 Unicode, Inc.
+#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 #
 # Test data for https://www.unicode.org/reports/tr35/tr35.html#Likely_Subtags
@@ -788,7 +788,7 @@ pt-TL ;	pt-Latn-TL ;	pt-TL ;
 qaa ;	FAIL ;	 ;	
 qaa-CH ;	FAIL ;	 ;	
 qaa-Cyrl ;	FAIL ;	 ;	
-qaa-Cyrl-CH ;	 ;	 ;	
+qaa-Cyrl-CH ;	FAIL ;	 ;	
 qu ;	qu-Latn-PE ;	qu ;	
 qu-AQ ;	qu-Latn-AQ ;	qu-AQ ;	
 qu-BO ;	qu-Latn-BO ;	qu-BO ;	
diff --git a/icu4c/source/test/testdata/cldr/localeIdentifiers/localeCanonicalization.txt b/icu4c/source/test/testdata/cldr/localeIdentifiers/localeCanonicalization.txt
index bce4a8a4ff7..2e4bb5929db 100644
--- a/icu4c/source/test/testdata/cldr/localeIdentifiers/localeCanonicalization.txt
+++ b/icu4c/source/test/testdata/cldr/localeIdentifiers/localeCanonicalization.txt
@@ -1,7 +1,7 @@
 # Test data for locale identifier canonicalization
-#  Copyright © 1991-2023 Unicode, Inc.
+#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 #
 # Format:
diff --git a/icu4c/source/test/testdata/cldr/localeIdentifiers/localeDisplayName.txt b/icu4c/source/test/testdata/cldr/localeIdentifiers/localeDisplayName.txt
index 655a6f4eb9f..ed0fdcd7b04 100644
--- a/icu4c/source/test/testdata/cldr/localeIdentifiers/localeDisplayName.txt
+++ b/icu4c/source/test/testdata/cldr/localeIdentifiers/localeDisplayName.txt
@@ -1,7 +1,7 @@
 # Test data for locale display name generation
-#  Copyright © 1991-2023 Unicode, Inc.
+#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 # Format:
 # @locale=<locale to display in>
diff --git a/icu4c/source/test/testdata/cldr/personNameTest/af.txt b/icu4c/source/test/testdata/cldr/personNameTest/af.txt
index 726da7aa12c..901123883a5 100644
--- a/icu4c/source/test/testdata/cldr/personNameTest/af.txt
+++ b/icu4c/source/test/testdata/cldr/personNameTest/af.txt
@@ -1,9 +1,7 @@
-# Test data for unit conversions
-#  Copyright © 1991-2023 Unicode, Inc.
+# Test data for Person Name Data#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-#
 # CLDR person name formatting test data for: af
 #
 # Test lines have the following structure:
diff --git a/icu4c/source/test/testdata/cldr/personNameTest/am.txt b/icu4c/source/test/testdata/cldr/personNameTest/am.txt
index ac7b469a2bf..eeb6e091052 100644
--- a/icu4c/source/test/testdata/cldr/personNameTest/am.txt
+++ b/icu4c/source/test/testdata/cldr/personNameTest/am.txt
@@ -1,9 +1,7 @@
-# Test data for unit conversions
-#  Copyright © 1991-2023 Unicode, Inc.
+# Test data for Person Name Data#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-#
 # CLDR person name formatting test data for: am
 #
 # Test lines have the following structure:
diff --git a/icu4c/source/test/testdata/cldr/personNameTest/ar.txt b/icu4c/source/test/testdata/cldr/personNameTest/ar.txt
index 6776b1de52c..7aeb605d07f 100644
--- a/icu4c/source/test/testdata/cldr/personNameTest/ar.txt
+++ b/icu4c/source/test/testdata/cldr/personNameTest/ar.txt
@@ -1,9 +1,7 @@
-# Test data for unit conversions
-#  Copyright © 1991-2023 Unicode, Inc.
+# Test data for Person Name Data#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-#
 # CLDR person name formatting test data for: ar
 #
 # Test lines have the following structure:
diff --git a/icu4c/source/test/testdata/cldr/personNameTest/as.txt b/icu4c/source/test/testdata/cldr/personNameTest/as.txt
index 6eeadad5cde..2b33e301a5c 100644
--- a/icu4c/source/test/testdata/cldr/personNameTest/as.txt
+++ b/icu4c/source/test/testdata/cldr/personNameTest/as.txt
@@ -1,9 +1,7 @@
-# Test data for unit conversions
-#  Copyright © 1991-2023 Unicode, Inc.
+# Test data for Person Name Data#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-#
 # CLDR person name formatting test data for: as
 #
 # Test lines have the following structure:
diff --git a/icu4c/source/test/testdata/cldr/personNameTest/az.txt b/icu4c/source/test/testdata/cldr/personNameTest/az.txt
index 2f1c236be5b..ae26d4f3191 100644
--- a/icu4c/source/test/testdata/cldr/personNameTest/az.txt
+++ b/icu4c/source/test/testdata/cldr/personNameTest/az.txt
@@ -1,9 +1,7 @@
-# Test data for unit conversions
-#  Copyright © 1991-2023 Unicode, Inc.
+# Test data for Person Name Data#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-#
 # CLDR person name formatting test data for: az
 #
 # Test lines have the following structure:
diff --git a/icu4c/source/test/testdata/cldr/personNameTest/be.txt b/icu4c/source/test/testdata/cldr/personNameTest/be.txt
index 5be3444c897..693d82263ce 100644
--- a/icu4c/source/test/testdata/cldr/personNameTest/be.txt
+++ b/icu4c/source/test/testdata/cldr/personNameTest/be.txt
@@ -1,9 +1,7 @@
-# Test data for unit conversions
-#  Copyright © 1991-2023 Unicode, Inc.
+# Test data for Person Name Data#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-#
 # CLDR person name formatting test data for: be
 #
 # Test lines have the following structure:
diff --git a/icu4c/source/test/testdata/cldr/personNameTest/bg.txt b/icu4c/source/test/testdata/cldr/personNameTest/bg.txt
index 78861df6cea..f1fc2e2ee32 100644
--- a/icu4c/source/test/testdata/cldr/personNameTest/bg.txt
+++ b/icu4c/source/test/testdata/cldr/personNameTest/bg.txt
@@ -1,9 +1,7 @@
-# Test data for unit conversions
-#  Copyright © 1991-2023 Unicode, Inc.
+# Test data for Person Name Data#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-#
 # CLDR person name formatting test data for: bg
 #
 # Test lines have the following structure:
diff --git a/icu4c/source/test/testdata/cldr/personNameTest/bn.txt b/icu4c/source/test/testdata/cldr/personNameTest/bn.txt
index 50982f61a40..3bd770fb315 100644
--- a/icu4c/source/test/testdata/cldr/personNameTest/bn.txt
+++ b/icu4c/source/test/testdata/cldr/personNameTest/bn.txt
@@ -1,9 +1,7 @@
-# Test data for unit conversions
-#  Copyright © 1991-2023 Unicode, Inc.
+# Test data for Person Name Data#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-#
 # CLDR person name formatting test data for: bn
 #
 # Test lines have the following structure:
diff --git a/icu4c/source/test/testdata/cldr/personNameTest/bs.txt b/icu4c/source/test/testdata/cldr/personNameTest/bs.txt
index c6687f31c14..faebd65139f 100644
--- a/icu4c/source/test/testdata/cldr/personNameTest/bs.txt
+++ b/icu4c/source/test/testdata/cldr/personNameTest/bs.txt
@@ -1,9 +1,7 @@
-# Test data for unit conversions
-#  Copyright © 1991-2023 Unicode, Inc.
+# Test data for Person Name Data#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-#
 # CLDR person name formatting test data for: bs
 #
 # Test lines have the following structure:
diff --git a/icu4c/source/test/testdata/cldr/personNameTest/ca.txt b/icu4c/source/test/testdata/cldr/personNameTest/ca.txt
index 259fec0cb8c..7b835dbaed3 100644
--- a/icu4c/source/test/testdata/cldr/personNameTest/ca.txt
+++ b/icu4c/source/test/testdata/cldr/personNameTest/ca.txt
@@ -1,9 +1,7 @@
-# Test data for unit conversions
-#  Copyright © 1991-2023 Unicode, Inc.
+# Test data for Person Name Data#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-#
 # CLDR person name formatting test data for: ca
 #
 # Test lines have the following structure:
diff --git a/icu4c/source/test/testdata/cldr/personNameTest/chr.txt b/icu4c/source/test/testdata/cldr/personNameTest/chr.txt
index d1941bac64b..ae4b242898e 100644
--- a/icu4c/source/test/testdata/cldr/personNameTest/chr.txt
+++ b/icu4c/source/test/testdata/cldr/personNameTest/chr.txt
@@ -1,9 +1,7 @@
-# Test data for unit conversions
-#  Copyright © 1991-2023 Unicode, Inc.
+# Test data for Person Name Data#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-#
 # CLDR person name formatting test data for: chr
 #
 # Test lines have the following structure:
diff --git a/icu4c/source/test/testdata/cldr/personNameTest/cs.txt b/icu4c/source/test/testdata/cldr/personNameTest/cs.txt
index 56e0c62890c..5ac120e5ba6 100644
--- a/icu4c/source/test/testdata/cldr/personNameTest/cs.txt
+++ b/icu4c/source/test/testdata/cldr/personNameTest/cs.txt
@@ -1,9 +1,7 @@
-# Test data for unit conversions
-#  Copyright © 1991-2023 Unicode, Inc.
+# Test data for Person Name Data#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-#
 # CLDR person name formatting test data for: cs
 #
 # Test lines have the following structure:
diff --git a/icu4c/source/test/testdata/cldr/personNameTest/cy.txt b/icu4c/source/test/testdata/cldr/personNameTest/cy.txt
index dd32a7a687f..ad45742d84f 100644
--- a/icu4c/source/test/testdata/cldr/personNameTest/cy.txt
+++ b/icu4c/source/test/testdata/cldr/personNameTest/cy.txt
@@ -1,9 +1,7 @@
-# Test data for unit conversions
-#  Copyright © 1991-2023 Unicode, Inc.
+# Test data for Person Name Data#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-#
 # CLDR person name formatting test data for: cy
 #
 # Test lines have the following structure:
diff --git a/icu4c/source/test/testdata/cldr/personNameTest/da.txt b/icu4c/source/test/testdata/cldr/personNameTest/da.txt
index bda38f8d1b5..a059b1ae7fb 100644
--- a/icu4c/source/test/testdata/cldr/personNameTest/da.txt
+++ b/icu4c/source/test/testdata/cldr/personNameTest/da.txt
@@ -1,9 +1,7 @@
-# Test data for unit conversions
-#  Copyright © 1991-2023 Unicode, Inc.
+# Test data for Person Name Data#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-#
 # CLDR person name formatting test data for: da
 #
 # Test lines have the following structure:
diff --git a/icu4c/source/test/testdata/cldr/personNameTest/de.txt b/icu4c/source/test/testdata/cldr/personNameTest/de.txt
index e719c9b60af..af18c8855d4 100644
--- a/icu4c/source/test/testdata/cldr/personNameTest/de.txt
+++ b/icu4c/source/test/testdata/cldr/personNameTest/de.txt
@@ -1,9 +1,7 @@
-# Test data for unit conversions
-#  Copyright © 1991-2023 Unicode, Inc.
+# Test data for Person Name Data#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-#
 # CLDR person name formatting test data for: de
 #
 # Test lines have the following structure:
diff --git a/icu4c/source/test/testdata/cldr/personNameTest/dsb.txt b/icu4c/source/test/testdata/cldr/personNameTest/dsb.txt
index fcf81ed62b0..a11a59600de 100644
--- a/icu4c/source/test/testdata/cldr/personNameTest/dsb.txt
+++ b/icu4c/source/test/testdata/cldr/personNameTest/dsb.txt
@@ -1,9 +1,7 @@
-# Test data for unit conversions
-#  Copyright © 1991-2023 Unicode, Inc.
+# Test data for Person Name Data#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-#
 # CLDR person name formatting test data for: dsb
 #
 # Test lines have the following structure:
diff --git a/icu4c/source/test/testdata/cldr/personNameTest/el.txt b/icu4c/source/test/testdata/cldr/personNameTest/el.txt
index b7ad436f9d8..efb02e5a2c0 100644
--- a/icu4c/source/test/testdata/cldr/personNameTest/el.txt
+++ b/icu4c/source/test/testdata/cldr/personNameTest/el.txt
@@ -1,9 +1,7 @@
-# Test data for unit conversions
-#  Copyright © 1991-2023 Unicode, Inc.
+# Test data for Person Name Data#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-#
 # CLDR person name formatting test data for: el
 #
 # Test lines have the following structure:
diff --git a/icu4c/source/test/testdata/cldr/personNameTest/en.txt b/icu4c/source/test/testdata/cldr/personNameTest/en.txt
index 06f447f2bfc..a42fd2b0cc7 100644
--- a/icu4c/source/test/testdata/cldr/personNameTest/en.txt
+++ b/icu4c/source/test/testdata/cldr/personNameTest/en.txt
@@ -1,9 +1,7 @@
-# Test data for unit conversions
-#  Copyright © 1991-2023 Unicode, Inc.
+# Test data for Person Name Data#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-#
 # CLDR person name formatting test data for: en
 #
 # Test lines have the following structure:
diff --git a/icu4c/source/test/testdata/cldr/personNameTest/es.txt b/icu4c/source/test/testdata/cldr/personNameTest/es.txt
index 3cb56375b91..27ac0d37efd 100644
--- a/icu4c/source/test/testdata/cldr/personNameTest/es.txt
+++ b/icu4c/source/test/testdata/cldr/personNameTest/es.txt
@@ -1,9 +1,7 @@
-# Test data for unit conversions
-#  Copyright © 1991-2023 Unicode, Inc.
+# Test data for Person Name Data#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-#
 # CLDR person name formatting test data for: es
 #
 # Test lines have the following structure:
diff --git a/icu4c/source/test/testdata/cldr/personNameTest/et.txt b/icu4c/source/test/testdata/cldr/personNameTest/et.txt
index 543ce3eb954..57194bffbd8 100644
--- a/icu4c/source/test/testdata/cldr/personNameTest/et.txt
+++ b/icu4c/source/test/testdata/cldr/personNameTest/et.txt
@@ -1,9 +1,7 @@
-# Test data for unit conversions
-#  Copyright © 1991-2023 Unicode, Inc.
+# Test data for Person Name Data#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-#
 # CLDR person name formatting test data for: et
 #
 # Test lines have the following structure:
diff --git a/icu4c/source/test/testdata/cldr/personNameTest/eu.txt b/icu4c/source/test/testdata/cldr/personNameTest/eu.txt
index eb47d520f42..9b178987347 100644
--- a/icu4c/source/test/testdata/cldr/personNameTest/eu.txt
+++ b/icu4c/source/test/testdata/cldr/personNameTest/eu.txt
@@ -1,9 +1,7 @@
-# Test data for unit conversions
-#  Copyright © 1991-2023 Unicode, Inc.
+# Test data for Person Name Data#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-#
 # CLDR person name formatting test data for: eu
 #
 # Test lines have the following structure:
diff --git a/icu4c/source/test/testdata/cldr/personNameTest/fa.txt b/icu4c/source/test/testdata/cldr/personNameTest/fa.txt
index ee9efab2b5c..7aa012fd721 100644
--- a/icu4c/source/test/testdata/cldr/personNameTest/fa.txt
+++ b/icu4c/source/test/testdata/cldr/personNameTest/fa.txt
@@ -1,9 +1,7 @@
-# Test data for unit conversions
-#  Copyright © 1991-2023 Unicode, Inc.
+# Test data for Person Name Data#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-#
 # CLDR person name formatting test data for: fa
 #
 # Test lines have the following structure:
diff --git a/icu4c/source/test/testdata/cldr/personNameTest/fi.txt b/icu4c/source/test/testdata/cldr/personNameTest/fi.txt
index 7a456e3907d..8d2754c40c5 100644
--- a/icu4c/source/test/testdata/cldr/personNameTest/fi.txt
+++ b/icu4c/source/test/testdata/cldr/personNameTest/fi.txt
@@ -1,9 +1,7 @@
-# Test data for unit conversions
-#  Copyright © 1991-2023 Unicode, Inc.
+# Test data for Person Name Data#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-#
 # CLDR person name formatting test data for: fi
 #
 # Test lines have the following structure:
diff --git a/icu4c/source/test/testdata/cldr/personNameTest/fil.txt b/icu4c/source/test/testdata/cldr/personNameTest/fil.txt
index c966189a0b6..601fa2b2304 100644
--- a/icu4c/source/test/testdata/cldr/personNameTest/fil.txt
+++ b/icu4c/source/test/testdata/cldr/personNameTest/fil.txt
@@ -1,9 +1,7 @@
-# Test data for unit conversions
-#  Copyright © 1991-2023 Unicode, Inc.
+# Test data for Person Name Data#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-#
 # CLDR person name formatting test data for: fil
 #
 # Test lines have the following structure:
diff --git a/icu4c/source/test/testdata/cldr/personNameTest/fr.txt b/icu4c/source/test/testdata/cldr/personNameTest/fr.txt
index fba3bd02fc2..2e429df078c 100644
--- a/icu4c/source/test/testdata/cldr/personNameTest/fr.txt
+++ b/icu4c/source/test/testdata/cldr/personNameTest/fr.txt
@@ -1,9 +1,7 @@
-# Test data for unit conversions
-#  Copyright © 1991-2023 Unicode, Inc.
+# Test data for Person Name Data#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-#
 # CLDR person name formatting test data for: fr
 #
 # Test lines have the following structure:
diff --git a/icu4c/source/test/testdata/cldr/personNameTest/ga.txt b/icu4c/source/test/testdata/cldr/personNameTest/ga.txt
index 3aba9ec8575..15d76693551 100644
--- a/icu4c/source/test/testdata/cldr/personNameTest/ga.txt
+++ b/icu4c/source/test/testdata/cldr/personNameTest/ga.txt
@@ -1,9 +1,7 @@
-# Test data for unit conversions
-#  Copyright © 1991-2023 Unicode, Inc.
+# Test data for Person Name Data#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-#
 # CLDR person name formatting test data for: ga
 #
 # Test lines have the following structure:
diff --git a/icu4c/source/test/testdata/cldr/personNameTest/gd.txt b/icu4c/source/test/testdata/cldr/personNameTest/gd.txt
index c20b602147a..ca8f8428bcf 100644
--- a/icu4c/source/test/testdata/cldr/personNameTest/gd.txt
+++ b/icu4c/source/test/testdata/cldr/personNameTest/gd.txt
@@ -1,9 +1,7 @@
-# Test data for unit conversions
-#  Copyright © 1991-2023 Unicode, Inc.
+# Test data for Person Name Data#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-#
 # CLDR person name formatting test data for: gd
 #
 # Test lines have the following structure:
diff --git a/icu4c/source/test/testdata/cldr/personNameTest/gl.txt b/icu4c/source/test/testdata/cldr/personNameTest/gl.txt
index a05b02af47d..b9be866f021 100644
--- a/icu4c/source/test/testdata/cldr/personNameTest/gl.txt
+++ b/icu4c/source/test/testdata/cldr/personNameTest/gl.txt
@@ -1,9 +1,7 @@
-# Test data for unit conversions
-#  Copyright © 1991-2023 Unicode, Inc.
+# Test data for Person Name Data#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-#
 # CLDR person name formatting test data for: gl
 #
 # Test lines have the following structure:
diff --git a/icu4c/source/test/testdata/cldr/personNameTest/gu.txt b/icu4c/source/test/testdata/cldr/personNameTest/gu.txt
index aa7aa5c2696..1ed81d7b14e 100644
--- a/icu4c/source/test/testdata/cldr/personNameTest/gu.txt
+++ b/icu4c/source/test/testdata/cldr/personNameTest/gu.txt
@@ -1,9 +1,7 @@
-# Test data for unit conversions
-#  Copyright © 1991-2023 Unicode, Inc.
+# Test data for Person Name Data#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-#
 # CLDR person name formatting test data for: gu
 #
 # Test lines have the following structure:
diff --git a/icu4c/source/test/testdata/cldr/personNameTest/ha.txt b/icu4c/source/test/testdata/cldr/personNameTest/ha.txt
index 474b7a3c3ad..34212aad0c5 100644
--- a/icu4c/source/test/testdata/cldr/personNameTest/ha.txt
+++ b/icu4c/source/test/testdata/cldr/personNameTest/ha.txt
@@ -1,9 +1,7 @@
-# Test data for unit conversions
-#  Copyright © 1991-2023 Unicode, Inc.
+# Test data for Person Name Data#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-#
 # CLDR person name formatting test data for: ha
 #
 # Test lines have the following structure:
diff --git a/icu4c/source/test/testdata/cldr/personNameTest/he.txt b/icu4c/source/test/testdata/cldr/personNameTest/he.txt
index adccf761389..f9673290e00 100644
--- a/icu4c/source/test/testdata/cldr/personNameTest/he.txt
+++ b/icu4c/source/test/testdata/cldr/personNameTest/he.txt
@@ -1,9 +1,7 @@
-# Test data for unit conversions
-#  Copyright © 1991-2023 Unicode, Inc.
+# Test data for Person Name Data#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-#
 # CLDR person name formatting test data for: he
 #
 # Test lines have the following structure:
diff --git a/icu4c/source/test/testdata/cldr/personNameTest/hi.txt b/icu4c/source/test/testdata/cldr/personNameTest/hi.txt
index d9021e942c6..9067abba3f5 100644
--- a/icu4c/source/test/testdata/cldr/personNameTest/hi.txt
+++ b/icu4c/source/test/testdata/cldr/personNameTest/hi.txt
@@ -1,9 +1,7 @@
-# Test data for unit conversions
-#  Copyright © 1991-2023 Unicode, Inc.
+# Test data for Person Name Data#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-#
 # CLDR person name formatting test data for: hi
 #
 # Test lines have the following structure:
diff --git a/icu4c/source/test/testdata/cldr/personNameTest/hi_Latn.txt b/icu4c/source/test/testdata/cldr/personNameTest/hi_Latn.txt
index 4bac4f3444e..ae746e392cd 100644
--- a/icu4c/source/test/testdata/cldr/personNameTest/hi_Latn.txt
+++ b/icu4c/source/test/testdata/cldr/personNameTest/hi_Latn.txt
@@ -1,9 +1,7 @@
-# Test data for unit conversions
-#  Copyright © 1991-2023 Unicode, Inc.
+# Test data for Person Name Data#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-#
 # CLDR person name formatting test data for: hi_Latn
 #
 # Test lines have the following structure:
diff --git a/icu4c/source/test/testdata/cldr/personNameTest/hr.txt b/icu4c/source/test/testdata/cldr/personNameTest/hr.txt
index c8b4c45082a..86893b7d4c8 100644
--- a/icu4c/source/test/testdata/cldr/personNameTest/hr.txt
+++ b/icu4c/source/test/testdata/cldr/personNameTest/hr.txt
@@ -1,9 +1,7 @@
-# Test data for unit conversions
-#  Copyright © 1991-2023 Unicode, Inc.
+# Test data for Person Name Data#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-#
 # CLDR person name formatting test data for: hr
 #
 # Test lines have the following structure:
diff --git a/icu4c/source/test/testdata/cldr/personNameTest/hsb.txt b/icu4c/source/test/testdata/cldr/personNameTest/hsb.txt
index 40fa1470c17..689c04d457f 100644
--- a/icu4c/source/test/testdata/cldr/personNameTest/hsb.txt
+++ b/icu4c/source/test/testdata/cldr/personNameTest/hsb.txt
@@ -1,9 +1,7 @@
-# Test data for unit conversions
-#  Copyright © 1991-2023 Unicode, Inc.
+# Test data for Person Name Data#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-#
 # CLDR person name formatting test data for: hsb
 #
 # Test lines have the following structure:
diff --git a/icu4c/source/test/testdata/cldr/personNameTest/hu.txt b/icu4c/source/test/testdata/cldr/personNameTest/hu.txt
index ffd6167bba5..8d3332d1fa4 100644
--- a/icu4c/source/test/testdata/cldr/personNameTest/hu.txt
+++ b/icu4c/source/test/testdata/cldr/personNameTest/hu.txt
@@ -1,9 +1,7 @@
-# Test data for unit conversions
-#  Copyright © 1991-2023 Unicode, Inc.
+# Test data for Person Name Data#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-#
 # CLDR person name formatting test data for: hu
 #
 # Test lines have the following structure:
diff --git a/icu4c/source/test/testdata/cldr/personNameTest/hy.txt b/icu4c/source/test/testdata/cldr/personNameTest/hy.txt
index 98390483c60..db0833793e0 100644
--- a/icu4c/source/test/testdata/cldr/personNameTest/hy.txt
+++ b/icu4c/source/test/testdata/cldr/personNameTest/hy.txt
@@ -1,9 +1,7 @@
-# Test data for unit conversions
-#  Copyright © 1991-2023 Unicode, Inc.
+# Test data for Person Name Data#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-#
 # CLDR person name formatting test data for: hy
 #
 # Test lines have the following structure:
diff --git a/icu4c/source/test/testdata/cldr/personNameTest/id.txt b/icu4c/source/test/testdata/cldr/personNameTest/id.txt
index 0069dcc041f..9faeb2d2bd0 100644
--- a/icu4c/source/test/testdata/cldr/personNameTest/id.txt
+++ b/icu4c/source/test/testdata/cldr/personNameTest/id.txt
@@ -1,9 +1,7 @@
-# Test data for unit conversions
-#  Copyright © 1991-2023 Unicode, Inc.
+# Test data for Person Name Data#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-#
 # CLDR person name formatting test data for: id
 #
 # Test lines have the following structure:
diff --git a/icu4c/source/test/testdata/cldr/personNameTest/ig.txt b/icu4c/source/test/testdata/cldr/personNameTest/ig.txt
index ba7c854cbbc..0889c0519ea 100644
--- a/icu4c/source/test/testdata/cldr/personNameTest/ig.txt
+++ b/icu4c/source/test/testdata/cldr/personNameTest/ig.txt
@@ -1,9 +1,7 @@
-# Test data for unit conversions
-#  Copyright © 1991-2023 Unicode, Inc.
+# Test data for Person Name Data#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-#
 # CLDR person name formatting test data for: ig
 #
 # Test lines have the following structure:
diff --git a/icu4c/source/test/testdata/cldr/personNameTest/is.txt b/icu4c/source/test/testdata/cldr/personNameTest/is.txt
index f276fc1c86c..26adf5d851a 100644
--- a/icu4c/source/test/testdata/cldr/personNameTest/is.txt
+++ b/icu4c/source/test/testdata/cldr/personNameTest/is.txt
@@ -1,9 +1,7 @@
-# Test data for unit conversions
-#  Copyright © 1991-2023 Unicode, Inc.
+# Test data for Person Name Data#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-#
 # CLDR person name formatting test data for: is
 #
 # Test lines have the following structure:
diff --git a/icu4c/source/test/testdata/cldr/personNameTest/it.txt b/icu4c/source/test/testdata/cldr/personNameTest/it.txt
index 94d1f430828..5fc5892eebe 100644
--- a/icu4c/source/test/testdata/cldr/personNameTest/it.txt
+++ b/icu4c/source/test/testdata/cldr/personNameTest/it.txt
@@ -1,9 +1,7 @@
-# Test data for unit conversions
-#  Copyright © 1991-2023 Unicode, Inc.
+# Test data for Person Name Data#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-#
 # CLDR person name formatting test data for: it
 #
 # Test lines have the following structure:
diff --git a/icu4c/source/test/testdata/cldr/personNameTest/ja.txt b/icu4c/source/test/testdata/cldr/personNameTest/ja.txt
index da3fd82e45d..a0629925cd1 100644
--- a/icu4c/source/test/testdata/cldr/personNameTest/ja.txt
+++ b/icu4c/source/test/testdata/cldr/personNameTest/ja.txt
@@ -1,9 +1,7 @@
-# Test data for unit conversions
-#  Copyright © 1991-2023 Unicode, Inc.
+# Test data for Person Name Data#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-#
 # CLDR person name formatting test data for: ja
 #
 # Test lines have the following structure:
diff --git a/icu4c/source/test/testdata/cldr/personNameTest/jv.txt b/icu4c/source/test/testdata/cldr/personNameTest/jv.txt
index ecd4f818098..838a49c389c 100644
--- a/icu4c/source/test/testdata/cldr/personNameTest/jv.txt
+++ b/icu4c/source/test/testdata/cldr/personNameTest/jv.txt
@@ -1,9 +1,7 @@
-# Test data for unit conversions
-#  Copyright © 1991-2023 Unicode, Inc.
+# Test data for Person Name Data#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-#
 # CLDR person name formatting test data for: jv
 #
 # Test lines have the following structure:
diff --git a/icu4c/source/test/testdata/cldr/personNameTest/ka.txt b/icu4c/source/test/testdata/cldr/personNameTest/ka.txt
index ced01ad4d5f..9ee4ffb65d2 100644
--- a/icu4c/source/test/testdata/cldr/personNameTest/ka.txt
+++ b/icu4c/source/test/testdata/cldr/personNameTest/ka.txt
@@ -1,9 +1,7 @@
-# Test data for unit conversions
-#  Copyright © 1991-2023 Unicode, Inc.
+# Test data for Person Name Data#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-#
 # CLDR person name formatting test data for: ka
 #
 # Test lines have the following structure:
diff --git a/icu4c/source/test/testdata/cldr/personNameTest/kk.txt b/icu4c/source/test/testdata/cldr/personNameTest/kk.txt
index 2a46fc875e5..bed9bb7603b 100644
--- a/icu4c/source/test/testdata/cldr/personNameTest/kk.txt
+++ b/icu4c/source/test/testdata/cldr/personNameTest/kk.txt
@@ -1,9 +1,7 @@
-# Test data for unit conversions
-#  Copyright © 1991-2023 Unicode, Inc.
+# Test data for Person Name Data#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-#
 # CLDR person name formatting test data for: kk
 #
 # Test lines have the following structure:
diff --git a/icu4c/source/test/testdata/cldr/personNameTest/km.txt b/icu4c/source/test/testdata/cldr/personNameTest/km.txt
index e2f529fbd71..6770db302c1 100644
--- a/icu4c/source/test/testdata/cldr/personNameTest/km.txt
+++ b/icu4c/source/test/testdata/cldr/personNameTest/km.txt
@@ -1,9 +1,7 @@
-# Test data for unit conversions
-#  Copyright © 1991-2023 Unicode, Inc.
+# Test data for Person Name Data#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-#
 # CLDR person name formatting test data for: km
 #
 # Test lines have the following structure:
diff --git a/icu4c/source/test/testdata/cldr/personNameTest/kn.txt b/icu4c/source/test/testdata/cldr/personNameTest/kn.txt
index 295c955b8f2..dd226e40739 100644
--- a/icu4c/source/test/testdata/cldr/personNameTest/kn.txt
+++ b/icu4c/source/test/testdata/cldr/personNameTest/kn.txt
@@ -1,9 +1,7 @@
-# Test data for unit conversions
-#  Copyright © 1991-2023 Unicode, Inc.
+# Test data for Person Name Data#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-#
 # CLDR person name formatting test data for: kn
 #
 # Test lines have the following structure:
diff --git a/icu4c/source/test/testdata/cldr/personNameTest/ko.txt b/icu4c/source/test/testdata/cldr/personNameTest/ko.txt
index a04f3bc9173..90a3bf4bf83 100644
--- a/icu4c/source/test/testdata/cldr/personNameTest/ko.txt
+++ b/icu4c/source/test/testdata/cldr/personNameTest/ko.txt
@@ -1,9 +1,7 @@
-# Test data for unit conversions
-#  Copyright © 1991-2023 Unicode, Inc.
+# Test data for Person Name Data#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-#
 # CLDR person name formatting test data for: ko
 #
 # Test lines have the following structure:
diff --git a/icu4c/source/test/testdata/cldr/personNameTest/kok.txt b/icu4c/source/test/testdata/cldr/personNameTest/kok.txt
index aef93c2ef85..6b177c1497b 100644
--- a/icu4c/source/test/testdata/cldr/personNameTest/kok.txt
+++ b/icu4c/source/test/testdata/cldr/personNameTest/kok.txt
@@ -1,9 +1,7 @@
-# Test data for unit conversions
-#  Copyright © 1991-2023 Unicode, Inc.
+# Test data for Person Name Data#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-#
 # CLDR person name formatting test data for: kok
 #
 # Test lines have the following structure:
diff --git a/icu4c/source/test/testdata/cldr/personNameTest/ky.txt b/icu4c/source/test/testdata/cldr/personNameTest/ky.txt
index bdc49df6eef..bf66de4fca5 100644
--- a/icu4c/source/test/testdata/cldr/personNameTest/ky.txt
+++ b/icu4c/source/test/testdata/cldr/personNameTest/ky.txt
@@ -1,9 +1,7 @@
-# Test data for unit conversions
-#  Copyright © 1991-2023 Unicode, Inc.
+# Test data for Person Name Data#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-#
 # CLDR person name formatting test data for: ky
 #
 # Test lines have the following structure:
diff --git a/icu4c/source/test/testdata/cldr/personNameTest/lo.txt b/icu4c/source/test/testdata/cldr/personNameTest/lo.txt
index 094259ed568..9cd5bfc7cbd 100644
--- a/icu4c/source/test/testdata/cldr/personNameTest/lo.txt
+++ b/icu4c/source/test/testdata/cldr/personNameTest/lo.txt
@@ -1,9 +1,7 @@
-# Test data for unit conversions
-#  Copyright © 1991-2023 Unicode, Inc.
+# Test data for Person Name Data#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-#
 # CLDR person name formatting test data for: lo
 #
 # Test lines have the following structure:
diff --git a/icu4c/source/test/testdata/cldr/personNameTest/lt.txt b/icu4c/source/test/testdata/cldr/personNameTest/lt.txt
index ab79d6e884b..40b517de822 100644
--- a/icu4c/source/test/testdata/cldr/personNameTest/lt.txt
+++ b/icu4c/source/test/testdata/cldr/personNameTest/lt.txt
@@ -1,9 +1,7 @@
-# Test data for unit conversions
-#  Copyright © 1991-2023 Unicode, Inc.
+# Test data for Person Name Data#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-#
 # CLDR person name formatting test data for: lt
 #
 # Test lines have the following structure:
diff --git a/icu4c/source/test/testdata/cldr/personNameTest/lv.txt b/icu4c/source/test/testdata/cldr/personNameTest/lv.txt
index d7a6d14822d..7efd7816671 100644
--- a/icu4c/source/test/testdata/cldr/personNameTest/lv.txt
+++ b/icu4c/source/test/testdata/cldr/personNameTest/lv.txt
@@ -1,9 +1,7 @@
-# Test data for unit conversions
-#  Copyright © 1991-2023 Unicode, Inc.
+# Test data for Person Name Data#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-#
 # CLDR person name formatting test data for: lv
 #
 # Test lines have the following structure:
diff --git a/icu4c/source/test/testdata/cldr/personNameTest/mk.txt b/icu4c/source/test/testdata/cldr/personNameTest/mk.txt
index fe66a9babd2..2679f9cab14 100644
--- a/icu4c/source/test/testdata/cldr/personNameTest/mk.txt
+++ b/icu4c/source/test/testdata/cldr/personNameTest/mk.txt
@@ -1,9 +1,7 @@
-# Test data for unit conversions
-#  Copyright © 1991-2023 Unicode, Inc.
+# Test data for Person Name Data#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-#
 # CLDR person name formatting test data for: mk
 #
 # Test lines have the following structure:
diff --git a/icu4c/source/test/testdata/cldr/personNameTest/ml.txt b/icu4c/source/test/testdata/cldr/personNameTest/ml.txt
index a2d58316764..aa0bb42d420 100644
--- a/icu4c/source/test/testdata/cldr/personNameTest/ml.txt
+++ b/icu4c/source/test/testdata/cldr/personNameTest/ml.txt
@@ -1,9 +1,7 @@
-# Test data for unit conversions
-#  Copyright © 1991-2023 Unicode, Inc.
+# Test data for Person Name Data#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-#
 # CLDR person name formatting test data for: ml
 #
 # Test lines have the following structure:
diff --git a/icu4c/source/test/testdata/cldr/personNameTest/mn.txt b/icu4c/source/test/testdata/cldr/personNameTest/mn.txt
index 23bff1e29ec..297a34df11e 100644
--- a/icu4c/source/test/testdata/cldr/personNameTest/mn.txt
+++ b/icu4c/source/test/testdata/cldr/personNameTest/mn.txt
@@ -1,9 +1,7 @@
-# Test data for unit conversions
-#  Copyright © 1991-2023 Unicode, Inc.
+# Test data for Person Name Data#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-#
 # CLDR person name formatting test data for: mn
 #
 # Test lines have the following structure:
diff --git a/icu4c/source/test/testdata/cldr/personNameTest/mr.txt b/icu4c/source/test/testdata/cldr/personNameTest/mr.txt
index f42c24ed6d1..5f857500bd9 100644
--- a/icu4c/source/test/testdata/cldr/personNameTest/mr.txt
+++ b/icu4c/source/test/testdata/cldr/personNameTest/mr.txt
@@ -1,9 +1,7 @@
-# Test data for unit conversions
-#  Copyright © 1991-2023 Unicode, Inc.
+# Test data for Person Name Data#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-#
 # CLDR person name formatting test data for: mr
 #
 # Test lines have the following structure:
diff --git a/icu4c/source/test/testdata/cldr/personNameTest/ms.txt b/icu4c/source/test/testdata/cldr/personNameTest/ms.txt
index 7d046ce6a17..dac327db5df 100644
--- a/icu4c/source/test/testdata/cldr/personNameTest/ms.txt
+++ b/icu4c/source/test/testdata/cldr/personNameTest/ms.txt
@@ -1,9 +1,7 @@
-# Test data for unit conversions
-#  Copyright © 1991-2023 Unicode, Inc.
+# Test data for Person Name Data#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-#
 # CLDR person name formatting test data for: ms
 #
 # Test lines have the following structure:
diff --git a/icu4c/source/test/testdata/cldr/personNameTest/my.txt b/icu4c/source/test/testdata/cldr/personNameTest/my.txt
index e7fcdfcb50c..aa50cdf674a 100644
--- a/icu4c/source/test/testdata/cldr/personNameTest/my.txt
+++ b/icu4c/source/test/testdata/cldr/personNameTest/my.txt
@@ -1,9 +1,7 @@
-# Test data for unit conversions
-#  Copyright © 1991-2023 Unicode, Inc.
+# Test data for Person Name Data#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-#
 # CLDR person name formatting test data for: my
 #
 # Test lines have the following structure:
diff --git a/icu4c/source/test/testdata/cldr/personNameTest/ne.txt b/icu4c/source/test/testdata/cldr/personNameTest/ne.txt
index 771c007ea63..9ea9c2ebb97 100644
--- a/icu4c/source/test/testdata/cldr/personNameTest/ne.txt
+++ b/icu4c/source/test/testdata/cldr/personNameTest/ne.txt
@@ -1,9 +1,7 @@
-# Test data for unit conversions
-#  Copyright © 1991-2023 Unicode, Inc.
+# Test data for Person Name Data#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-#
 # CLDR person name formatting test data for: ne
 #
 # Test lines have the following structure:
diff --git a/icu4c/source/test/testdata/cldr/personNameTest/nl.txt b/icu4c/source/test/testdata/cldr/personNameTest/nl.txt
index dcb197e3943..7a30d790de0 100644
--- a/icu4c/source/test/testdata/cldr/personNameTest/nl.txt
+++ b/icu4c/source/test/testdata/cldr/personNameTest/nl.txt
@@ -1,9 +1,7 @@
-# Test data for unit conversions
-#  Copyright © 1991-2023 Unicode, Inc.
+# Test data for Person Name Data#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-#
 # CLDR person name formatting test data for: nl
 #
 # Test lines have the following structure:
diff --git a/icu4c/source/test/testdata/cldr/personNameTest/nn.txt b/icu4c/source/test/testdata/cldr/personNameTest/nn.txt
index 0f3ffeb6308..9dd307756d2 100644
--- a/icu4c/source/test/testdata/cldr/personNameTest/nn.txt
+++ b/icu4c/source/test/testdata/cldr/personNameTest/nn.txt
@@ -1,9 +1,7 @@
-# Test data for unit conversions
-#  Copyright © 1991-2023 Unicode, Inc.
+# Test data for Person Name Data#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-#
 # CLDR person name formatting test data for: nn
 #
 # Test lines have the following structure:
diff --git a/icu4c/source/test/testdata/cldr/personNameTest/no.txt b/icu4c/source/test/testdata/cldr/personNameTest/no.txt
index 86734e65359..1935aa4c718 100644
--- a/icu4c/source/test/testdata/cldr/personNameTest/no.txt
+++ b/icu4c/source/test/testdata/cldr/personNameTest/no.txt
@@ -1,9 +1,7 @@
-# Test data for unit conversions
-#  Copyright © 1991-2023 Unicode, Inc.
+# Test data for Person Name Data#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-#
 # CLDR person name formatting test data for: no
 #
 # Test lines have the following structure:
diff --git a/icu4c/source/test/testdata/cldr/personNameTest/or.txt b/icu4c/source/test/testdata/cldr/personNameTest/or.txt
index fc4c7931ebe..0bc242952d0 100644
--- a/icu4c/source/test/testdata/cldr/personNameTest/or.txt
+++ b/icu4c/source/test/testdata/cldr/personNameTest/or.txt
@@ -1,9 +1,7 @@
-# Test data for unit conversions
-#  Copyright © 1991-2023 Unicode, Inc.
+# Test data for Person Name Data#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-#
 # CLDR person name formatting test data for: or
 #
 # Test lines have the following structure:
diff --git a/icu4c/source/test/testdata/cldr/personNameTest/pa.txt b/icu4c/source/test/testdata/cldr/personNameTest/pa.txt
index 55ce96617f3..b51a4177f51 100644
--- a/icu4c/source/test/testdata/cldr/personNameTest/pa.txt
+++ b/icu4c/source/test/testdata/cldr/personNameTest/pa.txt
@@ -1,9 +1,7 @@
-# Test data for unit conversions
-#  Copyright © 1991-2023 Unicode, Inc.
+# Test data for Person Name Data#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-#
 # CLDR person name formatting test data for: pa
 #
 # Test lines have the following structure:
diff --git a/icu4c/source/test/testdata/cldr/personNameTest/pl.txt b/icu4c/source/test/testdata/cldr/personNameTest/pl.txt
index dc2c1ff7a79..f11f991cc9d 100644
--- a/icu4c/source/test/testdata/cldr/personNameTest/pl.txt
+++ b/icu4c/source/test/testdata/cldr/personNameTest/pl.txt
@@ -1,9 +1,7 @@
-# Test data for unit conversions
-#  Copyright © 1991-2023 Unicode, Inc.
+# Test data for Person Name Data#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-#
 # CLDR person name formatting test data for: pl
 #
 # Test lines have the following structure:
diff --git a/icu4c/source/test/testdata/cldr/personNameTest/ps.txt b/icu4c/source/test/testdata/cldr/personNameTest/ps.txt
index b640ee021ba..fb76dd5eaed 100644
--- a/icu4c/source/test/testdata/cldr/personNameTest/ps.txt
+++ b/icu4c/source/test/testdata/cldr/personNameTest/ps.txt
@@ -1,9 +1,7 @@
-# Test data for unit conversions
-#  Copyright © 1991-2023 Unicode, Inc.
+# Test data for Person Name Data#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-#
 # CLDR person name formatting test data for: ps
 #
 # Test lines have the following structure:
diff --git a/icu4c/source/test/testdata/cldr/personNameTest/pt.txt b/icu4c/source/test/testdata/cldr/personNameTest/pt.txt
index d7d9f994815..10908dd7bea 100644
--- a/icu4c/source/test/testdata/cldr/personNameTest/pt.txt
+++ b/icu4c/source/test/testdata/cldr/personNameTest/pt.txt
@@ -1,9 +1,7 @@
-# Test data for unit conversions
-#  Copyright © 1991-2023 Unicode, Inc.
+# Test data for Person Name Data#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-#
 # CLDR person name formatting test data for: pt
 #
 # Test lines have the following structure:
diff --git a/icu4c/source/test/testdata/cldr/personNameTest/qu.txt b/icu4c/source/test/testdata/cldr/personNameTest/qu.txt
index 6122737fcd8..d5fb411f6fd 100644
--- a/icu4c/source/test/testdata/cldr/personNameTest/qu.txt
+++ b/icu4c/source/test/testdata/cldr/personNameTest/qu.txt
@@ -1,9 +1,7 @@
-# Test data for unit conversions
-#  Copyright © 1991-2023 Unicode, Inc.
+# Test data for Person Name Data#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-#
 # CLDR person name formatting test data for: qu
 #
 # Test lines have the following structure:
diff --git a/icu4c/source/test/testdata/cldr/personNameTest/ro.txt b/icu4c/source/test/testdata/cldr/personNameTest/ro.txt
index 5b8e6b8e05c..0e1c5c3dd94 100644
--- a/icu4c/source/test/testdata/cldr/personNameTest/ro.txt
+++ b/icu4c/source/test/testdata/cldr/personNameTest/ro.txt
@@ -1,9 +1,7 @@
-# Test data for unit conversions
-#  Copyright © 1991-2023 Unicode, Inc.
+# Test data for Person Name Data#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-#
 # CLDR person name formatting test data for: ro
 #
 # Test lines have the following structure:
diff --git a/icu4c/source/test/testdata/cldr/personNameTest/ru.txt b/icu4c/source/test/testdata/cldr/personNameTest/ru.txt
index 070e3a3d5d1..79b8426069c 100644
--- a/icu4c/source/test/testdata/cldr/personNameTest/ru.txt
+++ b/icu4c/source/test/testdata/cldr/personNameTest/ru.txt
@@ -1,9 +1,7 @@
-# Test data for unit conversions
-#  Copyright © 1991-2023 Unicode, Inc.
+# Test data for Person Name Data#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-#
 # CLDR person name formatting test data for: ru
 #
 # Test lines have the following structure:
diff --git a/icu4c/source/test/testdata/cldr/personNameTest/sc.txt b/icu4c/source/test/testdata/cldr/personNameTest/sc.txt
index 1c0c0cc60d6..f0580060ca8 100644
--- a/icu4c/source/test/testdata/cldr/personNameTest/sc.txt
+++ b/icu4c/source/test/testdata/cldr/personNameTest/sc.txt
@@ -1,9 +1,7 @@
-# Test data for unit conversions
-#  Copyright © 1991-2023 Unicode, Inc.
+# Test data for Person Name Data#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-#
 # CLDR person name formatting test data for: sc
 #
 # Test lines have the following structure:
diff --git a/icu4c/source/test/testdata/cldr/personNameTest/sd.txt b/icu4c/source/test/testdata/cldr/personNameTest/sd.txt
index 33fecc3e3a6..a8376573fd4 100644
--- a/icu4c/source/test/testdata/cldr/personNameTest/sd.txt
+++ b/icu4c/source/test/testdata/cldr/personNameTest/sd.txt
@@ -1,9 +1,7 @@
-# Test data for unit conversions
-#  Copyright © 1991-2023 Unicode, Inc.
+# Test data for Person Name Data#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-#
 # CLDR person name formatting test data for: sd
 #
 # Test lines have the following structure:
diff --git a/icu4c/source/test/testdata/cldr/personNameTest/si.txt b/icu4c/source/test/testdata/cldr/personNameTest/si.txt
index e3231077e4f..3a68439923a 100644
--- a/icu4c/source/test/testdata/cldr/personNameTest/si.txt
+++ b/icu4c/source/test/testdata/cldr/personNameTest/si.txt
@@ -1,9 +1,7 @@
-# Test data for unit conversions
-#  Copyright © 1991-2023 Unicode, Inc.
+# Test data for Person Name Data#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-#
 # CLDR person name formatting test data for: si
 #
 # Test lines have the following structure:
diff --git a/icu4c/source/test/testdata/cldr/personNameTest/sk.txt b/icu4c/source/test/testdata/cldr/personNameTest/sk.txt
index 39569e58ff5..c39d69b15b6 100644
--- a/icu4c/source/test/testdata/cldr/personNameTest/sk.txt
+++ b/icu4c/source/test/testdata/cldr/personNameTest/sk.txt
@@ -1,9 +1,7 @@
-# Test data for unit conversions
-#  Copyright © 1991-2023 Unicode, Inc.
+# Test data for Person Name Data#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-#
 # CLDR person name formatting test data for: sk
 #
 # Test lines have the following structure:
diff --git a/icu4c/source/test/testdata/cldr/personNameTest/sl.txt b/icu4c/source/test/testdata/cldr/personNameTest/sl.txt
index 6b0e0f7bc6b..3478023c367 100644
--- a/icu4c/source/test/testdata/cldr/personNameTest/sl.txt
+++ b/icu4c/source/test/testdata/cldr/personNameTest/sl.txt
@@ -1,9 +1,7 @@
-# Test data for unit conversions
-#  Copyright © 1991-2023 Unicode, Inc.
+# Test data for Person Name Data#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-#
 # CLDR person name formatting test data for: sl
 #
 # Test lines have the following structure:
diff --git a/icu4c/source/test/testdata/cldr/personNameTest/so.txt b/icu4c/source/test/testdata/cldr/personNameTest/so.txt
index b07186c7707..87f53812445 100644
--- a/icu4c/source/test/testdata/cldr/personNameTest/so.txt
+++ b/icu4c/source/test/testdata/cldr/personNameTest/so.txt
@@ -1,9 +1,7 @@
-# Test data for unit conversions
-#  Copyright © 1991-2023 Unicode, Inc.
+# Test data for Person Name Data#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-#
 # CLDR person name formatting test data for: so
 #
 # Test lines have the following structure:
diff --git a/icu4c/source/test/testdata/cldr/personNameTest/sq.txt b/icu4c/source/test/testdata/cldr/personNameTest/sq.txt
index e2f7e2d70be..8bb66d7fc1f 100644
--- a/icu4c/source/test/testdata/cldr/personNameTest/sq.txt
+++ b/icu4c/source/test/testdata/cldr/personNameTest/sq.txt
@@ -1,9 +1,7 @@
-# Test data for unit conversions
-#  Copyright © 1991-2023 Unicode, Inc.
+# Test data for Person Name Data#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-#
 # CLDR person name formatting test data for: sq
 #
 # Test lines have the following structure:
diff --git a/icu4c/source/test/testdata/cldr/personNameTest/sr.txt b/icu4c/source/test/testdata/cldr/personNameTest/sr.txt
index 2167976d02b..a158839a12c 100644
--- a/icu4c/source/test/testdata/cldr/personNameTest/sr.txt
+++ b/icu4c/source/test/testdata/cldr/personNameTest/sr.txt
@@ -1,9 +1,7 @@
-# Test data for unit conversions
-#  Copyright © 1991-2023 Unicode, Inc.
+# Test data for Person Name Data#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-#
 # CLDR person name formatting test data for: sr
 #
 # Test lines have the following structure:
diff --git a/icu4c/source/test/testdata/cldr/personNameTest/sr_Latn.txt b/icu4c/source/test/testdata/cldr/personNameTest/sr_Latn.txt
index fb8c4342ea5..b976e5c13d4 100644
--- a/icu4c/source/test/testdata/cldr/personNameTest/sr_Latn.txt
+++ b/icu4c/source/test/testdata/cldr/personNameTest/sr_Latn.txt
@@ -1,9 +1,7 @@
-# Test data for unit conversions
-#  Copyright © 1991-2023 Unicode, Inc.
+# Test data for Person Name Data#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-#
 # CLDR person name formatting test data for: sr_Latn
 #
 # Test lines have the following structure:
diff --git a/icu4c/source/test/testdata/cldr/personNameTest/sv.txt b/icu4c/source/test/testdata/cldr/personNameTest/sv.txt
index bde78126282..e71b7c7e6cb 100644
--- a/icu4c/source/test/testdata/cldr/personNameTest/sv.txt
+++ b/icu4c/source/test/testdata/cldr/personNameTest/sv.txt
@@ -1,9 +1,7 @@
-# Test data for unit conversions
-#  Copyright © 1991-2023 Unicode, Inc.
+# Test data for Person Name Data#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-#
 # CLDR person name formatting test data for: sv
 #
 # Test lines have the following structure:
diff --git a/icu4c/source/test/testdata/cldr/personNameTest/sw.txt b/icu4c/source/test/testdata/cldr/personNameTest/sw.txt
index 119cc16e849..3046d2a0536 100644
--- a/icu4c/source/test/testdata/cldr/personNameTest/sw.txt
+++ b/icu4c/source/test/testdata/cldr/personNameTest/sw.txt
@@ -1,9 +1,7 @@
-# Test data for unit conversions
-#  Copyright © 1991-2023 Unicode, Inc.
+# Test data for Person Name Data#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-#
 # CLDR person name formatting test data for: sw
 #
 # Test lines have the following structure:
diff --git a/icu4c/source/test/testdata/cldr/personNameTest/ta.txt b/icu4c/source/test/testdata/cldr/personNameTest/ta.txt
index 37cc63ea284..ce9b3e811da 100644
--- a/icu4c/source/test/testdata/cldr/personNameTest/ta.txt
+++ b/icu4c/source/test/testdata/cldr/personNameTest/ta.txt
@@ -1,9 +1,7 @@
-# Test data for unit conversions
-#  Copyright © 1991-2023 Unicode, Inc.
+# Test data for Person Name Data#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-#
 # CLDR person name formatting test data for: ta
 #
 # Test lines have the following structure:
diff --git a/icu4c/source/test/testdata/cldr/personNameTest/te.txt b/icu4c/source/test/testdata/cldr/personNameTest/te.txt
index 4e7b4dc1ae6..3f8a888d8fb 100644
--- a/icu4c/source/test/testdata/cldr/personNameTest/te.txt
+++ b/icu4c/source/test/testdata/cldr/personNameTest/te.txt
@@ -1,9 +1,7 @@
-# Test data for unit conversions
-#  Copyright © 1991-2023 Unicode, Inc.
+# Test data for Person Name Data#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-#
 # CLDR person name formatting test data for: te
 #
 # Test lines have the following structure:
diff --git a/icu4c/source/test/testdata/cldr/personNameTest/tg.txt b/icu4c/source/test/testdata/cldr/personNameTest/tg.txt
index e5e8f942488..9415a6f0b91 100644
--- a/icu4c/source/test/testdata/cldr/personNameTest/tg.txt
+++ b/icu4c/source/test/testdata/cldr/personNameTest/tg.txt
@@ -1,9 +1,7 @@
-# Test data for unit conversions
-#  Copyright © 1991-2023 Unicode, Inc.
+# Test data for Person Name Data#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-#
 # CLDR person name formatting test data for: tg
 #
 # Test lines have the following structure:
diff --git a/icu4c/source/test/testdata/cldr/personNameTest/th.txt b/icu4c/source/test/testdata/cldr/personNameTest/th.txt
index 8ae86cbb398..cc77a8d9fe0 100644
--- a/icu4c/source/test/testdata/cldr/personNameTest/th.txt
+++ b/icu4c/source/test/testdata/cldr/personNameTest/th.txt
@@ -1,9 +1,7 @@
-# Test data for unit conversions
-#  Copyright © 1991-2023 Unicode, Inc.
+# Test data for Person Name Data#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-#
 # CLDR person name formatting test data for: th
 #
 # Test lines have the following structure:
diff --git a/icu4c/source/test/testdata/cldr/personNameTest/ti.txt b/icu4c/source/test/testdata/cldr/personNameTest/ti.txt
index fc4873880db..7099857e43f 100644
--- a/icu4c/source/test/testdata/cldr/personNameTest/ti.txt
+++ b/icu4c/source/test/testdata/cldr/personNameTest/ti.txt
@@ -1,9 +1,7 @@
-# Test data for unit conversions
-#  Copyright © 1991-2023 Unicode, Inc.
+# Test data for Person Name Data#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-#
 # CLDR person name formatting test data for: ti
 #
 # Test lines have the following structure:
diff --git a/icu4c/source/test/testdata/cldr/personNameTest/tk.txt b/icu4c/source/test/testdata/cldr/personNameTest/tk.txt
index 25434d2a902..f443defee1f 100644
--- a/icu4c/source/test/testdata/cldr/personNameTest/tk.txt
+++ b/icu4c/source/test/testdata/cldr/personNameTest/tk.txt
@@ -1,9 +1,7 @@
-# Test data for unit conversions
-#  Copyright © 1991-2023 Unicode, Inc.
+# Test data for Person Name Data#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-#
 # CLDR person name formatting test data for: tk
 #
 # Test lines have the following structure:
diff --git a/icu4c/source/test/testdata/cldr/personNameTest/tr.txt b/icu4c/source/test/testdata/cldr/personNameTest/tr.txt
index f04baa7b06a..cd9726f3e52 100644
--- a/icu4c/source/test/testdata/cldr/personNameTest/tr.txt
+++ b/icu4c/source/test/testdata/cldr/personNameTest/tr.txt
@@ -1,9 +1,7 @@
-# Test data for unit conversions
-#  Copyright © 1991-2023 Unicode, Inc.
+# Test data for Person Name Data#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-#
 # CLDR person name formatting test data for: tr
 #
 # Test lines have the following structure:
diff --git a/icu4c/source/test/testdata/cldr/personNameTest/uk.txt b/icu4c/source/test/testdata/cldr/personNameTest/uk.txt
index eb599d84e5a..7b8f4b34fc9 100644
--- a/icu4c/source/test/testdata/cldr/personNameTest/uk.txt
+++ b/icu4c/source/test/testdata/cldr/personNameTest/uk.txt
@@ -1,9 +1,7 @@
-# Test data for unit conversions
-#  Copyright © 1991-2023 Unicode, Inc.
+# Test data for Person Name Data#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-#
 # CLDR person name formatting test data for: uk
 #
 # Test lines have the following structure:
diff --git a/icu4c/source/test/testdata/cldr/personNameTest/ur.txt b/icu4c/source/test/testdata/cldr/personNameTest/ur.txt
index 01958458782..acd818eceab 100644
--- a/icu4c/source/test/testdata/cldr/personNameTest/ur.txt
+++ b/icu4c/source/test/testdata/cldr/personNameTest/ur.txt
@@ -1,9 +1,7 @@
-# Test data for unit conversions
-#  Copyright © 1991-2023 Unicode, Inc.
+# Test data for Person Name Data#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-#
 # CLDR person name formatting test data for: ur
 #
 # Test lines have the following structure:
diff --git a/icu4c/source/test/testdata/cldr/personNameTest/uz.txt b/icu4c/source/test/testdata/cldr/personNameTest/uz.txt
index 07ab62850f8..e924ad71c2c 100644
--- a/icu4c/source/test/testdata/cldr/personNameTest/uz.txt
+++ b/icu4c/source/test/testdata/cldr/personNameTest/uz.txt
@@ -1,9 +1,7 @@
-# Test data for unit conversions
-#  Copyright © 1991-2023 Unicode, Inc.
+# Test data for Person Name Data#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-#
 # CLDR person name formatting test data for: uz
 #
 # Test lines have the following structure:
diff --git a/icu4c/source/test/testdata/cldr/personNameTest/vi.txt b/icu4c/source/test/testdata/cldr/personNameTest/vi.txt
index 895483649ea..bf7d4b32147 100644
--- a/icu4c/source/test/testdata/cldr/personNameTest/vi.txt
+++ b/icu4c/source/test/testdata/cldr/personNameTest/vi.txt
@@ -1,9 +1,7 @@
-# Test data for unit conversions
-#  Copyright © 1991-2023 Unicode, Inc.
+# Test data for Person Name Data#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-#
 # CLDR person name formatting test data for: vi
 #
 # Test lines have the following structure:
diff --git a/icu4c/source/test/testdata/cldr/personNameTest/wo.txt b/icu4c/source/test/testdata/cldr/personNameTest/wo.txt
index e16f3cffd1b..eefb1f11b40 100644
--- a/icu4c/source/test/testdata/cldr/personNameTest/wo.txt
+++ b/icu4c/source/test/testdata/cldr/personNameTest/wo.txt
@@ -1,9 +1,7 @@
-# Test data for unit conversions
-#  Copyright © 1991-2023 Unicode, Inc.
+# Test data for Person Name Data#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-#
 # CLDR person name formatting test data for: wo
 #
 # Test lines have the following structure:
diff --git a/icu4c/source/test/testdata/cldr/personNameTest/yo.txt b/icu4c/source/test/testdata/cldr/personNameTest/yo.txt
index fcb09dc7ee8..97a41cfb806 100644
--- a/icu4c/source/test/testdata/cldr/personNameTest/yo.txt
+++ b/icu4c/source/test/testdata/cldr/personNameTest/yo.txt
@@ -1,9 +1,7 @@
-# Test data for unit conversions
-#  Copyright © 1991-2023 Unicode, Inc.
+# Test data for Person Name Data#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-#
 # CLDR person name formatting test data for: yo
 #
 # Test lines have the following structure:
diff --git a/icu4c/source/test/testdata/cldr/personNameTest/yue.txt b/icu4c/source/test/testdata/cldr/personNameTest/yue.txt
index 845bd7b19c4..5be7d5a1e9e 100644
--- a/icu4c/source/test/testdata/cldr/personNameTest/yue.txt
+++ b/icu4c/source/test/testdata/cldr/personNameTest/yue.txt
@@ -1,9 +1,7 @@
-# Test data for unit conversions
-#  Copyright © 1991-2023 Unicode, Inc.
+# Test data for Person Name Data#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-#
 # CLDR person name formatting test data for: yue
 #
 # Test lines have the following structure:
diff --git a/icu4c/source/test/testdata/cldr/personNameTest/yue_Hans.txt b/icu4c/source/test/testdata/cldr/personNameTest/yue_Hans.txt
index ff6d9876015..09c45c70750 100644
--- a/icu4c/source/test/testdata/cldr/personNameTest/yue_Hans.txt
+++ b/icu4c/source/test/testdata/cldr/personNameTest/yue_Hans.txt
@@ -1,9 +1,7 @@
-# Test data for unit conversions
-#  Copyright © 1991-2023 Unicode, Inc.
+# Test data for Person Name Data#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-#
 # CLDR person name formatting test data for: yue_Hans
 #
 # Test lines have the following structure:
diff --git a/icu4c/source/test/testdata/cldr/personNameTest/zh.txt b/icu4c/source/test/testdata/cldr/personNameTest/zh.txt
index 1fa6bd3dc19..641dbcae624 100644
--- a/icu4c/source/test/testdata/cldr/personNameTest/zh.txt
+++ b/icu4c/source/test/testdata/cldr/personNameTest/zh.txt
@@ -1,9 +1,7 @@
-# Test data for unit conversions
-#  Copyright © 1991-2023 Unicode, Inc.
+# Test data for Person Name Data#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-#
 # CLDR person name formatting test data for: zh
 #
 # Test lines have the following structure:
diff --git a/icu4c/source/test/testdata/cldr/personNameTest/zh_Hant.txt b/icu4c/source/test/testdata/cldr/personNameTest/zh_Hant.txt
index 18698d5bf98..c2c73c05047 100644
--- a/icu4c/source/test/testdata/cldr/personNameTest/zh_Hant.txt
+++ b/icu4c/source/test/testdata/cldr/personNameTest/zh_Hant.txt
@@ -1,9 +1,7 @@
-# Test data for unit conversions
-#  Copyright © 1991-2023 Unicode, Inc.
+# Test data for Person Name Data#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-#
 # CLDR person name formatting test data for: zh_Hant
 #
 # Test lines have the following structure:
diff --git a/icu4c/source/test/testdata/cldr/personNameTest/zu.txt b/icu4c/source/test/testdata/cldr/personNameTest/zu.txt
index e9c2b0db57a..9c7eedb9a0d 100644
--- a/icu4c/source/test/testdata/cldr/personNameTest/zu.txt
+++ b/icu4c/source/test/testdata/cldr/personNameTest/zu.txt
@@ -1,9 +1,7 @@
-# Test data for unit conversions
-#  Copyright © 1991-2023 Unicode, Inc.
+# Test data for Person Name Data#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-#
 # CLDR person name formatting test data for: zu
 #
 # Test lines have the following structure:
diff --git a/icu4c/source/test/testdata/cldr/units/unitPreferencesTest.txt b/icu4c/source/test/testdata/cldr/units/unitPreferencesTest.txt
index 61abdcafd12..d48a9680ce4 100644
--- a/icu4c/source/test/testdata/cldr/units/unitPreferencesTest.txt
+++ b/icu4c/source/test/testdata/cldr/units/unitPreferencesTest.txt
@@ -1,8 +1,8 @@
 
 # Test data for unit preferences
-#  Copyright © 1991-2023 Unicode, Inc.
+#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 #
 # Format:
diff --git a/icu4c/source/test/testdata/cldr/units/unitsTest.txt b/icu4c/source/test/testdata/cldr/units/unitsTest.txt
index 233a9304ece..ea4820078f8 100644
--- a/icu4c/source/test/testdata/cldr/units/unitsTest.txt
+++ b/icu4c/source/test/testdata/cldr/units/unitsTest.txt
@@ -1,7 +1,7 @@
 # Test data for unit conversions
-#  Copyright © 1991-2023 Unicode, Inc.
+#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 #
 # Format:
@@ -182,6 +182,7 @@ resolution	;	pixel-per-inch	;	pixel-per-meter	;	5,000/127 * x	;	39370.08
 resolution	;	dot-per-centimeter	;	pixel-per-meter	;	100 * x	;	100000.0
 resolution	;	pixel-per-centimeter	;	pixel-per-meter	;	100 * x	;	100000.0
 solid-angle	;	steradian	;	square-revolution	;	4,290,444,930,214,144/169379976663492169 * x	;	25.3303
+speed	;	beaufort	;	meter-per-second	;	special:beaufort(x)	;	58.6
 speed	;	kilometer-per-hour	;	meter-per-second	;	2.5/9 * x	;	277.7778
 speed	;	mile-per-hour	;	meter-per-second	;	0.44704 * x	;	447.04
 speed	;	knot	;	meter-per-second	;	4.63/9 * x	;	514.4444
@@ -189,9 +190,9 @@ speed	;	meter-per-second	;	meter-per-second	;	1 * x	;	1,000.00
 substance-amount	;	item	;	item	;	1 * x	;	1,000.00
 substance-amount	;	mole	;	item	;	602,214,076,000,000,000,000,000 * x	;	6.022141E26
 temperature	;	rankine	;	kelvin	;	5/9 * x	;	555.5556
-temperature	;	fahrenheit	;	kelvin	;	5/9 * x - 2,298.35/9	;	810.9278
+temperature	;	fahrenheit	;	kelvin	;	5/9 * x + 2,298.35/9	;	810.9278
 temperature	;	kelvin	;	kelvin	;	1 * x	;	1,000.00
-temperature	;	celsius	;	kelvin	;	1 * x - 273.15	;	1273.15
+temperature	;	celsius	;	kelvin	;	1 * x + 273.15	;	1273.15
 typewidth	;	em	;	em	;	1 * x	;	1,000.00
 voltage	;	volt	;	kilogram-square-meter-per-cubic-second-ampere	;	1 * x	;	1000.0
 volume	;	drop	;	cubic-meter	;	0.0000001540287998046875/3 * x	;	5.134293E-5
diff --git a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/localeIdentifiers/likelySubtags.txt b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/localeIdentifiers/likelySubtags.txt
index 1f9e3557fff..b78342d301a 100644
--- a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/localeIdentifiers/likelySubtags.txt
+++ b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/localeIdentifiers/likelySubtags.txt
@@ -1,7 +1,7 @@
 # Test data for Likely Subtags
-#  Copyright © 1991-2023 Unicode, Inc.
+#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 #
 # Test data for https://www.unicode.org/reports/tr35/tr35.html#Likely_Subtags
@@ -788,7 +788,7 @@ pt-TL ;	pt-Latn-TL ;	pt-TL ;
 qaa ;	FAIL ;	 ;	
 qaa-CH ;	FAIL ;	 ;	
 qaa-Cyrl ;	FAIL ;	 ;	
-qaa-Cyrl-CH ;	 ;	 ;	
+qaa-Cyrl-CH ;	FAIL ;	 ;	
 qu ;	qu-Latn-PE ;	qu ;	
 qu-AQ ;	qu-Latn-AQ ;	qu-AQ ;	
 qu-BO ;	qu-Latn-BO ;	qu-BO ;	
diff --git a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/localeIdentifiers/localeCanonicalization.txt b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/localeIdentifiers/localeCanonicalization.txt
index bce4a8a4ff7..2e4bb5929db 100644
--- a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/localeIdentifiers/localeCanonicalization.txt
+++ b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/localeIdentifiers/localeCanonicalization.txt
@@ -1,7 +1,7 @@
 # Test data for locale identifier canonicalization
-#  Copyright © 1991-2023 Unicode, Inc.
+#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 #
 # Format:
diff --git a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/localeIdentifiers/localeDisplayName.txt b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/localeIdentifiers/localeDisplayName.txt
index 655a6f4eb9f..ed0fdcd7b04 100644
--- a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/localeIdentifiers/localeDisplayName.txt
+++ b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/localeIdentifiers/localeDisplayName.txt
@@ -1,7 +1,7 @@
 # Test data for locale display name generation
-#  Copyright © 1991-2023 Unicode, Inc.
+#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 # Format:
 # @locale=<locale to display in>
diff --git a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/af.txt b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/af.txt
index 726da7aa12c..901123883a5 100644
--- a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/af.txt
+++ b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/af.txt
@@ -1,9 +1,7 @@
-# Test data for unit conversions
-#  Copyright © 1991-2023 Unicode, Inc.
+# Test data for Person Name Data#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-#
 # CLDR person name formatting test data for: af
 #
 # Test lines have the following structure:
diff --git a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/am.txt b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/am.txt
index ac7b469a2bf..eeb6e091052 100644
--- a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/am.txt
+++ b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/am.txt
@@ -1,9 +1,7 @@
-# Test data for unit conversions
-#  Copyright © 1991-2023 Unicode, Inc.
+# Test data for Person Name Data#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-#
 # CLDR person name formatting test data for: am
 #
 # Test lines have the following structure:
diff --git a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/ar.txt b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/ar.txt
index 6776b1de52c..7aeb605d07f 100644
--- a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/ar.txt
+++ b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/ar.txt
@@ -1,9 +1,7 @@
-# Test data for unit conversions
-#  Copyright © 1991-2023 Unicode, Inc.
+# Test data for Person Name Data#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-#
 # CLDR person name formatting test data for: ar
 #
 # Test lines have the following structure:
diff --git a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/as.txt b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/as.txt
index 6eeadad5cde..2b33e301a5c 100644
--- a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/as.txt
+++ b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/as.txt
@@ -1,9 +1,7 @@
-# Test data for unit conversions
-#  Copyright © 1991-2023 Unicode, Inc.
+# Test data for Person Name Data#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-#
 # CLDR person name formatting test data for: as
 #
 # Test lines have the following structure:
diff --git a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/az.txt b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/az.txt
index 2f1c236be5b..ae26d4f3191 100644
--- a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/az.txt
+++ b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/az.txt
@@ -1,9 +1,7 @@
-# Test data for unit conversions
-#  Copyright © 1991-2023 Unicode, Inc.
+# Test data for Person Name Data#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-#
 # CLDR person name formatting test data for: az
 #
 # Test lines have the following structure:
diff --git a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/be.txt b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/be.txt
index 5be3444c897..693d82263ce 100644
--- a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/be.txt
+++ b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/be.txt
@@ -1,9 +1,7 @@
-# Test data for unit conversions
-#  Copyright © 1991-2023 Unicode, Inc.
+# Test data for Person Name Data#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-#
 # CLDR person name formatting test data for: be
 #
 # Test lines have the following structure:
diff --git a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/bg.txt b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/bg.txt
index 78861df6cea..f1fc2e2ee32 100644
--- a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/bg.txt
+++ b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/bg.txt
@@ -1,9 +1,7 @@
-# Test data for unit conversions
-#  Copyright © 1991-2023 Unicode, Inc.
+# Test data for Person Name Data#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-#
 # CLDR person name formatting test data for: bg
 #
 # Test lines have the following structure:
diff --git a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/bn.txt b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/bn.txt
index 50982f61a40..3bd770fb315 100644
--- a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/bn.txt
+++ b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/bn.txt
@@ -1,9 +1,7 @@
-# Test data for unit conversions
-#  Copyright © 1991-2023 Unicode, Inc.
+# Test data for Person Name Data#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-#
 # CLDR person name formatting test data for: bn
 #
 # Test lines have the following structure:
diff --git a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/bs.txt b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/bs.txt
index c6687f31c14..faebd65139f 100644
--- a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/bs.txt
+++ b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/bs.txt
@@ -1,9 +1,7 @@
-# Test data for unit conversions
-#  Copyright © 1991-2023 Unicode, Inc.
+# Test data for Person Name Data#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-#
 # CLDR person name formatting test data for: bs
 #
 # Test lines have the following structure:
diff --git a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/ca.txt b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/ca.txt
index 259fec0cb8c..7b835dbaed3 100644
--- a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/ca.txt
+++ b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/ca.txt
@@ -1,9 +1,7 @@
-# Test data for unit conversions
-#  Copyright © 1991-2023 Unicode, Inc.
+# Test data for Person Name Data#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-#
 # CLDR person name formatting test data for: ca
 #
 # Test lines have the following structure:
diff --git a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/chr.txt b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/chr.txt
index d1941bac64b..ae4b242898e 100644
--- a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/chr.txt
+++ b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/chr.txt
@@ -1,9 +1,7 @@
-# Test data for unit conversions
-#  Copyright © 1991-2023 Unicode, Inc.
+# Test data for Person Name Data#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-#
 # CLDR person name formatting test data for: chr
 #
 # Test lines have the following structure:
diff --git a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/cs.txt b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/cs.txt
index 56e0c62890c..5ac120e5ba6 100644
--- a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/cs.txt
+++ b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/cs.txt
@@ -1,9 +1,7 @@
-# Test data for unit conversions
-#  Copyright © 1991-2023 Unicode, Inc.
+# Test data for Person Name Data#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-#
 # CLDR person name formatting test data for: cs
 #
 # Test lines have the following structure:
diff --git a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/cy.txt b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/cy.txt
index dd32a7a687f..ad45742d84f 100644
--- a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/cy.txt
+++ b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/cy.txt
@@ -1,9 +1,7 @@
-# Test data for unit conversions
-#  Copyright © 1991-2023 Unicode, Inc.
+# Test data for Person Name Data#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-#
 # CLDR person name formatting test data for: cy
 #
 # Test lines have the following structure:
diff --git a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/da.txt b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/da.txt
index bda38f8d1b5..a059b1ae7fb 100644
--- a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/da.txt
+++ b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/da.txt
@@ -1,9 +1,7 @@
-# Test data for unit conversions
-#  Copyright © 1991-2023 Unicode, Inc.
+# Test data for Person Name Data#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-#
 # CLDR person name formatting test data for: da
 #
 # Test lines have the following structure:
diff --git a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/de.txt b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/de.txt
index e719c9b60af..af18c8855d4 100644
--- a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/de.txt
+++ b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/de.txt
@@ -1,9 +1,7 @@
-# Test data for unit conversions
-#  Copyright © 1991-2023 Unicode, Inc.
+# Test data for Person Name Data#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-#
 # CLDR person name formatting test data for: de
 #
 # Test lines have the following structure:
diff --git a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/dsb.txt b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/dsb.txt
index fcf81ed62b0..a11a59600de 100644
--- a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/dsb.txt
+++ b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/dsb.txt
@@ -1,9 +1,7 @@
-# Test data for unit conversions
-#  Copyright © 1991-2023 Unicode, Inc.
+# Test data for Person Name Data#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-#
 # CLDR person name formatting test data for: dsb
 #
 # Test lines have the following structure:
diff --git a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/el.txt b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/el.txt
index b7ad436f9d8..efb02e5a2c0 100644
--- a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/el.txt
+++ b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/el.txt
@@ -1,9 +1,7 @@
-# Test data for unit conversions
-#  Copyright © 1991-2023 Unicode, Inc.
+# Test data for Person Name Data#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-#
 # CLDR person name formatting test data for: el
 #
 # Test lines have the following structure:
diff --git a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/en.txt b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/en.txt
index 06f447f2bfc..a42fd2b0cc7 100644
--- a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/en.txt
+++ b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/en.txt
@@ -1,9 +1,7 @@
-# Test data for unit conversions
-#  Copyright © 1991-2023 Unicode, Inc.
+# Test data for Person Name Data#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-#
 # CLDR person name formatting test data for: en
 #
 # Test lines have the following structure:
diff --git a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/es.txt b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/es.txt
index 3cb56375b91..27ac0d37efd 100644
--- a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/es.txt
+++ b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/es.txt
@@ -1,9 +1,7 @@
-# Test data for unit conversions
-#  Copyright © 1991-2023 Unicode, Inc.
+# Test data for Person Name Data#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-#
 # CLDR person name formatting test data for: es
 #
 # Test lines have the following structure:
diff --git a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/et.txt b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/et.txt
index 543ce3eb954..57194bffbd8 100644
--- a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/et.txt
+++ b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/et.txt
@@ -1,9 +1,7 @@
-# Test data for unit conversions
-#  Copyright © 1991-2023 Unicode, Inc.
+# Test data for Person Name Data#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-#
 # CLDR person name formatting test data for: et
 #
 # Test lines have the following structure:
diff --git a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/eu.txt b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/eu.txt
index eb47d520f42..9b178987347 100644
--- a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/eu.txt
+++ b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/eu.txt
@@ -1,9 +1,7 @@
-# Test data for unit conversions
-#  Copyright © 1991-2023 Unicode, Inc.
+# Test data for Person Name Data#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-#
 # CLDR person name formatting test data for: eu
 #
 # Test lines have the following structure:
diff --git a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/fa.txt b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/fa.txt
index ee9efab2b5c..7aa012fd721 100644
--- a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/fa.txt
+++ b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/fa.txt
@@ -1,9 +1,7 @@
-# Test data for unit conversions
-#  Copyright © 1991-2023 Unicode, Inc.
+# Test data for Person Name Data#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-#
 # CLDR person name formatting test data for: fa
 #
 # Test lines have the following structure:
diff --git a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/fi.txt b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/fi.txt
index 7a456e3907d..8d2754c40c5 100644
--- a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/fi.txt
+++ b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/fi.txt
@@ -1,9 +1,7 @@
-# Test data for unit conversions
-#  Copyright © 1991-2023 Unicode, Inc.
+# Test data for Person Name Data#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-#
 # CLDR person name formatting test data for: fi
 #
 # Test lines have the following structure:
diff --git a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/fil.txt b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/fil.txt
index c966189a0b6..601fa2b2304 100644
--- a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/fil.txt
+++ b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/fil.txt
@@ -1,9 +1,7 @@
-# Test data for unit conversions
-#  Copyright © 1991-2023 Unicode, Inc.
+# Test data for Person Name Data#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-#
 # CLDR person name formatting test data for: fil
 #
 # Test lines have the following structure:
diff --git a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/fr.txt b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/fr.txt
index fba3bd02fc2..2e429df078c 100644
--- a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/fr.txt
+++ b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/fr.txt
@@ -1,9 +1,7 @@
-# Test data for unit conversions
-#  Copyright © 1991-2023 Unicode, Inc.
+# Test data for Person Name Data#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-#
 # CLDR person name formatting test data for: fr
 #
 # Test lines have the following structure:
diff --git a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/ga.txt b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/ga.txt
index 3aba9ec8575..15d76693551 100644
--- a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/ga.txt
+++ b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/ga.txt
@@ -1,9 +1,7 @@
-# Test data for unit conversions
-#  Copyright © 1991-2023 Unicode, Inc.
+# Test data for Person Name Data#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-#
 # CLDR person name formatting test data for: ga
 #
 # Test lines have the following structure:
diff --git a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/gd.txt b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/gd.txt
index c20b602147a..ca8f8428bcf 100644
--- a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/gd.txt
+++ b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/gd.txt
@@ -1,9 +1,7 @@
-# Test data for unit conversions
-#  Copyright © 1991-2023 Unicode, Inc.
+# Test data for Person Name Data#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-#
 # CLDR person name formatting test data for: gd
 #
 # Test lines have the following structure:
diff --git a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/gl.txt b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/gl.txt
index a05b02af47d..b9be866f021 100644
--- a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/gl.txt
+++ b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/gl.txt
@@ -1,9 +1,7 @@
-# Test data for unit conversions
-#  Copyright © 1991-2023 Unicode, Inc.
+# Test data for Person Name Data#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-#
 # CLDR person name formatting test data for: gl
 #
 # Test lines have the following structure:
diff --git a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/gu.txt b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/gu.txt
index aa7aa5c2696..1ed81d7b14e 100644
--- a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/gu.txt
+++ b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/gu.txt
@@ -1,9 +1,7 @@
-# Test data for unit conversions
-#  Copyright © 1991-2023 Unicode, Inc.
+# Test data for Person Name Data#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-#
 # CLDR person name formatting test data for: gu
 #
 # Test lines have the following structure:
diff --git a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/ha.txt b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/ha.txt
index 474b7a3c3ad..34212aad0c5 100644
--- a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/ha.txt
+++ b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/ha.txt
@@ -1,9 +1,7 @@
-# Test data for unit conversions
-#  Copyright © 1991-2023 Unicode, Inc.
+# Test data for Person Name Data#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-#
 # CLDR person name formatting test data for: ha
 #
 # Test lines have the following structure:
diff --git a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/he.txt b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/he.txt
index adccf761389..f9673290e00 100644
--- a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/he.txt
+++ b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/he.txt
@@ -1,9 +1,7 @@
-# Test data for unit conversions
-#  Copyright © 1991-2023 Unicode, Inc.
+# Test data for Person Name Data#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-#
 # CLDR person name formatting test data for: he
 #
 # Test lines have the following structure:
diff --git a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/hi.txt b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/hi.txt
index d9021e942c6..9067abba3f5 100644
--- a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/hi.txt
+++ b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/hi.txt
@@ -1,9 +1,7 @@
-# Test data for unit conversions
-#  Copyright © 1991-2023 Unicode, Inc.
+# Test data for Person Name Data#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-#
 # CLDR person name formatting test data for: hi
 #
 # Test lines have the following structure:
diff --git a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/hi_Latn.txt b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/hi_Latn.txt
index 4bac4f3444e..ae746e392cd 100644
--- a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/hi_Latn.txt
+++ b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/hi_Latn.txt
@@ -1,9 +1,7 @@
-# Test data for unit conversions
-#  Copyright © 1991-2023 Unicode, Inc.
+# Test data for Person Name Data#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-#
 # CLDR person name formatting test data for: hi_Latn
 #
 # Test lines have the following structure:
diff --git a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/hr.txt b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/hr.txt
index c8b4c45082a..86893b7d4c8 100644
--- a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/hr.txt
+++ b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/hr.txt
@@ -1,9 +1,7 @@
-# Test data for unit conversions
-#  Copyright © 1991-2023 Unicode, Inc.
+# Test data for Person Name Data#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-#
 # CLDR person name formatting test data for: hr
 #
 # Test lines have the following structure:
diff --git a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/hsb.txt b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/hsb.txt
index 40fa1470c17..689c04d457f 100644
--- a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/hsb.txt
+++ b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/hsb.txt
@@ -1,9 +1,7 @@
-# Test data for unit conversions
-#  Copyright © 1991-2023 Unicode, Inc.
+# Test data for Person Name Data#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-#
 # CLDR person name formatting test data for: hsb
 #
 # Test lines have the following structure:
diff --git a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/hu.txt b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/hu.txt
index ffd6167bba5..8d3332d1fa4 100644
--- a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/hu.txt
+++ b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/hu.txt
@@ -1,9 +1,7 @@
-# Test data for unit conversions
-#  Copyright © 1991-2023 Unicode, Inc.
+# Test data for Person Name Data#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-#
 # CLDR person name formatting test data for: hu
 #
 # Test lines have the following structure:
diff --git a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/hy.txt b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/hy.txt
index 98390483c60..db0833793e0 100644
--- a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/hy.txt
+++ b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/hy.txt
@@ -1,9 +1,7 @@
-# Test data for unit conversions
-#  Copyright © 1991-2023 Unicode, Inc.
+# Test data for Person Name Data#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-#
 # CLDR person name formatting test data for: hy
 #
 # Test lines have the following structure:
diff --git a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/id.txt b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/id.txt
index 0069dcc041f..9faeb2d2bd0 100644
--- a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/id.txt
+++ b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/id.txt
@@ -1,9 +1,7 @@
-# Test data for unit conversions
-#  Copyright © 1991-2023 Unicode, Inc.
+# Test data for Person Name Data#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-#
 # CLDR person name formatting test data for: id
 #
 # Test lines have the following structure:
diff --git a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/ig.txt b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/ig.txt
index ba7c854cbbc..0889c0519ea 100644
--- a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/ig.txt
+++ b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/ig.txt
@@ -1,9 +1,7 @@
-# Test data for unit conversions
-#  Copyright © 1991-2023 Unicode, Inc.
+# Test data for Person Name Data#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-#
 # CLDR person name formatting test data for: ig
 #
 # Test lines have the following structure:
diff --git a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/is.txt b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/is.txt
index f276fc1c86c..26adf5d851a 100644
--- a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/is.txt
+++ b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/is.txt
@@ -1,9 +1,7 @@
-# Test data for unit conversions
-#  Copyright © 1991-2023 Unicode, Inc.
+# Test data for Person Name Data#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-#
 # CLDR person name formatting test data for: is
 #
 # Test lines have the following structure:
diff --git a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/it.txt b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/it.txt
index 94d1f430828..5fc5892eebe 100644
--- a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/it.txt
+++ b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/it.txt
@@ -1,9 +1,7 @@
-# Test data for unit conversions
-#  Copyright © 1991-2023 Unicode, Inc.
+# Test data for Person Name Data#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-#
 # CLDR person name formatting test data for: it
 #
 # Test lines have the following structure:
diff --git a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/ja.txt b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/ja.txt
index da3fd82e45d..a0629925cd1 100644
--- a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/ja.txt
+++ b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/ja.txt
@@ -1,9 +1,7 @@
-# Test data for unit conversions
-#  Copyright © 1991-2023 Unicode, Inc.
+# Test data for Person Name Data#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-#
 # CLDR person name formatting test data for: ja
 #
 # Test lines have the following structure:
diff --git a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/jv.txt b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/jv.txt
index ecd4f818098..838a49c389c 100644
--- a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/jv.txt
+++ b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/jv.txt
@@ -1,9 +1,7 @@
-# Test data for unit conversions
-#  Copyright © 1991-2023 Unicode, Inc.
+# Test data for Person Name Data#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-#
 # CLDR person name formatting test data for: jv
 #
 # Test lines have the following structure:
diff --git a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/ka.txt b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/ka.txt
index ced01ad4d5f..9ee4ffb65d2 100644
--- a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/ka.txt
+++ b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/ka.txt
@@ -1,9 +1,7 @@
-# Test data for unit conversions
-#  Copyright © 1991-2023 Unicode, Inc.
+# Test data for Person Name Data#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-#
 # CLDR person name formatting test data for: ka
 #
 # Test lines have the following structure:
diff --git a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/kk.txt b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/kk.txt
index 2a46fc875e5..bed9bb7603b 100644
--- a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/kk.txt
+++ b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/kk.txt
@@ -1,9 +1,7 @@
-# Test data for unit conversions
-#  Copyright © 1991-2023 Unicode, Inc.
+# Test data for Person Name Data#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-#
 # CLDR person name formatting test data for: kk
 #
 # Test lines have the following structure:
diff --git a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/km.txt b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/km.txt
index e2f529fbd71..6770db302c1 100644
--- a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/km.txt
+++ b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/km.txt
@@ -1,9 +1,7 @@
-# Test data for unit conversions
-#  Copyright © 1991-2023 Unicode, Inc.
+# Test data for Person Name Data#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-#
 # CLDR person name formatting test data for: km
 #
 # Test lines have the following structure:
diff --git a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/kn.txt b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/kn.txt
index 295c955b8f2..dd226e40739 100644
--- a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/kn.txt
+++ b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/kn.txt
@@ -1,9 +1,7 @@
-# Test data for unit conversions
-#  Copyright © 1991-2023 Unicode, Inc.
+# Test data for Person Name Data#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-#
 # CLDR person name formatting test data for: kn
 #
 # Test lines have the following structure:
diff --git a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/ko.txt b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/ko.txt
index a04f3bc9173..90a3bf4bf83 100644
--- a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/ko.txt
+++ b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/ko.txt
@@ -1,9 +1,7 @@
-# Test data for unit conversions
-#  Copyright © 1991-2023 Unicode, Inc.
+# Test data for Person Name Data#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-#
 # CLDR person name formatting test data for: ko
 #
 # Test lines have the following structure:
diff --git a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/kok.txt b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/kok.txt
index aef93c2ef85..6b177c1497b 100644
--- a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/kok.txt
+++ b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/kok.txt
@@ -1,9 +1,7 @@
-# Test data for unit conversions
-#  Copyright © 1991-2023 Unicode, Inc.
+# Test data for Person Name Data#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-#
 # CLDR person name formatting test data for: kok
 #
 # Test lines have the following structure:
diff --git a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/ky.txt b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/ky.txt
index bdc49df6eef..bf66de4fca5 100644
--- a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/ky.txt
+++ b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/ky.txt
@@ -1,9 +1,7 @@
-# Test data for unit conversions
-#  Copyright © 1991-2023 Unicode, Inc.
+# Test data for Person Name Data#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-#
 # CLDR person name formatting test data for: ky
 #
 # Test lines have the following structure:
diff --git a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/lo.txt b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/lo.txt
index 094259ed568..9cd5bfc7cbd 100644
--- a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/lo.txt
+++ b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/lo.txt
@@ -1,9 +1,7 @@
-# Test data for unit conversions
-#  Copyright © 1991-2023 Unicode, Inc.
+# Test data for Person Name Data#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-#
 # CLDR person name formatting test data for: lo
 #
 # Test lines have the following structure:
diff --git a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/lt.txt b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/lt.txt
index ab79d6e884b..40b517de822 100644
--- a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/lt.txt
+++ b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/lt.txt
@@ -1,9 +1,7 @@
-# Test data for unit conversions
-#  Copyright © 1991-2023 Unicode, Inc.
+# Test data for Person Name Data#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-#
 # CLDR person name formatting test data for: lt
 #
 # Test lines have the following structure:
diff --git a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/lv.txt b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/lv.txt
index d7a6d14822d..7efd7816671 100644
--- a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/lv.txt
+++ b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/lv.txt
@@ -1,9 +1,7 @@
-# Test data for unit conversions
-#  Copyright © 1991-2023 Unicode, Inc.
+# Test data for Person Name Data#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-#
 # CLDR person name formatting test data for: lv
 #
 # Test lines have the following structure:
diff --git a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/mk.txt b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/mk.txt
index fe66a9babd2..2679f9cab14 100644
--- a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/mk.txt
+++ b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/mk.txt
@@ -1,9 +1,7 @@
-# Test data for unit conversions
-#  Copyright © 1991-2023 Unicode, Inc.
+# Test data for Person Name Data#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-#
 # CLDR person name formatting test data for: mk
 #
 # Test lines have the following structure:
diff --git a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/ml.txt b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/ml.txt
index a2d58316764..aa0bb42d420 100644
--- a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/ml.txt
+++ b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/ml.txt
@@ -1,9 +1,7 @@
-# Test data for unit conversions
-#  Copyright © 1991-2023 Unicode, Inc.
+# Test data for Person Name Data#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-#
 # CLDR person name formatting test data for: ml
 #
 # Test lines have the following structure:
diff --git a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/mn.txt b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/mn.txt
index 23bff1e29ec..297a34df11e 100644
--- a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/mn.txt
+++ b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/mn.txt
@@ -1,9 +1,7 @@
-# Test data for unit conversions
-#  Copyright © 1991-2023 Unicode, Inc.
+# Test data for Person Name Data#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-#
 # CLDR person name formatting test data for: mn
 #
 # Test lines have the following structure:
diff --git a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/mr.txt b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/mr.txt
index f42c24ed6d1..5f857500bd9 100644
--- a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/mr.txt
+++ b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/mr.txt
@@ -1,9 +1,7 @@
-# Test data for unit conversions
-#  Copyright © 1991-2023 Unicode, Inc.
+# Test data for Person Name Data#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-#
 # CLDR person name formatting test data for: mr
 #
 # Test lines have the following structure:
diff --git a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/ms.txt b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/ms.txt
index 7d046ce6a17..dac327db5df 100644
--- a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/ms.txt
+++ b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/ms.txt
@@ -1,9 +1,7 @@
-# Test data for unit conversions
-#  Copyright © 1991-2023 Unicode, Inc.
+# Test data for Person Name Data#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-#
 # CLDR person name formatting test data for: ms
 #
 # Test lines have the following structure:
diff --git a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/my.txt b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/my.txt
index e7fcdfcb50c..aa50cdf674a 100644
--- a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/my.txt
+++ b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/my.txt
@@ -1,9 +1,7 @@
-# Test data for unit conversions
-#  Copyright © 1991-2023 Unicode, Inc.
+# Test data for Person Name Data#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-#
 # CLDR person name formatting test data for: my
 #
 # Test lines have the following structure:
diff --git a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/ne.txt b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/ne.txt
index 771c007ea63..9ea9c2ebb97 100644
--- a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/ne.txt
+++ b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/ne.txt
@@ -1,9 +1,7 @@
-# Test data for unit conversions
-#  Copyright © 1991-2023 Unicode, Inc.
+# Test data for Person Name Data#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-#
 # CLDR person name formatting test data for: ne
 #
 # Test lines have the following structure:
diff --git a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/nl.txt b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/nl.txt
index dcb197e3943..7a30d790de0 100644
--- a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/nl.txt
+++ b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/nl.txt
@@ -1,9 +1,7 @@
-# Test data for unit conversions
-#  Copyright © 1991-2023 Unicode, Inc.
+# Test data for Person Name Data#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-#
 # CLDR person name formatting test data for: nl
 #
 # Test lines have the following structure:
diff --git a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/nn.txt b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/nn.txt
index 0f3ffeb6308..9dd307756d2 100644
--- a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/nn.txt
+++ b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/nn.txt
@@ -1,9 +1,7 @@
-# Test data for unit conversions
-#  Copyright © 1991-2023 Unicode, Inc.
+# Test data for Person Name Data#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-#
 # CLDR person name formatting test data for: nn
 #
 # Test lines have the following structure:
diff --git a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/no.txt b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/no.txt
index 86734e65359..1935aa4c718 100644
--- a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/no.txt
+++ b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/no.txt
@@ -1,9 +1,7 @@
-# Test data for unit conversions
-#  Copyright © 1991-2023 Unicode, Inc.
+# Test data for Person Name Data#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-#
 # CLDR person name formatting test data for: no
 #
 # Test lines have the following structure:
diff --git a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/or.txt b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/or.txt
index fc4c7931ebe..0bc242952d0 100644
--- a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/or.txt
+++ b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/or.txt
@@ -1,9 +1,7 @@
-# Test data for unit conversions
-#  Copyright © 1991-2023 Unicode, Inc.
+# Test data for Person Name Data#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-#
 # CLDR person name formatting test data for: or
 #
 # Test lines have the following structure:
diff --git a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/pa.txt b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/pa.txt
index 55ce96617f3..b51a4177f51 100644
--- a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/pa.txt
+++ b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/pa.txt
@@ -1,9 +1,7 @@
-# Test data for unit conversions
-#  Copyright © 1991-2023 Unicode, Inc.
+# Test data for Person Name Data#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-#
 # CLDR person name formatting test data for: pa
 #
 # Test lines have the following structure:
diff --git a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/pl.txt b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/pl.txt
index dc2c1ff7a79..f11f991cc9d 100644
--- a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/pl.txt
+++ b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/pl.txt
@@ -1,9 +1,7 @@
-# Test data for unit conversions
-#  Copyright © 1991-2023 Unicode, Inc.
+# Test data for Person Name Data#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-#
 # CLDR person name formatting test data for: pl
 #
 # Test lines have the following structure:
diff --git a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/ps.txt b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/ps.txt
index b640ee021ba..fb76dd5eaed 100644
--- a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/ps.txt
+++ b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/ps.txt
@@ -1,9 +1,7 @@
-# Test data for unit conversions
-#  Copyright © 1991-2023 Unicode, Inc.
+# Test data for Person Name Data#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-#
 # CLDR person name formatting test data for: ps
 #
 # Test lines have the following structure:
diff --git a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/pt.txt b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/pt.txt
index d7d9f994815..10908dd7bea 100644
--- a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/pt.txt
+++ b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/pt.txt
@@ -1,9 +1,7 @@
-# Test data for unit conversions
-#  Copyright © 1991-2023 Unicode, Inc.
+# Test data for Person Name Data#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-#
 # CLDR person name formatting test data for: pt
 #
 # Test lines have the following structure:
diff --git a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/qu.txt b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/qu.txt
index 6122737fcd8..d5fb411f6fd 100644
--- a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/qu.txt
+++ b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/qu.txt
@@ -1,9 +1,7 @@
-# Test data for unit conversions
-#  Copyright © 1991-2023 Unicode, Inc.
+# Test data for Person Name Data#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-#
 # CLDR person name formatting test data for: qu
 #
 # Test lines have the following structure:
diff --git a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/ro.txt b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/ro.txt
index 5b8e6b8e05c..0e1c5c3dd94 100644
--- a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/ro.txt
+++ b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/ro.txt
@@ -1,9 +1,7 @@
-# Test data for unit conversions
-#  Copyright © 1991-2023 Unicode, Inc.
+# Test data for Person Name Data#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-#
 # CLDR person name formatting test data for: ro
 #
 # Test lines have the following structure:
diff --git a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/ru.txt b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/ru.txt
index 070e3a3d5d1..79b8426069c 100644
--- a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/ru.txt
+++ b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/ru.txt
@@ -1,9 +1,7 @@
-# Test data for unit conversions
-#  Copyright © 1991-2023 Unicode, Inc.
+# Test data for Person Name Data#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-#
 # CLDR person name formatting test data for: ru
 #
 # Test lines have the following structure:
diff --git a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/sc.txt b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/sc.txt
index 1c0c0cc60d6..f0580060ca8 100644
--- a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/sc.txt
+++ b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/sc.txt
@@ -1,9 +1,7 @@
-# Test data for unit conversions
-#  Copyright © 1991-2023 Unicode, Inc.
+# Test data for Person Name Data#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-#
 # CLDR person name formatting test data for: sc
 #
 # Test lines have the following structure:
diff --git a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/sd.txt b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/sd.txt
index 33fecc3e3a6..a8376573fd4 100644
--- a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/sd.txt
+++ b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/sd.txt
@@ -1,9 +1,7 @@
-# Test data for unit conversions
-#  Copyright © 1991-2023 Unicode, Inc.
+# Test data for Person Name Data#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-#
 # CLDR person name formatting test data for: sd
 #
 # Test lines have the following structure:
diff --git a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/si.txt b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/si.txt
index e3231077e4f..3a68439923a 100644
--- a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/si.txt
+++ b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/si.txt
@@ -1,9 +1,7 @@
-# Test data for unit conversions
-#  Copyright © 1991-2023 Unicode, Inc.
+# Test data for Person Name Data#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-#
 # CLDR person name formatting test data for: si
 #
 # Test lines have the following structure:
diff --git a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/sk.txt b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/sk.txt
index 39569e58ff5..c39d69b15b6 100644
--- a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/sk.txt
+++ b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/sk.txt
@@ -1,9 +1,7 @@
-# Test data for unit conversions
-#  Copyright © 1991-2023 Unicode, Inc.
+# Test data for Person Name Data#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-#
 # CLDR person name formatting test data for: sk
 #
 # Test lines have the following structure:
diff --git a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/sl.txt b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/sl.txt
index 6b0e0f7bc6b..3478023c367 100644
--- a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/sl.txt
+++ b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/sl.txt
@@ -1,9 +1,7 @@
-# Test data for unit conversions
-#  Copyright © 1991-2023 Unicode, Inc.
+# Test data for Person Name Data#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-#
 # CLDR person name formatting test data for: sl
 #
 # Test lines have the following structure:
diff --git a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/so.txt b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/so.txt
index b07186c7707..87f53812445 100644
--- a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/so.txt
+++ b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/so.txt
@@ -1,9 +1,7 @@
-# Test data for unit conversions
-#  Copyright © 1991-2023 Unicode, Inc.
+# Test data for Person Name Data#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-#
 # CLDR person name formatting test data for: so
 #
 # Test lines have the following structure:
diff --git a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/sq.txt b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/sq.txt
index e2f7e2d70be..8bb66d7fc1f 100644
--- a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/sq.txt
+++ b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/sq.txt
@@ -1,9 +1,7 @@
-# Test data for unit conversions
-#  Copyright © 1991-2023 Unicode, Inc.
+# Test data for Person Name Data#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-#
 # CLDR person name formatting test data for: sq
 #
 # Test lines have the following structure:
diff --git a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/sr.txt b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/sr.txt
index 2167976d02b..a158839a12c 100644
--- a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/sr.txt
+++ b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/sr.txt
@@ -1,9 +1,7 @@
-# Test data for unit conversions
-#  Copyright © 1991-2023 Unicode, Inc.
+# Test data for Person Name Data#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-#
 # CLDR person name formatting test data for: sr
 #
 # Test lines have the following structure:
diff --git a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/sr_Latn.txt b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/sr_Latn.txt
index fb8c4342ea5..b976e5c13d4 100644
--- a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/sr_Latn.txt
+++ b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/sr_Latn.txt
@@ -1,9 +1,7 @@
-# Test data for unit conversions
-#  Copyright © 1991-2023 Unicode, Inc.
+# Test data for Person Name Data#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-#
 # CLDR person name formatting test data for: sr_Latn
 #
 # Test lines have the following structure:
diff --git a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/sv.txt b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/sv.txt
index bde78126282..e71b7c7e6cb 100644
--- a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/sv.txt
+++ b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/sv.txt
@@ -1,9 +1,7 @@
-# Test data for unit conversions
-#  Copyright © 1991-2023 Unicode, Inc.
+# Test data for Person Name Data#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-#
 # CLDR person name formatting test data for: sv
 #
 # Test lines have the following structure:
diff --git a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/sw.txt b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/sw.txt
index 119cc16e849..3046d2a0536 100644
--- a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/sw.txt
+++ b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/sw.txt
@@ -1,9 +1,7 @@
-# Test data for unit conversions
-#  Copyright © 1991-2023 Unicode, Inc.
+# Test data for Person Name Data#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-#
 # CLDR person name formatting test data for: sw
 #
 # Test lines have the following structure:
diff --git a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/ta.txt b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/ta.txt
index 37cc63ea284..ce9b3e811da 100644
--- a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/ta.txt
+++ b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/ta.txt
@@ -1,9 +1,7 @@
-# Test data for unit conversions
-#  Copyright © 1991-2023 Unicode, Inc.
+# Test data for Person Name Data#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-#
 # CLDR person name formatting test data for: ta
 #
 # Test lines have the following structure:
diff --git a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/te.txt b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/te.txt
index 4e7b4dc1ae6..3f8a888d8fb 100644
--- a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/te.txt
+++ b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/te.txt
@@ -1,9 +1,7 @@
-# Test data for unit conversions
-#  Copyright © 1991-2023 Unicode, Inc.
+# Test data for Person Name Data#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-#
 # CLDR person name formatting test data for: te
 #
 # Test lines have the following structure:
diff --git a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/tg.txt b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/tg.txt
index e5e8f942488..9415a6f0b91 100644
--- a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/tg.txt
+++ b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/tg.txt
@@ -1,9 +1,7 @@
-# Test data for unit conversions
-#  Copyright © 1991-2023 Unicode, Inc.
+# Test data for Person Name Data#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-#
 # CLDR person name formatting test data for: tg
 #
 # Test lines have the following structure:
diff --git a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/th.txt b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/th.txt
index 8ae86cbb398..cc77a8d9fe0 100644
--- a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/th.txt
+++ b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/th.txt
@@ -1,9 +1,7 @@
-# Test data for unit conversions
-#  Copyright © 1991-2023 Unicode, Inc.
+# Test data for Person Name Data#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-#
 # CLDR person name formatting test data for: th
 #
 # Test lines have the following structure:
diff --git a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/ti.txt b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/ti.txt
index fc4873880db..7099857e43f 100644
--- a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/ti.txt
+++ b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/ti.txt
@@ -1,9 +1,7 @@
-# Test data for unit conversions
-#  Copyright © 1991-2023 Unicode, Inc.
+# Test data for Person Name Data#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-#
 # CLDR person name formatting test data for: ti
 #
 # Test lines have the following structure:
diff --git a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/tk.txt b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/tk.txt
index 25434d2a902..f443defee1f 100644
--- a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/tk.txt
+++ b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/tk.txt
@@ -1,9 +1,7 @@
-# Test data for unit conversions
-#  Copyright © 1991-2023 Unicode, Inc.
+# Test data for Person Name Data#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-#
 # CLDR person name formatting test data for: tk
 #
 # Test lines have the following structure:
diff --git a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/tr.txt b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/tr.txt
index f04baa7b06a..cd9726f3e52 100644
--- a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/tr.txt
+++ b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/tr.txt
@@ -1,9 +1,7 @@
-# Test data for unit conversions
-#  Copyright © 1991-2023 Unicode, Inc.
+# Test data for Person Name Data#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-#
 # CLDR person name formatting test data for: tr
 #
 # Test lines have the following structure:
diff --git a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/uk.txt b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/uk.txt
index eb599d84e5a..7b8f4b34fc9 100644
--- a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/uk.txt
+++ b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/uk.txt
@@ -1,9 +1,7 @@
-# Test data for unit conversions
-#  Copyright © 1991-2023 Unicode, Inc.
+# Test data for Person Name Data#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-#
 # CLDR person name formatting test data for: uk
 #
 # Test lines have the following structure:
diff --git a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/ur.txt b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/ur.txt
index 01958458782..acd818eceab 100644
--- a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/ur.txt
+++ b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/ur.txt
@@ -1,9 +1,7 @@
-# Test data for unit conversions
-#  Copyright © 1991-2023 Unicode, Inc.
+# Test data for Person Name Data#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-#
 # CLDR person name formatting test data for: ur
 #
 # Test lines have the following structure:
diff --git a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/uz.txt b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/uz.txt
index 07ab62850f8..e924ad71c2c 100644
--- a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/uz.txt
+++ b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/uz.txt
@@ -1,9 +1,7 @@
-# Test data for unit conversions
-#  Copyright © 1991-2023 Unicode, Inc.
+# Test data for Person Name Data#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-#
 # CLDR person name formatting test data for: uz
 #
 # Test lines have the following structure:
diff --git a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/vi.txt b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/vi.txt
index 895483649ea..bf7d4b32147 100644
--- a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/vi.txt
+++ b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/vi.txt
@@ -1,9 +1,7 @@
-# Test data for unit conversions
-#  Copyright © 1991-2023 Unicode, Inc.
+# Test data for Person Name Data#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-#
 # CLDR person name formatting test data for: vi
 #
 # Test lines have the following structure:
diff --git a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/wo.txt b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/wo.txt
index e16f3cffd1b..eefb1f11b40 100644
--- a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/wo.txt
+++ b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/wo.txt
@@ -1,9 +1,7 @@
-# Test data for unit conversions
-#  Copyright © 1991-2023 Unicode, Inc.
+# Test data for Person Name Data#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-#
 # CLDR person name formatting test data for: wo
 #
 # Test lines have the following structure:
diff --git a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/yo.txt b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/yo.txt
index fcb09dc7ee8..97a41cfb806 100644
--- a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/yo.txt
+++ b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/yo.txt
@@ -1,9 +1,7 @@
-# Test data for unit conversions
-#  Copyright © 1991-2023 Unicode, Inc.
+# Test data for Person Name Data#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-#
 # CLDR person name formatting test data for: yo
 #
 # Test lines have the following structure:
diff --git a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/yue.txt b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/yue.txt
index 845bd7b19c4..5be7d5a1e9e 100644
--- a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/yue.txt
+++ b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/yue.txt
@@ -1,9 +1,7 @@
-# Test data for unit conversions
-#  Copyright © 1991-2023 Unicode, Inc.
+# Test data for Person Name Data#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-#
 # CLDR person name formatting test data for: yue
 #
 # Test lines have the following structure:
diff --git a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/yue_Hans.txt b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/yue_Hans.txt
index ff6d9876015..09c45c70750 100644
--- a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/yue_Hans.txt
+++ b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/yue_Hans.txt
@@ -1,9 +1,7 @@
-# Test data for unit conversions
-#  Copyright © 1991-2023 Unicode, Inc.
+# Test data for Person Name Data#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-#
 # CLDR person name formatting test data for: yue_Hans
 #
 # Test lines have the following structure:
diff --git a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/zh.txt b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/zh.txt
index 1fa6bd3dc19..641dbcae624 100644
--- a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/zh.txt
+++ b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/zh.txt
@@ -1,9 +1,7 @@
-# Test data for unit conversions
-#  Copyright © 1991-2023 Unicode, Inc.
+# Test data for Person Name Data#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-#
 # CLDR person name formatting test data for: zh
 #
 # Test lines have the following structure:
diff --git a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/zh_Hant.txt b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/zh_Hant.txt
index 18698d5bf98..c2c73c05047 100644
--- a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/zh_Hant.txt
+++ b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/zh_Hant.txt
@@ -1,9 +1,7 @@
-# Test data for unit conversions
-#  Copyright © 1991-2023 Unicode, Inc.
+# Test data for Person Name Data#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-#
 # CLDR person name formatting test data for: zh_Hant
 #
 # Test lines have the following structure:
diff --git a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/zu.txt b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/zu.txt
index e9c2b0db57a..9c7eedb9a0d 100644
--- a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/zu.txt
+++ b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/personNameTest/zu.txt
@@ -1,9 +1,7 @@
-# Test data for unit conversions
-#  Copyright © 1991-2023 Unicode, Inc.
+# Test data for Person Name Data#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-#
 # CLDR person name formatting test data for: zu
 #
 # Test lines have the following structure:
diff --git a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/units/unitPreferencesTest.txt b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/units/unitPreferencesTest.txt
index 61abdcafd12..d48a9680ce4 100644
--- a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/units/unitPreferencesTest.txt
+++ b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/units/unitPreferencesTest.txt
@@ -1,8 +1,8 @@
 
 # Test data for unit preferences
-#  Copyright © 1991-2023 Unicode, Inc.
+#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 #
 # Format:
diff --git a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/units/unitsTest.txt b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/units/unitsTest.txt
index 233a9304ece..ea4820078f8 100644
--- a/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/units/unitsTest.txt
+++ b/icu4j/main/core/src/test/resources/com/ibm/icu/dev/data/cldr/units/unitsTest.txt
@@ -1,7 +1,7 @@
 # Test data for unit conversions
-#  Copyright © 1991-2023 Unicode, Inc.
+#  Copyright © 1991-2024 Unicode, Inc.
 #  For terms of use, see http://www.unicode.org/copyright.html
-#  SPDX-License-Identifier: Unicode-DFS-2016
+#  SPDX-License-Identifier: Unicode-3.0
 #  CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
 #
 # Format:
@@ -182,6 +182,7 @@ resolution	;	pixel-per-inch	;	pixel-per-meter	;	5,000/127 * x	;	39370.08
 resolution	;	dot-per-centimeter	;	pixel-per-meter	;	100 * x	;	100000.0
 resolution	;	pixel-per-centimeter	;	pixel-per-meter	;	100 * x	;	100000.0
 solid-angle	;	steradian	;	square-revolution	;	4,290,444,930,214,144/169379976663492169 * x	;	25.3303
+speed	;	beaufort	;	meter-per-second	;	special:beaufort(x)	;	58.6
 speed	;	kilometer-per-hour	;	meter-per-second	;	2.5/9 * x	;	277.7778
 speed	;	mile-per-hour	;	meter-per-second	;	0.44704 * x	;	447.04
 speed	;	knot	;	meter-per-second	;	4.63/9 * x	;	514.4444
@@ -189,9 +190,9 @@ speed	;	meter-per-second	;	meter-per-second	;	1 * x	;	1,000.00
 substance-amount	;	item	;	item	;	1 * x	;	1,000.00
 substance-amount	;	mole	;	item	;	602,214,076,000,000,000,000,000 * x	;	6.022141E26
 temperature	;	rankine	;	kelvin	;	5/9 * x	;	555.5556
-temperature	;	fahrenheit	;	kelvin	;	5/9 * x - 2,298.35/9	;	810.9278
+temperature	;	fahrenheit	;	kelvin	;	5/9 * x + 2,298.35/9	;	810.9278
 temperature	;	kelvin	;	kelvin	;	1 * x	;	1,000.00
-temperature	;	celsius	;	kelvin	;	1 * x - 273.15	;	1273.15
+temperature	;	celsius	;	kelvin	;	1 * x + 273.15	;	1273.15
 typewidth	;	em	;	em	;	1 * x	;	1,000.00
 voltage	;	volt	;	kilogram-square-meter-per-cubic-second-ampere	;	1 * x	;	1000.0
 volume	;	drop	;	cubic-meter	;	0.0000001540287998046875/3 * x	;	5.134293E-5