diff --git a/client/src/App.js b/client/src/App.js
index 59c78b918..26192760a 100644
--- a/client/src/App.js
+++ b/client/src/App.js
@@ -11,7 +11,7 @@ import { Route, BrowserRouter, Switch } from 'react-router-dom'
 
 // Components
 
-import ButtonAppBar from './components/Material-UI/ButtonAppBar'
+import NavBar from './components/NavBar'
 
 import Home from './components/Home'
 import Profile from './components/Profile'
@@ -71,7 +71,7 @@ class App extends Component {
         <ApolloProvider client={client}>
 
           <div className="App">
-            <ButtonAppBar/>
+            <NavBar/>
             <Switch>
               <Route exact path='/' component={Home}/>
               <Route path='/profile' component={Profile} />
diff --git a/client/src/components/Material-UI/ButtonAppBar.js b/client/src/components/NavBar.js
similarity index 95%
rename from client/src/components/Material-UI/ButtonAppBar.js
rename to client/src/components/NavBar.js
index d0c9f0cd3..bea946f28 100644
--- a/client/src/components/Material-UI/ButtonAppBar.js
+++ b/client/src/components/NavBar.js
@@ -19,7 +19,7 @@ import ModulesIcon from '@material-ui/icons/QueuePlayNext';
 import { Link } from 'react-router-dom';
 
 // components
-import LoggedInUser from '../LoggedInUser';
+import LoggedInUser from './LoggedInUser';
 
 const AboutLink = props => <Link to="/about" {...props} />
 const ContactLink = props => <Link to="/contact" {...props} />
@@ -41,7 +41,7 @@ const styles = {
   },
 };
 
-class ButtonAppBar extends Component {
+class NavBar extends Component {
 
   constructor(props){
     super(props);
@@ -87,8 +87,8 @@ class ButtonAppBar extends Component {
   }
 }
 
-ButtonAppBar.propTypes = {
+NavBar.propTypes = {
   classes: PropTypes.object.isRequired,
 };
 
-export default withStyles(styles)(ButtonAppBar);
+export default withStyles(styles)(NavBar);