Improve box rename.