Improved rename