[DF - 291] Fix variable names.
Merge pull request #276 from ya-888/development

[DF - 291] Fix variable names.