Finished fixing names