Refactored Listeners

- Renamed listener interfaces to make them easier to understand and
shorter to type.