Fixed naming
Merge pull request #17 from balanced/develop

Fixed naming