diff --git a/app/app.js b/app/app.js
index f4deacf..b7ffa1a 100644
--- a/app/app.js
+++ b/app/app.js
@@ -3,7 +3,7 @@
 angular.module('adagios', [
     'ngRoute',
     'adagios.sidebar',
-    'adagios.navbar',
+    'adagios.topbar',
     'adagios.tactical'
 ])
 
diff --git a/app/index.html b/app/index.html
index ea51d8d..174a89d 100644
--- a/app/index.html
+++ b/app/index.html
@@ -28,9 +28,9 @@
     <!-- Sidebar -->>
     <script src="sidebar/sidebar.js"></script>
     <link rel="stylesheet" href="sidebar/sidebar.css">
-    <!-- Navbar -->
-    <script src="navbar/navbar.js"></script>
-    <link rel="stylesheet" href="navbar/navbar.css">
+    <!-- Topbar -->
+    <script src="topbar/topbar.js"></script>
+    <link rel="stylesheet" href="topbar/topbar.css">
     <!-- Tactical -->
     <script src="tactical/tactical.js"></script>
     <link rel="stylesheet" href="tactical/tactical.css">
@@ -54,7 +54,7 @@
 
   <sidebar></sidebar>
 
-  <navbar></navbar>
+  <topbar></topbar>
 
 
   <div ng-view id="page" class="content"></div>
diff --git a/app/navbar/navbar.js b/app/navbar/navbar.js
deleted file mode 100644
index 89d634e..0000000
--- a/app/navbar/navbar.js
+++ /dev/null
@@ -1,14 +0,0 @@
-'use strict';
-
-angular.module('adagios.navbar', ['adagios.live'])
-
-    .controller('NavBarCtrl', ['$scope', '$http', 'GetProblems', function ($scope, $http, GetProblems) {
-        $scope.notifications = GetProblems;
-    }])
-
-    .directive('navbar', function () {
-        return {
-            restrict: 'E',
-            templateUrl: "navbar/navbar.html"
-        };
-    });
diff --git a/app/navbar/navbar.css b/app/topbar/topbar.css
similarity index 69%
rename from app/navbar/navbar.css
rename to app/topbar/topbar.css
index ef5aa9e..db739ed 100644
--- a/app/navbar/navbar.css
+++ b/app/topbar/topbar.css
@@ -1,4 +1,4 @@
-nav#navbar {
+nav#topbar {
     top: 0%;
     margin-left: 300px;
     background-color: #353d48;
@@ -10,22 +10,22 @@ nav#navbar {
 }
 
 
-nav#navbar div.container-fluid{
+nav#topbar div.container-fluid{
     padding-left: 0px;
 }
 
-nav#navbar .navbar-brand{ padding: 0px 30px;font-size: 1.5em;line-height: 80px; }
-nav#navbar .navbar-nav > li > a {  padding: 0px 30px; line-height: 80px; font-size: 1.5em; }
-nav#navbar .navbar-nav > li > form div {
+nav#topbar .navbar-brand{ padding: 0px 30px;font-size: 1.5em;line-height: 80px; }
+nav#topbar .navbar-nav > li > a {  padding: 0px 30px; line-height: 80px; font-size: 1.5em; }
+nav#topbar .navbar-nav > li > form div {
     line-height: 55px;
     font-size: 1.5em;
 }
-nav#navbar .navbar-nav > li > form input {
+nav#topbar .navbar-nav > li > form input {
     height: 60px;
 }
 
 
-nav#navbar div.navbar-collapse {
+nav#topbar div.navbar-collapse {
     padding-left: 0px;
 }
 
@@ -52,12 +52,12 @@ a#toggle-sidebar i {
 }
 
 
-nav#navbar li {
+nav#topbar li {
     border-color: #252b37;
     border-style: solid;
     border-width: 1px;
 }
 
-nav#navbar li a#search {
+nav#topbar li a#search {
     float: left;
 }
diff --git a/app/navbar/navbar.html b/app/topbar/topbar.html
similarity index 84%
rename from app/navbar/navbar.html
rename to app/topbar/topbar.html
index 60ab46b..bc5f6cc 100644
--- a/app/navbar/navbar.html
+++ b/app/topbar/topbar.html
@@ -1,8 +1,8 @@
-<nav ng-app="adagios.navbar" id="navbar" class="navbar navbar-default navbar-inverse" role="navigation" ng-controller="NavBarCtrl">
+<nav ng-app="adagios.topbar" id="topbar" class="navbar navbar-default navbar-inverse" role="navigation" ng-controller="TopBarCtrl">
   <div class="container-fluid">
     <!-- Brand and toggle get grouped for better mobile display -->
     <div class="navbar-header">
-      <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1">
+      <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#bs-example-topbar-collapse-1">
         <span class="sr-only">Toggle navigation</span>
         <span class="icon-bar"></span>
         <span class="icon-bar"></span>
@@ -11,7 +11,7 @@
     </div>
 
     <!-- Collect the nav links, forms, and other content for toggling -->
-    <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
+    <div class="collapse navbar-collapse" id="bs-example-topbar-collapse-1">
       <ul class="nav navbar-nav">
         <li>
           <a href="#" id="toggle-sidebar">
@@ -36,4 +36,3 @@
     </div><!-- /.navbar-collapse -->
   </div><!-- /.container-fluid -->
 </nav>
-
diff --git a/app/topbar/topbar.js b/app/topbar/topbar.js
new file mode 100644
index 0000000..3cb029d
--- /dev/null
+++ b/app/topbar/topbar.js
@@ -0,0 +1,14 @@
+'use strict';
+
+angular.module('adagios.topbar', ['adagios.live'])
+
+    .controller('TopBarCtrl', ['$scope', '$http', 'GetProblems', function ($scope, $http, GetProblems) {
+        $scope.notifications = GetProblems;
+    }])
+
+    .directive('topbar', function () {
+        return {
+            restrict: 'E',
+            templateUrl: "topbar/topbar.html"
+        };
+    });
diff --git a/app/navbar/navbar_test.js b/app/topbar/topbar_test.js
similarity index 64%
rename from app/navbar/navbar_test.js
rename to app/topbar/topbar_test.js
index 7523696..d71e7c8 100644
--- a/app/navbar/navbar_test.js
+++ b/app/topbar/topbar_test.js
@@ -1,12 +1,12 @@
 'use strict';
 
-describe('Navbar module', function () {
+describe('Topbar module', function () {
     var $compile,
         $rootScope,
         $controller,
         $httpBackend;
 
-    beforeEach(module('adagios.navbar'));
+    beforeEach(module('adagios.topbar'));
 
     beforeEach(inject(function (_$compile_, _$rootScope_, _$controller_, _$httpBackend_) {
         $compile = _$compile_;
@@ -14,24 +14,24 @@ describe('Navbar module', function () {
         $controller = _$controller_;
         $httpBackend = _$httpBackend_;
 
-        $httpBackend.expectGET('navbar/navbar.html').respond('<a>{{ notifications }}</a>');
+        $httpBackend.expectGET('topbar/topbar.html').respond('<a>{{ notifications }}</a>');
     }));
 
-    describe('NavBarCtrl', function () {
+    describe('TopBarCtrl', function () {
 
         it('should be defined', function () {
             var scope = $rootScope.$new(),
-                navbar = $controller('NavBarCtrl', { $scope : scope });
+                topbar = $controller('TopBarCtrl', { $scope : scope });
 
-            expect(navbar).toBeDefined();
+            expect(topbar).toBeDefined();
         });
 
     });
 
-    describe('Navbar directive', function () {
+    describe('Topbar directive', function () {
 
         it('should insert the number of warnings', function () {
-            var element = $compile('<navbar></navbar>')($rootScope);
+            var element = $compile('<topbar></topbar>')($rootScope);
             $httpBackend.flush();
             $rootScope.notifications = 44;
             $rootScope.$digest();