Fix name fixing.