diff --git a/src/components/UIShell/UIShellNav/UtilityComponent.svelte b/src/components/UIShell/GlobalHeader/HeaderAction.svelte
similarity index 100%
rename from src/components/UIShell/UIShellNav/UtilityComponent.svelte
rename to src/components/UIShell/GlobalHeader/HeaderAction.svelte
diff --git a/src/components/UIShell/UIShellNav/UtilityLink.svelte b/src/components/UIShell/GlobalHeader/HeaderActionLink.svelte
similarity index 100%
rename from src/components/UIShell/UIShellNav/UtilityLink.svelte
rename to src/components/UIShell/GlobalHeader/HeaderActionLink.svelte
diff --git a/src/components/UIShell/UIShellNav/UtilitySearch.svelte b/src/components/UIShell/GlobalHeader/HeaderActionSearch.svelte
similarity index 100%
rename from src/components/UIShell/UIShellNav/UtilitySearch.svelte
rename to src/components/UIShell/GlobalHeader/HeaderActionSearch.svelte
diff --git a/src/components/UIShell/UIShellNav/UIShellNav.svelte b/src/components/UIShell/GlobalHeader/HeaderNav.svelte
similarity index 100%
rename from src/components/UIShell/UIShellNav/UIShellNav.svelte
rename to src/components/UIShell/GlobalHeader/HeaderNav.svelte
diff --git a/src/components/UIShell/UIShellNav/UIShellNavItem.svelte b/src/components/UIShell/GlobalHeader/HeaderNavItem.svelte
similarity index 100%
rename from src/components/UIShell/UIShellNav/UIShellNavItem.svelte
rename to src/components/UIShell/GlobalHeader/HeaderNavItem.svelte
diff --git a/src/components/UIShell/UIShellNav/UIShellNavSubmenu.svelte b/src/components/UIShell/GlobalHeader/HeaderNavMenu.svelte
similarity index 100%
rename from src/components/UIShell/UIShellNav/UIShellNavSubmenu.svelte
rename to src/components/UIShell/GlobalHeader/HeaderNavMenu.svelte
diff --git a/src/components/UIShell/UIShellNav/UIShellUtilities.svelte b/src/components/UIShell/GlobalHeader/HeaderUtilities.svelte
similarity index 100%
rename from src/components/UIShell/UIShellNav/UIShellUtilities.svelte
rename to src/components/UIShell/GlobalHeader/HeaderUtilities.svelte
diff --git a/src/components/UIShell/UIShell.Story.svelte b/src/components/UIShell/UIShell.Story.svelte
index 66391ca6..3d7428f0 100644
--- a/src/components/UIShell/UIShell.Story.svelte
+++ b/src/components/UIShell/UIShell.Story.svelte
@@ -15,13 +15,15 @@
   import SideNavMenu from './SideNav/SideNavMenu.svelte';
   import SideNavMenuItem from './SideNav/SideNavMenuItem.svelte';
   import SideNavLink from './SideNav/SideNavLink.svelte';
-  import UIShellNav from './UIShellNav/UIShellNav.svelte';
-  import UIShellNavItem from './UIShellNav/UIShellNavItem.svelte';
-  import UIShellNavSubmenu from './UIShellNav/UIShellNavSubmenu.svelte';
-  import UIShellUtilities from './UIShellNav/UIShellUtilities.svelte';
-  import UtilitySearch from './UIShellNav/UtilitySearch.svelte';
-  import UtilityLink from './UIShellNav/UtilityLink.svelte';
-  import UtilityComponent from './UIShellNav/UtilityComponent.svelte';
+  import HeaderNav from './GlobalHeader/HeaderNav.svelte';
+  import HeaderNavItem from './GlobalHeader/HeaderNavItem.svelte';
+  import HeaderNavMenu from './GlobalHeader/HeaderNavMenu.svelte';
+  import HeaderUtilities from './GlobalHeader/HeaderUtilities.svelte';
+  import HeaderActionSearch from './GlobalHeader/HeaderActionSearch.svelte';
+  import HeaderActionLink from './GlobalHeader/HeaderActionLink.svelte';
+  import HeaderAction from './GlobalHeader/HeaderAction.svelte';
+
+  let isSideNavOpen = undefined;
 
   let iCatalog = {
     class: undefined,
@@ -106,57 +108,53 @@
 
 {#if story === 'with-nav'}
   <UIShell {...$$props}>
-    <div slot="Nav">
-      <UIShellNav>
-        <UIShellNavItem href="/" text="Link 1" />
-        <UIShellNavItem href="/" text="Link 2" />
-        <UIShellNavItem href="/" text="Link 3" />
-        <UIShellNavSubmenu text="Sub Menu">
-          <UIShellNavItem href="/" text="Link 1" />
-          <UIShellNavItem href="/" text="Link 2" />
-          <UIShellNavItem href="/" text="Link 3" />
-        </UIShellNavSubmenu>
-      </UIShellNav>
-    </div>
+    <HeaderNav>
+      <HeaderNavItem href="/" text="Link 1" />
+      <HeaderNavItem href="/" text="Link 2" />
+      <HeaderNavItem href="/" text="Link 3" />
+      <HeaderNavMenu text="Sub Menu">
+        <HeaderNavItem href="/" text="Link 1" />
+        <HeaderNavItem href="/" text="Link 2" />
+        <HeaderNavItem href="/" text="Link 3" />
+      </HeaderNavMenu>
+    </HeaderNav>
   </UIShell>
 {:else if story === 'with-actions'}
   <UIShell {...$$props}>
-    <UIShellUtilities>
-      <UtilitySearch />
-      <UtilityComponent type="Settings" icon={iSettings}>
+    <HeaderUtilities>
+      <HeaderActionSearch />
+      <HeaderAction type="Settings" icon={iSettings}>
         <p>Settings</p>
-      </UtilityComponent>
-      <UtilityLink type="Help" icon={iHelp} />
-      <UtilityComponent type="Notifications" icon={iNotifications}>
+      </HeaderAction>
+      <HeaderActionLink type="Help" icon={iHelp} />
+      <HeaderAction type="Notifications" icon={iNotifications}>
         <p>Notifications</p>
-      </UtilityComponent>
-      <UtilityLink type="Account" icon={iAccount} />
-      <UtilityComponent type="Switcher" icon={iSwitcher}>
+      </HeaderAction>
+      <HeaderActionLink type="Account" icon={iAccount} />
+      <HeaderAction type="Switcher" icon={iSwitcher}>
         <p>Switcher</p>
-      </UtilityComponent>
-    </UIShellUtilities>
+      </HeaderAction>
+    </HeaderUtilities>
   </UIShell>
-{:else if story === 'with-actions-sidenav'}
-  <UIShell {...$$props}>
-    <div slot="SideNav">
-      <SideNav>
-        <SideNavItems>
-          <SideNavMenu text="Menu 01" icon={iCatalog}>
-            <SideNavMenuItem text="Sub 01" href="/" />
-            <SideNavMenuItem text="Sub 02" href="/" />
-            <SideNavMenuItem text="Sub 03" href="/" />
-            <SideNavMenuItem text="Sub 04" href="/" />
-          </SideNavMenu>
-          <SideNavMenu text="Menu 02" icon={iAdjust}>
-            <SideNavMenuItem text="Sub 01" href="/" />
-            <SideNavMenuItem text="Sub 02" href="/" />
-            <SideNavMenuItem text="Sub 03" href="/" />
-            <SideNavMenuItem text="Sub 04" href="/" />
-          </SideNavMenu>
-          <SideNavLink text="Menu 03" href="/" icon={iProtection} />
-        </SideNavItems>
-      </SideNav>
-    </div>
+{:else if story === 'with-sidenav'}
+  <UIShell bind:isSideNavOpen {...$$props}>
+    <SideNav isOpen={isSideNavOpen}>
+      <SideNavItems>
+        <SideNavMenu text="Menu 01" icon={iCatalog}>
+          <SideNavMenuItem text="Sub 01" href="/" />
+          <SideNavMenuItem text="Sub 02" href="/" />
+          <SideNavMenuItem text="Sub 03" href="/" />
+          <SideNavMenuItem text="Sub 04" href="/" />
+        </SideNavMenu>
+        <SideNavMenu text="Menu 02" icon={iAdjust}>
+          <SideNavMenuItem text="Sub 01" href="/" />
+          <SideNavMenuItem text="Sub 02" href="/" />
+          <SideNavMenuItem text="Sub 03" href="/" />
+          <SideNavMenuItem text="Sub 04" href="/" />
+        </SideNavMenu>
+        <SideNavLink text="Menu 03" href="/" icon={iProtection} />
+      </SideNavItems>
+    </SideNav>
   </UIShell>
 {:else}
   <UIShell {...$$props} />
diff --git a/src/components/UIShell/UIShell.stories.js b/src/components/UIShell/UIShell.stories.js
index a85e8be9..e8b66ea1 100644
--- a/src/components/UIShell/UIShell.stories.js
+++ b/src/components/UIShell/UIShell.stories.js
@@ -26,7 +26,7 @@ export const WithActions = () => ({
 export const WithActionsAndSidenav = () => ({
   Component,
   props: {
-    story: 'with-actions-sidenav',
+    story: 'with-sidenav',
     href: text('The link href (href)', '#'),
     company: text('Company name', 'IBM'),
     platformName: text('Platform name', 'Platform Name')
diff --git a/src/components/UIShell/UIShell.svelte b/src/components/UIShell/UIShell.svelte
index ad64fe2c..07ab2493 100644
--- a/src/components/UIShell/UIShell.svelte
+++ b/src/components/UIShell/UIShell.svelte
@@ -3,11 +3,11 @@
   export let href = undefined;
   export let company = undefined;
   export let platformName = undefined;
+  export let isSideNavOpen = undefined;
 
   import { cx } from '../../lib';
   import HamburgerMenu from './SideNav/HamburgerMenu.svelte';
 
-  let isSideNavOpen = undefined;
   let winWidth = undefined;
   $: isSideNavOpen = winWidth >= 1056;
 
@@ -24,7 +24,5 @@
     <span class={cx('--header__name--prefix')}>{company}</span>
     &nbsp;{platformName}
   </a>
-  <slot name="Nav" />
   <slot />
-  <slot name="SideNav" />
 </header>
diff --git a/src/components/UIShell/index.js b/src/components/UIShell/index.js
index 3d65b23b..a5943d11 100644
--- a/src/components/UIShell/index.js
+++ b/src/components/UIShell/index.js
@@ -7,6 +7,10 @@ export { default as SideNavItems } from './SideNav/SideNavItems.svelte';
 export { default as SideNavLink } from './SideNav/SideNavLink.svelte';
 export { default as SideNavMenu } from './SideNav/SideNavMenu.svelte';
 export { default as SideNavMenuItem } from './SideNav/SideNavMenuItem.svelte';
-export { default as UIShellNav } from './UIShellShellNav/UIShellNav.svelte';
-export { default as UIShellNavItem } from './UIShellShellNav/UIShellNavItem.svelte';
-export { default as UIShellNavSubMenu } from './UIShellShellNav/UIShellNavSubMenu.svelte';
+export { default as HeaderNavl } from './GlobalHeader/HeaderNavl.svelte';
+export { default as HeaderNavItem } from './GlobalHeader/HeaderNavItem.svelte';
+export { default as HeaderNavMenu } from './GlobalHeader/HeaderNavMenu.svelte';
+export { default as HeaderUtilities } from './GlobalHeader/HeaderUtilities.svelte';
+export { default as HeaderAction } from './GlobalHeader/HeaderAction.svelte';
+export { default as HeaderActionLink } from './GlobalHeader/HeaderActionLink.svelte';
+export { default as HeaderActionSearch } from './GlobalHeader/HeaderActionSearch.svelte';
diff --git a/src/index.js b/src/index.js
index 5bf4bd4a..5b84c1c5 100644
--- a/src/index.js
+++ b/src/index.js
@@ -84,9 +84,13 @@ import UIShell, {
   SideNavLink,
   SideNavMenu,
   SideNavMenuItem,
-  UIShellNav,
-  UIShellNavItem,
-  UIShellNavSubMenu
+  HeaderNav,
+  HeaderNavItem,
+  HeaderNavMenu,
+  HeaderUtilities,
+  HeaderAction,
+  HeaderActionLink,
+  HeaderActionSearch
 } from './components/UIShell';
 import UnorderedList from './components/UnorderedList';
 
@@ -208,8 +212,12 @@ export {
   SideNavLink,
   SideNavMenu,
   SideNavMenuItem,
-  UIShellNav,
-  UIShellNavItem,
-  UIShellNavSubMenu,
+  HeaderNav,
+  HeaderNavItem,
+  HeaderNavMenu,
+  HeaderUtilities,
+  HeaderAction,
+  HeaderActionLink,
+  HeaderActionSearch,
   UnorderedList
 };