PMPS-109 : renamed util class