Rename ConsumerEventHandler to ConsumerHandler