revert foreign key column naming changes due to BC issues