Make better use of the Rename module.