Refactor events to rename clients'.