Be coherent in the class names