#330983 follow-up by David Rothenstein: Move rename function later in the process to un-break D6->D7 upgrade path.