Changed math name conventions