refactored event name

* Also fixed PHPCS
* Modified interfaces