Fix name mistakes