Rename and tidy various i18n keys