Rename some classes.
Merge pull request #13 from MarianoGnu/master

Rename some classes.