changed class names
Merge pull request #13 from sacjaya/master

changed class names