Rename reserve words and foreign key columns

...es by default