diff --git a/modules/commerce_kickstart/commerce_kickstart_product/commerce_kickstart_product.features.field.inc b/modules/commerce_kickstart/commerce_kickstart_product/commerce_kickstart_product.features.field.inc
index 35933bc..e895c05 100644
--- a/modules/commerce_kickstart/commerce_kickstart_product/commerce_kickstart_product.features.field.inc
+++ b/modules/commerce_kickstart/commerce_kickstart_product/commerce_kickstart_product.features.field.inc
@@ -204,6 +204,7 @@ function commerce_kickstart_product_field_default_fields() {
       'commerce_cart_settings' => array(
         'attribute_field' => 1,
         'attribute_widget' => 'select',
+        'attribute_widget_title' => 'Select Size',
       ),
       'default_value' => NULL,
       'deleted' => '0',
@@ -313,6 +314,7 @@ function commerce_kickstart_product_field_default_fields() {
       'commerce_cart_settings' => array(
         'attribute_field' => 1,
         'attribute_widget' => 'commerce_fancy_attributes',
+        'attribute_widget_title' => 'Select Color',
       ),
       'default_value' => NULL,
       'deleted' => '0',
@@ -828,6 +830,7 @@ function commerce_kickstart_product_field_default_fields() {
       'commerce_cart_settings' => array(
         'attribute_field' => 1,
         'attribute_widget' => 'commerce_fancy_attributes',
+        'attribute_widget_title' => 'Select Color',
       ),
       'default_value' => NULL,
       'deleted' => '0',
@@ -1344,6 +1347,7 @@ function commerce_kickstart_product_field_default_fields() {
       'commerce_cart_settings' => array(
         'attribute_field' => 1,
         'attribute_widget' => 'commerce_fancy_attributes',
+        'attribute_widget_title' => 'Select Color',
       ),
       'default_value' => NULL,
       'deleted' => '0',
@@ -1458,6 +1462,7 @@ function commerce_kickstart_product_field_default_fields() {
       'commerce_cart_settings' => array(
         'attribute_field' => 1,
         'attribute_widget' => 'select',
+        'attribute_widget_title' => 'Select Size',
       ),
       'default_value' => NULL,
       'deleted' => '0',
@@ -1977,6 +1982,7 @@ function commerce_kickstart_product_field_default_fields() {
       'commerce_cart_settings' => array(
         'attribute_field' => 1,
         'attribute_widget' => 'commerce_fancy_attributes',
+        'attribute_widget_title' => 'Select Color',
       ),
       'default_value' => NULL,
       'deleted' => '0',
@@ -2240,6 +2246,7 @@ function commerce_kickstart_product_field_default_fields() {
       'commerce_cart_settings' => array(
         'attribute_field' => 1,
         'attribute_widget' => 'select',
+        'attribute_widget_title' => 'Select Size',
       ),
       'default_value' => NULL,
       'deleted' => '0',
@@ -3117,6 +3124,7 @@ function commerce_kickstart_product_field_default_fields() {
       'commerce_cart_settings' => array(
         'attribute_field' => 1,
         'attribute_widget' => 'commerce_fancy_attributes',
+        'attribute_widget_title' => 'Select Color',
       ),
       'default_value' => NULL,
       'deleted' => '0',
@@ -3379,6 +3387,7 @@ function commerce_kickstart_product_field_default_fields() {
       'commerce_cart_settings' => array(
         'attribute_field' => 1,
         'attribute_widget' => 'select',
+        'attribute_widget_title' => 'Select Size',
       ),
       'default_value' => NULL,
       'deleted' => '0',
diff --git a/modules/commerce_kickstart/commerce_kickstart_product_ui/commerce_kickstart_product_ui.module b/modules/commerce_kickstart/commerce_kickstart_product_ui/commerce_kickstart_product_ui.module
index 8e306f7..8f599f9 100644
--- a/modules/commerce_kickstart/commerce_kickstart_product_ui/commerce_kickstart_product_ui.module
+++ b/modules/commerce_kickstart/commerce_kickstart_product_ui/commerce_kickstart_product_ui.module
@@ -139,16 +139,8 @@ function commerce_kickstart_product_ui_form_alter(&$form, &$form_state, $form_id
     $form['#attached']['library'][] = array('commerce_kickstart_product_ui', 'jquery_ui_spinner');
     $form['#attached']['js'][] = drupal_get_path('module', 'commerce_kickstart_product_ui') . '/commerce_kickstart_product_ui.js';
 
-    // Rename add-to-cart form fields label (quantity, color, size)
+    // Rename add-to-cart form fields label (quantity).
     $form['quantity']['#title'] = t('Enter Quantity');
-    $form['attributes']['field_color']['#title'] = t('Select Color');
-
-    foreach(array_keys($form['attributes']) as $field_name) {
-      if (strstr($field_name, 'size')) {
-        $form['attributes'][$field_name]['#title'] = t('Select Size');
-        break;
-      }
-    }
   }
   if ($form_id == 'views_exposed_form' && $form_state['view']->name == 'display_products') {
     if (isset($form['#info']['filter-search_api_views_fulltext'])) {