Renamed columns based on the fact that FK's are done differently in ActiveRecord