Implement support for renaming plans