some renaming in rvmap
[wip] Some cleanup the rvmap stuff