Refactored Topic Names and routing for them