Rename file names for consistancy