diff --git a/demo/src/components/index/Index.js b/demo/src/components/index/Index.js
index a042862..e6e3404 100644
--- a/demo/src/components/index/Index.js
+++ b/demo/src/components/index/Index.js
@@ -1,6 +1,6 @@
 import React from 'react';
-import Header from './header/header';
-import Main from './main/main';
+import Header from './header/Header';
+import Main from './main/Main';
 
 var Index = React.createClass({
 
diff --git a/demo/src/components/index/header/Header.js b/demo/src/components/index/header/Header.js
index 7156896..49491f5 100644
--- a/demo/src/components/index/header/Header.js
+++ b/demo/src/components/index/header/Header.js
@@ -1,5 +1,5 @@
 import React from 'react';
-import Icon from './../../icon/icon';
+import Icon from './../../icon/Icon';
 
 var Header = React.createClass({
 
diff --git a/demo/src/components/index/main/Main.js b/demo/src/components/index/main/Main.js
index 9d7b6c4..526295b 100644
--- a/demo/src/components/index/main/Main.js
+++ b/demo/src/components/index/main/Main.js
@@ -1,8 +1,8 @@
 import React from 'react';
 import ReactDOM from 'react-dom';
-import Button from './../../button/button';
+import Button from './../../button/Button';
 import browserStackLogo from './../../../../browserstack.png';
-import {default as Video, Controls, Overlay} from './../../../../../src/components/video/video';
+import {default as Video, Controls, Overlay} from './../../../../../src/components/video/Video';
 
 var videos = [
     // TODO: Don't hot link these. upload them somewhere.
diff --git a/demo/src/entry.js b/demo/src/entry.js
index 3e0dc5a..92db2aa 100644
--- a/demo/src/entry.js
+++ b/demo/src/entry.js
@@ -1,6 +1,6 @@
 import React from 'react';
 import ReactDOM from 'react-dom';
-import Index from './components/index/index';
+import Index from './components/index/Index';
 
 // For hot reloading to work it is essential
 // that our entry point only contains this render
diff --git a/src/components/controls/Controls.js b/src/components/controls/Controls.js
index 261b758..22052ad 100644
--- a/src/components/controls/Controls.js
+++ b/src/components/controls/Controls.js
@@ -1,9 +1,9 @@
 import React from 'react';
-import Play from './play/play';
-import Seek from './seek/seek';
-import Mute from './mute/mute';
-import Time from './time/time';
-import Fullscreen from './fullscreen/fullscreen';
+import Play from './play/Play';
+import Seek from './seek/Seek';
+import Mute from './mute/Mute';
+import Time from './time/Time';
+import Fullscreen from './fullscreen/Fullscreen';
 
 var Controls = React.createClass({
 
diff --git a/src/components/controls/fullscreen/Fullscreen.js b/src/components/controls/fullscreen/Fullscreen.js
index 8ecfbb1..961c337 100644
--- a/src/components/controls/fullscreen/Fullscreen.js
+++ b/src/components/controls/fullscreen/Fullscreen.js
@@ -1,5 +1,5 @@
 import React from 'react';
-import Icon from './../../icon/icon';
+import Icon from './../../icon/Icon';
 
 var Fullscreen = React.createClass({
 
diff --git a/src/components/controls/mute/Mute.js b/src/components/controls/mute/Mute.js
index 02d1e6c..81c7c16 100644
--- a/src/components/controls/mute/Mute.js
+++ b/src/components/controls/mute/Mute.js
@@ -1,6 +1,6 @@
 import React from 'react';
-import Icon from './../../icon/icon';
-import ProgressBar from './../../progressbar/progressbar';
+import Icon from './../../icon/Icon';
+import ProgressBar from './../../progressbar/ProgressBar';
 
 var Mute = React.createClass({
 
diff --git a/src/components/controls/play/Play.js b/src/components/controls/play/Play.js
index 7c0df15..54f9688 100644
--- a/src/components/controls/play/Play.js
+++ b/src/components/controls/play/Play.js
@@ -1,5 +1,5 @@
 import React from 'react';
-import Icon from './../../icon/icon';
+import Icon from './../../icon/Icon';
 
 var Play = React.createClass({
 
diff --git a/src/components/controls/seek/Seek.js b/src/components/controls/seek/Seek.js
index 10a3544..329d394 100644
--- a/src/components/controls/seek/Seek.js
+++ b/src/components/controls/seek/Seek.js
@@ -1,5 +1,5 @@
 import React from 'react';
-import ProgressBar from './../../progressbar/progressbar';
+import ProgressBar from './../../progressbar/ProgressBar';
 
 var Seek = React.createClass({
 
@@ -15,7 +15,7 @@ var Seek = React.createClass({
         return {
             // When the child range input becomes focused,
             // we need to set this custom seek bar to look
-            // 'focused' with the correct styles. Need to 
+            // 'focused' with the correct styles. Need to
             // do this via a class.
             focused: false
         };
diff --git a/src/components/controls/time/Time.js b/src/components/controls/time/Time.js
index e7c2e4d..c4e91de 100644
--- a/src/components/controls/time/Time.js
+++ b/src/components/controls/time/Time.js
@@ -1,5 +1,5 @@
 import React from 'react';
-import Icon from './../../icon/icon';
+import Icon from './../../icon/Icon';
 
 var Time = React.createClass({
 
diff --git a/src/components/video/Video.js b/src/components/video/Video.js
index 2204205..18cf1a5 100644
--- a/src/components/video/Video.js
+++ b/src/components/video/Video.js
@@ -1,11 +1,11 @@
 import React from 'react';
-import Overlay from './overlay/overlay';
-import Controls from './../controls/controls';
-import Seek from './../controls/seek/seek';
-import Play from './../controls/play/play';
-import Mute from './../controls/mute/mute';
-import Fullscreen from './../controls/fullscreen/fullscreen';
-import Time from './../controls/time/time';
+import Overlay from './overlay/Overlay';
+import Controls from './../controls/Controls';
+import Seek from './../controls/seek/Seek';
+import Play from './../controls/play/Play';
+import Mute from './../controls/mute/Mute';
+import Fullscreen from './../controls/fullscreen/Fullscreen';
+import Time from './../controls/time/Time';
 import throttle from 'lodash.throttle';
 import copy from './../../assets/copy';
 
diff --git a/src/components/video/overlay/Overlay.js b/src/components/video/overlay/Overlay.js
index 642d37b..0d58b26 100644
--- a/src/components/video/overlay/Overlay.js
+++ b/src/components/video/overlay/Overlay.js
@@ -1,6 +1,6 @@
 import React from 'react';
-import Icon from './../../icon/icon';
-import Spinner from './../../spinner/spinner';
+import Icon from './../../icon/Icon';
+import Spinner from './../../spinner/Spinner';
 
 var Overlay = React.createClass({