diff --git a/example/input-text.html b/example/input-text.html
index c3c47c0789..4bf08216db 100644
--- a/example/input-text.html
+++ b/example/input-text.html
@@ -24,7 +24,7 @@
       <div class="content has-header has-footer">
 
         <h3>Default Text Input, Not Inset, No Content Padding</h3>
-        <div class="form-group">
+        <div class="input-group">
           <label class="input-wrapper">
             <input type="text" placeholder="First Name">
           </label>
@@ -37,7 +37,7 @@
         </div>
 
         <h3>Default Text Input, Is Inset, No Content Padding</h3>
-        <div class="form-group inset">
+        <div class="input-group inset">
           <label class="input-wrapper">
             <input type="text" placeholder="First Name">
           </label>
@@ -52,7 +52,7 @@
         <div class="content-padded">
 
           <h3>Default Text Input, Not Inset, With Content Padding</h3>
-          <div class="form-group">
+          <div class="input-group">
             <label class="input-wrapper">
               <input type="text" placeholder="Username">
             </label>
@@ -61,14 +61,14 @@
             </label>
           </div>
 
-          <div class="form-group">
+          <div class="input-group">
             <label class="input-wrapper">
               <input type="text" placeholder="Filter by name">
             </label>
           </div>
 
           <h3>Default Text Input, Is Inset, With Content Padding</h3>
-          <div class="form-group inset">
+          <div class="input-group inset">
             <label class="input-wrapper">
               <input type="email" placeholder="Email">
             </label>
@@ -83,7 +83,7 @@
 
 
         <h3>Inline Label On Top Of Text Input, Not Inset, No Content Padding</h3>
-        <div class="form-group">
+        <div class="input-group">
           <label class="input-wrapper row">
             <span class="input-label col-xs-4">Username</span>
             <input class="col-xs-8" type="text" placeholder="@drifty">
@@ -99,7 +99,7 @@
         </div>
 
         <h3>Inline Label On Top Of Text Input, Is Inset, No Content Padding</h3>
-        <div class="form-group inset">
+        <div class="input-group inset">
           <label class="input-wrapper row">
             <span class="input-label col-xs-4">Email</span>
             <input class="col-xs-8" type="text" placeholder="your@email.com">
@@ -109,7 +109,7 @@
         <div class="content-padded">
 
           <h3>Inline Label On Top Of Text Input, Not Inset, With Content Padding</h3>
-          <div class="form-group">
+          <div class="input-group">
             <label class="input-wrapper row">
               <span class="input-label col-xs-4">First Name</span>
               <input class="col-xs-8" type="text" placeholder="John">
@@ -121,13 +121,13 @@
           </div>
 
           <h3>Inline Label On Top Of Text Input, Is Inset, With Content Padding</h3>
-          <div class="form-group inset">
+          <div class="input-group inset">
             <label class="input-wrapper row">
               <span class="input-label col-xs-4">Email</span>
               <input class="col-xs-8" type="text" placeholder="your@email.com">
             </label>
           </div>
-          <div class="form-group inset">
+          <div class="input-group inset">
             <label class="input-wrapper row">
               <span class="input-label col-xs-4">Filter By Name</span>
               <input class="col-xs-8" type="text" placeholder="Enter keywords">
@@ -140,7 +140,7 @@
 
 
         <h3>Stacked Label On Top Of Text Input, Not Inset, No Content Padding</h3>
-        <div class="form-group stacked-label">
+        <div class="input-group stacked-label">
           <label class="input-wrapper">
             <span class="input-label">First Name</span>
             <input type="text" placeholder="Drifty">
@@ -154,7 +154,7 @@
             <input type="text" placeholder="your@email.com">
           </label>
         </div>
-        <div class="form-group stacked-label">
+        <div class="input-group stacked-label">
           <label class="input-wrapper">
             <span class="input-label">Filter By Name</span>
             <input type="text" placeholder="">
@@ -162,7 +162,7 @@
         </div>
 
         <h3>Stacked Label On Top Of Text Input, Is Inset, No Content Padding</h3>
-        <div class="form-group stacked-label inset">
+        <div class="input-group stacked-label inset">
           <label class="input-wrapper">
             <span class="input-label">Email</span>
             <input type="text" placeholder="your@email.com">
@@ -172,7 +172,7 @@
         <div class="content-padded">
 
           <h3>Stacked Label On Top Of Text Input, Not Inset, With Content Padding</h3>
-          <div class="form-group stacked-label">
+          <div class="input-group stacked-label">
             <label class="input-wrapper">
               <span class="input-label">Email</span>
               <input type="text" placeholder="your@email.com">
@@ -180,7 +180,7 @@
           </div>
 
           <h3>Stacked Label On Top Of Text Input, Is Inset, With Content Padding</h3>
-          <div class="form-group stacked-label inset">
+          <div class="input-group stacked-label inset">
             <label class="input-wrapper">
               <span class="input-label">Email</span>
               <input type="text" placeholder="your@email.com">
diff --git a/scss/ionic/_form.scss b/scss/ionic/_form.scss
index 505a3ae54e..31853f6e52 100644
--- a/scss/ionic/_form.scss
+++ b/scss/ionic/_form.scss
@@ -47,24 +47,24 @@ textarea {
   font-family: $base-font-family; // And only set font-family here for those that need it (note the missing label element)
 }
 
-.form-group {
+.input-group {
   border-top: $input-border-width solid $input-border-color;
   border-bottom: $input-border-width solid $input-border-color;
   background-color: $input-bg;
   overflow: hidden;
 }
-.content-padded > .form-group,
-.form-group.inset {
+.content-padded > .input-group,
+.input-group.inset {
   border-left: $input-border-width solid $input-border-color;
   border-right: $input-border-width solid $input-border-color;
   @include border-radius($input-border-radius);
 }
 
-.form-group .input-wrapper + .input-wrapper {
+.input-group .input-wrapper + .input-wrapper {
   border-top: $input-border-width solid $input-border-color;
 }
 
-.form-group + .form-group {
+.input-group + .input-group {
   margin-top: $content-padding;
 }
 
@@ -86,13 +86,13 @@ textarea {
   }
 }
 
-.form-group.stacked-label,
-.form-group.stacked-label .input-wrapper {
+.input-group.stacked-label,
+.input-group.stacked-label .input-wrapper {
   background-color: transparent;
   border: 0;
 }
 
-.form-group.stacked-label input {
+.input-group.stacked-label input {
   border: $input-border-width solid $input-border-color;
   background-color: $input-bg;
   padding: 4px 8px 3px;