Reorder pipes, apply rename fix for upstream files #394