rename files to meet conventions