refactored renameplan according to spec