t1: Rework X1,X2 URIs to be a bit more logical