Name overhaul, cherry-picked out of the morass.