Renaming files to become more standarized