Rename things according to cadorn's comments