Rename delim_* to delimiter_*