EHO-366 cleaned up i18n keys