renamings out of the way
more tweaks in heritage-multiple