Cleanup legacy variable naming style.