Cleaned up the topic names