Fix class names
Merge pull request #14 from cotal/master

Fix class names