Resolved issue with rename