Adjusting names of events loader components to be more consistent with flow loader components