Revert "Change NamePublisher"

This reverts commit 2ea3f5bb897f1b9d28d11ddbfd0002ebe8fe445c.