More specific naming conventions
Merge remote-tracking branch 'upstream/master'
Merge pull request #4 from kesapojat/master

More specific naming conventions