Fixed basic rename issue