changed foreign key names in the database
merge