Rename handlers to defaultHandlers