Fix i18n namespacing issue