Consistent naming
Merge pull request #1 from madbence/consistent-naming

Consistent naming