Changed relationship to use 'r1' and 'r2'

rather than 'a' and 'b'... It was getting confusing as they don't always correspond to A.id and B.id in ManyToMany...