Refactored the name of the handlers.