KCINFR-979: renaming methods to smaller names