Rename and fix targets to new names.