A few more name changes to make things clearer