More variable name corrections