Improve naming consistency of some report topics.