Remove old filenames from regex, switch around base and duckpan