keep variable naming convention consistent
Merge branch 'hotfix/0.2.14'

* hotfix/0.2.14:
  keep variable naming convention consistent