Rename files appropriately