Be consistent with letter ordering

always use x, y, z, w