fixed foreign key column names using rails conventions