Improvement class names

Improvement class names