Fix name and encoding