ENYO-2528: rename methods and typo fix