Rename id columns in address and country tables