Bespoke diagnostic quiz - Unit and screen names updated