More client_rename work