Fixing more topic names