Fix full name and short name