Better names for classes and traits