Add more descriptive class names