Renaming files

Pick a convention and stick with it.  Hopefully.