Merge pull request #29 from Akon32/develop

Refactoring: renames.