Improve class names #183