tweaks to reflect new names.