update class name conventions