Fix account names