Rename files to ensure ordering