Fix class names
Merge pull request #26 from andreoav/master

[Fix] Class Names according to Warden 2.0