i18n key names chnaged. Use underscore to saperate words for consistency.