Finished renames and etc