diff --git a/public/js/app.jsx b/public/js/app.jsx
index 47b5682aaa..79b716f0af 100644
--- a/public/js/app.jsx
+++ b/public/js/app.jsx
@@ -1,17 +1,17 @@
-var React                  = require('react');
-var TabView                = React.createFactory(require('./components/TabView'));
-var Menu                   = React.createFactory(require('./components/Menu'));
-var FeatureToggleComponent = React.createFactory(require('./components/feature/FeatureToggleComponent'));
-var StrategyComponent      = React.createFactory(require('./components/strategy/StrategyComponent'));
+var React                   = require('react');
+var TabView                 = React.createFactory(require('./components/TabView'));
+var Menu                    = React.createFactory(require('./components/Menu'));
+var FeatureTogglesComponent = React.createFactory(require('./components/feature/FeatureTogglesComponent'));
+var StrategiesComponent     = React.createFactory(require('./components/strategy/StrategiesComponent'));
 
 var tabPanes = [
     {
         name: "Feature Toggles",
-        content: new FeatureToggleComponent({pollInterval: 5000})
+        content: new FeatureTogglesComponent({pollInterval: 5000})
     },
     {
         name: "Strategies",
-        content: new StrategyComponent({})
+        content: new StrategiesComponent({})
     }
 ];
 
diff --git a/public/js/components/feature/FeatureToggleComponent.jsx b/public/js/components/feature/FeatureTogglesComponent.jsx
similarity index 97%
rename from public/js/components/feature/FeatureToggleComponent.jsx
rename to public/js/components/feature/FeatureTogglesComponent.jsx
index 10b189091c..1089568ef5 100644
--- a/public/js/components/feature/FeatureToggleComponent.jsx
+++ b/public/js/components/feature/FeatureTogglesComponent.jsx
@@ -5,7 +5,7 @@ var FeatureList   = require('./FeatureList');
 var FeatureForm   = require('./FeatureForm');
 var FeatureStore  = require('../../stores/FeatureStore');
 
-var FeatureToggleComponent = React.createClass({
+var FeatureTogglesComponent = React.createClass({
     getInitialState: function() {
         return {
             features: [],
@@ -113,4 +113,4 @@ var FeatureToggleComponent = React.createClass({
 
 
 
-module.exports = FeatureToggleComponent;
\ No newline at end of file
+module.exports = FeatureTogglesComponent;
\ No newline at end of file
diff --git a/public/js/components/strategy/StrategyComponent.jsx b/public/js/components/strategy/StrategiesComponent.jsx
similarity index 96%
rename from public/js/components/strategy/StrategyComponent.jsx
rename to public/js/components/strategy/StrategiesComponent.jsx
index 5688af2b5d..2deb7e24f1 100644
--- a/public/js/components/strategy/StrategyComponent.jsx
+++ b/public/js/components/strategy/StrategiesComponent.jsx
@@ -4,7 +4,7 @@ var React          = require('react'),
     strategyStore  = require('../../stores/StrategyStore'),
     ErrorMessages  = require('../ErrorMessages');
 
-var StrategyComponent = React.createClass({
+var StrategiesComponent = React.createClass({
     getInitialState: function() {
         return {
             createView: false,
@@ -74,4 +74,4 @@ var StrategyComponent = React.createClass({
     }
 });
 
-module.exports = StrategyComponent;
\ No newline at end of file
+module.exports = StrategiesComponent;
\ No newline at end of file