Improved nametag calculations.