More changes to rename script