More variable name clean-up