Simplified class names