Updated foreign key names to be unique