NEON-748 consistent property usage