diff --git a/ionic/components.ts b/ionic/components.ts
index 3d7cd58ef2..9fbd8f90c3 100644
--- a/ionic/components.ts
+++ b/ionic/components.ts
@@ -24,7 +24,7 @@ export * from 'ionic/components/nav/nav-controller'
 export * from 'ionic/components/nav/view-controller'
 export * from 'ionic/components/nav/nav-push'
 export * from 'ionic/components/nav/nav-router'
-export * from 'ionic/components/nav-bar/nav-bar'
+export * from 'ionic/components/navbar/navbar'
 export * from 'ionic/components/overlay/overlay'
 export * from 'ionic/components/popup/popup'
 export * from 'ionic/components/slides/slides'
diff --git a/ionic/components/menu/menu-toggle.ts b/ionic/components/menu/menu-toggle.ts
index 48e5da262e..ea9bff80ad 100644
--- a/ionic/components/menu/menu-toggle.ts
+++ b/ionic/components/menu/menu-toggle.ts
@@ -3,7 +3,7 @@ import {Directive, ElementRef, Optional} from 'angular2/angular2';
 import {Ion} from '../ion';
 import {IonicApp} from '../app/app';
 import {ViewController} from '../nav/view-controller';
-import {Navbar} from '../nav-bar/nav-bar';
+import {Navbar} from '../navbar/navbar';
 
 
 /**
diff --git a/ionic/components/nav-bar/modes/ios.scss b/ionic/components/navbar/modes/ios.scss
similarity index 100%
rename from ionic/components/nav-bar/modes/ios.scss
rename to ionic/components/navbar/modes/ios.scss
diff --git a/ionic/components/nav-bar/modes/md.scss b/ionic/components/navbar/modes/md.scss
similarity index 100%
rename from ionic/components/nav-bar/modes/md.scss
rename to ionic/components/navbar/modes/md.scss
diff --git a/ionic/components/nav-bar/nav-bar.scss b/ionic/components/navbar/navbar.scss
similarity index 100%
rename from ionic/components/nav-bar/nav-bar.scss
rename to ionic/components/navbar/navbar.scss
diff --git a/ionic/components/nav-bar/nav-bar.ts b/ionic/components/navbar/navbar.ts
similarity index 100%
rename from ionic/components/nav-bar/nav-bar.ts
rename to ionic/components/navbar/navbar.ts
diff --git a/ionic/components/toolbar/toolbar.ts b/ionic/components/toolbar/toolbar.ts
index ef799906d8..8d7b5bdacb 100644
--- a/ionic/components/toolbar/toolbar.ts
+++ b/ionic/components/toolbar/toolbar.ts
@@ -3,7 +3,7 @@ import {Component, Directive, Host, ElementRef, Renderer, Optional, forwardRef,
 import {Ion} from '../ion';
 import {Config} from '../../config/config';
 import {MenuToggle} from '../menu/menu-toggle';
-import {Navbar} from '../nav-bar/nav-bar';
+import {Navbar} from '../navbar/navbar';
 
 
 /**
diff --git a/ionic/config/directives.ts b/ionic/config/directives.ts
index 71595081c7..a06d8cd281 100644
--- a/ionic/config/directives.ts
+++ b/ionic/config/directives.ts
@@ -28,7 +28,7 @@ import {SearchBar} from '../components/search-bar/search-bar';
 import {Nav} from '../components/nav/nav';
 import {NavPush, NavPop} from '../components/nav/nav-push';
 import {NavRouter} from '../components/nav/nav-router';
-import {NavbarTemplate, Navbar} from '../components/nav-bar/nav-bar';
+import {NavbarTemplate, Navbar} from '../components/navbar/navbar';
 import {IdRef} from '../components/app/id';
 import {ShowWhen, HideWhen} from '../components/show-hide-when/show-hide-when';
 
diff --git a/ionic/ionic.core.scss b/ionic/ionic.core.scss
index c8bf1d9991..572b2d07be 100644
--- a/ionic/ionic.core.scss
+++ b/ionic/ionic.core.scss
@@ -35,7 +35,7 @@
   "components/menu/menu",
   "components/menu/menu-types",
   "components/modal/modal",
-  "components/nav-bar/nav-bar",
+  "components/navbar/navbar",
   "components/popup/popup",
   "components/slides/slides",
   "components/radio/radio",
diff --git a/ionic/ionic.ios.scss b/ionic/ionic.ios.scss
index 42aae80932..a27a1a9d4d 100644
--- a/ionic/ionic.ios.scss
+++ b/ionic/ionic.ios.scss
@@ -13,7 +13,7 @@
   "components/content/modes/ios",
   "components/list/modes/ios",
   "components/text-input/modes/ios",
-  "components/nav-bar/modes/ios",
+  "components/navbar/modes/ios",
   "components/popup/modes/ios",
   "components/checkbox/modes/ios",
   "components/radio/modes/ios",
diff --git a/ionic/ionic.md.scss b/ionic/ionic.md.scss
index b0f5a63cd5..7b6f427dee 100644
--- a/ionic/ionic.md.scss
+++ b/ionic/ionic.md.scss
@@ -13,7 +13,7 @@
   "components/card/modes/md",
   "components/checkbox/modes/md",
   "components/text-input/modes/md",
-  "components/nav-bar/modes/md",
+  "components/navbar/modes/md",
   "components/popup/modes/md",
   "components/radio/modes/md",
   "components/search-bar/modes/md",
diff --git a/scripts/docs/templates/api_menu_version.template.html b/scripts/docs/templates/api_menu_version.template.html
index c6f4c2a3c1..9ed861b45e 100644
--- a/scripts/docs/templates/api_menu_version.template.html
+++ b/scripts/docs/templates/api_menu_version.template.html
@@ -330,17 +330,17 @@
 
   <!-- NavBar -->
   <li class="menu-section">
-    <a href="{{ page.versionHref }}/api/components/nav-bar/NavBar/" class="api-section">
+    <a href="{{ page.versionHref }}/api/components/navbar/NavBar/" class="api-section">
       NavBar
     </a>
     <ul>
       <li>
-        <a href="{{ page.versionHref }}/api/components/nav-bar/NavBar/">
+        <a href="{{ page.versionHref }}/api/components/navbar/NavBar/">
           NavBar
         </a>
       </li>
       <li>
-        <a href="{{ page.versionHref }}/api/components/nav-bar/NavbarTemplate/">
+        <a href="{{ page.versionHref }}/api/components/navbar/NavbarTemplate/">
           NavbarTemplate
         </a>
       </li>