diff --git a/src/demo-app/demo-app-module.ts b/src/demo-app/demo-app-module.ts
index 541909dbf171..9f66cf8016ba 100644
--- a/src/demo-app/demo-app-module.ts
+++ b/src/demo-app/demo-app-module.ts
@@ -36,7 +36,7 @@ import {TabsDemo, SunnyTabContent, RainyTabContent, FoggyTabContent} from './tab
 import {ProjectionDemo, ProjectionTestComponent} from './projection/projection-demo';
 import {PlatformDemo} from './platform/platform-demo';
 import {AutocompleteDemo} from './autocomplete/autocomplete-demo';
-import {InputContainerDemo} from './input/input-container-demo';
+import {InputDemo} from './input/input-demo';
 import {StyleDemo} from './style/style-demo';
 
 @NgModule({
@@ -62,7 +62,7 @@ import {StyleDemo} from './style/style-demo';
     GridListDemo,
     Home,
     IconDemo,
-    InputContainerDemo,
+    InputDemo,
     JazzDialog,
     ContentElementDialog,
     IFrameDialog,
diff --git a/src/demo-app/demo-app/demo-app.ts b/src/demo-app/demo-app/demo-app.ts
index cdbdcd904484..746a18056915 100644
--- a/src/demo-app/demo-app/demo-app.ts
+++ b/src/demo-app/demo-app/demo-app.ts
@@ -31,7 +31,6 @@ export class DemoApp {
     {name: 'Grid List', route: 'grid-list'},
     {name: 'Icon', route: 'icon'},
     {name: 'Input', route: 'input'},
-    {name: 'Input Container', route: 'input-container'},
     {name: 'List', route: 'list'},
     {name: 'Menu', route: 'menu'},
     {name: 'Live Announcer', route: 'live-announcer'},
diff --git a/src/demo-app/demo-app/routes.ts b/src/demo-app/demo-app/routes.ts
index c1d92d0fab43..d2e2360799f6 100644
--- a/src/demo-app/demo-app/routes.ts
+++ b/src/demo-app/demo-app/routes.ts
@@ -31,7 +31,7 @@ import {ProjectionDemo} from '../projection/projection-demo';
 import {TABS_DEMO_ROUTES} from '../tabs/routes';
 import {PlatformDemo} from '../platform/platform-demo';
 import {AutocompleteDemo} from '../autocomplete/autocomplete-demo';
-import {InputContainerDemo} from '../input/input-container-demo';
+import {InputDemo} from '../input/input-demo';
 import {StyleDemo} from '../style/style-demo';
 
 export const DEMO_APP_ROUTES: Routes = [
@@ -51,7 +51,7 @@ export const DEMO_APP_ROUTES: Routes = [
   {path: 'projection', component: ProjectionDemo},
   {path: 'overlay', component: OverlayDemo},
   {path: 'checkbox', component: CheckboxDemo},
-  {path: 'input-container', component: InputContainerDemo},
+  {path: 'input', component: InputDemo},
   {path: 'toolbar', component: ToolbarDemo},
   {path: 'icon', component: IconDemo},
   {path: 'list', component: ListDemo},
diff --git a/src/demo-app/input/input-container-demo.html b/src/demo-app/input/input-demo.html
similarity index 100%
rename from src/demo-app/input/input-container-demo.html
rename to src/demo-app/input/input-demo.html
diff --git a/src/demo-app/input/input-container-demo.scss b/src/demo-app/input/input-demo.scss
similarity index 100%
rename from src/demo-app/input/input-container-demo.scss
rename to src/demo-app/input/input-demo.scss
diff --git a/src/demo-app/input/input-container-demo.ts b/src/demo-app/input/input-demo.ts
similarity index 79%
rename from src/demo-app/input/input-container-demo.ts
rename to src/demo-app/input/input-demo.ts
index 9c773f00e5ee..e8fb5838141c 100644
--- a/src/demo-app/input/input-container-demo.ts
+++ b/src/demo-app/input/input-demo.ts
@@ -6,11 +6,11 @@ let max = 5;
 
 @Component({
   moduleId: module.id,
-  selector: 'input-container-demo',
-  templateUrl: 'input-container-demo.html',
-  styleUrls: ['input-container-demo.css'],
+  selector: 'input-demo',
+  templateUrl: 'input-demo.html',
+  styleUrls: ['input-demo.css'],
 })
-export class InputContainerDemo {
+export class InputDemo {
   floatingLabel: string = 'auto';
   dividerColor: boolean;
   requiredField: boolean;