Update variable names to name conventions