Fixing field renaming and i18n naming issues.