ENYO-577: Fix backward-compatibility for deprecated uppercase properties

Cherry-picking commits from master to 2.5-upkeep