Fix to rename logic.