rpc-rename-avoid-loop-20031201