change variable naming
Merge branch 'hotfix/4224'

Close #4224
Merge pull request #4225 from samsonasik/fix/var.naming

change variable naming
Merge branch 'hotfix/4225' into develop

Forward port #4225