Some changes with rename script