Changed some class names
Merge pull request #146 from TsudaKageyu/classname

Changed some class names