fix some name conventions