Renamed the handler classes.