updating name conventions