Part of P0284, funded by [Anonymous] and Blue Bolt.
And slightly improve the 2018 names, matching TH02's from earlier in 2023. Part of P0241, funded by [Anonymous] and Blue Bolt.