Add rename special case