Bug 21747: (follow-up) Intelligent rename of offsets