a few more name updates, for consistency