diff --git a/client/coral-admin/src/components/ModerationKeysModal.js b/client/coral-admin/src/components/ModerationKeysModal.js
index 5efe19a18..1dac10142 100644
--- a/client/coral-admin/src/components/ModerationKeysModal.js
+++ b/client/coral-admin/src/components/ModerationKeysModal.js
@@ -39,13 +39,13 @@ export default class ModerationKeysModal extends React.Component {
       <div>
         <div className={styles.callToAction} style={{display: shortcutsNoteVisible === 'show' ? 'block' : 'none'}}>
           <div onClick={hideShortcutsNote} className={styles.closeButton}>×</div>
-          <p className={styles.ctaHeader}>{lang.t('modqueue.mod-faster')}</p>
-          <p><strong>{lang.t('modqueue.try-these')}:</strong></p>
+          <p className={styles.ctaHeader}>{lang.t('modqueue.mod_faster')}</p>
+          <p><strong>{lang.t('modqueue.try_these')}:</strong></p>
           <ul>
             <li><span>{lang.t('modqueue.approve')}</span> <span className={styles.smallKey}>t</span></li>
             <li><span>{lang.t('modqueue.reject')}</span> <span className={styles.smallKey}>r</span></li>
           </ul>
-          <p><span>{lang.t('modqueue.view-more-shortcuts')}</span> <span className={styles.smallKey}>{lang.t('modqueue.shift-key')}</span> + <span className={styles.smallKey}>/</span></p>
+          <p><span>{lang.t('modqueue.view_more_shortcuts')}</span> <span className={styles.smallKey}>{lang.t('modqueue.shift_key')}</span> + <span className={styles.smallKey}>/</span></p>
         </div>
         <Modal open={open} onClose={onClose}>
           <h3>{lang.t('modqueue.shortcuts')}</h3>
diff --git a/client/coral-admin/src/containers/ModerationQueue/ModerationQueue.js b/client/coral-admin/src/containers/ModerationQueue/ModerationQueue.js
index 3618f2d81..9f49cb756 100644
--- a/client/coral-admin/src/containers/ModerationQueue/ModerationQueue.js
+++ b/client/coral-admin/src/containers/ModerationQueue/ModerationQueue.js
@@ -56,7 +56,7 @@ class ModerationQueue extends React.Component {
                 currentAsset={props.currentAsset}
                 />;
             })
-            : <EmptyCard>{lang.t('modqueue.emptyqueue')}</EmptyCard>
+            : <EmptyCard>{lang.t('modqueue.empty_queue')}</EmptyCard>
           }
         </ul>
         <LoadMore
diff --git a/client/coral-admin/src/containers/ModerationQueue/components/FlagBox.js b/client/coral-admin/src/containers/ModerationQueue/components/FlagBox.js
index b06733d0f..a3839b390 100644
--- a/client/coral-admin/src/containers/ModerationQueue/components/FlagBox.js
+++ b/client/coral-admin/src/containers/ModerationQueue/components/FlagBox.js
@@ -6,9 +6,9 @@ const lang = new I18n();
 
 const shortReasons = {
   'This comment is offensive': lang.t('modqueue.offensive'),
-  'This looks like an ad/marketing': lang.t('modqueue.spam/ads'),
+  'This looks like an ad/marketing': lang.t('modqueue.spam_ads'),
   'This user is impersonating': lang.t('modqueue.impersonating'),
-  'I don\'t like this username': lang.t('modqueue.dont-like-username'),
+  'I don\'t like this username': lang.t('modqueue.dont_like_username'),
   'Other': lang.t('modqueue.other')
 };
 
@@ -47,7 +47,7 @@ class FlagBox extends Component {
                 <li key={i} className={styles.lessDetail}>{this.reasonMap(action.reason)} (<strong>{action.count}</strong>)</li>
               )}
             </ul>
-            <a onClick={this.toggleDetail} className={styles.moreDetail}>{showDetail ? lang.t('modqueue.less-detail') : lang.t('modqueue.more-detail')}</a>
+            <a onClick={this.toggleDetail} className={styles.moreDetail}>{showDetail ? lang.t('modqueue.less-detail') : lang.t('modqueue.more_detail')}</a>
           </div>
           {showDetail && (
             <div className={styles.detail}>
diff --git a/client/coral-admin/src/containers/Stories/Stories.js b/client/coral-admin/src/containers/Stories/Stories.js
index 0a9b9f5a6..aa905b94c 100644
--- a/client/coral-admin/src/containers/Stories/Stories.js
+++ b/client/coral-admin/src/containers/Stories/Stories.js
@@ -122,8 +122,8 @@ class Stories extends Component {
               onChange={this.onSearchChange}
               placeholder={lang.t('streams.search')}/>
           </div>
-          <div className={styles.optionHeader}>{lang.t('streams.filter-streams')}</div>
-          <div className={styles.optionDetail}>{lang.t('streams.stream-status')}</div>
+          <div className={styles.optionHeader}>{lang.t('streams.filter_streams')}</div>
+          <div className={styles.optionDetail}>{lang.t('streams.stream_status')}</div>
           <RadioGroup
             name='status filter'
             value={filter}
diff --git a/client/coral-admin/src/containers/Streams/Stories.js b/client/coral-admin/src/containers/Streams/Stories.js
index 7b2490885..a92f8a3d6 100644
--- a/client/coral-admin/src/containers/Streams/Stories.js
+++ b/client/coral-admin/src/containers/Streams/Stories.js
@@ -118,8 +118,8 @@ class Stories extends Component {
               onChange={this.onSearchChange}
               placeholder={lang.t('streams.search')}/>
           </div>
-          <div className={styles.optionHeader}>{lang.t('streams.filter-streams')}</div>
-          <div className={styles.optionDetail}>{lang.t('streams.stream-status')}</div>
+          <div className={styles.optionHeader}>{lang.t('streams.filter_streams')}</div>
+          <div className={styles.optionDetail}>{lang.t('streams.stream_status')}</div>
           <RadioGroup
             name='status filter'
             value={filter}
diff --git a/client/coral-i18n/locales/en.yml b/client/coral-i18n/locales/en.yml
index e314354bd..ff447a88c 100644
--- a/client/coral-i18n/locales/en.yml
+++ b/client/coral-i18n/locales/en.yml
@@ -175,11 +175,11 @@ framework:
   view_all_replies_initial: view all 0 replies
   view_more_comments: view more comments
   view_reply: view reply
-fromSettingsPage: From the Profile Page you can see your comment history.
+from_settings_page: From the Profile Page you can see your comment history.
 like: Like
 marketing: This looks like an ad/marketing
 moderate_this_stream: Moderate this stream
-modqueue:
+mo dqueue:
   account: account flags
   actions: Actions
   all: all
@@ -187,70 +187,69 @@ modqueue:
   approved: approved
   billion: B
   close: Close
-  dont-like-username: Don't like username
-  emptyqueue: No more comments to moderate! You're all caught up. Go have some ☕️
+  dont_like_username: Don't like username
+  empty_queue: No more comments to moderate! You're all caught up. Go have some ☕️
   flagged: flagged
   impersonating: Impersonating
-  less-detail: Less detail
+  less_detail: Less detail
   likes: likes
   million: M
-  mod-faster: Moderate faster with keyboard shortcuts
-  more-detail: More detail
+  mod_faster: Moderate faster with keyboard shortcuts
+  more_detail: More detail
   navigation: Navigation
-  nextcomment: Go to the next comment
+  next_comment: Go to the next comment
   offensive: Offensive
   other: Other
   premod: pre-mod
-  prevcomment: Go to the previous comment
+  prev_comment: Go to the previous comment
   reject: Reject comment
   rejected: rejected
-  shift-key: ⇧
+  shift_key: ⇧
   shortcuts: Shortcuts
-  showshortcuts: Show Shortcuts
+  show_shortcuts: Show Shortcuts
   singleview: Toggle single comment edit view
-  spam/ads: Spam/Ads
+  spam_ads: Spam/Ads
   thismenu: Open this menu
   thousand: k
-  try-these: Try these
-  view-more-shortcuts: View more shortcuts
-myCommentHistory: My comment History
+  try_these: Try these
+  view_more_shortcuts: View more shortcuts
+my_comment_history: My comment History
 name: Name
-no-agree-comment: I don't agree with this comment
-no-like-bio: I don't like this bio
-no-like-username: I don't like this username
+no_agree_comment: I don't agree with this comment
+no_like_bio: I don't like this bio
+no_like_username: I don't like this username
 other: Other
-permalink:
-  permalink: Link
-personal-info: This comment reveals personally identifiable information
+permalink: Link
+personal_info: This comment reveals personally identifiable information
 post: Post
 profile: Profile
-profileSettings: Profile Settings
+profile_settings: Profile Settings
 reply: Reply
 report: Report
-report-notif: Thank you for reporting this comment. Our moderation team has been notified
+report_notif: Thank you for reporting this comment. Our moderation team has been notified
   and will review it shortly.
-report-notif-remove: Your report has been removed.
+report_notif_remove: Your report has been removed.
 reported: Reported
-setBest: Tag as Best
+set_best: Tag as Best
 settings:
-  allComments: All Comments
-  fromSettingsPage: From the Profile Page you can see your comment history.
-  myCommentHistory: My comment History
+  all_comments: All Comments
+  from_settings_page: From the Profile Page you can see your comment history.
+  my_comment_history: My comment History
   profile: Profile
-  profileSettings: Profile Settings
-  signIn: Sign in
-  toAccess: to access Profile
-  userNoComment: You've never left a comment. Join the conversation!
-signIn: Sign in
-step-1-header: Report an issue
-step-2-header: Help us understand
-step-3-header: Thank you for your input
+  profile_settings: Profile Settings
+  sign_in: Sign in
+  to_access: to access Profile
+  user_no_comment: You've never left a comment. Join the conversation!
+sign_in: Sign in
+step_1_header: Report an issue
+step_2_header: Help us understand
+step_3_header: Thank you for your input
 streams:
   all: All
   article: Story
   closed: Closed
   empty_result: No assets match this search. Maybe try widening your search?
-  filter-streams: Filter Streams
+  filter_streams: Filter Streams
   newest: Newest
   oldest: Oldest
   open: Open
@@ -258,7 +257,7 @@ streams:
   search: Search
   sort_by: Sort By
   status: Stream Status
-  stream-status: Stream Status
+  stream_status: Stream Status
 suspenduser:
   bio: bio
   description_0: Would you like to temporarily ban this user because of their {0}?
@@ -278,13 +277,12 @@ suspenduser:
   username: username
   write_message: Write a message
   yes_suspend: Yes suspend
-thank-you: We value your safety and feedback. A moderator will review your report.
-toAccess: ' to access Profile'
-unsetBest: Untag as Best
+thank_you: We value your safety and feedback. A moderator will review your report.
+unset_best: Untag as Best
 user:
   bio_flags: flags for this bio
   user_bio: User Bio
   username_flags: flags for this username
-user-impersonating: This user is impersonating
-userNoComment: You've never left a comment. Join the conversation!
-username-offensive: This username is offensive
+user_impersonating: This user is impersonating
+user_no_comment: You've never left a comment. Join the conversation!
+username_offensive: This username is offensive
diff --git a/client/coral-i18n/locales/es.yml b/client/coral-i18n/locales/es.yml
index 0a91429b4..bcdbfe139 100644
--- a/client/coral-i18n/locales/es.yml
+++ b/client/coral-i18n/locales/es.yml
@@ -176,7 +176,7 @@ framework:
   view_all_replies_initial: ver todas las 0 respuestas
   view_more_comments: Ver commentarios más
   view_reply: ver respuesta
-fromSettingsPage: Desde la página de configuración puedes ver tu historia de comentarios.
+from_settings_page: Desde la página de configuración puedes ver tu historia de comentarios.
 like: Me gusta
 marketing: Esto parece una propaganda
 moderate_this_stream: Modera este hilo de comentarios
@@ -188,70 +188,68 @@ modqueue:
   approved: approved
   billion: B
   close: Close
-  dont-like-username: Don't like username
-  emptyqueue: No more comments to moderate! You're all caught up. Go have some ☕️
+  dont_like_username: Don't like username
+  empty_queue: No more comments to moderate! You're all caught up. Go have some ☕️
   flagged: flagged
   impersonating: Impersonating
-  less-detail: Less detail
+  less_detail: Less detail
   likes: likes
   million: M
-  mod-faster: Moderate faster with keyboard shortcuts
-  more-detail: More detail
+  mod_faster: Moderate faster with keyboard shortcuts
+  more_detail: More detail
   navigation: Navigation
-  nextcomment: Go to the next comment
+  next_comment: Go to the next comment
   offensive: Offensive
   other: Other
   premod: pre-mod
-  prevcomment: Go to the previous comment
+  prev_comment: Go to the previous comment
   reject: Reject comment
   rejected: rejected
-  shift-key: ⇧
+  shift_key: ⇧
   shortcuts: Shortcuts
-  showshortcuts: Show Shortcuts
+  show_shortcuts: Show Shortcuts
   singleview: Toggle single comment edit view
-  spam/ads: Spam/Ads
+  spam_ads: Spam/Ads
   thismenu: Open this menu
   thousand: k
-  try-these: Try these
-  view-more-shortcuts: View more shortcuts
-myCommentHistory: Mi historial de comentarios
+  try_these: Try these
+  view_more_shortcuts: View more shortcuts
+my_comment_history: Mi historial de comentarios
 name: Nombre
-no-agree-comment: No estoy de acuerdo con este comentario
-no-like-bio: No me gusta esta biografia
-no-like-username: No me gusta este nombre de usuario
+no_agree_comment: No estoy de acuerdo con este comentario
+no_like_bio: No me gusta esta biografia
+no_like_username: No me gusta este nombre de usuario
 other: Otro
-permalink:
-  permalink: Enlace
-personal-info: Este comentario muestra información personal
+permalink: Enlace
+personal_info: Este comentario muestra información personal
 post: Publicar
 profile: Perfil
 profileSettings: Configuración del perfil
 reply: Responder
 report: Reportar
-report-notif: Gracias por reportar este comentario. Nuestro equipo de moderación ha
-  sido notificado y muy pronto lo va a revisar.
-report-notif-remove: Tu reporte ha sido eliminada.
+report_notif: Gracias por reportar este comentario. Nuestro equipo de moderación ha sido notificado y muy pronto lo va a revisar.
+report_notif_remove: Tu reporte ha sido eliminada.
 reported: Reportado
-setBest: Etiquetar como el mejor
+set_best: Etiquetar como el mejor
 settings:
-  allComments: Todos los comentarios
-  fromSettingsPage: Desde la página de configuración puedes ver tu historia de comentarios.
-  myCommentHistory: Mi historial de comentarios
+  all_comments: Todos los comentarios
+  from_settings_page: Desde la página de configuración puedes ver tu historia de comentarios.
+  my_comment_history: Mi historial de comentarios
   profile: Perfil
-  profileSettings: Configuración del perfil
-  signIn: Entrar
-  toAccess: para acceder a al perfil
-  userNoComment: No has dejado aún ningún comentario. ¡Únete a la conversación!
-signIn: Entrar
-step-1-header: Reportar un problema
-step-2-header: Ayudanos a comprender
-step-3-header: Gracias por tu participación
+  profile_settings: Configuración del perfil
+  sign_in: Entrar
+  to_access: para acceder a al perfil
+  user_no_comment: No has dejado aún ningún comentario. ¡Únete a la conversación!
+sign_in: Entrar
+step_1_header: Reportar un problema
+step_2_header: Ayudanos a comprender
+step_3_header: Gracias por tu participación
 streams:
   all: All
   article: Story
   closed: Closed
   empty_result: No assets match this search. Maybe try widening your search?
-  filter-streams: Filter Streams
+  filter_streams: Filter Streams
   newest: Newest
   oldest: Oldest
   open: Open
@@ -259,7 +257,7 @@ streams:
   search: Search
   sort_by: Sort By
   status: Stream Status
-  stream-status: Stream Status
+  stream_status: Stream Status
 suspenduser:
   bio: bio
   description_0: Would you like to temporarily ban this user because of their {0}?
@@ -279,14 +277,12 @@ suspenduser:
   username: username
   write_message: Write a message
   yes_suspend: Yes suspend
-thank-you: Valoramos tanto tu seguridad en este espacio como tus comentarios. Un o
-  una moderadora van a leer tu reporte.
-toAccess: para acceder a al perfil
-unsetBest: Desetiquetar como el mejor
+thank_you: Valoramos tanto tu seguridad en este espacio como tus comentarios. Un o una moderadora van a leer tu reporte.
+unset_best: Desetiquetar como el mejor
 user:
   bio_flags: flags for this bio
   user_bio: User Bio
   username_flags: flags for this username
-user-impersonating: Este usuario suplanta a alguien
-userNoComment: No has dejado aún ningún comentario. ¡Únete a la conversación!
-username-offensive: Este nombre de usuario es ofensivo
+user_impersonating: Este usuario suplanta a alguien
+user_no_comment: No has dejado aún ningún comentario. ¡Únete a la conversación!
+username_offensive: Este nombre de usuario es ofensivo
diff --git a/client/coral-plugin-flags/FlagComment.js b/client/coral-plugin-flags/FlagComment.js
index 88c5821f4..17ca03f5e 100644
--- a/client/coral-plugin-flags/FlagComment.js
+++ b/client/coral-plugin-flags/FlagComment.js
@@ -9,7 +9,7 @@ const FlagComment = (props) => <FlagButton {...props} getPopupMenu={getPopupMenu
 const getPopupMenu = [
   () => {
     return {
-      header: lang.t('step-1-header'),
+      header: lang.t('step_1_header'),
       options: [
         {val: 'COMMENTS', text: lang.t('flag_comment')},
         {val: 'USERS', text: lang.t('flag_username')}
@@ -23,18 +23,18 @@ const getPopupMenu = [
     [
       {val: 'This comment is offensive', text: lang.t('comment_offensive')},
       {val: 'This looks like an ad/marketing', text: lang.t('marketing')},
-      {val: 'I don\'t agree with this comment', text: lang.t('no-agree-comment')},
+      {val: 'I don\'t agree with this comment', text: lang.t('no_agree_comment')},
       {val: 'Other', text: lang.t('other')}
     ]
     : [
-      {val: 'This username is offensive', text: lang.t('username-offensive')},
-      {val: 'I don\'t like this username', text: lang.t('no-like-username')},
-      {val: 'This user is impersonating', text: lang.t('user-impersonating')},
+      {val: 'This username is offensive', text: lang.t('username_offensive')},
+      {val: 'I don\'t like this username', text: lang.t('no_like_username')},
+      {val: 'This user is impersonating', text: lang.t('user_impersonating')},
       {val: 'This looks like an ad/marketing', text: lang.t('marketing')},
       {val: 'Other', text: lang.t('other')}
     ];
     return {
-      header: lang.t('step-2-header'),
+      header: lang.t('step_2_header'),
       options,
       button: lang.t('continue'),
       sets: 'reason'
@@ -42,8 +42,8 @@ const getPopupMenu = [
   },
   () =>  {
     return {
-      header: lang.t('step-3-header'),
-      text: lang.t('thank-you'),
+      header: lang.t('step_3_header'),
+      text: lang.t('thank_you'),
       button: lang.t('done'),
     };
   }
diff --git a/client/coral-plugin-permalinks/PermalinkButton.js b/client/coral-plugin-permalinks/PermalinkButton.js
index 1567df465..79a1bc1eb 100644
--- a/client/coral-plugin-permalinks/PermalinkButton.js
+++ b/client/coral-plugin-permalinks/PermalinkButton.js
@@ -55,7 +55,7 @@ class PermalinkButton extends React.Component {
           ref={ref => this.linkButton = ref}
           onClick={this.toggle}
           className={`${name}-button`}>
-          {lang.t('permalink.permalink')}
+          {lang.t('permalink')}
           <i className={`${name}-icon material-icons`} aria-hidden={true}>link</i>
         </button>
         <div
diff --git a/client/coral-settings/components/NotLoggedIn.js b/client/coral-settings/components/NotLoggedIn.js
index 25b84c192..25c33263e 100644
--- a/client/coral-settings/components/NotLoggedIn.js
+++ b/client/coral-settings/components/NotLoggedIn.js
@@ -7,10 +7,10 @@ const lang = new I18n();
 export default ({showSignInDialog}) => (
   <div className={styles.message}>
     <div>
-      <a onClick={showSignInDialog}>{lang.t('signIn')}</a> {lang.t('toAccess')}
+      <a onClick={showSignInDialog}>{lang.t('sign_in')}</a> {lang.t('toAccess')}
     </div>
     <div>
-      {lang.t('fromSettingsPage')}
+      {lang.t('from_settings_page')}
     </div>
   </div>
 );
diff --git a/client/coral-settings/containers/ProfileContainer.js b/client/coral-settings/containers/ProfileContainer.js
index 43e3d0560..01c7cf7a7 100644
--- a/client/coral-settings/containers/ProfileContainer.js
+++ b/client/coral-settings/containers/ProfileContainer.js
@@ -80,7 +80,7 @@ class ProfileContainer extends Component {
               link={link}
             />
           :
-            <p>{lang.t('userNoComment')}</p>
+            <p>{lang.t('user_no_comment')}</p>
         }
       </div>
     );
diff --git a/client/coral-sign-in/components/FakeComment.js b/client/coral-sign-in/components/FakeComment.js
index 5fabc6904..71b365f57 100644
--- a/client/coral-sign-in/components/FakeComment.js
+++ b/client/coral-sign-in/components/FakeComment.js
@@ -45,7 +45,7 @@ class FakeComment extends React.Component {
         <div className="commentActionsRight comment__action-container">
           <div className="coral-plugin-permalinks-container">
             <button className="coral-plugin-permalinks-button">
-              <span className={`comment__action-button comment__action-button--nowrap ${'coral-plugin-flags'}-button-text`}>{lang.t('permalink.permalink')}</span>
+              <span className={`comment__action-button comment__action-button--nowrap ${'coral-plugin-flags'}-button-text`}>{lang.t('permalink')}</span>
               <i className="coral-plugin-permalinks-icon material-icons" aria-hidden={true}>link</i>
             </button>
           </div>