reworked how the Topic name is generated