Fixed class names
Closed #25