fix name conventions