Slight nickname tweaks.