Make code more readable
Merge pull request #846 from AlexYursha/master

Improve code readability by using the bean-like naming convention.