Remove templateName logic from init
Revert back to using event labels
Merge