diff --git a/app/assets/javascripts/discourse/app/components/glimmer-site-header.gjs b/app/assets/javascripts/discourse/app/components/glimmer-site-header.gjs
index 8e83e52ee4a..a05abbb4e2a 100644
--- a/app/assets/javascripts/discourse/app/components/glimmer-site-header.gjs
+++ b/app/assets/javascripts/discourse/app/components/glimmer-site-header.gjs
@@ -13,7 +13,7 @@ import { isDocumentRTL } from "discourse/lib/text-direction";
 import { isTesting } from "discourse-common/config/environment";
 import discourseLater from "discourse-common/lib/later";
 import { bind, debounce } from "discourse-common/utils/decorators";
-import GlimmerHeader from "./glimmer-header";
+import Header from "./header";
 
 let _menuPanelClassesToForceDropdown = [];
 const PANEL_WIDTH = 340;
@@ -438,7 +438,7 @@ export default class GlimmerSiteHeader extends Component {
       }}
       {{didInsert this.setupHeader}}
     >
-      <GlimmerHeader
+      <Header
         @canSignUp={{@canSignUp}}
         @showSidebar={{@showSidebar}}
         @sidebarEnabled={{@sidebarEnabled}}
diff --git a/app/assets/javascripts/discourse/app/components/glimmer-header.gjs b/app/assets/javascripts/discourse/app/components/header.gjs
similarity index 94%
rename from app/assets/javascripts/discourse/app/components/glimmer-header.gjs
rename to app/assets/javascripts/discourse/app/components/header.gjs
index 8cc17788b24..04b6c10ac36 100644
--- a/app/assets/javascripts/discourse/app/components/glimmer-header.gjs
+++ b/app/assets/javascripts/discourse/app/components/header.gjs
@@ -10,12 +10,12 @@ import DAG from "discourse/lib/dag";
 import scrollLock from "discourse/lib/scroll-lock";
 import DiscourseURL from "discourse/lib/url";
 import { scrollTop } from "discourse/mixins/scroll-top";
-import AuthButtons from "./glimmer-header/auth-buttons";
-import Contents from "./glimmer-header/contents";
-import HamburgerDropdownWrapper from "./glimmer-header/hamburger-dropdown-wrapper";
-import Icons from "./glimmer-header/icons";
-import SearchMenuWrapper from "./glimmer-header/search-menu-wrapper";
-import UserMenuWrapper from "./glimmer-header/user-menu-wrapper";
+import AuthButtons from "./header/auth-buttons";
+import Contents from "./header/contents";
+import HamburgerDropdownWrapper from "./header/hamburger-dropdown-wrapper";
+import Icons from "./header/icons";
+import SearchMenuWrapper from "./header/search-menu-wrapper";
+import UserMenuWrapper from "./header/user-menu-wrapper";
 
 const SEARCH_BUTTON_ID = "search-button";
 
diff --git a/app/assets/javascripts/discourse/app/components/glimmer-header/auth-buttons.gjs b/app/assets/javascripts/discourse/app/components/header/auth-buttons.gjs
similarity index 100%
rename from app/assets/javascripts/discourse/app/components/glimmer-header/auth-buttons.gjs
rename to app/assets/javascripts/discourse/app/components/header/auth-buttons.gjs
diff --git a/app/assets/javascripts/discourse/app/components/glimmer-header/contents.gjs b/app/assets/javascripts/discourse/app/components/header/contents.gjs
similarity index 100%
rename from app/assets/javascripts/discourse/app/components/glimmer-header/contents.gjs
rename to app/assets/javascripts/discourse/app/components/header/contents.gjs
diff --git a/app/assets/javascripts/discourse/app/components/glimmer-header/dropdown.gjs b/app/assets/javascripts/discourse/app/components/header/dropdown.gjs
similarity index 100%
rename from app/assets/javascripts/discourse/app/components/glimmer-header/dropdown.gjs
rename to app/assets/javascripts/discourse/app/components/header/dropdown.gjs
diff --git a/app/assets/javascripts/discourse/app/components/glimmer-header/hamburger-dropdown-wrapper.gjs b/app/assets/javascripts/discourse/app/components/header/hamburger-dropdown-wrapper.gjs
similarity index 100%
rename from app/assets/javascripts/discourse/app/components/glimmer-header/hamburger-dropdown-wrapper.gjs
rename to app/assets/javascripts/discourse/app/components/header/hamburger-dropdown-wrapper.gjs
diff --git a/app/assets/javascripts/discourse/app/components/glimmer-header/home-logo.gjs b/app/assets/javascripts/discourse/app/components/header/home-logo.gjs
similarity index 100%
rename from app/assets/javascripts/discourse/app/components/glimmer-header/home-logo.gjs
rename to app/assets/javascripts/discourse/app/components/header/home-logo.gjs
diff --git a/app/assets/javascripts/discourse/app/components/glimmer-header/icons.gjs b/app/assets/javascripts/discourse/app/components/header/icons.gjs
similarity index 100%
rename from app/assets/javascripts/discourse/app/components/glimmer-header/icons.gjs
rename to app/assets/javascripts/discourse/app/components/header/icons.gjs
diff --git a/app/assets/javascripts/discourse/app/components/glimmer-header/logo.gjs b/app/assets/javascripts/discourse/app/components/header/logo.gjs
similarity index 100%
rename from app/assets/javascripts/discourse/app/components/glimmer-header/logo.gjs
rename to app/assets/javascripts/discourse/app/components/header/logo.gjs
diff --git a/app/assets/javascripts/discourse/app/components/glimmer-header/panel-portal.gjs b/app/assets/javascripts/discourse/app/components/header/panel-portal.gjs
similarity index 100%
rename from app/assets/javascripts/discourse/app/components/glimmer-header/panel-portal.gjs
rename to app/assets/javascripts/discourse/app/components/header/panel-portal.gjs
diff --git a/app/assets/javascripts/discourse/app/components/glimmer-header/search-menu-wrapper.gjs b/app/assets/javascripts/discourse/app/components/header/search-menu-wrapper.gjs
similarity index 100%
rename from app/assets/javascripts/discourse/app/components/glimmer-header/search-menu-wrapper.gjs
rename to app/assets/javascripts/discourse/app/components/header/search-menu-wrapper.gjs
diff --git a/app/assets/javascripts/discourse/app/components/glimmer-header/sidebar-toggle.gjs b/app/assets/javascripts/discourse/app/components/header/sidebar-toggle.gjs
similarity index 100%
rename from app/assets/javascripts/discourse/app/components/glimmer-header/sidebar-toggle.gjs
rename to app/assets/javascripts/discourse/app/components/header/sidebar-toggle.gjs
diff --git a/app/assets/javascripts/discourse/app/components/glimmer-header/topic/featured-link.gjs b/app/assets/javascripts/discourse/app/components/header/topic/featured-link.gjs
similarity index 100%
rename from app/assets/javascripts/discourse/app/components/glimmer-header/topic/featured-link.gjs
rename to app/assets/javascripts/discourse/app/components/header/topic/featured-link.gjs
diff --git a/app/assets/javascripts/discourse/app/components/glimmer-header/topic/info.gjs b/app/assets/javascripts/discourse/app/components/header/topic/info.gjs
similarity index 100%
rename from app/assets/javascripts/discourse/app/components/glimmer-header/topic/info.gjs
rename to app/assets/javascripts/discourse/app/components/header/topic/info.gjs
diff --git a/app/assets/javascripts/discourse/app/components/glimmer-header/topic/participant.gjs b/app/assets/javascripts/discourse/app/components/header/topic/participant.gjs
similarity index 100%
rename from app/assets/javascripts/discourse/app/components/glimmer-header/topic/participant.gjs
rename to app/assets/javascripts/discourse/app/components/header/topic/participant.gjs
diff --git a/app/assets/javascripts/discourse/app/components/glimmer-header/topic/status.gjs b/app/assets/javascripts/discourse/app/components/header/topic/status.gjs
similarity index 100%
rename from app/assets/javascripts/discourse/app/components/glimmer-header/topic/status.gjs
rename to app/assets/javascripts/discourse/app/components/header/topic/status.gjs
diff --git a/app/assets/javascripts/discourse/app/components/glimmer-header/user-dropdown.gjs b/app/assets/javascripts/discourse/app/components/header/user-dropdown.gjs
similarity index 100%
rename from app/assets/javascripts/discourse/app/components/glimmer-header/user-dropdown.gjs
rename to app/assets/javascripts/discourse/app/components/header/user-dropdown.gjs
diff --git a/app/assets/javascripts/discourse/app/components/glimmer-header/user-dropdown/notifications.gjs b/app/assets/javascripts/discourse/app/components/header/user-dropdown/notifications.gjs
similarity index 100%
rename from app/assets/javascripts/discourse/app/components/glimmer-header/user-dropdown/notifications.gjs
rename to app/assets/javascripts/discourse/app/components/header/user-dropdown/notifications.gjs
diff --git a/app/assets/javascripts/discourse/app/components/glimmer-header/user-dropdown/user-status-bubble.gjs b/app/assets/javascripts/discourse/app/components/header/user-dropdown/user-status-bubble.gjs
similarity index 100%
rename from app/assets/javascripts/discourse/app/components/glimmer-header/user-dropdown/user-status-bubble.gjs
rename to app/assets/javascripts/discourse/app/components/header/user-dropdown/user-status-bubble.gjs
diff --git a/app/assets/javascripts/discourse/app/components/glimmer-header/user-menu-wrapper.gjs b/app/assets/javascripts/discourse/app/components/header/user-menu-wrapper.gjs
similarity index 100%
rename from app/assets/javascripts/discourse/app/components/glimmer-header/user-menu-wrapper.gjs
rename to app/assets/javascripts/discourse/app/components/header/user-menu-wrapper.gjs
diff --git a/app/assets/javascripts/discourse/app/components/legacy-header-icon-shim.gjs b/app/assets/javascripts/discourse/app/components/legacy-header-icon-shim.gjs
index f41426e00de..be5863ba9bf 100644
--- a/app/assets/javascripts/discourse/app/components/legacy-header-icon-shim.gjs
+++ b/app/assets/javascripts/discourse/app/components/legacy-header-icon-shim.gjs
@@ -2,7 +2,7 @@ import Component from "@glimmer/component";
 import { tracked } from "@glimmer/tracking";
 import { schedule } from "@ember/runloop";
 import { PANEL_WRAPPER_ID } from "discourse/widgets/header";
-import PanelPortal from "./glimmer-header/panel-portal";
+import PanelPortal from "./header/panel-portal";
 
 export default class LegacyHeaderIconShim extends Component {
   @tracked panelElement;
diff --git a/app/assets/javascripts/discourse/app/lib/plugin-api.gjs b/app/assets/javascripts/discourse/app/lib/plugin-api.gjs
index ddc4ad7169b..de5d7b040b7 100644
--- a/app/assets/javascripts/discourse/app/lib/plugin-api.gjs
+++ b/app/assets/javascripts/discourse/app/lib/plugin-api.gjs
@@ -9,10 +9,10 @@ import {
 import { addPluginDocumentTitleCounter } from "discourse/components/d-document";
 import { addToolbarCallback } from "discourse/components/d-editor";
 import { addCategorySortCriteria } from "discourse/components/edit-category-settings";
-import { headerButtonsDAG } from "discourse/components/glimmer-header";
-import { headerIconsDAG } from "discourse/components/glimmer-header/icons";
 import { forceDropdownForMenuPanels as glimmerForceDropdownForMenuPanels } from "discourse/components/glimmer-site-header";
 import { addGlobalNotice } from "discourse/components/global-notice";
+import { headerButtonsDAG } from "discourse/components/header";
+import { headerIconsDAG } from "discourse/components/header/icons";
 import { _addBulkButton } from "discourse/components/modal/topic-bulk-actions";
 import MountWidget, {
   addWidgetCleanCallback,
diff --git a/app/assets/javascripts/discourse/app/lib/render-topic-featured-link.js b/app/assets/javascripts/discourse/app/lib/render-topic-featured-link.js
index 28daf19f021..43381915709 100644
--- a/app/assets/javascripts/discourse/app/lib/render-topic-featured-link.js
+++ b/app/assets/javascripts/discourse/app/lib/render-topic-featured-link.js
@@ -54,7 +54,7 @@ export default function renderTopicFeaturedLink(topic) {
     return "";
   }
 }
-// deprecated per components/glimmer-header/topic/featured-link.gjs
+// deprecated per components/header/topic/featured-link.gjs
 export function topicFeaturedLinkNode(topic) {
   const meta = extractLinkMeta(topic);
   if (meta) {
diff --git a/app/assets/javascripts/discourse/app/widgets/header.js b/app/assets/javascripts/discourse/app/widgets/header.js
index ad660670bf8..0e688122554 100644
--- a/app/assets/javascripts/discourse/app/widgets/header.js
+++ b/app/assets/javascripts/discourse/app/widgets/header.js
@@ -2,8 +2,8 @@ import { schedule } from "@ember/runloop";
 import { hbs } from "ember-cli-htmlbars";
 import $ from "jquery";
 import { h } from "virtual-dom";
-import { headerButtonsDAG } from "discourse/components/glimmer-header";
-import { headerIconsDAG } from "discourse/components/glimmer-header/icons";
+import { headerButtonsDAG } from "discourse/components/header";
+import { headerIconsDAG } from "discourse/components/header/icons";
 import { addExtraUserClasses } from "discourse/helpers/user-avatar";
 import { wantsNewWindow } from "discourse/lib/intercept-click";
 import scrollLock from "discourse/lib/scroll-lock";
diff --git a/app/assets/javascripts/discourse/app/widgets/home-logo.js b/app/assets/javascripts/discourse/app/widgets/home-logo.js
index 2ace90d8366..6e5b1c8ae89 100644
--- a/app/assets/javascripts/discourse/app/widgets/home-logo.js
+++ b/app/assets/javascripts/discourse/app/widgets/home-logo.js
@@ -1,4 +1,4 @@
-// deprecated in favor of components/glimmer-header/home-logo.gjs
+// deprecated in favor of components/header/home-logo.gjs
 import { h } from "virtual-dom";
 import { wantsNewWindow } from "discourse/lib/intercept-click";
 import DiscourseURL from "discourse/lib/url";
diff --git a/app/assets/javascripts/discourse/app/widgets/sidebar-toggle.js b/app/assets/javascripts/discourse/app/widgets/sidebar-toggle.js
index 172788bc0de..eb5a3f21a00 100644
--- a/app/assets/javascripts/discourse/app/widgets/sidebar-toggle.js
+++ b/app/assets/javascripts/discourse/app/widgets/sidebar-toggle.js
@@ -1,4 +1,4 @@
-// Deprecated in favor of app/assets/javascripts/discourse/app/components/glimmer-header/sidebar-toggle.gjs
+// Deprecated in favor of app/assets/javascripts/discourse/app/components/header/sidebar-toggle.gjs
 import { createWidget } from "discourse/widgets/widget";
 
 export default createWidget("sidebar-toggle", {
diff --git a/app/assets/javascripts/discourse/app/widgets/user-status-bubble.js b/app/assets/javascripts/discourse/app/widgets/user-status-bubble.js
index 5ea546abf29..4f772f69ab4 100644
--- a/app/assets/javascripts/discourse/app/widgets/user-status-bubble.js
+++ b/app/assets/javascripts/discourse/app/widgets/user-status-bubble.js
@@ -1,4 +1,4 @@
-// deprecated in favor of app/components/glimmer-header/user-dropdown/user-status-bubble.gjs
+// deprecated in favor of app/components/header/user-dropdown/user-status-bubble.gjs
 
 import { createWidget } from "discourse/widgets/widget";
 import I18n from "discourse-i18n";
diff --git a/app/assets/javascripts/discourse/tests/helpers/qunit-helpers.js b/app/assets/javascripts/discourse/tests/helpers/qunit-helpers.js
index 13f9af9a6ae..cc8d6a0440c 100644
--- a/app/assets/javascripts/discourse/tests/helpers/qunit-helpers.js
+++ b/app/assets/javascripts/discourse/tests/helpers/qunit-helpers.js
@@ -18,8 +18,8 @@ import {
   cleanUpComposerUploadPreProcessor,
 } from "discourse/components/composer-editor";
 import { clearToolbarCallbacks } from "discourse/components/d-editor";
-import { clearExtraHeaderButtons as clearExtraGlimmerHeaderButtons } from "discourse/components/glimmer-header";
-import { clearExtraHeaderIcons as clearExtraGlimmerHeaderIcons } from "discourse/components/glimmer-header/icons";
+import { clearExtraHeaderButtons as clearExtraGlimmerHeaderButtons } from "discourse/components/header";
+import { clearExtraHeaderIcons as clearExtraGlimmerHeaderIcons } from "discourse/components/header/icons";
 import { clearBulkButtons } from "discourse/components/modal/topic-bulk-actions";
 import { resetWidgetCleanCallbacks } from "discourse/components/mount-widget";
 import { resetDecorators as resetPluginOutletDecorators } from "discourse/components/plugin-connector";
diff --git a/app/assets/javascripts/discourse/tests/integration/components/home-logo-test.gjs b/app/assets/javascripts/discourse/tests/integration/components/home-logo-test.gjs
index 9ebe59acd7a..ec4b970244e 100644
--- a/app/assets/javascripts/discourse/tests/integration/components/home-logo-test.gjs
+++ b/app/assets/javascripts/discourse/tests/integration/components/home-logo-test.gjs
@@ -1,7 +1,7 @@
 import { getOwner } from "@ember/application";
 import { render } from "@ember/test-helpers";
 import { module, test } from "qunit";
-import HomeLogo from "discourse/components/glimmer-header/home-logo";
+import HomeLogo from "discourse/components/header/home-logo";
 import { setupRenderingTest } from "discourse/tests/helpers/component-test";
 
 const bigLogo = "/images/d-logo-sketch.png?test";