Tidying (mostly renaming) in ONF
Detangle conflict