Finished name fixing