rename r1/r2 as rx/ry