refactors pub-sub naming conventions for clarity