Improved /rename