Name tweaks, interface consolidation and cosmetic tidy ups