Rename files according to our naming convention