Updated names, added notification pub functionality