diff --git a/ionic/components.ios.scss b/ionic/components.ios.scss
index 10980f4b24..297cb7a14c 100644
--- a/ionic/components.ios.scss
+++ b/ionic/components.ios.scss
@@ -14,8 +14,8 @@
   "components/checkbox/checkbox.ios",
   "components/chip/chip.ios",
   "components/content/content.ios",
+  "components/input/input.ios",
   "components/item/item.ios",
-  "components/item-input/item-input.ios",
   "components/label/label.ios",
   "components/list/list.ios",
   "components/menu/menu.ios",
diff --git a/ionic/components.md.scss b/ionic/components.md.scss
index a19cc735a4..2deade485b 100644
--- a/ionic/components.md.scss
+++ b/ionic/components.md.scss
@@ -14,8 +14,8 @@
   "components/checkbox/checkbox.md",
   "components/chip/chip.md",
   "components/content/content.md",
+  "components/input/input.md",
   "components/item/item.md",
-  "components/item-input/item-input.md",
   "components/label/label.md",
   "components/list/list.md",
   "components/menu/menu.md",
diff --git a/ionic/components/item-input/item-input.ios.scss b/ionic/components/input/input.ios.scss
similarity index 98%
rename from ionic/components/item-input/item-input.ios.scss
rename to ionic/components/input/input.ios.scss
index a68bbaa334..a5a24a20ee 100644
--- a/ionic/components/item-input/item-input.ios.scss
+++ b/ionic/components/input/input.ios.scss
@@ -1,5 +1,5 @@
 @import "../../globals.ios";
-@import "./item-input";
+@import "./input";
 
 // iOS Input
 // --------------------------------------------------
diff --git a/ionic/components/item-input/item-input.md.scss b/ionic/components/input/input.md.scss
similarity index 99%
rename from ionic/components/item-input/item-input.md.scss
rename to ionic/components/input/input.md.scss
index fcd9129956..ff5062be45 100644
--- a/ionic/components/item-input/item-input.md.scss
+++ b/ionic/components/input/input.md.scss
@@ -1,5 +1,5 @@
 @import "../../globals.md";
-@import "./item-input";
+@import "./input";
 
 // Material Design Input
 // --------------------------------------------------
diff --git a/ionic/components/item-input/item-input.scss b/ionic/components/input/input.scss
similarity index 100%
rename from ionic/components/item-input/item-input.scss
rename to ionic/components/input/input.scss
diff --git a/ionic/components/item-input/item-input.ts b/ionic/components/input/input.ts
similarity index 100%
rename from ionic/components/item-input/item-input.ts
rename to ionic/components/input/input.ts
diff --git a/ionic/components/item-input/test/fixed-inline-labels/e2e.ts b/ionic/components/input/test/fixed-inline-labels/e2e.ts
similarity index 100%
rename from ionic/components/item-input/test/fixed-inline-labels/e2e.ts
rename to ionic/components/input/test/fixed-inline-labels/e2e.ts
diff --git a/ionic/components/item-input/test/fixed-inline-labels/index.ts b/ionic/components/input/test/fixed-inline-labels/index.ts
similarity index 100%
rename from ionic/components/item-input/test/fixed-inline-labels/index.ts
rename to ionic/components/input/test/fixed-inline-labels/index.ts
diff --git a/ionic/components/item-input/test/fixed-inline-labels/main.html b/ionic/components/input/test/fixed-inline-labels/main.html
similarity index 100%
rename from ionic/components/item-input/test/fixed-inline-labels/main.html
rename to ionic/components/input/test/fixed-inline-labels/main.html
diff --git a/ionic/components/item-input/test/floating-labels/e2e.ts b/ionic/components/input/test/floating-labels/e2e.ts
similarity index 100%
rename from ionic/components/item-input/test/floating-labels/e2e.ts
rename to ionic/components/input/test/floating-labels/e2e.ts
diff --git a/ionic/components/item-input/test/floating-labels/index.ts b/ionic/components/input/test/floating-labels/index.ts
similarity index 100%
rename from ionic/components/item-input/test/floating-labels/index.ts
rename to ionic/components/input/test/floating-labels/index.ts
diff --git a/ionic/components/item-input/test/floating-labels/main.html b/ionic/components/input/test/floating-labels/main.html
similarity index 100%
rename from ionic/components/item-input/test/floating-labels/main.html
rename to ionic/components/input/test/floating-labels/main.html
diff --git a/ionic/components/item-input/test/form-inputs/e2e.ts b/ionic/components/input/test/form-inputs/e2e.ts
similarity index 100%
rename from ionic/components/item-input/test/form-inputs/e2e.ts
rename to ionic/components/input/test/form-inputs/e2e.ts
diff --git a/ionic/components/item-input/test/form-inputs/index.ts b/ionic/components/input/test/form-inputs/index.ts
similarity index 100%
rename from ionic/components/item-input/test/form-inputs/index.ts
rename to ionic/components/input/test/form-inputs/index.ts
diff --git a/ionic/components/item-input/test/form-inputs/main.html b/ionic/components/input/test/form-inputs/main.html
similarity index 100%
rename from ionic/components/item-input/test/form-inputs/main.html
rename to ionic/components/input/test/form-inputs/main.html
diff --git a/ionic/components/item-input/test/inline-labels/e2e.ts b/ionic/components/input/test/inline-labels/e2e.ts
similarity index 100%
rename from ionic/components/item-input/test/inline-labels/e2e.ts
rename to ionic/components/input/test/inline-labels/e2e.ts
diff --git a/ionic/components/item-input/test/inline-labels/index.ts b/ionic/components/input/test/inline-labels/index.ts
similarity index 100%
rename from ionic/components/item-input/test/inline-labels/index.ts
rename to ionic/components/input/test/inline-labels/index.ts
diff --git a/ionic/components/item-input/test/inline-labels/main.html b/ionic/components/input/test/inline-labels/main.html
similarity index 100%
rename from ionic/components/item-input/test/inline-labels/main.html
rename to ionic/components/input/test/inline-labels/main.html
diff --git a/ionic/components/item-input/test/input-focus/index.ts b/ionic/components/input/test/input-focus/index.ts
similarity index 100%
rename from ionic/components/item-input/test/input-focus/index.ts
rename to ionic/components/input/test/input-focus/index.ts
diff --git a/ionic/components/item-input/test/input-focus/main.html b/ionic/components/input/test/input-focus/main.html
similarity index 100%
rename from ionic/components/item-input/test/input-focus/main.html
rename to ionic/components/input/test/input-focus/main.html
diff --git a/ionic/components/item-input/test/inset-inputs/e2e.ts b/ionic/components/input/test/inset-inputs/e2e.ts
similarity index 100%
rename from ionic/components/item-input/test/inset-inputs/e2e.ts
rename to ionic/components/input/test/inset-inputs/e2e.ts
diff --git a/ionic/components/item-input/test/inset-inputs/index.ts b/ionic/components/input/test/inset-inputs/index.ts
similarity index 100%
rename from ionic/components/item-input/test/inset-inputs/index.ts
rename to ionic/components/input/test/inset-inputs/index.ts
diff --git a/ionic/components/item-input/test/inset-inputs/main.html b/ionic/components/input/test/inset-inputs/main.html
similarity index 100%
rename from ionic/components/item-input/test/inset-inputs/main.html
rename to ionic/components/input/test/inset-inputs/main.html
diff --git a/ionic/components/item-input/test/placeholder-labels/e2e.ts b/ionic/components/input/test/placeholder-labels/e2e.ts
similarity index 100%
rename from ionic/components/item-input/test/placeholder-labels/e2e.ts
rename to ionic/components/input/test/placeholder-labels/e2e.ts
diff --git a/ionic/components/item-input/test/placeholder-labels/index.ts b/ionic/components/input/test/placeholder-labels/index.ts
similarity index 100%
rename from ionic/components/item-input/test/placeholder-labels/index.ts
rename to ionic/components/input/test/placeholder-labels/index.ts
diff --git a/ionic/components/item-input/test/placeholder-labels/main.html b/ionic/components/input/test/placeholder-labels/main.html
similarity index 100%
rename from ionic/components/item-input/test/placeholder-labels/main.html
rename to ionic/components/input/test/placeholder-labels/main.html
diff --git a/ionic/components/item-input/test/stacked-labels/e2e.ts b/ionic/components/input/test/stacked-labels/e2e.ts
similarity index 100%
rename from ionic/components/item-input/test/stacked-labels/e2e.ts
rename to ionic/components/input/test/stacked-labels/e2e.ts
diff --git a/ionic/components/item-input/test/stacked-labels/index.ts b/ionic/components/input/test/stacked-labels/index.ts
similarity index 100%
rename from ionic/components/item-input/test/stacked-labels/index.ts
rename to ionic/components/input/test/stacked-labels/index.ts
diff --git a/ionic/components/item-input/test/stacked-labels/main.html b/ionic/components/input/test/stacked-labels/main.html
similarity index 100%
rename from ionic/components/item-input/test/stacked-labels/main.html
rename to ionic/components/input/test/stacked-labels/main.html
diff --git a/ionic/components/item-input/test/text-input.spec.ts b/ionic/components/input/test/text-input.spec.ts
similarity index 91%
rename from ionic/components/item-input/test/text-input.spec.ts
rename to ionic/components/input/test/text-input.spec.ts
index 8abc8fc69d..05449434a1 100644
--- a/ionic/components/item-input/test/text-input.spec.ts
+++ b/ionic/components/input/test/text-input.spec.ts
@@ -41,7 +41,7 @@ export function run() {
   });
 
   it('should scroll, top above safe', () => {
-    // Input top within safe area, bottom below safe area, room to scroll
+    // ItemInput top within safe area, bottom below safe area, room to scroll
     let inputOffsetTop = 100;
     let inputOffsetHeight = 33;
     let scrollViewDimensions = {
@@ -61,7 +61,7 @@ export function run() {
   });
 
   it('should scroll, top in safe, bottom below safe, below more than top in, not enough padding', () => {
-    // Input top within safe area, bottom below safe area, room to scroll
+    // ItemInput top within safe area, bottom below safe area, room to scroll
     let inputOffsetTop = 100;
     let inputOffsetHeight = 320;
     let scrollViewDimensions = {
@@ -81,7 +81,7 @@ export function run() {
   });
 
   it('should scroll, top in safe, bottom below safe, below more than top in, enough padding', () => {
-    // Input top within safe area, bottom below safe area, room to scroll
+    // ItemInput top within safe area, bottom below safe area, room to scroll
     let inputOffsetTop = 20;
     let inputOffsetHeight = 330;
     let scrollViewDimensions = {
@@ -99,7 +99,7 @@ export function run() {
   });
 
   it('should scroll, top in safe, bottom below safe, below less than top in, enough padding', () => {
-    // Input top within safe area, bottom below safe area, room to scroll
+    // ItemInput top within safe area, bottom below safe area, room to scroll
     let inputOffsetTop = 250;
     let inputOffsetHeight = 80; // goes 30px below safe area
     let scrollViewDimensions = {
@@ -117,7 +117,7 @@ export function run() {
   });
 
   it('should not scroll, top in safe, bottom in safe', () => {
-    // Input top within safe area, bottom within safe area
+    // ItemInput top within safe area, bottom within safe area
     let inputOffsetTop = 100;
     let inputOffsetHeight = 50;
     let scrollViewDimensions = {
diff --git a/ionic/config/directives.ts b/ionic/config/directives.ts
index ceade4996d..073cae169a 100644
--- a/ionic/config/directives.ts
+++ b/ionic/config/directives.ts
@@ -14,8 +14,8 @@ import {Slides, Slide, SlideLazy} from '../components/slides/slides';
 import {Tabs} from '../components/tabs/tabs';
 import {Tab} from '../components/tabs/tab';
 import {List, ListHeader} from '../components/list/list';
+import {ItemInput} from '../components/input/input';
 import {Item} from '../components/item/item';
-import {ItemInput} from '../components/item-input/item-input';
 import {ItemSliding} from '../components/item/item-sliding';
 import {Toolbar, ToolbarTitle, ToolbarItem} from '../components/toolbar/toolbar';
 import {Icon} from '../components/icon/icon';