Cleaning up and fixing topic names