diff --git a/client/coral-admin/src/routes/Community/components/User.js b/client/coral-admin/src/routes/Community/components/User.js
index 85f8cbd27..b6a01f016 100644
--- a/client/coral-admin/src/routes/Community/components/User.js
+++ b/client/coral-admin/src/routes/Community/components/User.js
@@ -2,7 +2,7 @@ import React from 'react';
 import styles from './Community.css';
 
 import ActionButton from './ActionButton';
-import {username} from 'coral-plugin-flags/helpers/flagMap';
+import {username} from 'coral-plugin-flags/helpers/flagReasons';
 import ActionsMenu from 'coral-admin/src/components/ActionsMenu';
 import ActionsMenuItem from 'coral-admin/src/components/ActionsMenuItem';
 
diff --git a/client/coral-plugin-flags/components/FlagComment.js b/client/coral-plugin-flags/components/FlagComment.js
index ddad63b7e..fc67d4b71 100644
--- a/client/coral-plugin-flags/components/FlagComment.js
+++ b/client/coral-plugin-flags/components/FlagComment.js
@@ -2,7 +2,7 @@ import React from 'react';
 import FlagButton from './FlagButton';
 
 import t from 'coral-framework/services/i18n';
-import * as flagReason from '../helpers/flagMap';
+import {username, comment} from '../helpers/flagReasons';
 
 const FlagComment = (props) => <FlagButton {...props} getPopupMenu={getPopupMenu} />;
 
@@ -21,17 +21,17 @@ const getPopupMenu = [
   (itemType) => {
     const options = itemType === 'COMMENTS' ?
     [
-      {val: flagReason.commment.offensive, text: t('comment_offensive')},
-      {val: flagReason.commment.spam, text: t('marketing')},
-      {val: flagReason.commment.noagree, text: t('no_agree_comment')},
-      {val: flagReason.commment.other, text: t('other')}
+      {val: comment.offensive, text: t('comment_offensive')},
+      {val: comment.spam, text: t('marketing')},
+      {val: comment.noagree, text: t('no_agree_comment')},
+      {val: comment.other, text: t('other')}
     ]
     : [
-      {val: flagReason.username.offensive, text: t('username_offensive')},
-      {val: flagReason.username.nolike, text: t('no_like_username')},
-      {val: flagReason.username.impersonating, text: t('user_impersonating')},
-      {val: flagReason.username.spam, text: t('marketing')},
-      {val: flagReason.username.other, text: t('other')}
+      {val: username.offensive, text: t('username_offensive')},
+      {val: username.nolike, text: t('no_like_username')},
+      {val: username.impersonating, text: t('user_impersonating')},
+      {val: username.spam, text: t('marketing')},
+      {val: username.other, text: t('other')}
     ];
     return {
       header: t('step_2_header'),
diff --git a/client/coral-plugin-flags/helpers/flagMap.js b/client/coral-plugin-flags/helpers/flagReasons.js
similarity index 100%
rename from client/coral-plugin-flags/helpers/flagMap.js
rename to client/coral-plugin-flags/helpers/flagReasons.js