Fix topic names