diff --git a/components/components_strings.grd b/components/components_strings.grd
index 732e6f0..7aeac7b 100644
--- a/components/components_strings.grd
+++ b/components/components_strings.grd
@@ -3,167 +3,167 @@
 <grit latest_public_release="0" current_release="1"
       source_lang_id="en" enc_check="möl">
   <outputs>
-    <output filename="grit/component_strings.h" type="rc_header">
+    <output filename="grit/components_strings.h" type="rc_header">
       <emit emit_type='prepend'></emit>
     </output>
-    <output filename="component_strings_am.pak" type="data_package" lang="am" />
-    <output filename="component_strings_ar.pak" type="data_package" lang="ar" />
+    <output filename="components_strings_am.pak" type="data_package" lang="am" />
+    <output filename="components_strings_ar.pak" type="data_package" lang="ar" />
     <if expr="use_third_party_translations">
-      <output filename="component_strings_ast.pak" type="data_package" lang="ast" />
+      <output filename="components_strings_ast.pak" type="data_package" lang="ast" />
     </if>
-    <output filename="component_strings_bg.pak" type="data_package" lang="bg" />
-    <output filename="component_strings_bn.pak" type="data_package" lang="bn" />
+    <output filename="components_strings_bg.pak" type="data_package" lang="bg" />
+    <output filename="components_strings_bn.pak" type="data_package" lang="bn" />
     <if expr="use_third_party_translations">
-      <output filename="component_strings_bs.pak" type="data_package" lang="bs" />
+      <output filename="components_strings_bs.pak" type="data_package" lang="bs" />
     </if>
-    <output filename="component_strings_ca.pak" type="data_package" lang="ca" />
+    <output filename="components_strings_ca.pak" type="data_package" lang="ca" />
     <if expr="use_third_party_translations">
-      <output filename="component_strings_ca@valencia.pak" type="data_package" lang="ca@valencia" />
+      <output filename="components_strings_ca@valencia.pak" type="data_package" lang="ca@valencia" />
     </if>
-    <output filename="component_strings_cs.pak" type="data_package" lang="cs" />
-    <output filename="component_strings_da.pak" type="data_package" lang="da" />
-    <output filename="component_strings_de.pak" type="data_package" lang="de" />
-    <output filename="component_strings_el.pak" type="data_package" lang="el" />
+    <output filename="components_strings_cs.pak" type="data_package" lang="cs" />
+    <output filename="components_strings_da.pak" type="data_package" lang="da" />
+    <output filename="components_strings_de.pak" type="data_package" lang="de" />
+    <output filename="components_strings_el.pak" type="data_package" lang="el" />
     <if expr="use_third_party_translations">
-      <output filename="component_strings_en-AU.pak" type="data_package" lang="en-AU" />
+      <output filename="components_strings_en-AU.pak" type="data_package" lang="en-AU" />
     </if>
-    <output filename="component_strings_en-GB.pak" type="data_package" lang="en-GB" />
-    <output filename="component_strings_en-US.pak" type="data_package" lang="en" />
+    <output filename="components_strings_en-GB.pak" type="data_package" lang="en-GB" />
+    <output filename="components_strings_en-US.pak" type="data_package" lang="en" />
     <if expr="use_third_party_translations">
-      <output filename="component_strings_eo.pak" type="data_package" lang="eo" />
+      <output filename="components_strings_eo.pak" type="data_package" lang="eo" />
     </if>
-    <output filename="component_strings_es.pak" type="data_package" lang="es" />
+    <output filename="components_strings_es.pak" type="data_package" lang="es" />
     <if expr="is_ios">
       <!-- iOS uses es-MX for es-419 -->
-      <output filename="component_strings_es-MX.pak" type="data_package" lang="es-419" />
+      <output filename="components_strings_es-MX.pak" type="data_package" lang="es-419" />
     </if>
     <if expr="not is_ios">
-      <output filename="component_strings_es-419.pak" type="data_package" lang="es-419" />
+      <output filename="components_strings_es-419.pak" type="data_package" lang="es-419" />
     </if>
-    <output filename="component_strings_et.pak" type="data_package" lang="et" />
+    <output filename="components_strings_et.pak" type="data_package" lang="et" />
     <if expr="use_third_party_translations">
-      <output filename="component_strings_eu.pak" type="data_package" lang="eu" />
+      <output filename="components_strings_eu.pak" type="data_package" lang="eu" />
     </if>
-    <output filename="component_strings_fa.pak" type="data_package" lang="fa" />
-    <output filename="component_strings_fake-bidi.pak" type="data_package" lang="fake-bidi" />
-    <output filename="component_strings_fi.pak" type="data_package" lang="fi" />
-    <output filename="component_strings_fil.pak" type="data_package" lang="fil" />
-    <output filename="component_strings_fr.pak" type="data_package" lang="fr" />
+    <output filename="components_strings_fa.pak" type="data_package" lang="fa" />
+    <output filename="components_strings_fake-bidi.pak" type="data_package" lang="fake-bidi" />
+    <output filename="components_strings_fi.pak" type="data_package" lang="fi" />
+    <output filename="components_strings_fil.pak" type="data_package" lang="fil" />
+    <output filename="components_strings_fr.pak" type="data_package" lang="fr" />
     <if expr="use_third_party_translations">
-      <output filename="component_strings_gl.pak" type="data_package" lang="gl" />
+      <output filename="components_strings_gl.pak" type="data_package" lang="gl" />
     </if>
-    <output filename="component_strings_gu.pak" type="data_package" lang="gu" />
-    <output filename="component_strings_he.pak" type="data_package" lang="he" />
-    <output filename="component_strings_hi.pak" type="data_package" lang="hi" />
-    <output filename="component_strings_hr.pak" type="data_package" lang="hr" />
-    <output filename="component_strings_hu.pak" type="data_package" lang="hu" />
+    <output filename="components_strings_gu.pak" type="data_package" lang="gu" />
+    <output filename="components_strings_he.pak" type="data_package" lang="he" />
+    <output filename="components_strings_hi.pak" type="data_package" lang="hi" />
+    <output filename="components_strings_hr.pak" type="data_package" lang="hr" />
+    <output filename="components_strings_hu.pak" type="data_package" lang="hu" />
     <if expr="use_third_party_translations">
-      <output filename="component_strings_hy.pak" type="data_package" lang="hy" />
-      <output filename="component_strings_ia.pak" type="data_package" lang="ia" />
+      <output filename="components_strings_hy.pak" type="data_package" lang="hy" />
+      <output filename="components_strings_ia.pak" type="data_package" lang="ia" />
     </if>
-    <output filename="component_strings_id.pak" type="data_package" lang="id" />
-    <output filename="component_strings_it.pak" type="data_package" lang="it" />
-    <output filename="component_strings_ja.pak" type="data_package" lang="ja" />
+    <output filename="components_strings_id.pak" type="data_package" lang="id" />
+    <output filename="components_strings_it.pak" type="data_package" lang="it" />
+    <output filename="components_strings_ja.pak" type="data_package" lang="ja" />
     <if expr="use_third_party_translations">
-      <output filename="component_strings_ka.pak" type="data_package" lang="ka" />
+      <output filename="components_strings_ka.pak" type="data_package" lang="ka" />
     </if>
-    <output filename="component_strings_kn.pak" type="data_package" lang="kn" />
-    <output filename="component_strings_ko.pak" type="data_package" lang="ko" />
+    <output filename="components_strings_kn.pak" type="data_package" lang="kn" />
+    <output filename="components_strings_ko.pak" type="data_package" lang="ko" />
     <if expr="use_third_party_translations">
-      <output filename="component_strings_ku.pak" type="data_package" lang="ku" />
-      <output filename="component_strings_kw.pak" type="data_package" lang="kw" />
+      <output filename="components_strings_ku.pak" type="data_package" lang="ku" />
+      <output filename="components_strings_kw.pak" type="data_package" lang="kw" />
     </if>
-    <output filename="component_strings_lt.pak" type="data_package" lang="lt" />
-    <output filename="component_strings_lv.pak" type="data_package" lang="lv" />
-    <output filename="component_strings_ml.pak" type="data_package" lang="ml" />
-    <output filename="component_strings_mr.pak" type="data_package" lang="mr" />
-    <output filename="component_strings_ms.pak" type="data_package" lang="ms" />
-    <output filename="component_strings_nl.pak" type="data_package" lang="nl" />
+    <output filename="components_strings_lt.pak" type="data_package" lang="lt" />
+    <output filename="components_strings_lv.pak" type="data_package" lang="lv" />
+    <output filename="components_strings_ml.pak" type="data_package" lang="ml" />
+    <output filename="components_strings_mr.pak" type="data_package" lang="mr" />
+    <output filename="components_strings_ms.pak" type="data_package" lang="ms" />
+    <output filename="components_strings_nl.pak" type="data_package" lang="nl" />
     <!-- The translation console uses 'no' for Norwegian Bokmål. It should
          be 'nb'. -->
-    <output filename="component_strings_nb.pak" type="data_package" lang="no" />
-    <output filename="component_strings_pl.pak" type="data_package" lang="pl" />
+    <output filename="components_strings_nb.pak" type="data_package" lang="no" />
+    <output filename="components_strings_pl.pak" type="data_package" lang="pl" />
     <if expr="is_ios">
       <!-- iOS uses pt for pt-BR -->
-      <output filename="component_strings_pt.pak" type="data_package" lang="pt-BR" />
+      <output filename="components_strings_pt.pak" type="data_package" lang="pt-BR" />
     </if>
     <if expr="not is_ios">
-      <output filename="component_strings_pt-BR.pak" type="data_package" lang="pt-BR" />
+      <output filename="components_strings_pt-BR.pak" type="data_package" lang="pt-BR" />
     </if>
-    <output filename="component_strings_pt-PT.pak" type="data_package" lang="pt-PT" />
-    <output filename="component_strings_ro.pak" type="data_package" lang="ro" />
-    <output filename="component_strings_ru.pak" type="data_package" lang="ru" />
-    <output filename="component_strings_sk.pak" type="data_package" lang="sk" />
-    <output filename="component_strings_sl.pak" type="data_package" lang="sl" />
-    <output filename="component_strings_sr.pak" type="data_package" lang="sr" />
-    <output filename="component_strings_sv.pak" type="data_package" lang="sv" />
-    <output filename="component_strings_sw.pak" type="data_package" lang="sw" />
-    <output filename="component_strings_ta.pak" type="data_package" lang="ta" />
-    <output filename="component_strings_te.pak" type="data_package" lang="te" />
-    <output filename="component_strings_th.pak" type="data_package" lang="th" />
-    <output filename="component_strings_tr.pak" type="data_package" lang="tr" />
+    <output filename="components_strings_pt-PT.pak" type="data_package" lang="pt-PT" />
+    <output filename="components_strings_ro.pak" type="data_package" lang="ro" />
+    <output filename="components_strings_ru.pak" type="data_package" lang="ru" />
+    <output filename="components_strings_sk.pak" type="data_package" lang="sk" />
+    <output filename="components_strings_sl.pak" type="data_package" lang="sl" />
+    <output filename="components_strings_sr.pak" type="data_package" lang="sr" />
+    <output filename="components_strings_sv.pak" type="data_package" lang="sv" />
+    <output filename="components_strings_sw.pak" type="data_package" lang="sw" />
+    <output filename="components_strings_ta.pak" type="data_package" lang="ta" />
+    <output filename="components_strings_te.pak" type="data_package" lang="te" />
+    <output filename="components_strings_th.pak" type="data_package" lang="th" />
+    <output filename="components_strings_tr.pak" type="data_package" lang="tr" />
     <if expr="use_third_party_translations">
-      <output filename="component_strings_ug.pak" type="data_package" lang="ug" />
+      <output filename="components_strings_ug.pak" type="data_package" lang="ug" />
     </if>
-    <output filename="component_strings_uk.pak" type="data_package" lang="uk" />
-    <output filename="component_strings_vi.pak" type="data_package" lang="vi" />
-    <output filename="component_strings_zh-CN.pak" type="data_package" lang="zh-CN" />
-    <output filename="component_strings_zh-TW.pak" type="data_package" lang="zh-TW" />
+    <output filename="components_strings_uk.pak" type="data_package" lang="uk" />
+    <output filename="components_strings_vi.pak" type="data_package" lang="vi" />
+    <output filename="components_strings_zh-CN.pak" type="data_package" lang="zh-CN" />
+    <output filename="components_strings_zh-TW.pak" type="data_package" lang="zh-TW" />
   </outputs>
   <translations>
-    <file path="strings/component_strings_am.xtb" lang="am" />
-    <file path="strings/component_strings_ar.xtb" lang="ar" />
-    <file path="strings/component_strings_bg.xtb" lang="bg" />
-    <file path="strings/component_strings_bn.xtb" lang="bn" />
-    <file path="strings/component_strings_ca.xtb" lang="ca" />
-    <file path="strings/component_strings_cs.xtb" lang="cs" />
-    <file path="strings/component_strings_da.xtb" lang="da" />
-    <file path="strings/component_strings_de.xtb" lang="de" />
-    <file path="strings/component_strings_el.xtb" lang="el" />
-    <file path="strings/component_strings_en-GB.xtb" lang="en-GB" />
-    <file path="strings/component_strings_es.xtb" lang="es" />
-    <file path="strings/component_strings_es-419.xtb" lang="es-419" />
-    <file path="strings/component_strings_et.xtb" lang="et" />
-    <file path="strings/component_strings_fa.xtb" lang="fa" />
-    <file path="strings/component_strings_fi.xtb" lang="fi" />
-    <file path="strings/component_strings_fil.xtb" lang="fil" />
-    <file path="strings/component_strings_fr.xtb" lang="fr" />
-    <file path="strings/component_strings_gu.xtb" lang="gu" />
-    <file path="strings/component_strings_hi.xtb" lang="hi" />
-    <file path="strings/component_strings_hr.xtb" lang="hr" />
-    <file path="strings/component_strings_hu.xtb" lang="hu" />
-    <file path="strings/component_strings_id.xtb" lang="id" />
-    <file path="strings/component_strings_it.xtb" lang="it" />
+    <file path="strings/components_strings_am.xtb" lang="am" />
+    <file path="strings/components_strings_ar.xtb" lang="ar" />
+    <file path="strings/components_strings_bg.xtb" lang="bg" />
+    <file path="strings/components_strings_bn.xtb" lang="bn" />
+    <file path="strings/components_strings_ca.xtb" lang="ca" />
+    <file path="strings/components_strings_cs.xtb" lang="cs" />
+    <file path="strings/components_strings_da.xtb" lang="da" />
+    <file path="strings/components_strings_de.xtb" lang="de" />
+    <file path="strings/components_strings_el.xtb" lang="el" />
+    <file path="strings/components_strings_en-GB.xtb" lang="en-GB" />
+    <file path="strings/components_strings_es.xtb" lang="es" />
+    <file path="strings/components_strings_es-419.xtb" lang="es-419" />
+    <file path="strings/components_strings_et.xtb" lang="et" />
+    <file path="strings/components_strings_fa.xtb" lang="fa" />
+    <file path="strings/components_strings_fi.xtb" lang="fi" />
+    <file path="strings/components_strings_fil.xtb" lang="fil" />
+    <file path="strings/components_strings_fr.xtb" lang="fr" />
+    <file path="strings/components_strings_gu.xtb" lang="gu" />
+    <file path="strings/components_strings_hi.xtb" lang="hi" />
+    <file path="strings/components_strings_hr.xtb" lang="hr" />
+    <file path="strings/components_strings_hu.xtb" lang="hu" />
+    <file path="strings/components_strings_id.xtb" lang="id" />
+    <file path="strings/components_strings_it.xtb" lang="it" />
     <!-- The translation console uses 'iw' for Hebrew, but we use 'he'. -->
-    <file path="strings/component_strings_iw.xtb" lang="he" />
-    <file path="strings/component_strings_ja.xtb" lang="ja" />
-    <file path="strings/component_strings_kn.xtb" lang="kn" />
-    <file path="strings/component_strings_ko.xtb" lang="ko" />
-    <file path="strings/component_strings_lt.xtb" lang="lt" />
-    <file path="strings/component_strings_lv.xtb" lang="lv" />
-    <file path="strings/component_strings_ml.xtb" lang="ml" />
-    <file path="strings/component_strings_mr.xtb" lang="mr" />
-    <file path="strings/component_strings_ms.xtb" lang="ms" />
-    <file path="strings/component_strings_nl.xtb" lang="nl" />
-    <file path="strings/component_strings_no.xtb" lang="no" />
-    <file path="strings/component_strings_pl.xtb" lang="pl" />
-    <file path="strings/component_strings_pt-BR.xtb" lang="pt-BR" />
-    <file path="strings/component_strings_pt-PT.xtb" lang="pt-PT" />
-    <file path="strings/component_strings_ro.xtb" lang="ro" />
-    <file path="strings/component_strings_ru.xtb" lang="ru" />
-    <file path="strings/component_strings_sk.xtb" lang="sk" />
-    <file path="strings/component_strings_sl.xtb" lang="sl" />
-    <file path="strings/component_strings_sr.xtb" lang="sr" />
-    <file path="strings/component_strings_sv.xtb" lang="sv" />
-    <file path="strings/component_strings_sw.xtb" lang="sw" />
-    <file path="strings/component_strings_ta.xtb" lang="ta" />
-    <file path="strings/component_strings_te.xtb" lang="te" />
-    <file path="strings/component_strings_th.xtb" lang="th" />
-    <file path="strings/component_strings_tr.xtb" lang="tr" />
-    <file path="strings/component_strings_uk.xtb" lang="uk" />
-    <file path="strings/component_strings_vi.xtb" lang="vi" />
-    <file path="strings/component_strings_zh-CN.xtb" lang="zh-CN" />
-    <file path="strings/component_strings_zh-TW.xtb" lang="zh-TW" />
+    <file path="strings/components_strings_iw.xtb" lang="he" />
+    <file path="strings/components_strings_ja.xtb" lang="ja" />
+    <file path="strings/components_strings_kn.xtb" lang="kn" />
+    <file path="strings/components_strings_ko.xtb" lang="ko" />
+    <file path="strings/components_strings_lt.xtb" lang="lt" />
+    <file path="strings/components_strings_lv.xtb" lang="lv" />
+    <file path="strings/components_strings_ml.xtb" lang="ml" />
+    <file path="strings/components_strings_mr.xtb" lang="mr" />
+    <file path="strings/components_strings_ms.xtb" lang="ms" />
+    <file path="strings/components_strings_nl.xtb" lang="nl" />
+    <file path="strings/components_strings_no.xtb" lang="no" />
+    <file path="strings/components_strings_pl.xtb" lang="pl" />
+    <file path="strings/components_strings_pt-BR.xtb" lang="pt-BR" />
+    <file path="strings/components_strings_pt-PT.xtb" lang="pt-PT" />
+    <file path="strings/components_strings_ro.xtb" lang="ro" />
+    <file path="strings/components_strings_ru.xtb" lang="ru" />
+    <file path="strings/components_strings_sk.xtb" lang="sk" />
+    <file path="strings/components_strings_sl.xtb" lang="sl" />
+    <file path="strings/components_strings_sr.xtb" lang="sr" />
+    <file path="strings/components_strings_sv.xtb" lang="sv" />
+    <file path="strings/components_strings_sw.xtb" lang="sw" />
+    <file path="strings/components_strings_ta.xtb" lang="ta" />
+    <file path="strings/components_strings_te.xtb" lang="te" />
+    <file path="strings/components_strings_th.xtb" lang="th" />
+    <file path="strings/components_strings_tr.xtb" lang="tr" />
+    <file path="strings/components_strings_uk.xtb" lang="uk" />
+    <file path="strings/components_strings_vi.xtb" lang="vi" />
+    <file path="strings/components_strings_zh-CN.xtb" lang="zh-CN" />
+    <file path="strings/components_strings_zh-TW.xtb" lang="zh-TW" />
   </translations>
   <release seq="1" allow_pseudo="false">
     <messages fallback_to_english="true">