Variable name corrections.