VID-676 making variable name more clear