EZP-22510: Clarified properties names