r10574: start renaming