Rename and change linkings