diff --git a/src/components/Attachments/Attachment.jsx b/src/components/Attachments/Attachment.jsx
index 26f285d5..7b44e631 100644
--- a/src/components/Attachments/Attachment.jsx
+++ b/src/components/Attachments/Attachment.jsx
@@ -129,9 +129,13 @@ const Attachment = ({
               <Input
                 autoFocus
                 data-cy="neeto-editor-preview-rename-input"
-                error={isEmpty(newFilename) ? t("attachments.nameEmpty") : ""}
                 size="small"
                 value={newFilename}
+                error={
+                  isEmpty(newFilename)
+                    ? t("neetoEditor.attachments.nameEmpty")
+                    : ""
+                }
                 onChange={withEventTargetValue(setNewFilename)}
                 onKeyDown={event =>
                   handleKeyDown({
@@ -161,7 +165,7 @@ const Attachment = ({
               </Tooltip>
             </div>
             <Tooltip
-              content={t("attachments.actionsBlocked")}
+              content={t("neetoEditor.attachments.actionsBlocked")}
               disabled={!disabled}
               position="top"
             >
@@ -190,11 +194,11 @@ const Attachment = ({
       <Alert
         isOpen={isDeleteAlertOpen}
         isSubmitting={isDeleting}
-        submitButtonLabel={t("menu.delete")}
-        title={t("attachments.deleteTitle")}
+        submitButtonLabel={t("neetoEditor.menu.delete")}
+        title={t("neetoEditor.attachments.deleteTitle")}
         message={
           <Trans
-            i18nKey="attachments.deleteConfirmation"
+            i18nKey="neetoEditor.attachments.deleteConfirmation"
             values={{ entity: newFilename }}
           />
         }
diff --git a/src/components/Attachments/Preview.jsx b/src/components/Attachments/Preview.jsx
index adc4f693..694d9a25 100644
--- a/src/components/Attachments/Preview.jsx
+++ b/src/components/Attachments/Preview.jsx
@@ -79,7 +79,7 @@ const Preview = ({
     return (
       <Typography>
         <Trans
-          i18nKey="attachments.noPreview"
+          i18nKey="neetoEditor.attachments.noPreview"
           components={{
             span: (
               <span
@@ -119,7 +119,7 @@ const Preview = ({
         <Button
           icon={Download}
           iconPosition="right"
-          label={t("common.download")}
+          label={t("neetoEditor.common.download")}
           ref={downloadRef}
           onClick={handleDownload}
         />
diff --git a/src/components/Attachments/index.jsx b/src/components/Attachments/index.jsx
index b03a4482..bf0b2108 100644
--- a/src/components/Attachments/index.jsx
+++ b/src/components/Attachments/index.jsx
@@ -53,8 +53,8 @@ const Attachments = (
           data: file,
         });
       } catch (error) {
-        if (error.message !== t("error.onBeforeFileAddedReturn")) {
-          Toastr.error(t("error.cannotAddFiles"));
+        if (error.message !== t("neetoEditor.error.onBeforeFileAddedReturn")) {
+          Toastr.error(t("neetoEditor.error.cannotAddFiles"));
         }
       }
     });
@@ -173,7 +173,7 @@ const Attachments = (
           <Button
             data-cy="neeto-editor-attachments-upload-button"
             disabled={isUploading}
-            label={t("attachments.add")}
+            label={t("neetoEditor.attachments.add")}
             loading={isUploading}
             size="medium"
             style="link"
@@ -189,7 +189,7 @@ const Attachments = (
           onClick={event => {
             if (!isEmpty(attachments) && config.maxNumberOfFiles === 1) {
               event.preventDefault();
-              Toastr.warning(t("attachments.oneAttachmentAllowed"));
+              Toastr.warning(t("neetoEditor.attachments.oneAttachmentAllowed"));
             }
           }}
         />
diff --git a/src/components/Attachments/utils.js b/src/components/Attachments/utils.js
index b367d2de..453a68d9 100644
--- a/src/components/Attachments/utils.js
+++ b/src/components/Attachments/utils.js
@@ -19,7 +19,9 @@ export const selectFiles = ({ previousAttachmentsCount, config, files }) => {
 
     if (remainingAttachments <= 0) {
       Toastr.warning(
-        t("attachments.maxNumberOfFiles", { entity: maxNumberOfFiles })
+        t("neetoEditor.attachments.maxNumberOfFiles", {
+          entity: maxNumberOfFiles,
+        })
       );
 
       return [];
@@ -29,7 +31,9 @@ export const selectFiles = ({ previousAttachmentsCount, config, files }) => {
 
     if (selectedFiles.length < files.length) {
       Toastr.warning(
-        t("attachments.maxNumberOfFiles", { entity: maxNumberOfFiles })
+        t("neetoEditor.attachments.maxNumberOfFiles", {
+          entity: maxNumberOfFiles,
+        })
       );
     }
 
@@ -48,7 +52,9 @@ export const handleDrop = ({ uppy, config, previousAttachmentsCount }) => {
 
     if (totalAttachments > maxNumberOfFiles) {
       Toastr.warning(
-        t("attachments.maxNumberOfFiles", { entity: maxNumberOfFiles })
+        t("neetoEditor.attachments.maxNumberOfFiles", {
+          entity: maxNumberOfFiles,
+        })
       );
       uppy.reset();
 
diff --git a/src/components/Editor/CustomExtensions/CodeBlock/CodeBlockComponent.jsx b/src/components/Editor/CustomExtensions/CodeBlock/CodeBlockComponent.jsx
index fe642560..f7296001 100644
--- a/src/components/Editor/CustomExtensions/CodeBlock/CodeBlockComponent.jsx
+++ b/src/components/Editor/CustomExtensions/CodeBlock/CodeBlockComponent.jsx
@@ -40,13 +40,13 @@ const CodeBlockComponent = ({ node, editor, updateAttributes }) => {
             buttonSize="small"
             buttonStyle="secondary"
             icon={Down}
-            label={node.attrs?.language || t("common.auto")}
+            label={node.attrs?.language || t("neetoEditor.common.auto")}
             strategy="fixed"
           >
             <Input
               autoFocus
               className="neeto-editor-codeblock-options__input"
-              placeholder={t("placeholders.searchLanguages")}
+              placeholder={t("neetoEditor.placeholders.searchLanguages")}
               size="small"
               value={keyword}
               onChange={e => setKeyword(e.target.value)}
@@ -61,7 +61,7 @@ const CodeBlockComponent = ({ node, editor, updateAttributes }) => {
                   key={language}
                   onClick={() => handleLanguageSelect(language)}
                 >
-                  {language || t("common.auto")}
+                  {language || t("neetoEditor.common.auto")}
                 </MenuItem.Button>
               ))}
             </Menu>
diff --git a/src/components/Editor/CustomExtensions/Embeds/index.jsx b/src/components/Editor/CustomExtensions/Embeds/index.jsx
index f0a45098..a0f82c77 100644
--- a/src/components/Editor/CustomExtensions/Embeds/index.jsx
+++ b/src/components/Editor/CustomExtensions/Embeds/index.jsx
@@ -74,7 +74,7 @@ const EmbedOption = ({ isEmbedModalOpen, setIsEmbedModalOpen, editor }) => {
         <Input
           data-cy="neeto-editor-embed-input"
           error={error && "Please enter a valid URL"}
-          label={t("common.videoUrl")}
+          label={t("neetoEditor.common.videoUrl")}
           ref={inputRef}
           size="medium"
           type="text"
@@ -87,7 +87,7 @@ const EmbedOption = ({ isEmbedModalOpen, setIsEmbedModalOpen, editor }) => {
         <Button
           data-cy="neeto-editor-embed-cancel"
           disabled={error || isEmpty(embedUrl)}
-          label={t("common.embed")}
+          label={t("neetoEditor.common.embed")}
           onClick={handleEmbed}
         />
       </Modal.Footer>
diff --git a/src/components/Editor/CustomExtensions/Image/ExtensionConfig.js b/src/components/Editor/CustomExtensions/Image/ExtensionConfig.js
index 4462f4d2..4cb4e534 100644
--- a/src/components/Editor/CustomExtensions/Image/ExtensionConfig.js
+++ b/src/components/Editor/CustomExtensions/Image/ExtensionConfig.js
@@ -21,7 +21,9 @@ const upload = async (file, url) => {
   }
 
   const imageSizeInMB = MAX_IMAGE_SIZE / (1024 * 1024);
-  Toastr.error(t("error.imageSizeIsShouldBeLess", { limit: imageSizeInMB }));
+  Toastr.error(
+    t("neetoEditor.error.imageSizeIsShouldBeLess", { limit: imageSizeInMB })
+  );
 
   return "";
 };
diff --git a/src/components/Editor/CustomExtensions/Placeholder/ExtensionConfig.js b/src/components/Editor/CustomExtensions/Placeholder/ExtensionConfig.js
index 259d4762..db924fba 100644
--- a/src/components/Editor/CustomExtensions/Placeholder/ExtensionConfig.js
+++ b/src/components/Editor/CustomExtensions/Placeholder/ExtensionConfig.js
@@ -11,7 +11,7 @@ const Placeholder = Extension.create({
       excludeNodeTypes: ["variable", "codeBlock"],
       emptyEditorClass: "is-editor-empty",
       emptyNodeClass: "is-empty",
-      placeholder: t("placeholders.writeSomething"),
+      placeholder: t("neetoEditor.placeholders.writeSomething"),
       showOnlyWhenEditable: true,
       showOnlyCurrent: false,
       includeChildren: false,
diff --git a/src/components/Editor/LinkPopOver.jsx b/src/components/Editor/LinkPopOver.jsx
index bca041d3..0f563853 100644
--- a/src/components/Editor/LinkPopOver.jsx
+++ b/src/components/Editor/LinkPopOver.jsx
@@ -60,7 +60,7 @@ const LinkPopOver = ({ editor }) => {
         .run();
       setIsEditing(false);
     } else {
-      setError(t("error.invalidUrl"));
+      setError(t("neetoEditor.error.invalidUrl"));
     }
   };
 
@@ -116,8 +116,8 @@ const LinkPopOver = ({ editor }) => {
       <Input
         autoFocus
         {...{ error }}
-        label={t("menu.link")}
-        placeholder={t("placeholders.url")}
+        label={t("neetoEditor.menu.link")}
+        placeholder={t("neetoEditor.placeholders.url")}
         style={{ width: "250px" }}
         value={urlString}
         onChange={({ target: { value } }) => setUrlString(value)}
@@ -125,9 +125,13 @@ const LinkPopOver = ({ editor }) => {
         onKeyDown={handleKeyDown}
       />
       <div className="ne-link-popover__edit-prompt-buttons">
-        <Button label={t("menu.link")} size="small" onClick={handleLink} />
         <Button
-          label={t("common.cancel")}
+          label={t("neetoEditor.menu.link")}
+          size="small"
+          onClick={handleLink}
+        />
+        <Button
+          label={t("neetoEditor.common.cancel")}
           size="small"
           style="text"
           onClick={() => {
@@ -147,7 +151,7 @@ const LinkPopOver = ({ editor }) => {
       {" - "}
       <Button
         className="ne-link-popover__option-button"
-        label={t("common.edit")}
+        label={t("neetoEditor.common.edit")}
         size="small"
         style="link"
         onClick={() => setIsEditing(true)}
@@ -155,7 +159,7 @@ const LinkPopOver = ({ editor }) => {
       <span>|</span>
       <Button
         className="ne-link-popover__option-button"
-        label={t("common.unlink")}
+        label={t("neetoEditor.common.unlink")}
         size="small"
         style="link"
         onClick={handleUnlink}
diff --git a/src/components/Editor/MediaUploader/LocalUploader.jsx b/src/components/Editor/MediaUploader/LocalUploader.jsx
index 0f13a844..fe45ee0a 100644
--- a/src/components/Editor/MediaUploader/LocalUploader.jsx
+++ b/src/components/Editor/MediaUploader/LocalUploader.jsx
@@ -47,8 +47,8 @@ const LocalUploader = ({
           data: file,
         });
       } catch (error) {
-        if (error.message !== t("error.onBeforeFileAddedReturn")) {
-          Toastr.error(t("error.cannotAddFiles"));
+        if (error.message !== t("neetoEditor.error.onBeforeFileAddedReturn")) {
+          Toastr.error(t("neetoEditor.error.cannotAddFiles"));
         }
       }
     });
@@ -129,9 +129,11 @@ const LocalUploader = ({
         onChange={handleAddFile}
       />
       <ImageUpload className="ne-media-uploader__dnd-icon" size={24} />
-      <Typography style="body2">{t("localUploader.dropFilesHere")}</Typography>
+      <Typography style="body2">
+        {t("neetoEditor.localUploader.dropFilesHere")}
+      </Typography>
       <Typography style="body3">
-        {t("localUploader.maxFileSize", {
+        {t("neetoEditor.localUploader.maxFileSize", {
           entity: convertToFileSize(uppyConfig.restrictions.maxFileSize),
         })}
       </Typography>
diff --git a/src/components/Editor/MediaUploader/Progress.jsx b/src/components/Editor/MediaUploader/Progress.jsx
index 71ec2cdf..60cff223 100644
--- a/src/components/Editor/MediaUploader/Progress.jsx
+++ b/src/components/Editor/MediaUploader/Progress.jsx
@@ -58,7 +58,7 @@ const Progress = ({ uppy, pendingUploads, setPendingUploads }) => {
             </div>
           ) : (
             <Typography style="body3">
-              {t("localUploader.completed")}
+              {t("neetoEditor.localUploader.completed")}
             </Typography>
           )}
         </div>
diff --git a/src/components/Editor/MediaUploader/URLForm.jsx b/src/components/Editor/MediaUploader/URLForm.jsx
index 4c939ee0..2d934b44 100644
--- a/src/components/Editor/MediaUploader/URLForm.jsx
+++ b/src/components/Editor/MediaUploader/URLForm.jsx
@@ -21,7 +21,7 @@ const URLForm = ({
     event.preventDefault();
     URL_REGEXP.test(urlString)
       ? onSubmit(urlString)
-      : setError(t("error.invalidUrl"));
+      : setError(t("neetoEditor.error.invalidUrl"));
   };
 
   return (
@@ -33,9 +33,8 @@ const URLForm = ({
       <Input
         autoFocus
         data-cy="neeto-editor-media-upload-url-input"
-        error={error}
+        {...{ error, placeholder }}
         name="url"
-        placeholder={placeholder}
         value={urlString}
         onChange={({ target: { value } }) => setUrlString(value)}
         onFocus={() => setError("")}
diff --git a/src/components/Editor/MediaUploader/UnsplashImagePicker.jsx b/src/components/Editor/MediaUploader/UnsplashImagePicker.jsx
index 717faebd..ebdcc9a0 100644
--- a/src/components/Editor/MediaUploader/UnsplashImagePicker.jsx
+++ b/src/components/Editor/MediaUploader/UnsplashImagePicker.jsx
@@ -71,7 +71,7 @@ const UnsplashImagePicker = ({ onSubmit, unsplashApiKey }) => {
         className="neeto-editor-unsplash-search"
         data-cy="neeto-editor-unsplash-image-picker-search-input"
         name="text"
-        placeholder={t("placeholders.searchUnsplash")}
+        placeholder={t("neetoEditor.placeholders.searchUnsplash")}
         value={query}
         onChange={({ target: { value } }) => {
           setQuery(value);
@@ -82,7 +82,7 @@ const UnsplashImagePicker = ({ onSubmit, unsplashApiKey }) => {
           className="neeto-editor-unsplash-gallery__text"
           data-cy="neeto-editor-unsplash-image-picker-error"
         >
-          {t("unsplash.errorMessage")}
+          {t("neetoEditor.unsplash.errorMessage")}
         </p>
       )}
       {!error && !loading && isNilOrEmpty(images) && (
@@ -90,7 +90,7 @@ const UnsplashImagePicker = ({ onSubmit, unsplashApiKey }) => {
           className="neeto-editor-unsplash-gallery__text"
           data-cy="neeto-editor-unsplash-image-picker-no-results-error"
         >
-          {t("unsplash.noResults")}
+          {t("neetoEditor.unsplash.noResults")}
         </p>
       )}
       {!error && (
@@ -99,8 +99,7 @@ const UnsplashImagePicker = ({ onSubmit, unsplashApiKey }) => {
             pack
             position
             className="neeto-editor-unsplash-gallery"
-            hasMore={hasMore}
-            loadMore={loadMore}
+            {...{ hasMore, loadMore }}
             loader={Loader}
             ref={masonryRef}
             style={{ width: "100%" }}
@@ -146,7 +145,7 @@ const UnsplashImagePicker = ({ onSubmit, unsplashApiKey }) => {
           </MasonryInfiniteScroller>
           {!hasMore && (
             <p className="neeto-editor-unsplash-gallery__text">
-              {t("unsplash.end")}
+              {t("neetoEditor.unsplash.end")}
             </p>
           )}
         </div>
diff --git a/src/components/Editor/MediaUploader/index.jsx b/src/components/Editor/MediaUploader/index.jsx
index 48f5d5ce..51bfb968 100644
--- a/src/components/Editor/MediaUploader/index.jsx
+++ b/src/components/Editor/MediaUploader/index.jsx
@@ -83,7 +83,7 @@ const MediaUploader = ({ mediaUploader, onClose, editor, unsplashApiKey }) => {
           )}
           {activeTab === "link" && (
             <URLForm
-              placeholder={t("placeholders.pasteLink")}
+              placeholder={t("neetoEditor.placeholders.pasteLink")}
               buttonLabel={
                 mediaUploader.image ? "Upload image" : "Upload video"
               }
diff --git a/src/components/Editor/MediaUploader/utils.js b/src/components/Editor/MediaUploader/utils.js
index e5fc8ea4..00dc9d2f 100644
--- a/src/components/Editor/MediaUploader/utils.js
+++ b/src/components/Editor/MediaUploader/utils.js
@@ -16,20 +16,17 @@ export const buildImageOptions = () => [
   {
     Icon: LeftAlign,
     alignPos: "left",
-    optionName: t("menu.alignLeft"),
+    optionName: t("neetoEditor.menu.alignLeft"),
   },
   {
     Icon: CenterAlign,
     alignPos: "center",
-    optionName: t("menu.alignCenter"),
+    optionName: t("neetoEditor.menu.alignCenter"),
   },
   {
     Icon: RightAlign,
     alignPos: "right",
-    optionName: t("menu.alignRight"),
-  },
-  {
-    Icon: Delete,
-    optionName: t("menu.delete"),
+    optionName: t("neetoEditor.menu.alignRight"),
   },
+  { Icon: Delete, optionName: t("neetoEditor.menu.delete") },
 ];
diff --git a/src/components/Editor/Menu/Bubble/LinkOption.jsx b/src/components/Editor/Menu/Bubble/LinkOption.jsx
index c8048d11..23602c57 100644
--- a/src/components/Editor/Menu/Bubble/LinkOption.jsx
+++ b/src/components/Editor/Menu/Bubble/LinkOption.jsx
@@ -53,7 +53,7 @@ const LinkOption = ({ editor, handleClose, handleAnimateInvalidLink }) => {
         className="neeto-editor-bubble-menu-link__input"
         data-cy="neeto-editor-link-input"
         name="url"
-        placeholder={t("placeholders.linkInput")}
+        placeholder={t("neetoEditor.placeholders.linkInput")}
         value={link}
         onChange={({ target: { value } }) => setLink(value)}
       />
diff --git a/src/components/Editor/Menu/Bubble/Options.jsx b/src/components/Editor/Menu/Bubble/Options.jsx
index 452f9b76..a273b966 100644
--- a/src/components/Editor/Menu/Bubble/Options.jsx
+++ b/src/components/Editor/Menu/Bubble/Options.jsx
@@ -69,8 +69,7 @@ const Options = ({
   if (isLinkOptionActive) {
     return (
       <LinkOption
-        editor={editor}
-        handleAnimateInvalidLink={handleAnimateInvalidLink}
+        {...{ editor, handleAnimateInvalidLink }}
         handleClose={() => setIsLinkOptionActive(false)}
       />
     );
@@ -79,7 +78,7 @@ const Options = ({
   if (isTableOptionActive) {
     return (
       <TableOption
-        editor={editor}
+        {...{ editor }}
         handleClose={() => setIsTableOptionActive(false)}
       />
     );
@@ -105,16 +104,16 @@ const Options = ({
       {blockStyleOptions.map(renderOptionButton)}
       {isTextColorOptionActive && (
         <TextColorOption
-          editor={editor}
-          tooltipContent={tooltips.textColor || t("menu.textColor")}
+          {...{ editor }}
+          tooltipContent={tooltips.textColor || t("neetoEditor.menu.textColor")}
         />
       )}
       {isEmojiActive && (
         <EmojiOption
-          editor={editor}
+          {...{ editor }}
           isActive={isEmojiPickerActive}
           setActive={setIsEmojiPickerActive}
-          tooltipContent={tooltips.emoji || t("menu.emoji")}
+          tooltipContent={tooltips.emoji || t("neetoEditor.menu.emoji")}
         />
       )}
       {listStyleOptions.map(renderOptionButton)}
@@ -125,7 +124,7 @@ const Options = ({
           active: editor.isActive("link"),
           optionName: "link",
           highlight: false,
-          tooltip: tooltips.link || t("menu.link"),
+          tooltip: tooltips.link || t("neetoEditor.menu.link"),
         })}
       {isTableActive &&
         renderOptionButton({
@@ -134,12 +133,11 @@ const Options = ({
           active: editor.isActive("table"),
           optionName: "table",
           highlight: false,
-          tooltip: tooltips.table || t("menu.table"),
+          tooltip: tooltips.table || t("neetoEditor.menu.table"),
         })}
       <Mentions
-        editor={editor}
-        mentions={mentions}
-        tooltipContent={tooltips.mention || t("menu.mention")}
+        {...{ editor, mentions }}
+        tooltipContent={tooltips.mention || t("neetoEditor.menu.mention")}
       />
       {children}
     </>
diff --git a/src/components/Editor/Menu/Bubble/TableOption.jsx b/src/components/Editor/Menu/Bubble/TableOption.jsx
index 10ea6605..a0c2938f 100644
--- a/src/components/Editor/Menu/Bubble/TableOption.jsx
+++ b/src/components/Editor/Menu/Bubble/TableOption.jsx
@@ -35,7 +35,7 @@ const TableOption = ({ editor, handleClose }) => {
             autoFocus
             data-cy="neeto-editor-fixed-menu-table-option-input"
             min="1"
-            placeholder={t("placeholders.rows")}
+            placeholder={t("neetoEditor.placeholders.rows")}
             type="number"
             value={rows}
             onChange={withEventTargetValue(setRows)}
@@ -43,7 +43,7 @@ const TableOption = ({ editor, handleClose }) => {
           <input
             data-cy="neeto-editor-bubble-menu-table-option-input"
             min="1"
-            placeholder={t("placeholders.columns")}
+            placeholder={t("neetoEditor.placeholders.columns")}
             type="number"
             value={columns}
             onChange={withEventTargetValue(setColumns)}
diff --git a/src/components/Editor/Menu/Fixed/LinkAddPopOver.jsx b/src/components/Editor/Menu/Fixed/LinkAddPopOver.jsx
index a194b952..26b34e5b 100644
--- a/src/components/Editor/Menu/Fixed/LinkAddPopOver.jsx
+++ b/src/components/Editor/Menu/Fixed/LinkAddPopOver.jsx
@@ -41,7 +41,7 @@ const LinkAddPopOver = ({ isAddLinkActive, setIsAddLinkActive, editor }) => {
     const formattedUrl = validateAndFormatUrl(linkUrl);
 
     if (!URL_REGEXP.test(formattedUrl)) {
-      setError(t("error.invalidUrl"));
+      setError(t("neetoEditor.error.invalidUrl"));
 
       return;
     }
@@ -132,8 +132,8 @@ const LinkAddPopOver = ({ isAddLinkActive, setIsAddLinkActive, editor }) => {
             <Input
               required
               autoFocus={!isLinkTextPresent}
-              label={t("common.text")}
-              placeholder={t("placeholders.enterText")}
+              label={t("neetoEditor.common.text")}
+              placeholder={t("neetoEditor.placeholders.enterText")}
               size="small"
               style={{ width: "250px" }}
               value={linkText}
@@ -144,10 +144,10 @@ const LinkAddPopOver = ({ isAddLinkActive, setIsAddLinkActive, editor }) => {
               required
               autoFocus={isLinkTextPresent}
               className="ne-link-popover__url-input"
-              label={t("common.url")}
+              label={t("neetoEditor.common.url")}
               size="small"
               {...{ error }}
-              placeholder={t("placeholders.url")}
+              placeholder={t("neetoEditor.placeholders.url")}
               style={{ width: "250px" }}
               value={linkUrl}
               onChange={({ target: { value } }) => setLinkUrl(value)}
@@ -157,12 +157,12 @@ const LinkAddPopOver = ({ isAddLinkActive, setIsAddLinkActive, editor }) => {
             <div className="ne-link-popover__edit-prompt-buttons">
               <Button
                 disabled={isSubmitDisabled}
-                label={t("common.done")}
+                label={t("neetoEditor.common.done")}
                 size="small"
                 onClick={handleAddLink}
               />
               <Button
-                label={t("common.cancel")}
+                label={t("neetoEditor.common.cancel")}
                 size="small"
                 style="text"
                 onClick={removePopover}
diff --git a/src/components/Editor/Menu/Fixed/TableOption.jsx b/src/components/Editor/Menu/Fixed/TableOption.jsx
index aa4ed5a5..7c818227 100644
--- a/src/components/Editor/Menu/Fixed/TableOption.jsx
+++ b/src/components/Editor/Menu/Fixed/TableOption.jsx
@@ -35,7 +35,7 @@ const TableOption = ({ editor, tooltipContent }) => {
       closeOnSelect={false}
       data-cy="neeto-editor-fixed-menu-link-option"
       icon={NeetoChangelog}
-      isOpen={isOpen}
+      {...{ isOpen }}
       position="bottom"
       buttonProps={{
         tabIndex: -1,
@@ -50,7 +50,7 @@ const TableOption = ({ editor, tooltipContent }) => {
           autoFocus
           data-cy="neeto-editor-fixed-menu-table-option-input"
           min="1"
-          placeholder={t("placeholders.rows")}
+          placeholder={t("neetoEditor.placeholders.rows")}
           size="small"
           type="number"
           value={rows}
@@ -59,7 +59,7 @@ const TableOption = ({ editor, tooltipContent }) => {
         <Input
           data-cy="neeto-editor-fixed-menu-table-option-input"
           min="1"
-          placeholder={t("placeholders.rows")}
+          placeholder={t("neetoEditor.placeholders.rows")}
           size="small"
           type="number"
           value={columns}
@@ -67,7 +67,7 @@ const TableOption = ({ editor, tooltipContent }) => {
         />
         <Button
           data-cy="neeto-editor-fixed-menu-table-option-create-button"
-          label={t("common.create")}
+          label={t("neetoEditor.common.create")}
           size="small"
           onClick={handleSubmit}
         />
diff --git a/src/components/Editor/Menu/Fixed/TextColorOption.jsx b/src/components/Editor/Menu/Fixed/TextColorOption.jsx
index 1e9b7bb2..65f51804 100644
--- a/src/components/Editor/Menu/Fixed/TextColorOption.jsx
+++ b/src/components/Editor/Menu/Fixed/TextColorOption.jsx
@@ -53,7 +53,7 @@ const TextColorOption = ({ editor, tooltipContent }) => {
       <Dropdown
         buttonStyle={isOpen ? "secondary" : "text"}
         icon={Customize}
-        isOpen={isOpen}
+        {...{ isOpen }}
         buttonProps={{
           tabIndex: -1,
           tooltipProps: { content: tooltipContent, position: "bottom" },
@@ -73,14 +73,14 @@ const TextColorOption = ({ editor, tooltipContent }) => {
           <Input
             autoFocus
             className="neeto-editor-text-color-option__options-group__input"
-            placeholder={t("placeholders.pickColor")}
+            placeholder={t("neetoEditor.placeholders.pickColor")}
             size="small"
             value={color}
             onChange={withEventTargetValue(setColor)}
           />
           <Button
             className="neeto-editor-text-color-option__options-group__reset-button"
-            label={t("common.reset")}
+            label={t("neetoEditor.common.reset")}
             size="small"
             style="text"
             onClick={handleReset}
diff --git a/src/components/Editor/Menu/Fixed/index.jsx b/src/components/Editor/Menu/Fixed/index.jsx
index d0f0d980..506cf49e 100644
--- a/src/components/Editor/Menu/Fixed/index.jsx
+++ b/src/components/Editor/Menu/Fixed/index.jsx
@@ -141,7 +141,7 @@ const Fixed = ({
         {isFontSizeActive && (
           <FontSizeOption
             {...{ editor }}
-            tooltipContent={tooltips.fontSize || t("menu.fontSize")}
+            tooltipContent={tooltips.fontSize || t("neetoEditor.menu.fontSize")}
           />
         )}
         {isFontSizeActive && <div className="vertical-divider" />}
@@ -149,7 +149,7 @@ const Fixed = ({
           {fontStyleOptions.map(renderOptionButton)}
           <TableActions
             {...{ editor }}
-            tooltipContent={tooltips.table || t("menu.table")}
+            tooltipContent={tooltips.table || t("neetoEditor.menu.table")}
           />
         </div>
         {isNotEmpty(fontStyleOptions) && <div className="vertical-divider" />}
@@ -179,14 +179,16 @@ const Fixed = ({
               {isTableActive && (
                 <TableOption
                   {...{ editor }}
-                  tooltipContent={tooltips.table || t("menu.table")}
+                  tooltipContent={tooltips.table || t("neetoEditor.menu.table")}
                 />
               )}
               {miscOptions.map(renderOptionButton)}
               {isTextColorOptionActive && (
                 <TextColorOption
                   {...{ editor }}
-                  tooltipContent={tooltips.textColor || t("menu.textColor")}
+                  tooltipContent={
+                    tooltips.textColor || t("neetoEditor.menu.textColor")
+                  }
                 />
               )}
               {isEmojiActive && (
@@ -194,7 +196,7 @@ const Fixed = ({
                   {...{ editor }}
                   isActive={isEmojiPickerActive}
                   setActive={setIsEmojiPickerActive}
-                  tooltipContent={tooltips.emoji || t("menu.emoji")}
+                  tooltipContent={tooltips.emoji || t("neetoEditor.menu.emoji")}
                 />
               )}
               {isMediaUploaderActive && (
@@ -212,7 +214,9 @@ const Fixed = ({
               )}
               <Mentions
                 {...{ editor, mentions }}
-                tooltipContent={tooltips.mention || t("menu.mention")}
+                tooltipContent={
+                  tooltips.mention || t("neetoEditor.menu.mention")
+                }
               />
               {addonCommandOptions.map(renderOptionButton)}
             </div>
@@ -231,7 +235,9 @@ const Fixed = ({
             icon={isMenuExpanded ? Left : Right}
             style="text"
             tooltipProps={{
-              content: isMenuExpanded ? t("menu.collapse") : t("menu.expand"),
+              content: isMenuExpanded
+                ? t("neetoEditor.menu.collapse")
+                : t("neetoEditor.menu.expand"),
               position: "bottom",
             }}
             onClick={() => setIsMenuExpanded(not)}
@@ -246,7 +252,7 @@ const Fixed = ({
               buttonSize: "small",
               buttonProps: {
                 tooltipProps: {
-                  content: t("menu.dynamicVariables"),
+                  content: t("neetoEditor.menu.dynamicVariables"),
                   position: "bottom",
                 },
               },
diff --git a/src/components/Editor/Menu/Fixed/utils.jsx b/src/components/Editor/Menu/Fixed/utils.jsx
index 553409fa..cec3f2fa 100644
--- a/src/components/Editor/Menu/Fixed/utils.jsx
+++ b/src/components/Editor/Menu/Fixed/utils.jsx
@@ -27,35 +27,35 @@ import { generateFocusProps } from "utils/focusHighlighter";
 
 export const tableActions = ({ editor }) => [
   {
-    label: t("table.insertRow"),
+    label: t("neetoEditor.table.insertRow"),
     command: () => editor.commands.addRowAfter(),
   },
   {
-    label: t("table.insertColumn"),
+    label: t("neetoEditor.table.insertColumn"),
     command: () => editor.commands.addColumnAfter(),
   },
   {
-    label: t("table.deleteRow"),
+    label: t("neetoEditor.table.deleteRow"),
     command: () => editor.chain().focus().deleteRow().run(),
   },
   {
-    label: t("table.deleteColumn"),
+    label: t("neetoEditor.table.deleteColumn"),
     command: () => editor.chain().focus().deleteColumn().run(),
   },
   {
-    label: t("table.mergeSplit"),
+    label: t("neetoEditor.table.mergeSplit"),
     command: () => editor.chain().focus().mergeOrSplit().run(),
   },
   {
-    label: t("table.toggleHeaderRow"),
+    label: t("neetoEditor.table.toggleHeaderRow"),
     command: () => editor.chain().focus().toggleHeaderRow().run(),
   },
   {
-    label: t("table.toggleHeaderColumn"),
+    label: t("neetoEditor.table.toggleHeaderColumn"),
     command: () => editor.chain().focus().toggleHeaderColumn().run(),
   },
   {
-    label: t("table.delete"),
+    label: t("neetoEditor.table.delete"),
     command: () => editor.commands.deleteTable(),
   },
 ];
@@ -74,35 +74,35 @@ export const createMenuOptions = ({
       command: () => editor.chain().focus().toggleBold().run(),
       active: editor.isActive("bold"),
       optionName: "bold",
-      tooltip: tooltips.bold || t("menu.bold"),
+      tooltip: tooltips.bold || t("neetoEditor.menu.bold"),
     },
     {
       Icon: TextItalic,
       command: () => editor.chain().focus().toggleItalic().run(),
       active: editor.isActive("italic"),
       optionName: "italic",
-      tooltip: tooltips.italic || t("menu.italic"),
+      tooltip: tooltips.italic || t("neetoEditor.menu.italic"),
     },
     {
       Icon: Underline,
       command: () => editor.chain().focus().toggleUnderline().run(),
       active: editor.isActive("underline"),
       optionName: "underline",
-      tooltip: tooltips.underline || t("menu.underline"),
+      tooltip: tooltips.underline || t("neetoEditor.menu.underline"),
     },
     {
       Icon: TextCross,
       command: () => editor.chain().focus().toggleStrike().run(),
       active: editor.isActive("strike"),
       optionName: "strike",
-      tooltip: tooltips.strike || t("menu.strike"),
+      tooltip: tooltips.strike || t("neetoEditor.menu.strike"),
     },
     {
       Icon: Highlight,
       command: () => editor.chain().focus().toggleHighlight().run(),
       active: editor.isActive("highlight"),
       optionName: "highlight",
-      tooltip: tooltips.highlight || t("menu.highlight"),
+      tooltip: tooltips.highlight || t("neetoEditor.menu.highlight"),
     },
   ],
   block: [
@@ -112,21 +112,21 @@ export const createMenuOptions = ({
       active: editor.isActive("blockquote"),
       optionName: "block-quote",
       highlight: true,
-      tooltip: tooltips.blockQuote || t("menu.blockQuote"),
+      tooltip: tooltips.blockQuote || t("neetoEditor.menu.blockQuote"),
     },
     {
       Icon: Code,
       command: () => editor.chain().focus().toggleCode().run(),
       active: editor.isActive("code"),
       optionName: "code",
-      tooltip: tooltips.code || t("menu.code"),
+      tooltip: tooltips.code || t("neetoEditor.menu.code"),
     },
     {
       Icon: CodeBlock,
       command: () => editor.chain().focus().toggleCodeBlock().run(),
       active: editor.isActive("codeBlock"),
       optionName: "code-block",
-      tooltip: tooltips.codeBlock || t("menu.codeBlock"),
+      tooltip: tooltips.codeBlock || t("neetoEditor.menu.codeBlock"),
     },
   ],
   list: [
@@ -136,7 +136,7 @@ export const createMenuOptions = ({
       active: editor.isActive("bulletList"),
       optionName: "bullet-list",
       highlight: true,
-      tooltip: tooltips.bulletList || t("menu.bulletedList"),
+      tooltip: tooltips.bulletList || t("neetoEditor.menu.bulletedList"),
     },
     {
       Icon: ListNumber,
@@ -144,7 +144,7 @@ export const createMenuOptions = ({
       active: editor.isActive("orderedList"),
       optionName: "ordered-list",
       highlight: true,
-      tooltip: tooltips.orderedList || t("menu.orderedList"),
+      tooltip: tooltips.orderedList || t("neetoEditor.menu.orderedList"),
     },
   ],
   misc: [
@@ -159,25 +159,25 @@ export const createMenuOptions = ({
       command: handleUploadAttachments,
       active: false,
       optionName: "attachments",
-      tooltip: tooltips.attachments || t("menu.attachments"),
+      tooltip: tooltips.attachments || t("neetoEditor.menu.attachments"),
     },
     {
       Icon: ImageUpload,
       command: () => setMediaUploader(assoc("image", true)),
       optionName: "image-upload",
-      tooltip: tooltips.imageUpload || t("menu.imageUpload"),
+      tooltip: tooltips.imageUpload || t("neetoEditor.menu.imageUpload"),
     },
     {
       Icon: Video,
       command: () => setMediaUploader(assoc("video", true)),
       optionName: "video-upload",
-      tooltip: tooltips.videoUpload || t("menu.videoUpload"),
+      tooltip: tooltips.videoUpload || t("neetoEditor.menu.videoUpload"),
     },
     {
       Icon: MediaVideo,
       command: () => setIsEmbedModalOpen(true),
       optionName: "video-embed",
-      tooltip: tooltips.videoEmbed || t("menu.videoEmbed"),
+      tooltip: tooltips.videoEmbed || t("neetoEditor.menu.videoEmbed"),
     },
   ],
   right: [
@@ -187,7 +187,7 @@ export const createMenuOptions = ({
       active: false,
       disabled: !editor.can().undo(),
       optionName: "undo",
-      tooltip: tooltips.undo || t("menu.undo"),
+      tooltip: tooltips.undo || t("neetoEditor.menu.undo"),
     },
     {
       Icon: Redo,
@@ -195,7 +195,7 @@ export const createMenuOptions = ({
       active: false,
       disabled: !editor.can().redo(),
       optionName: "redo",
-      tooltip: tooltips.redo || t("menu.redo"),
+      tooltip: tooltips.redo || t("neetoEditor.menu.redo"),
     },
   ],
 });
diff --git a/src/components/Editor/Menu/Headless/constants.js b/src/components/Editor/Menu/Headless/constants.js
index abb6d286..e70e6c16 100644
--- a/src/components/Editor/Menu/Headless/constants.js
+++ b/src/components/Editor/Menu/Headless/constants.js
@@ -39,100 +39,100 @@ export const MENU_OPTIONS = ({
     command: () => editor.chain().focus().toggleBold().run(),
     active: editor.isActive("bold"),
     optionName: "bold",
-    tooltip: tooltips.bold || t("menu.bold"),
+    tooltip: tooltips.bold || t("neetoEditor.menu.bold"),
   },
   {
     Icon: TextItalic,
     command: () => editor.chain().focus().toggleItalic().run(),
     active: editor.isActive("italic"),
     optionName: "italic",
-    tooltip: tooltips.italic || t("menu.italic"),
+    tooltip: tooltips.italic || t("neetoEditor.menu.italic"),
   },
   {
     Icon: Underline,
     command: () => editor.chain().focus().toggleUnderline().run(),
     active: editor.isActive("underline"),
     optionName: "underline",
-    tooltip: tooltips.underline || t("menu.underline"),
+    tooltip: tooltips.underline || t("neetoEditor.menu.underline"),
   },
   {
     Icon: TextCross,
     command: () => editor.chain().focus().toggleStrike().run(),
     active: editor.isActive("strike"),
     optionName: "strike",
-    tooltip: tooltips.strike || t("menu.strike"),
+    tooltip: tooltips.strike || t("neetoEditor.menu.strike"),
   },
   {
     Icon: Highlight,
     command: () => editor.chain().focus().toggleHighlight().run(),
     active: editor.isActive("highlight"),
     optionName: "highlight",
-    tooltip: tooltips.highlight || t("menu.highlight"),
+    tooltip: tooltips.highlight || t("neetoEditor.menu.highlight"),
   },
   {
     Icon: Quote,
     command: () => editor.chain().focus().toggleBlockquote().run(),
     active: editor.isActive("blockquote"),
     optionName: "block-quote",
-    tooltip: tooltips.blockQuote || t("menu.blockQuote"),
+    tooltip: tooltips.blockQuote || t("neetoEditor.menu.blockQuote"),
   },
   {
     Icon: Code,
     command: () => editor.chain().focus().toggleCode().run(),
     active: editor.isActive("code"),
     optionName: "code",
-    tooltip: tooltips.code || t("menu.code"),
+    tooltip: tooltips.code || t("neetoEditor.menu.code"),
   },
   {
     Icon: CodeBlock,
     command: () => editor.chain().focus().toggleCodeBlock().run(),
     active: editor.isActive("codeBlock"),
     optionName: "code-block",
-    tooltip: tooltips.codeBlock || t("menu.codeBlock"),
+    tooltip: tooltips.codeBlock || t("neetoEditor.menu.codeBlock"),
   },
   {
     Icon: ListDot,
     command: () => editor.chain().focus().toggleBulletList().run(),
     active: editor.isActive("bulletList"),
     optionName: "bullet-list",
-    tooltip: tooltips.bulletList || t("menu.bulletedList"),
+    tooltip: tooltips.bulletList || t("neetoEditor.menu.bulletedList"),
   },
   {
     Icon: ListNumber,
     command: () => editor.chain().focus().toggleOrderedList().run(),
     active: editor.isActive("orderedList"),
     optionName: "ordered-list",
-    tooltip: tooltips.orderedList || t("menu.orderedList"),
+    tooltip: tooltips.orderedList || t("neetoEditor.menu.orderedList"),
   },
   {
     Icon: File,
     command: handleUploadAttachments,
     optionName: "attachments",
-    tooltip: tooltips.attachments || t("menu.attachments"),
+    tooltip: tooltips.attachments || t("neetoEditor.menu.attachments"),
   },
   {
     Icon: ImageUpload,
     command: () => setMediaUploader(assoc("image", true)),
     optionName: "image-upload",
-    tooltip: tooltips.imageUpload || t("menu.imageUpload"),
+    tooltip: tooltips.imageUpload || t("neetoEditor.menu.imageUpload"),
   },
   {
     Icon: Video,
     command: () => setMediaUploader(assoc("video", true)),
     optionName: "video-upload",
-    tooltip: tooltips.videoUpload || t("menu.videoUpload"),
+    tooltip: tooltips.videoUpload || t("neetoEditor.menu.videoUpload"),
   },
   {
     Icon: MediaVideo,
     command: () => setIsEmbedModalOpen(true),
     optionName: "video-embed",
-    tooltip: tooltips.videoEmbed || t("menu.videoEmbed"),
+    tooltip: tooltips.videoEmbed || t("neetoEditor.menu.videoEmbed"),
   },
   {
     Icon: Smiley,
     command: noop,
     optionName: "emoji",
-    tooltip: tooltips.emoji || t("menu.emoji"),
+    tooltip: tooltips.emoji || t("neetoEditor.menu.emoji"),
     isActive: isEmojiPickerActive,
     setActive: setIsEmojiPickerActive,
   },
@@ -145,20 +145,20 @@ export const MENU_OPTIONS = ({
         .insertTable({ rows: 3, cols: 3, withHeaderRow: true })
         .run(),
     optionName: "table",
-    tooltip: tooltips.table || t("menu.table"),
+    tooltip: tooltips.table || t("neetoEditor.menu.table"),
   },
   {
     Icon: Undo,
     command: () => editor.chain().focus().undo().run(),
     disabled: !editor.can().undo(),
     optionName: "undo",
-    tooltip: tooltips.undo || t("menu.undo"),
+    tooltip: tooltips.undo || t("neetoEditor.menu.undo"),
   },
   {
     Icon: Redo,
     command: () => editor.chain().focus().redo().run(),
     disabled: !editor.can().redo(),
     optionName: "redo",
-    tooltip: tooltips.redo || t("menu.redo"),
+    tooltip: tooltips.redo || t("neetoEditor.menu.redo"),
   },
 ];
diff --git a/src/components/Editor/Menu/Headless/utils.js b/src/components/Editor/Menu/Headless/utils.js
index 9f0ec36e..17a1af7d 100644
--- a/src/components/Editor/Menu/Headless/utils.js
+++ b/src/components/Editor/Menu/Headless/utils.js
@@ -38,100 +38,100 @@ export const createMenuOptions = ({
     command: () => editor.chain().focus().toggleBold().run(),
     active: editor.isActive("bold"),
     optionName: "bold",
-    tooltip: tooltips.bold || t("menu.bold"),
+    tooltip: tooltips.bold || t("neetoEditor.menu.bold"),
   },
   {
     Icon: TextItalic,
     command: () => editor.chain().focus().toggleItalic().run(),
     active: editor.isActive("italic"),
     optionName: "italic",
-    tooltip: tooltips.italic || t("menu.italic"),
+    tooltip: tooltips.italic || t("neetoEditor.menu.italic"),
   },
   {
     Icon: Underline,
     command: () => editor.chain().focus().toggleUnderline().run(),
     active: editor.isActive("underline"),
     optionName: "underline",
-    tooltip: tooltips.underline || t("menu.underline"),
+    tooltip: tooltips.underline || t("neetoEditor.menu.underline"),
   },
   {
     Icon: TextCross,
     command: () => editor.chain().focus().toggleStrike().run(),
     active: editor.isActive("strike"),
     optionName: "strike",
-    tooltip: tooltips.strike || t("menu.strike"),
+    tooltip: tooltips.strike || t("neetoEditor.menu.strike"),
   },
   {
     Icon: Highlight,
     command: () => editor.chain().focus().toggleHighlight().run(),
     active: editor.isActive("highlight"),
     optionName: "highlight",
-    tooltip: tooltips.highlight || t("menu.highlight"),
+    tooltip: tooltips.highlight || t("neetoEditor.menu.highlight"),
   },
   {
     Icon: Quote,
     command: () => editor.chain().focus().toggleBlockquote().run(),
     active: editor.isActive("blockquote"),
     optionName: "block-quote",
-    tooltip: tooltips.blockQuote || t("menu.blockQuote"),
+    tooltip: tooltips.blockQuote || t("neetoEditor.menu.blockQuote"),
   },
   {
     Icon: Code,
     command: () => editor.chain().focus().toggleCode().run(),
     active: editor.isActive("code"),
     optionName: "code",
-    tooltip: tooltips.code || t("menu.code"),
+    tooltip: tooltips.code || t("neetoEditor.menu.code"),
   },
   {
     Icon: CodeBlock,
     command: () => editor.chain().focus().toggleCodeBlock().run(),
     active: editor.isActive("codeBlock"),
     optionName: "code-block",
-    tooltip: tooltips.codeBlock || t("menu.codeBlock"),
+    tooltip: tooltips.codeBlock || t("neetoEditor.menu.codeBlock"),
   },
   {
     Icon: ListDot,
     command: () => editor.chain().focus().toggleBulletList().run(),
     active: editor.isActive("bulletList"),
     optionName: "bullet-list",
-    tooltip: tooltips.bulletList || t("menu.bulletedList"),
+    tooltip: tooltips.bulletList || t("neetoEditor.menu.bulletedList"),
   },
   {
     Icon: ListNumber,
     command: () => editor.chain().focus().toggleOrderedList().run(),
     active: editor.isActive("orderedList"),
     optionName: "ordered-list",
-    tooltip: tooltips.orderedList || t("menu.orderedList"),
+    tooltip: tooltips.orderedList || t("neetoEditor.menu.orderedList"),
   },
   {
     Icon: File,
     command: handleUploadAttachments,
     optionName: "attachments",
-    tooltip: tooltips.attachments || t("menu.attachments"),
+    tooltip: tooltips.attachments || t("neetoEditor.menu.attachments"),
   },
   {
     Icon: ImageUpload,
     command: () => setMediaUploader(assoc("image", true)),
     optionName: "image-upload",
-    tooltip: tooltips.imageUpload || t("menu.imageUpload"),
+    tooltip: tooltips.imageUpload || t("neetoEditor.menu.imageUpload"),
   },
   {
     Icon: Video,
     command: () => setMediaUploader(assoc("video", true)),
     optionName: "video-upload",
-    tooltip: tooltips.videoUpload || t("menu.videoUpload"),
+    tooltip: tooltips.videoUpload || t("neetoEditor.menu.videoUpload"),
   },
   {
     Icon: MediaVideo,
     command: () => setIsEmbedModalOpen(true),
     optionName: "video-embed",
-    tooltip: tooltips.videoEmbed || t("menu.videoEmbed"),
+    tooltip: tooltips.videoEmbed || t("neetoEditor.menu.videoEmbed"),
   },
   {
     Icon: Smiley,
     command: noop,
     optionName: "emoji",
-    tooltip: tooltips.emoji || t("menu.emoji"),
+    tooltip: tooltips.emoji || t("neetoEditor.menu.emoji"),
     isActive: isEmojiPickerActive,
     setActive: setIsEmojiPickerActive,
   },
@@ -144,21 +144,21 @@ export const createMenuOptions = ({
         .insertTable({ rows: 3, cols: 3, withHeaderRow: true })
         .run(),
     optionName: "table",
-    tooltip: tooltips.table || t("menu.table"),
+    tooltip: tooltips.table || t("neetoEditor.menu.table"),
   },
   {
     Icon: Undo,
     command: () => editor.chain().focus().undo().run(),
     disabled: !editor.can().undo(),
     optionName: "undo",
-    tooltip: tooltips.undo || t("menu.undo"),
+    tooltip: tooltips.undo || t("neetoEditor.menu.undo"),
   },
   {
     Icon: Redo,
     command: () => editor.chain().focus().redo().run(),
     disabled: !editor.can().redo(),
     optionName: "redo",
-    tooltip: tooltips.redo || t("menu.redo"),
+    tooltip: tooltips.redo || t("neetoEditor.menu.redo"),
   },
 ];
 
diff --git a/src/hooks/useUppyUploader.js b/src/hooks/useUppyUploader.js
index 7e30d353..66069b0b 100644
--- a/src/hooks/useUppyUploader.js
+++ b/src/hooks/useUppyUploader.js
@@ -20,7 +20,7 @@ const useUppyUploader = ({ uppyConfig, onSuccess = noop }) => {
 
     if (file.size > maxFileSize) {
       Toastr.error(
-        t("error.fileIsTooLarge", {
+        t("neetoEditor.error.fileIsTooLarge", {
           maxFileSize: convertToFileSize(uppyConfig.restrictions.maxFileSize),
         })
       );
diff --git a/src/translations/en.json b/src/translations/en.json
index 57bddd4c..a071b905 100644
--- a/src/translations/en.json
+++ b/src/translations/en.json
@@ -1,96 +1,98 @@
 {
-  "common": {
-    "create": "Create",
-    "download": "Download",
-    "embed": "Embed",
-    "unlink": "Unlink",
-    "videoUrl": "Video URL:",
-    "reset": "Reset",
-    "auto": "Auto",
-    "edit": "Edit",
-    "cancel": "Cancel",
-    "text": "Text:",
-    "done": "Done",
-    "url": "Url:"
-  },
-  "attachments": {
-    "actionsBlocked": "You are not permitted to update or delete attachments",
-    "add": "Add attachment",
-    "deleteConfirmation": "You are permanently deleting the attachment <strong>{{entity}}</strong>. This can't be undone.",
-    "deleteTitle": "Delete attachment?",
-    "maxNumberOfFiles": "You can only attach {{entity}} files",
-    "nameEmpty": "Filename cannot be empty",
-    "noPreview": "There is no preview available, click to <span>download</span>.",
-    "oneAttachmentAllowed": "Only one attachment is allowed"
-  },
-  "error": {
-    "invalidUrl": "Please enter a valid URL",
-    "cannotAddFiles": "Cannot add files",
-    "onBeforeFileAddedReturn": "Cannot add the file because onBeforeFileAdded returned false.",
-    "fileIsTooLarge": "File size is too large. Max size is {{maxFileSize}}.",
-    "imageSizeIsShouldBeLess": "Image size should be less than {{limit}} MB"
-  },
-  "menu": {
-    "attachments": "Attachments",
-    "blockQuote": "Block quote",
-    "bold": "Bold",
-    "bulletedList": "Bulleted list",
-    "code": "Code",
-    "codeBlock": "Code block",
-    "collapse": "Collapse",
-    "emoji": "Emoji",
-    "expand": "Expand",
-    "fontSize": "Font size",
-    "highlight": "Highlight",
-    "imageUpload": "Image upload",
-    "italic": "Italic",
-    "link": "Link",
-    "mention": "Mention",
-    "orderedList": "Ordered list",
-    "redo": "Redo",
-    "strike": "Strike",
-    "table": "Table",
-    "textColor": "Text color",
-    "underline": "Underline",
-    "undo": "Undo",
-    "dynamicVariables": "Dynamic variables",
-    "videoEmbed": "Video embed",
-    "videoUpload": "Video upload",
-    "alignLeft": "Align left",
-    "alignCenter": "Align center",
-    "alignRight": "Align right",
-    "delete": "Delete"
-  },
-  "placeholders": {
-    "columns": "Enter columns",
-    "linkInput": "Paste or type a link...",
-    "pasteLink": "Paste the link here...",
-    "pickColor": "Pick a color",
-    "rows": "Enter rows",
-    "searchUnsplash": "Search Unsplash",
-    "url": "Enter URL",
-    "enterText": "Enter text",
-    "writeSomething": "Write something …",
-    "searchLanguages": "Search languages"
-  },
-  "table": {
-    "delete": "Delete table",
-    "deleteColumn": "Delete column",
-    "deleteRow": "Delete row",
-    "insertColumn": "Insert column",
-    "insertRow": "Insert row",
-    "mergeSplit": "Merge/Split cell",
-    "toggleHeaderColumn": "Toggle header column",
-    "toggleHeaderRow": "Toggle header row"
-  },
-  "unsplash": {
-    "errorMessage": "Something went wrong! Please try again later.",
-    "noResults": "No results",
-    "end": "End of results"
-  },
-  "localUploader": {
-    "dropFilesHere": "Drop your file(s) here or Browse.",
-    "maxFileSize": "Max. File Size: {{entity}}",
-    "completed": "Completed"
+  "neetoEditor": {
+    "common": {
+      "create": "Create",
+      "download": "Download",
+      "embed": "Embed",
+      "unlink": "Unlink",
+      "videoUrl": "Video URL:",
+      "reset": "Reset",
+      "auto": "Auto",
+      "edit": "Edit",
+      "cancel": "Cancel",
+      "text": "Text:",
+      "done": "Done",
+      "url": "Url:"
+    },
+    "attachments": {
+      "actionsBlocked": "You are not permitted to update or delete attachments",
+      "add": "Add attachment",
+      "deleteConfirmation": "You are permanently deleting the attachment <strong>{{entity}}</strong>. This can't be undone.",
+      "deleteTitle": "Delete attachment?",
+      "maxNumberOfFiles": "You can only attach {{entity}} files",
+      "nameEmpty": "Filename cannot be empty",
+      "noPreview": "There is no preview available, click to <span>download</span>.",
+      "oneAttachmentAllowed": "Only one attachment is allowed"
+    },
+    "error": {
+      "invalidUrl": "Please enter a valid URL",
+      "cannotAddFiles": "Cannot add files",
+      "onBeforeFileAddedReturn": "Cannot add the file because onBeforeFileAdded returned false.",
+      "fileIsTooLarge": "File size is too large. Max size is {{maxFileSize}}.",
+      "imageSizeIsShouldBeLess": "Image size should be less than {{limit}} MB"
+    },
+    "menu": {
+      "attachments": "Attachments",
+      "blockQuote": "Block quote",
+      "bold": "Bold",
+      "bulletedList": "Bulleted list",
+      "code": "Code",
+      "codeBlock": "Code block",
+      "collapse": "Collapse",
+      "emoji": "Emoji",
+      "expand": "Expand",
+      "fontSize": "Font size",
+      "highlight": "Highlight",
+      "imageUpload": "Image upload",
+      "italic": "Italic",
+      "link": "Link",
+      "mention": "Mention",
+      "orderedList": "Ordered list",
+      "redo": "Redo",
+      "strike": "Strike",
+      "table": "Table",
+      "textColor": "Text color",
+      "underline": "Underline",
+      "undo": "Undo",
+      "dynamicVariables": "Dynamic variables",
+      "videoEmbed": "Video embed",
+      "videoUpload": "Video upload",
+      "alignLeft": "Align left",
+      "alignCenter": "Align center",
+      "alignRight": "Align right",
+      "delete": "Delete"
+    },
+    "placeholders": {
+      "columns": "Enter columns",
+      "linkInput": "Paste or type a link...",
+      "pasteLink": "Paste the link here...",
+      "pickColor": "Pick a color",
+      "rows": "Enter rows",
+      "searchUnsplash": "Search Unsplash",
+      "url": "Enter URL",
+      "enterText": "Enter text",
+      "writeSomething": "Write something …",
+      "searchLanguages": "Search languages"
+    },
+    "table": {
+      "delete": "Delete table",
+      "deleteColumn": "Delete column",
+      "deleteRow": "Delete row",
+      "insertColumn": "Insert column",
+      "insertRow": "Insert row",
+      "mergeSplit": "Merge/Split cell",
+      "toggleHeaderColumn": "Toggle header column",
+      "toggleHeaderRow": "Toggle header row"
+    },
+    "unsplash": {
+      "errorMessage": "Something went wrong! Please try again later.",
+      "noResults": "No results",
+      "end": "End of results"
+    },
+    "localUploader": {
+      "dropFilesHere": "Drop your file(s) here or Browse.",
+      "maxFileSize": "Max. File Size: {{entity}}",
+      "completed": "Completed"
+    }
   }
 }