diff --git a/packages/unleash-frontend-next/src/component/feature/add-container.jsx b/packages/unleash-frontend-next/src/component/feature/form-add-container.jsx
similarity index 90%
rename from packages/unleash-frontend-next/src/component/feature/add-container.jsx
rename to packages/unleash-frontend-next/src/component/feature/form-add-container.jsx
index 9ba291f664..99cfe2d7dd 100644
--- a/packages/unleash-frontend-next/src/component/feature/add-container.jsx
+++ b/packages/unleash-frontend-next/src/component/feature/form-add-container.jsx
@@ -1,10 +1,8 @@
 import { connect } from 'react-redux';
 import { hashHistory } from 'react-router';
-
-
 import { createFeatureToggles } from '../../store/feature-actions';
-import AddComponent from './form/add-component';
 import { createMapper, createActions } from '../input-helpers';
+import FormComponent from './form';
 
 const ID = 'add-feature-toggle';
 const mapStateToProps = createMapper({ id: ID });
@@ -40,4 +38,4 @@ const prepare = (methods, dispatch) => {
 };
 const actions = createActions({ id: ID, prepare });
 
-export default connect(mapStateToProps, actions)(AddComponent);
+export default connect(mapStateToProps, actions)(FormComponent);
diff --git a/packages/unleash-frontend-next/src/component/feature/edit-container.jsx b/packages/unleash-frontend-next/src/component/feature/form-edit-container.jsx
similarity index 93%
rename from packages/unleash-frontend-next/src/component/feature/edit-container.jsx
rename to packages/unleash-frontend-next/src/component/feature/form-edit-container.jsx
index 286ef9c936..26b262b658 100644
--- a/packages/unleash-frontend-next/src/component/feature/edit-container.jsx
+++ b/packages/unleash-frontend-next/src/component/feature/form-edit-container.jsx
@@ -2,8 +2,8 @@ import { connect } from 'react-redux';
 import { hashHistory } from 'react-router';
 
 import { requestUpdateFeatureToggle } from '../../store/feature-actions';
-import AddComponent from './form/add-component';
 import { createMapper, createActions } from '../input-helpers';
+import FormComponent from './form';
 
 const ID = 'edit-feature-toggle';
 function getId (props) {
@@ -65,4 +65,4 @@ const actions = createActions({
     prepare,
 });
 
-export default connect(mapStateToProps, actions)(AddComponent);
+export default connect(mapStateToProps, actions)(FormComponent);
diff --git a/packages/unleash-frontend-next/src/component/feature/form/add-component.jsx b/packages/unleash-frontend-next/src/component/feature/form/index.jsx
similarity index 100%
rename from packages/unleash-frontend-next/src/component/feature/form/add-component.jsx
rename to packages/unleash-frontend-next/src/component/feature/form/index.jsx
diff --git a/packages/unleash-frontend-next/src/page/features/create.js b/packages/unleash-frontend-next/src/page/features/create.js
index 86b5f0b410..ff9afd5e6f 100644
--- a/packages/unleash-frontend-next/src/page/features/create.js
+++ b/packages/unleash-frontend-next/src/page/features/create.js
@@ -1,10 +1,10 @@
 import React from 'react';
-import AddFeatureToggle from '../../component/feature/add-container';
+import AddFeatureToggleForm from '../../component/feature/form-add-container';
 
 const render = () => (
     <div>
         <h3>Create feature toggle</h3>
-        <AddFeatureToggle />
+        <AddFeatureToggleForm />
     </div>
 );
 
diff --git a/packages/unleash-frontend-next/src/page/features/edit.js b/packages/unleash-frontend-next/src/page/features/edit.js
index 3e9c0e75b6..fed77e7f18 100644
--- a/packages/unleash-frontend-next/src/page/features/edit.js
+++ b/packages/unleash-frontend-next/src/page/features/edit.js
@@ -1,5 +1,5 @@
 import React, { Component, PropTypes } from 'react';
-import EditFeatureToggle from '../../component/feature/edit-container';
+import EditFeatureToggleForm from '../../component/feature/form-edit-container';
 
 export default class Features extends Component {
     static propTypes () {
@@ -12,7 +12,7 @@ export default class Features extends Component {
         return (
             <div>
                 <h3>Edit feature toggle</h3>
-                <EditFeatureToggle featureToggleName={this.props.params.name} />
+                <EditFeatureToggleForm featureToggleName={this.props.params.name} />
             </div>
         );
     }