a few more name changes