some more name changes