reorg names in relop.c
Merge branch '14-names-reorg' into 15