more terminology cleanup
fixing data types
more getting rid of "segment" and "subsegment"
more removal of "xri" term