Merge pull request #1 from Mindar/master

Cleanup naming