re #842 - Renaming