Simpler class names