updating relationships to rails 4.0 format