Minor change to text output, and unification of topic names