Pre-set self for prefetched collections, fixed od_delete bug, backward incompatible rename argument related name to rel_name, to single style of naming, fixed tests and minors