Referencing fixes to reflect changes in template and event-bus file names