Renaming: Got rid of the (#) filename suffixes