changed associations and attraction naming