Nametag section reworked