Improve some class names