#2719: renaming things