Fixes topic names