Use better class names