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

Changed some class names