Fix name errors