Implement more rename logic