BZ-7194 refactor name