Failing scrubbing test and lots of event name refactoring