Change association names to reflect changed child models