Improve variable names (2)