change variable naming
Merge pull request #4225 from samsonasik/fix/var.naming

change variable naming
Merge branch 'hotfix/4225'

Close #4225