Rename factory trait
Refactor event deletion