Pipe
This removes unnecessary Pipe from filenames which the directory name already contains. This also renames some of them to match the *new* pipeline.