cleanup internal usage of "marker" and better pubsub topic names