Fixed 'Bug 12554 - Field rename issue'.