Fixed rename functionality