Improve name choices and consistency.