Rename and prefix some symbols