fix
build_sorter -> BuildSorter
escape_input -> EscapeInput