minor tweaks to some major names