More variable name corrections.