NH-3648 renames of attributes

on request of hazzik