Attempting a two stage rename to avoid case problems on the build farm (this is part 2)