Refactor event relay classes again because "relayer" is not a word