edited name conventions