Rename some stuff.