Renamed handlers to use snake case.