Change name models and update relations

blabla