Renaming push things to get ready for new event types