diff --git a/components/Home/NodeFeatures/__test__/__snapshots__/index.test.tsx.snap b/components/Home/NodeFeatures/__test__/__snapshots__/index.test.tsx.snap
index 187988e6d43f5..4cf67440b4440 100644
--- a/components/Home/NodeFeatures/__test__/__snapshots__/index.test.tsx.snap
+++ b/components/Home/NodeFeatures/__test__/__snapshots__/index.test.tsx.snap
@@ -29,10 +29,10 @@ exports[`NodeFeatures should render 1`] = `
       <h2
         class="t-subheading2"
       >
-        pages.index.features.javascript.title
+        components.home.nodeFeatures.javascript.title
       </h2>
       <p>
-        pages.index.features.javascript.description
+        components.home.nodeFeatures.javascript.description
       </p>
     </div>
     <div
@@ -56,10 +56,10 @@ exports[`NodeFeatures should render 1`] = `
       <h2
         class="t-subheading2"
       >
-        pages.index.features.openSource.title
+        components.home.nodeFeatures.openSource.title
       </h2>
       <p>
-        pages.index.features.openSource.description
+        components.home.nodeFeatures.openSource.description
       </p>
     </div>
     <div
@@ -86,10 +86,10 @@ exports[`NodeFeatures should render 1`] = `
       <h2
         class="t-subheading2"
       >
-        pages.index.features.everywhere.title
+        components.home.nodeFeatures.everywhere.title
       </h2>
       <p>
-        pages.index.features.everywhere.description
+        components.home.nodeFeatures.everywhere.description
       </p>
     </div>
   </section>
diff --git a/components/Home/NodeFeatures/index.tsx b/components/Home/NodeFeatures/index.tsx
index c08f17f9340e4..43942adfaf54c 100644
--- a/components/Home/NodeFeatures/index.tsx
+++ b/components/Home/NodeFeatures/index.tsx
@@ -14,18 +14,18 @@ const styled = (icon: ReactElement): ReactElement =>
 const features = [
   {
     icon: styled(<IoLogoNodejs />),
-    heading: 'pages.index.features.javascript.title',
-    description: 'pages.index.features.javascript.description',
+    heading: 'components.home.nodeFeatures.javascript.title',
+    description: 'components.home.nodeFeatures.javascript.description',
   },
   {
     icon: styled(<IoMdGitPullRequest />),
-    heading: 'pages.index.features.openSource.title',
-    description: 'pages.index.features.openSource.description',
+    heading: 'components.home.nodeFeatures.openSource.title',
+    description: 'components.home.nodeFeatures.openSource.description',
   },
   {
     icon: styled(<IoMdRocket />),
-    heading: 'pages.index.features.everywhere.title',
-    description: 'pages.index.features.everywhere.description',
+    heading: 'components.home.nodeFeatures.everywhere.title',
+    description: 'components.home.nodeFeatures.everywhere.description',
   },
 ];
 
diff --git a/components/Learn/PreviousNextLink/index.tsx b/components/Learn/PreviousNextLink/index.tsx
index 4bc91c5ff9d71..5dc6a85c5ba29 100644
--- a/components/Learn/PreviousNextLink/index.tsx
+++ b/components/Learn/PreviousNextLink/index.tsx
@@ -21,14 +21,14 @@ const PreviousNextLink: FC<PreviousNextLinkProps> = ({ previous, next }) => {
         {previous && (
           <Link href={previous.slug} rel="prev">
             <FaAngleDoubleLeft size="1em" style={{ marginRight: '5px' }} />
-            <FormattedMessage id="components.prevnextlink.previous" />
+            <FormattedMessage id="components.learn.previousNextLink.previous" />
           </Link>
         )}
       </li>
       <li>
         {next && (
           <Link href={next.slug} rel="next">
-            <FormattedMessage id="components.prevnextlink.next" />
+            <FormattedMessage id="components.learn.previousNextLink.next" />
             <FaAngleDoubleRight style={{ marginLeft: '5px' }} />
           </Link>
         )}
diff --git a/components/Sections/NewFooter/__tests__/__snapshots__/index.test.tsx.snap b/components/Sections/NewFooter/__tests__/__snapshots__/index.test.tsx.snap
index 56f24adf2645d..7f6cda4e1abbc 100644
--- a/components/Sections/NewFooter/__tests__/__snapshots__/index.test.tsx.snap
+++ b/components/Sections/NewFooter/__tests__/__snapshots__/index.test.tsx.snap
@@ -16,7 +16,7 @@ exports[`Tests for Footer component renders correctly 1`] = `
           rel="noopener noreferrer"
           target="_blank"
         >
-          components.footer.links.trademark
+          components.sections.newFooter.trademark
         </a>
       </li>
       <li>
@@ -27,7 +27,7 @@ exports[`Tests for Footer component renders correctly 1`] = `
           rel="noopener noreferrer"
           target="_blank"
         >
-          components.footer.links.privacy
+          components.sections.newFooter.privacy
         </a>
       </li>
       <li>
@@ -37,7 +37,7 @@ exports[`Tests for Footer component renders correctly 1`] = `
           rel="noopener noreferrer"
           target="_blank"
         >
-          components.footer.links.codeOfConduct
+          components.sections.newFooter.codeOfConduct
         </a>
       </li>
       <li>
@@ -45,7 +45,7 @@ exports[`Tests for Footer component renders correctly 1`] = `
           class="link"
           href="/en/about/security"
         >
-          components.footer.links.security
+          components.sections.newFooter.security
         </a>
       </li>
       <li>
@@ -53,7 +53,7 @@ exports[`Tests for Footer component renders correctly 1`] = `
           class="link"
           href="/en/about"
         >
-          components.footer.links.about
+          components.sections.newFooter.about
         </a>
       </li>
       <li>
@@ -61,7 +61,7 @@ exports[`Tests for Footer component renders correctly 1`] = `
           class="link"
           href="/en/blog"
         >
-          components.footer.links.blog
+          components.sections.newFooter.blog
         </a>
       </li>
     </ul>
diff --git a/components/Sections/NewFooter/index.tsx b/components/Sections/NewFooter/index.tsx
index f8e700e688b80..34593acf22c2a 100644
--- a/components/Sections/NewFooter/index.tsx
+++ b/components/Sections/NewFooter/index.tsx
@@ -14,7 +14,7 @@ const Footer = () => (
           rel="noopener noreferrer"
           aria-label="Node.js Trademark Policy - PDF (Opens in new tab)"
         >
-          <FormattedMessage id="components.footer.links.trademark" />
+          <FormattedMessage id="components.sections.newFooter.trademark" />
         </a>
       </li>
       <li>
@@ -25,7 +25,7 @@ const Footer = () => (
           rel="noopener noreferrer"
           aria-label="Node.js Privacy Policy - PDF (Opens in new tab)"
         >
-          <FormattedMessage id="components.footer.links.privacy" />
+          <FormattedMessage id="components.sections.newFooter.privacy" />
         </a>
       </li>
       <li>
@@ -35,22 +35,22 @@ const Footer = () => (
           href="https://github.com/openjs-foundation/cross-project-council/blob/main/CODE_OF_CONDUCT.md#contributor-covenant-code-of-conduct"
           rel="noopener noreferrer"
         >
-          <FormattedMessage id="components.footer.links.codeOfConduct" />
+          <FormattedMessage id="components.sections.newFooter.codeOfConduct" />
         </a>
       </li>
       <li>
         <LocalizedLink className={styles.link} href="/about/security">
-          <FormattedMessage id="components.footer.links.security" />
+          <FormattedMessage id="components.sections.newFooter.security" />
         </LocalizedLink>
       </li>
       <li>
         <LocalizedLink className={styles.link} href="/about">
-          <FormattedMessage id="components.footer.links.about" />
+          <FormattedMessage id="components.sections.newFooter.about" />
         </LocalizedLink>
       </li>
       <li>
         <LocalizedLink className={styles.link} href="/blog">
-          <FormattedMessage id="components.footer.links.blog" />
+          <FormattedMessage id="components.sections.newFooter.blog" />
         </LocalizedLink>
       </li>
     </ul>
diff --git a/i18n/locales/en.json b/i18n/locales/en.json
index 9f0bbb6bd6f7e..5ed9a6a747cc1 100644
--- a/i18n/locales/en.json
+++ b/i18n/locales/en.json
@@ -43,20 +43,20 @@
   "components.article.editLink.title.translate": "Interested to help with translations?",
   "components.common.languageSelector.button.title": "Switch Language",
   "components.blog.blogCard.author.by": "by",
-  "components.footer.links.trademark": "Trademark Policy",
-  "components.footer.links.privacy": "Privacy Policy",
-  "components.footer.links.codeOfConduct": "Code of Conduct",
-  "components.footer.links.security": "Security",
-  "components.footer.links.about": "About",
-  "components.footer.links.blog": "Blog",
-  "components.footer.links.github": "GitHub",
-  "components.prevnextlink.next": "NEXT",
-  "components.prevnextlink.previous": "PREV",
-  "pages.index.features.javascript.title": "JavaScript",
-  "pages.index.features.javascript.description": "Node.js provides support for the JavaScript programming language",
-  "pages.index.features.openSource.title": "Open Source",
-  "pages.index.features.openSource.description": "Node.js is open source and actively maintained by contributors all over the world",
-  "pages.index.features.everywhere.title": "Everywhere",
-  "pages.index.features.everywhere.description": "Node.js has been adapted to work in a wide variety of places",
+  "components.sections.newFooter.trademark": "Trademark Policy",
+  "components.sections.newFooter.privacy": "Privacy Policy",
+  "components.sections.newFooter.codeOfConduct": "Code of Conduct",
+  "components.sections.newFooter.security": "Security",
+  "components.sections.newFooter.about": "About",
+  "components.sections.newFooter.blog": "Blog",
+  "components.sections.newFooter.github": "GitHub",
+  "components.learn.previousNextLink.next": "NEXT",
+  "components.learn.previousNextLink.previous": "PREV",
+  "components.home.nodeFeatures.javascript.title": "JavaScript",
+  "components.home.nodeFeatures.javascript.description": "Node.js provides support for the JavaScript programming language",
+  "components.home.nodeFeatures.openSource.title": "Open Source",
+  "components.home.nodeFeatures.openSource.description": "Node.js is open source and actively maintained by contributors all over the world",
+  "components.home.nodeFeatures.everywhere.title": "Everywhere",
+  "components.home.nodeFeatures.everywhere.description": "Node.js has been adapted to work in a wide variety of places",
   "components.common.shellBox.copy": "{copied, select, true {copied}other {copy}}"
 }