update name conventions