Finished setting all of the correct names.