New event dispatch strategies, cleaned up namings