Fixed class name conventions