diff --git a/src/editors/containers/EditorContainer/components/EditorFooter/messages.js b/src/editors/containers/EditorContainer/components/EditorFooter/messages.js
index 6058d2960..f8203a9d8 100644
--- a/src/editors/containers/EditorContainer/components/EditorFooter/messages.js
+++ b/src/editors/containers/EditorContainer/components/EditorFooter/messages.js
@@ -1,4 +1,7 @@
-export const messages = {
+import { defineMessages } from '@edx/frontend-platform/i18n';
+
+const messages = defineMessages({
+
   contentSaveFailed: {
     id: 'authoring.editorfooter.save.error',
     defaultMessage: 'Error: Content save failed. Try again later.',
@@ -24,6 +27,6 @@ export const messages = {
     defaultMessage: 'Save',
     description: 'Label for Save button',
   },
-};
+});
 
 export default messages;
diff --git a/src/editors/containers/EditorContainer/components/TitleHeader/messages.js b/src/editors/containers/EditorContainer/components/TitleHeader/messages.js
index 7c55e51e4..54d92ac16 100644
--- a/src/editors/containers/EditorContainer/components/TitleHeader/messages.js
+++ b/src/editors/containers/EditorContainer/components/TitleHeader/messages.js
@@ -1,4 +1,7 @@
-export const messages = {
+import { defineMessages } from '@edx/frontend-platform/i18n';
+
+const messages = defineMessages({
+
   loading: {
     id: 'authoring.texteditor.title.loading',
     defaultMessage: 'Loading...',
@@ -24,6 +27,6 @@ export const messages = {
     defaultMessage: 'Save',
     description: 'Screen reader label title for icon button to edit the xblock title',
   },
-};
+});
 
 export default messages;
diff --git a/src/editors/containers/EditorContainer/messages.js b/src/editors/containers/EditorContainer/messages.js
index c9eb65dce..b8301ca81 100644
--- a/src/editors/containers/EditorContainer/messages.js
+++ b/src/editors/containers/EditorContainer/messages.js
@@ -1,4 +1,7 @@
-export const messages = {
+import { defineMessages } from '@edx/frontend-platform/i18n';
+
+const messages = defineMessages({
+
   cancelConfirmTitle: {
     id: 'authoring.editorContainer.cancelConfirm.title',
     defaultMessage: 'Exit the editor?',
@@ -14,6 +17,6 @@ export const messages = {
     defaultMessage: 'OK',
     description: 'Label for OK button',
   },
-};
+});
 
 export default messages;
diff --git a/src/editors/containers/ProblemEditor/components/EditProblemView/AnswerWidget/AnswersContainer.test.jsx b/src/editors/containers/ProblemEditor/components/EditProblemView/AnswerWidget/AnswersContainer.test.jsx
index 7bf2966e5..91974e787 100644
--- a/src/editors/containers/ProblemEditor/components/EditProblemView/AnswerWidget/AnswersContainer.test.jsx
+++ b/src/editors/containers/ProblemEditor/components/EditProblemView/AnswerWidget/AnswersContainer.test.jsx
@@ -11,8 +11,10 @@ import { AnswersContainer as AnswersContainerWithoutHOC } from './AnswersContain
 
 jest.mock('@edx/frontend-platform/i18n', () => ({
   FormattedMessage: ({ defaultMessage }) => (<p>{defaultMessage}</p>),
+  defineMessages: m => m,
   injectIntl: (args) => args,
   intlShape: {},
+  getLocale: jest.fn(),
 }));
 
 jest.mock('./AnswerOption', () => () => <div>MockAnswerOption</div>);
diff --git a/src/editors/containers/ProblemEditor/components/EditProblemView/AnswerWidget/components/Feedback/FeedbackBox.jsx b/src/editors/containers/ProblemEditor/components/EditProblemView/AnswerWidget/components/Feedback/FeedbackBox.jsx
index 154cfb40c..c75cafe2f 100644
--- a/src/editors/containers/ProblemEditor/components/EditProblemView/AnswerWidget/components/Feedback/FeedbackBox.jsx
+++ b/src/editors/containers/ProblemEditor/components/EditProblemView/AnswerWidget/components/Feedback/FeedbackBox.jsx
@@ -4,7 +4,7 @@ import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
 
 import { answerOptionProps } from '../../../../../../../data/services/cms/types';
 import FeedbackControl from './FeedbackControl';
-import { messages } from './messages';
+import messages from './messages';
 import { ProblemTypeKeys } from '../../../../../../../data/constants/problem';
 
 export const FeedbackBox = ({
diff --git a/src/editors/containers/ProblemEditor/components/EditProblemView/AnswerWidget/components/Feedback/messages.js b/src/editors/containers/ProblemEditor/components/EditProblemView/AnswerWidget/components/Feedback/messages.js
index a580c9c7e..b8b9ad8b2 100644
--- a/src/editors/containers/ProblemEditor/components/EditProblemView/AnswerWidget/components/Feedback/messages.js
+++ b/src/editors/containers/ProblemEditor/components/EditProblemView/AnswerWidget/components/Feedback/messages.js
@@ -1,4 +1,7 @@
-export const messages = {
+import { defineMessages } from '@edx/frontend-platform/i18n';
+
+const messages = defineMessages({
+
   feedbackPlaceholder: {
     id: 'authoring.answerwidget.feedback.placeholder',
     defaultMessage: 'Feedback message',
@@ -29,6 +32,6 @@ export const messages = {
     defaultMessage: 'is not selected',
     description: 'Bold & underlined text for feedback if option is not selected',
   },
-};
+});
 
 export default messages;
diff --git a/src/editors/containers/ProblemEditor/components/EditProblemView/AnswerWidget/hooks.test.js b/src/editors/containers/ProblemEditor/components/EditProblemView/AnswerWidget/hooks.test.js
index 417a3edf4..6fce1220a 100644
--- a/src/editors/containers/ProblemEditor/components/EditProblemView/AnswerWidget/hooks.test.js
+++ b/src/editors/containers/ProblemEditor/components/EditProblemView/AnswerWidget/hooks.test.js
@@ -9,12 +9,15 @@ import * as module from './hooks';
 jest.mock('react', () => {
   const updateState = jest.fn();
   return {
-    updateState,
     useEffect: jest.fn(),
     useState: jest.fn(val => ([{ state: val }, (newVal) => updateState({ val, newVal })])),
   };
 });
 
+jest.mock('@edx/frontend-platform/i18n', () => ({
+  defineMessages: m => m,
+}));
+
 jest.mock('../../../../../data/redux', () => ({
   actions: {
     problem: {
diff --git a/src/editors/containers/ProblemEditor/components/EditProblemView/AnswerWidget/messages.js b/src/editors/containers/ProblemEditor/components/EditProblemView/AnswerWidget/messages.js
index 301c86ec2..d047f9552 100644
--- a/src/editors/containers/ProblemEditor/components/EditProblemView/AnswerWidget/messages.js
+++ b/src/editors/containers/ProblemEditor/components/EditProblemView/AnswerWidget/messages.js
@@ -1,4 +1,6 @@
-export const messages = {
+import { defineMessages } from '@edx/frontend-platform/i18n';
+
+const messages = defineMessages({
   answerWidgetTitle: {
     id: 'authoring.answerwidget.answer.answerWidgetTitle',
     defaultMessage: 'Answers',
@@ -54,6 +56,5 @@ export const messages = {
     defaultMessage: 'is not selected',
     description: 'Bold & underlined text for feedback if option is not selected',
   },
-};
-
+});
 export default messages;
diff --git a/src/editors/containers/ProblemEditor/components/EditProblemView/ExplanationWidget/index.jsx b/src/editors/containers/ProblemEditor/components/EditProblemView/ExplanationWidget/index.jsx
index 8e164bb55..2cd04cb95 100644
--- a/src/editors/containers/ProblemEditor/components/EditProblemView/ExplanationWidget/index.jsx
+++ b/src/editors/containers/ProblemEditor/components/EditProblemView/ExplanationWidget/index.jsx
@@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
 import { connect } from 'react-redux';
 import { injectIntl, FormattedMessage, intlShape } from '@edx/frontend-platform/i18n';
 import { selectors } from '../../../../../data/redux';
-import { messages } from './messages';
+import messages from './messages';
 
 import TinyMceWidget from '../../../../../sharedComponents/TinyMceWidget';
 import { prepareEditorRef } from '../../../../../sharedComponents/TinyMceWidget/hooks';
diff --git a/src/editors/containers/ProblemEditor/components/EditProblemView/ExplanationWidget/messages.js b/src/editors/containers/ProblemEditor/components/EditProblemView/ExplanationWidget/messages.js
index ef74a6052..77a3f0cca 100644
--- a/src/editors/containers/ProblemEditor/components/EditProblemView/ExplanationWidget/messages.js
+++ b/src/editors/containers/ProblemEditor/components/EditProblemView/ExplanationWidget/messages.js
@@ -1,4 +1,7 @@
-export const messages = {
+import { defineMessages } from '@edx/frontend-platform/i18n';
+
+const messages = defineMessages({
+
   solutionWidgetTitle: {
     id: 'authoring.problemEditor.explanationwidget.explanationWidgetTitle',
     defaultMessage: 'Explanation',
@@ -14,6 +17,6 @@ export const messages = {
     defaultMessage: 'Enter your explanation',
     description: 'Placeholder text for tinyMCE editor',
   },
-};
+});
 
 export default messages;
diff --git a/src/editors/containers/ProblemEditor/components/EditProblemView/QuestionWidget/index.jsx b/src/editors/containers/ProblemEditor/components/EditProblemView/QuestionWidget/index.jsx
index ea6780dab..0c95ad17a 100644
--- a/src/editors/containers/ProblemEditor/components/EditProblemView/QuestionWidget/index.jsx
+++ b/src/editors/containers/ProblemEditor/components/EditProblemView/QuestionWidget/index.jsx
@@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
 import { connect } from 'react-redux';
 import { injectIntl, FormattedMessage, intlShape } from '@edx/frontend-platform/i18n';
 import { selectors } from '../../../../../data/redux';
-import { messages } from './messages';
+import messages from './messages';
 
 import TinyMceWidget from '../../../../../sharedComponents/TinyMceWidget';
 import { prepareEditorRef } from '../../../../../sharedComponents/TinyMceWidget/hooks';
diff --git a/src/editors/containers/ProblemEditor/components/EditProblemView/QuestionWidget/messages.js b/src/editors/containers/ProblemEditor/components/EditProblemView/QuestionWidget/messages.js
index 48354a96d..a3a61fd95 100644
--- a/src/editors/containers/ProblemEditor/components/EditProblemView/QuestionWidget/messages.js
+++ b/src/editors/containers/ProblemEditor/components/EditProblemView/QuestionWidget/messages.js
@@ -1,4 +1,7 @@
-export const messages = {
+import { defineMessages } from '@edx/frontend-platform/i18n';
+
+const messages = defineMessages({
+
   questionWidgetTitle: {
     id: 'authoring.questionwidget.question.questionWidgetTitle',
     defaultMessage: 'Question',
@@ -9,6 +12,6 @@ export const messages = {
     defaultMessage: 'Enter your question',
     description: 'Placeholder text for tinyMCE editor',
   },
-};
+});
 
 export default messages;
diff --git a/src/editors/containers/ProblemEditor/components/EditProblemView/SettingsWidget/hooks.test.js b/src/editors/containers/ProblemEditor/components/EditProblemView/SettingsWidget/hooks.test.js
index 52ca07fc7..6946bae97 100644
--- a/src/editors/containers/ProblemEditor/components/EditProblemView/SettingsWidget/hooks.test.js
+++ b/src/editors/containers/ProblemEditor/components/EditProblemView/SettingsWidget/hooks.test.js
@@ -15,6 +15,10 @@ jest.mock('react', () => {
   };
 });
 
+jest.mock('@edx/frontend-platform/i18n', () => ({
+  defineMessages: m => m,
+}));
+
 jest.mock('../../../../../data/redux', () => ({
   actions: {
     problem: {
diff --git a/src/editors/containers/ProblemEditor/components/EditProblemView/SettingsWidget/messages.js b/src/editors/containers/ProblemEditor/components/EditProblemView/SettingsWidget/messages.js
index af54147f6..4e2c4545d 100644
--- a/src/editors/containers/ProblemEditor/components/EditProblemView/SettingsWidget/messages.js
+++ b/src/editors/containers/ProblemEditor/components/EditProblemView/SettingsWidget/messages.js
@@ -1,4 +1,7 @@
-export const messages = {
+import { defineMessages } from '@edx/frontend-platform/i18n';
+
+const messages = defineMessages({
+
   settingsWidgetTitle: {
     id: 'authoring.problemeditor.settings.settingsWidgetTitle',
     defaultMessage: 'Settings',
@@ -185,17 +188,17 @@ export const messages = {
     description: 'button to switch to the advanced mode of the editor.',
   },
   ConfirmSwitchMessage: {
-    id: 'authoring.problemeditor.settings.switchtoadvancededitor.message',
+    id: 'authoring.problemeditor.settings.switchtoadvancededitor.ConfirmSwitchMessage',
     defaultMessage: 'If you use the advanced editor, this problem will be converted to OLX and you will not be able to return to the simple editor.',
     description: 'message to confirm that a user wants to use the advanced editor',
   },
   ConfirmSwitchMessageTitle: {
-    id: 'authoring.problemeditor.settings.switchtoadvancededitor.message',
+    id: 'authoring.problemeditor.settings.switchtoadvancededitor.ConfirmSwitchMessageTitle',
     defaultMessage: 'Convert to OLX?',
     description: 'message to confirm that a user wants to use the advanced editor',
   },
   ConfirmSwitchButtonLabel: {
-    id: 'authoring.problemeditor.settings.switchtoadvancededitor.message',
+    id: 'authoring.problemeditor.settings.switchtoadvancededitor.ConfirmSwitchButtonLabel',
     defaultMessage: 'Switch to advanced editor',
     description: 'message to confirm that a user wants to use the advanced editor',
   },
@@ -209,5 +212,6 @@ export const messages = {
     defaultMessage: 'Provide an explanation for the correct answer.',
     description: 'Solution Explanation text',
   },
-};
+});
+
 export default messages;
diff --git a/src/editors/containers/ProblemEditor/components/EditProblemView/SettingsWidget/settingsComponents/GeneralFeedback/hooks.test.js b/src/editors/containers/ProblemEditor/components/EditProblemView/SettingsWidget/settingsComponents/GeneralFeedback/hooks.test.js
index 0cd35cfee..d866353bb 100644
--- a/src/editors/containers/ProblemEditor/components/EditProblemView/SettingsWidget/settingsComponents/GeneralFeedback/hooks.test.js
+++ b/src/editors/containers/ProblemEditor/components/EditProblemView/SettingsWidget/settingsComponents/GeneralFeedback/hooks.test.js
@@ -12,6 +12,10 @@ jest.mock('react', () => {
   };
 });
 
+jest.mock('@edx/frontend-platform/i18n', () => ({
+  defineMessages: m => m,
+}));
+
 const state = new MockUseState(hooks);
 
 describe('Problem settings hooks', () => {
diff --git a/src/editors/containers/ProblemEditor/components/EditProblemView/SettingsWidget/settingsComponents/GeneralFeedback/messages.js b/src/editors/containers/ProblemEditor/components/EditProblemView/SettingsWidget/settingsComponents/GeneralFeedback/messages.js
index a0fd27af2..acec22627 100644
--- a/src/editors/containers/ProblemEditor/components/EditProblemView/SettingsWidget/settingsComponents/GeneralFeedback/messages.js
+++ b/src/editors/containers/ProblemEditor/components/EditProblemView/SettingsWidget/settingsComponents/GeneralFeedback/messages.js
@@ -1,4 +1,7 @@
-export const messages = {
+import { defineMessages } from '@edx/frontend-platform/i18n';
+
+const messages = defineMessages({
+
   generalFeebackSettingTitle: {
     id: 'authoring.problemeditor.settings.generalFeebackSettingTitle',
     defaultMessage: 'General Feedback',
@@ -19,5 +22,5 @@ export const messages = {
     defaultMessage: 'None',
     description: 'message which informs use there is no general feedback set.',
   },
-};
+});
 export default messages;
diff --git a/src/editors/containers/ProblemEditor/components/EditProblemView/SettingsWidget/settingsComponents/GroupFeedback/hooks.test.js b/src/editors/containers/ProblemEditor/components/EditProblemView/SettingsWidget/settingsComponents/GroupFeedback/hooks.test.js
index 553d6b8f1..91728e55a 100644
--- a/src/editors/containers/ProblemEditor/components/EditProblemView/SettingsWidget/settingsComponents/GroupFeedback/hooks.test.js
+++ b/src/editors/containers/ProblemEditor/components/EditProblemView/SettingsWidget/settingsComponents/GroupFeedback/hooks.test.js
@@ -12,6 +12,10 @@ jest.mock('react', () => {
   };
 });
 
+jest.mock('@edx/frontend-platform/i18n', () => ({
+  defineMessages: m => m,
+}));
+
 const state = new MockUseState(hooks);
 
 describe('groupFeedbackCardHooks', () => {
diff --git a/src/editors/containers/ProblemEditor/components/EditProblemView/SettingsWidget/settingsComponents/GroupFeedback/messages.js b/src/editors/containers/ProblemEditor/components/EditProblemView/SettingsWidget/settingsComponents/GroupFeedback/messages.js
index 454f312e8..de4a5c6fe 100644
--- a/src/editors/containers/ProblemEditor/components/EditProblemView/SettingsWidget/settingsComponents/GroupFeedback/messages.js
+++ b/src/editors/containers/ProblemEditor/components/EditProblemView/SettingsWidget/settingsComponents/GroupFeedback/messages.js
@@ -1,6 +1,9 @@
-export const messages = {
+import { defineMessages } from '@edx/frontend-platform/i18n';
+
+const messages = defineMessages({
+
   noGroupFeedbackSummary: {
-    id: 'authoring.problemeditor.settings.GroupFeedbackSummary.message',
+    id: 'authoring.problemeditor.settings.GroupFeedbackSummary.nonMessage',
     defaultMessage: 'None',
     description: 'message to confirm that a user wants to use the advanced editor',
   },
@@ -24,5 +27,6 @@ export const messages = {
     defaultMessage: 'Group Feedback',
     description: 'label for group feedback setting',
   },
-};
+});
+
 export default messages;
diff --git a/src/editors/containers/ProblemEditor/components/EditProblemView/SettingsWidget/settingsComponents/Randomization/hooks.test.js b/src/editors/containers/ProblemEditor/components/EditProblemView/SettingsWidget/settingsComponents/Randomization/hooks.test.js
index 7999c56f9..9650f0c23 100644
--- a/src/editors/containers/ProblemEditor/components/EditProblemView/SettingsWidget/settingsComponents/Randomization/hooks.test.js
+++ b/src/editors/containers/ProblemEditor/components/EditProblemView/SettingsWidget/settingsComponents/Randomization/hooks.test.js
@@ -12,6 +12,10 @@ jest.mock('react', () => {
   };
 });
 
+jest.mock('@edx/frontend-platform/i18n', () => ({
+  defineMessages: m => m,
+}));
+
 const state = new MockUseState(hooks);
 
 describe('Problem settings hooks', () => {
diff --git a/src/editors/containers/ProblemEditor/components/EditProblemView/SettingsWidget/settingsComponents/Randomization/messages.js b/src/editors/containers/ProblemEditor/components/EditProblemView/SettingsWidget/settingsComponents/Randomization/messages.js
index 52e980519..a8aa13ae2 100644
--- a/src/editors/containers/ProblemEditor/components/EditProblemView/SettingsWidget/settingsComponents/Randomization/messages.js
+++ b/src/editors/containers/ProblemEditor/components/EditProblemView/SettingsWidget/settingsComponents/Randomization/messages.js
@@ -1,4 +1,7 @@
-export const messages = {
+import { defineMessages } from '@edx/frontend-platform/i18n';
+
+const messages = defineMessages({
+
   randomizationSettingTitle: {
     id: 'authoring.problemeditor.settings.randomization.SettingTitle',
     defaultMessage: 'Randomization',
@@ -14,5 +17,6 @@ export const messages = {
     defaultMessage: 'No Python based randomization is present in this problem.',
     description: 'text shown when no randomization option is given',
   },
-};
+});
+
 export default messages;
diff --git a/src/editors/containers/ProblemEditor/components/EditProblemView/SettingsWidget/settingsComponents/Tolerance/messages.js b/src/editors/containers/ProblemEditor/components/EditProblemView/SettingsWidget/settingsComponents/Tolerance/messages.js
index b31c0c6d7..1b16c0cfb 100644
--- a/src/editors/containers/ProblemEditor/components/EditProblemView/SettingsWidget/settingsComponents/Tolerance/messages.js
+++ b/src/editors/containers/ProblemEditor/components/EditProblemView/SettingsWidget/settingsComponents/Tolerance/messages.js
@@ -1,4 +1,6 @@
-const messages = {
+import { defineMessages } from '@edx/frontend-platform/i18n';
+
+const messages = defineMessages({
   toleranceSettingTitle: {
     id: 'problemEditor.settings.tolerance.title',
     defaultMessage: 'Tolerance',
@@ -42,5 +44,6 @@ const messages = {
     description: 'A possible value type for a tolerance',
   },
 
-};
+});
+
 export default messages;
diff --git a/src/editors/containers/ProblemEditor/components/EditProblemView/SettingsWidget/settingsComponents/__snapshots__/SwitchToAdvancedEditorCard.test.jsx.snap b/src/editors/containers/ProblemEditor/components/EditProblemView/SettingsWidget/settingsComponents/__snapshots__/SwitchToAdvancedEditorCard.test.jsx.snap
index 2ecc2a26c..defddbed5 100644
--- a/src/editors/containers/ProblemEditor/components/EditProblemView/SettingsWidget/settingsComponents/__snapshots__/SwitchToAdvancedEditorCard.test.jsx.snap
+++ b/src/editors/containers/ProblemEditor/components/EditProblemView/SettingsWidget/settingsComponents/__snapshots__/SwitchToAdvancedEditorCard.test.jsx.snap
@@ -16,7 +16,7 @@ exports[`SwitchToAdvancedEditorCard snapshot snapshot: SwitchToAdvancedEditorCar
         <FormattedMessage
           defaultMessage="Switch to advanced editor"
           description="message to confirm that a user wants to use the advanced editor"
-          id="authoring.problemeditor.settings.switchtoadvancededitor.message"
+          id="authoring.problemeditor.settings.switchtoadvancededitor.ConfirmSwitchButtonLabel"
         />
       </Button>
     }
@@ -27,14 +27,14 @@ exports[`SwitchToAdvancedEditorCard snapshot snapshot: SwitchToAdvancedEditorCar
       <FormattedMessage
         defaultMessage="Convert to OLX?"
         description="message to confirm that a user wants to use the advanced editor"
-        id="authoring.problemeditor.settings.switchtoadvancededitor.message"
+        id="authoring.problemeditor.settings.switchtoadvancededitor.ConfirmSwitchMessageTitle"
       />
     }
   >
     <FormattedMessage
       defaultMessage="If you use the advanced editor, this problem will be converted to OLX and you will not be able to return to the simple editor."
       description="message to confirm that a user wants to use the advanced editor"
-      id="authoring.problemeditor.settings.switchtoadvancededitor.message"
+      id="authoring.problemeditor.settings.switchtoadvancededitor.ConfirmSwitchMessage"
     />
   </BaseModal>
   <Button
diff --git a/src/editors/containers/ProblemEditor/components/SelectTypeModal/SelectTypeWrapper/messages.js b/src/editors/containers/ProblemEditor/components/SelectTypeModal/SelectTypeWrapper/messages.js
index 5dbb562a8..120968e30 100644
--- a/src/editors/containers/ProblemEditor/components/SelectTypeModal/SelectTypeWrapper/messages.js
+++ b/src/editors/containers/ProblemEditor/components/SelectTypeModal/SelectTypeWrapper/messages.js
@@ -1,4 +1,7 @@
-export const messages = {
+import { defineMessages } from '@edx/frontend-platform/i18n';
+
+const messages = defineMessages({
+
   selectTypeTitle: {
     id: 'authoring.problemEditor.selectType.title',
     defaultMessage: 'Select problem type',
@@ -24,6 +27,6 @@ export const messages = {
     defaultMessage: 'Select',
     description: 'Screen reader label for select button.',
   },
-};
+});
 
 export default messages;
diff --git a/src/editors/containers/ProblemEditor/components/SelectTypeModal/content/messages.js b/src/editors/containers/ProblemEditor/components/SelectTypeModal/content/messages.js
index 9d220f1a1..508d665f1 100644
--- a/src/editors/containers/ProblemEditor/components/SelectTypeModal/content/messages.js
+++ b/src/editors/containers/ProblemEditor/components/SelectTypeModal/content/messages.js
@@ -1,4 +1,7 @@
-export const messages = {
+import { defineMessages } from '@edx/frontend-platform/i18n';
+
+const messages = defineMessages({
+
   advanceProblemButtonLabel: {
     id: 'authoring.problemEditor.problemSelect.advanceButton.label',
     defaultMessage: 'Advanced problem types',
@@ -69,6 +72,6 @@ export const messages = {
     defaultMessage: 'Learn more about advanced problem types',
     description: 'Label for Learn more about advanced problem types button',
   },
-};
+});
 
 export default messages;
diff --git a/src/editors/containers/ProblemEditor/messages.js b/src/editors/containers/ProblemEditor/messages.js
index ed4cdfd5a..d9fa05cb4 100644
--- a/src/editors/containers/ProblemEditor/messages.js
+++ b/src/editors/containers/ProblemEditor/messages.js
@@ -1,9 +1,12 @@
-export const messages = {
+import { defineMessages } from '@edx/frontend-platform/i18n';
+
+const messages = defineMessages({
+
   blockFailed: {
     id: 'authoring.problemEditor.blockFailed',
     defaultMessage: 'Problem failed to load',
     description: 'Error message for problem block failing to load',
   },
-};
+});
 
 export default messages;
diff --git a/src/editors/containers/TextEditor/messages.js b/src/editors/containers/TextEditor/messages.js
index 3484cd510..e6f870a4b 100644
--- a/src/editors/containers/TextEditor/messages.js
+++ b/src/editors/containers/TextEditor/messages.js
@@ -1,4 +1,7 @@
-export const messages = {
+import { defineMessages } from '@edx/frontend-platform/i18n';
+
+const messages = defineMessages({
+
   couldNotLoadTextContext: {
     id: 'authoring.texteditor.load.error',
     defaultMessage: 'Error: Could Not Load Text Content',
@@ -9,6 +12,6 @@ export const messages = {
     defaultMessage: 'loading',
     description: 'Loading message for spinner screenreader text.',
   },
-};
+});
 
 export default messages;
diff --git a/src/editors/containers/VideoEditor/components/VideoSettingsModal/components/HandoutWidget/messages.js b/src/editors/containers/VideoEditor/components/VideoSettingsModal/components/HandoutWidget/messages.js
index 8520ccb0f..4e7114ef7 100644
--- a/src/editors/containers/VideoEditor/components/VideoSettingsModal/components/HandoutWidget/messages.js
+++ b/src/editors/containers/VideoEditor/components/VideoSettingsModal/components/HandoutWidget/messages.js
@@ -1,4 +1,7 @@
-export const messages = {
+import { defineMessages } from '@edx/frontend-platform/i18n';
+
+const messages = defineMessages({
+
   titleLabel: {
     id: 'authoring.videoeditor.handout.title.label',
     defaultMessage: 'Handout',
@@ -45,6 +48,6 @@ export const messages = {
     defaultMessage: 'Download',
     description: 'Message Presented To user for action to download handout',
   },
-};
+});
 
 export default messages;
diff --git a/src/editors/containers/VideoEditor/components/VideoSettingsModal/components/LicenseWidget/LicenseDetails.jsx b/src/editors/containers/VideoEditor/components/VideoSettingsModal/components/LicenseWidget/LicenseDetails.jsx
index f33ee83cc..d24d53233 100644
--- a/src/editors/containers/VideoEditor/components/VideoSettingsModal/components/LicenseWidget/LicenseDetails.jsx
+++ b/src/editors/containers/VideoEditor/components/VideoSettingsModal/components/LicenseWidget/LicenseDetails.jsx
@@ -21,7 +21,7 @@ import {
 
 import { actions } from '../../../../../../data/redux';
 import { LicenseLevel, LicenseTypes } from '../../../../../../data/constants/licenses';
-import { messages } from './messages';
+import messages from './messages';
 
 export const LicenseDetails = ({
   license,
diff --git a/src/editors/containers/VideoEditor/components/VideoSettingsModal/components/LicenseWidget/LicenseDisplay.jsx b/src/editors/containers/VideoEditor/components/VideoSettingsModal/components/LicenseWidget/LicenseDisplay.jsx
index 735f381b0..002c5503b 100644
--- a/src/editors/containers/VideoEditor/components/VideoSettingsModal/components/LicenseWidget/LicenseDisplay.jsx
+++ b/src/editors/containers/VideoEditor/components/VideoSettingsModal/components/LicenseWidget/LicenseDisplay.jsx
@@ -13,7 +13,7 @@ import {
 import { LicenseTypes } from '../../../../../../data/constants/licenses';
 
 import LicenseBlurb from './LicenseBlurb';
-import { messages } from './messages';
+import messages from './messages';
 
 export const LicenseDisplay = ({
   license,
diff --git a/src/editors/containers/VideoEditor/components/VideoSettingsModal/components/LicenseWidget/hooks.test.jsx b/src/editors/containers/VideoEditor/components/VideoSettingsModal/components/LicenseWidget/hooks.test.jsx
index 09efff5c6..2f569c1cc 100644
--- a/src/editors/containers/VideoEditor/components/VideoSettingsModal/components/LicenseWidget/hooks.test.jsx
+++ b/src/editors/containers/VideoEditor/components/VideoSettingsModal/components/LicenseWidget/hooks.test.jsx
@@ -2,7 +2,7 @@ import { FormattedMessage } from '@edx/frontend-platform/i18n';
 import { actions } from '../../../../../../data/redux';
 import { LicenseTypes } from '../../../../../../data/constants/licenses';
 import * as module from './hooks';
-import { messages } from './messages';
+import messages from './messages';
 
 jest.mock('../../../../../../data/redux', () => ({
   actions: {
diff --git a/src/editors/containers/VideoEditor/components/VideoSettingsModal/components/LicenseWidget/messages.js b/src/editors/containers/VideoEditor/components/VideoSettingsModal/components/LicenseWidget/messages.js
index e8b92aa54..9c388caa2 100644
--- a/src/editors/containers/VideoEditor/components/VideoSettingsModal/components/LicenseWidget/messages.js
+++ b/src/editors/containers/VideoEditor/components/VideoSettingsModal/components/LicenseWidget/messages.js
@@ -1,4 +1,7 @@
-export const messages = {
+import { defineMessages } from '@edx/frontend-platform/i18n';
+
+const messages = defineMessages({
+
   title: {
     id: 'authoring.videoeditor.license.title',
     defaultMessage: 'License',
@@ -119,6 +122,6 @@ export const messages = {
     defaultMessage: 'You reserve all rights for your work.',
     description: 'All Rights Reserved section message',
   },
-};
+});
 
 export default messages;
diff --git a/src/editors/containers/VideoEditor/components/VideoSettingsModal/components/ThumbnailWidget/messages.js b/src/editors/containers/VideoEditor/components/VideoSettingsModal/components/ThumbnailWidget/messages.js
index d184d8136..f6a1112ad 100644
--- a/src/editors/containers/VideoEditor/components/VideoSettingsModal/components/ThumbnailWidget/messages.js
+++ b/src/editors/containers/VideoEditor/components/VideoSettingsModal/components/ThumbnailWidget/messages.js
@@ -1,4 +1,7 @@
-export const messages = {
+import { defineMessages } from '@edx/frontend-platform/i18n';
+
+const messages = defineMessages({
+
   title: {
     id: 'authoring.videoeditor.thumbnail.title',
     defaultMessage: 'Thumbnail',
@@ -56,6 +59,6 @@ export const messages = {
     description:
       ' Message presented to user when file size of image is less than 2 KB or larger than 2 MB',
   },
-};
+});
 
 export default messages;
diff --git a/src/editors/containers/VideoEditor/components/VideoSettingsModal/components/TranscriptWidget/messages.js b/src/editors/containers/VideoEditor/components/VideoSettingsModal/components/TranscriptWidget/messages.js
index 5fa311d0a..57cfeeec9 100644
--- a/src/editors/containers/VideoEditor/components/VideoSettingsModal/components/TranscriptWidget/messages.js
+++ b/src/editors/containers/VideoEditor/components/VideoSettingsModal/components/TranscriptWidget/messages.js
@@ -1,4 +1,7 @@
-export const messages = {
+import { defineMessages } from '@edx/frontend-platform/i18n';
+
+const messages = defineMessages({
+
   title: {
     id: 'authoring.videoeditor.transcripts.title',
     defaultMessage: 'Transcripts',
@@ -114,6 +117,6 @@ export const messages = {
     defaultMessage: 'We found transcript for this video on YouTube. Would you like to import it now?',
     description: 'Message for import transcript card asking user if they want to import transcript',
   },
-};
+});
 
 export default messages;
diff --git a/src/editors/containers/VideoEditor/components/VideoSettingsModal/components/VideoSourceWidget/messages.js b/src/editors/containers/VideoEditor/components/VideoSettingsModal/components/VideoSourceWidget/messages.js
index e0fd2ab66..f5a01138a 100644
--- a/src/editors/containers/VideoEditor/components/VideoSettingsModal/components/VideoSourceWidget/messages.js
+++ b/src/editors/containers/VideoEditor/components/VideoSettingsModal/components/VideoSourceWidget/messages.js
@@ -1,4 +1,7 @@
-export const messages = {
+import { defineMessages } from '@edx/frontend-platform/i18n';
+
+const messages = defineMessages({
+
   titleLabel: {
     id: 'authoring.videoeditor.videoSource.title.label',
     defaultMessage: 'Video source',
@@ -78,6 +81,6 @@ export const messages = {
     defaultMessage: 'Add a video URL',
     description: 'Label for add a video URL button',
   },
-};
+});
 
 export default messages;
diff --git a/src/editors/containers/VideoEditor/components/VideoSettingsModal/components/messages.js b/src/editors/containers/VideoEditor/components/VideoSettingsModal/components/messages.js
index 85201a24e..57e097fb7 100644
--- a/src/editors/containers/VideoEditor/components/VideoSettingsModal/components/messages.js
+++ b/src/editors/containers/VideoEditor/components/VideoSettingsModal/components/messages.js
@@ -1,4 +1,7 @@
-export const messages = {
+import { defineMessages } from '@edx/frontend-platform/i18n';
+
+const messages = defineMessages({
+
   expandAltText: {
     id: 'authoring.videoeditor.expand',
     defaultMessage: 'Expand',
@@ -77,6 +80,6 @@ export const messages = {
     defaultMessage: 'Other video',
     description: 'Shown on the preview card if the video source could not be identified.',
   },
-};
+});
 
 export default messages;
diff --git a/src/editors/containers/VideoEditor/index.jsx b/src/editors/containers/VideoEditor/index.jsx
index d11c1543e..4e8c9d33c 100644
--- a/src/editors/containers/VideoEditor/index.jsx
+++ b/src/editors/containers/VideoEditor/index.jsx
@@ -13,7 +13,7 @@ import { RequestKeys } from '../../data/constants/requests';
 import EditorContainer from '../EditorContainer';
 import VideoEditorModal from './components/VideoEditorModal';
 import { ErrorContext, errorsHook, fetchVideoContent } from './hooks';
-import { messages } from './messages';
+import messages from './messages';
 
 export const VideoEditor = ({
   onClose,
diff --git a/src/editors/containers/VideoEditor/messages.js b/src/editors/containers/VideoEditor/messages.js
index 488c8c7c1..515eb4493 100644
--- a/src/editors/containers/VideoEditor/messages.js
+++ b/src/editors/containers/VideoEditor/messages.js
@@ -1,9 +1,12 @@
-export const messages = {
+import { defineMessages } from '@edx/frontend-platform/i18n';
+
+const messages = defineMessages({
+
   spinnerScreenReaderText: {
     id: 'authoring.videoEditor.spinnerScreenReaderText',
     defaultMessage: 'loading',
     description: 'Loading message for spinner screenreader text.',
   },
-};
+});
 
 export default messages;
diff --git a/src/editors/messages.js b/src/editors/messages.js
index 4aa6a0ccb..cfbf46501 100644
--- a/src/editors/messages.js
+++ b/src/editors/messages.js
@@ -1,9 +1,12 @@
-export const messages = {
+import { defineMessages } from '@edx/frontend-platform/i18n';
+
+const messages = defineMessages({
+
   couldNotFindEditor: {
     id: 'authoring.editorpage.selecteditor.error',
     defaultMessage: 'Error: Could Not find Editor',
     description: 'Error Message Dispayed When An unsopported Editor is desired in V2',
   },
-};
+});
 
 export default messages;
diff --git a/src/editors/sharedComponents/BaseModal/messages.js b/src/editors/sharedComponents/BaseModal/messages.js
index eac25a893..8a5823b45 100644
--- a/src/editors/sharedComponents/BaseModal/messages.js
+++ b/src/editors/sharedComponents/BaseModal/messages.js
@@ -1,9 +1,12 @@
-export const messages = {
+import { defineMessages } from '@edx/frontend-platform/i18n';
+
+const messages = defineMessages({
+
   cancelButtonLabel: {
     id: 'authoring.baseModal.cancelButtonLabel',
     defaultMessage: 'Cancel',
     description: 'Label for cancel button.',
   },
-};
+});
 
 export default messages;
diff --git a/src/editors/sharedComponents/CodeEditor/messages.js b/src/editors/sharedComponents/CodeEditor/messages.js
index 9df01970a..84c555465 100644
--- a/src/editors/sharedComponents/CodeEditor/messages.js
+++ b/src/editors/sharedComponents/CodeEditor/messages.js
@@ -1,9 +1,12 @@
-export const messages = {
+import { defineMessages } from '@edx/frontend-platform/i18n';
+
+const messages = defineMessages({
+
   escapeHTMLButtonLabel: {
     id: 'authoring.texteditor.codeEditor.escapeHTMLButton',
     defaultMessage: 'Unescape HTML Literals',
     description: 'Label For escape special html charectars button',
   },
-};
+});
 
 export default messages;
diff --git a/src/editors/sharedComponents/ErrorAlerts/messages.js b/src/editors/sharedComponents/ErrorAlerts/messages.js
index 0f8b80fc9..7857cc991 100644
--- a/src/editors/sharedComponents/ErrorAlerts/messages.js
+++ b/src/editors/sharedComponents/ErrorAlerts/messages.js
@@ -1,9 +1,12 @@
-export const messages = {
+import { defineMessages } from '@edx/frontend-platform/i18n';
+
+const messages = defineMessages({
+
   errorTitle: {
     id: 'authoring.texteditor.selectimagemodal.error.errorTitle',
     defaultMessage: 'Error',
     description: 'Title of message presented to user when something goes wrong',
   },
-};
+});
 
 export default messages;
diff --git a/src/editors/sharedComponents/ErrorBoundary/messages.js b/src/editors/sharedComponents/ErrorBoundary/messages.js
index f292b7408..6ad6a7502 100644
--- a/src/editors/sharedComponents/ErrorBoundary/messages.js
+++ b/src/editors/sharedComponents/ErrorBoundary/messages.js
@@ -1,4 +1,6 @@
-export const messages = {
+import { defineMessages } from '@edx/frontend-platform/i18n';
+
+const messages = defineMessages({
   unexpectedError: {
     id: 'unexpected.error.message.text',
     defaultMessage: 'An unexpected error occurred. Please click the button below to refresh the page.',
@@ -9,5 +11,6 @@ export const messages = {
     defaultMessage: 'Try again',
     description: 'text for button that tries to reload the app by refreshing the page',
   },
-};
+});
+
 export default messages;
diff --git a/src/editors/sharedComponents/ImageUploadModal/ImageSettingsModal/messages.js b/src/editors/sharedComponents/ImageUploadModal/ImageSettingsModal/messages.js
index 0f5e5030e..a20a492a0 100644
--- a/src/editors/sharedComponents/ImageUploadModal/ImageSettingsModal/messages.js
+++ b/src/editors/sharedComponents/ImageUploadModal/ImageSettingsModal/messages.js
@@ -1,4 +1,7 @@
-export const messages = {
+import { defineMessages } from '@edx/frontend-platform/i18n';
+
+const messages = defineMessages({
+
   // index
   titleLabel: {
     id: 'authoring.texteditor.imagesettingsmodal.titleLabel',
@@ -86,6 +89,6 @@ export const messages = {
     defaultMessage: 'Enter a value less than or equal to 100.',
     description: 'Message feedback for user below the dimension fields.',
   },
-};
+});
 
 export default messages;
diff --git a/src/editors/sharedComponents/ImageUploadModal/SelectImageModal/messages.js b/src/editors/sharedComponents/ImageUploadModal/SelectImageModal/messages.js
index d2fa7c311..d31b9d7b6 100644
--- a/src/editors/sharedComponents/ImageUploadModal/SelectImageModal/messages.js
+++ b/src/editors/sharedComponents/ImageUploadModal/SelectImageModal/messages.js
@@ -1,4 +1,7 @@
-export const messages = {
+import { defineMessages } from '@edx/frontend-platform/i18n';
+
+const messages = defineMessages({
+
   nextButtonLabel: {
     id: 'authoring.texteditor.selectimagemodal.next.label',
     defaultMessage: 'Next',
@@ -89,6 +92,6 @@ export const messages = {
     description:
       'Message presented to user when clicking Next without selecting an image',
   },
-};
+});
 
 export default messages;
diff --git a/src/editors/sharedComponents/SourceCodeModal/messages.js b/src/editors/sharedComponents/SourceCodeModal/messages.js
index b0e46bf63..2f1bfe200 100644
--- a/src/editors/sharedComponents/SourceCodeModal/messages.js
+++ b/src/editors/sharedComponents/SourceCodeModal/messages.js
@@ -1,4 +1,7 @@
-export const messages = {
+import { defineMessages } from '@edx/frontend-platform/i18n';
+
+const messages = defineMessages({
+
   saveButtonLabel: {
     id: 'authoring.texteditor.sourcecodemodal.next.label',
     defaultMessage: 'Save',
@@ -9,5 +12,6 @@ export const messages = {
     defaultMessage: 'Edit Source Code',
     description: 'Title for the source code editor',
   },
-};
+});
+
 export default messages;