Add model designations back to name, update references to TCDS
Authored by: deltaecho 2021-02-24
Parent: [r5589]
Child: [r5591]