diff --git a/commerce_flat_rate.i18n.inc b/commerce_flat_rate.i18n.inc
index 35738a3..1cc407a 100644
--- a/commerce_flat_rate.i18n.inc
+++ b/commerce_flat_rate.i18n.inc
@@ -1,11 +1,16 @@
 <?php
 
 /**
+ * @file
+ * Internationalization (i18n) integration for the Commerce Flat Rate module.
+ */
+
+/**
  * Implements hook_i18n_object_info().
  */
 function commerce_flat_rate_i18n_object_info() {
   $info['commerce_flat_rate'] = array(
-    'title' => t('Commerce flat rate'),
+    'title' => t('Commerce Flat Rate'),
     'key' => 'name',
     'class' => 'i18n_string_object_wrapper',
     'string translation' => array(
@@ -26,8 +31,8 @@ function commerce_flat_rate_i18n_object_info() {
  */
 function commerce_flat_rate_i18n_string_info() {
   $groups['commerce_flat_rate'] = array(
-    'title' => t('Commerce flat rate'),
-    'description' => t("Commerce flate rate shipping services' titles and display titles."),
+    'title' => t('Commerce Flat Rate'),
+    'description' => t('Commerce Flat Rate shipping service titles, display titles, and descriptions.'),
     'format' => FALSE, // This group doesn't have strings with format
     'list' => FALSE, // This group cannot list all strings
   );
@@ -44,4 +49,4 @@ function commerce_flat_rate_i18n_string_objects($type) {
       ->execute()
       ->fetchAllAssoc('name', PDO::FETCH_ASSOC);
   }
-}
\ No newline at end of file
+}
diff --git a/includes/commerce_flat_rate.admin.inc b/includes/commerce_flat_rate.admin.inc
index 364bca0..3f927e8 100644
--- a/includes/commerce_flat_rate.admin.inc
+++ b/includes/commerce_flat_rate.admin.inc
@@ -218,16 +218,6 @@ function commerce_flat_rate_service_form_submit($form, &$form_state) {
   unset($shipping_service['base_rate']);
   $op = commerce_flat_rate_service_save($shipping_service);
 
-  if (module_exists('i18n_string')) {
-    $object = new stdclass;
-    $object->title = $shipping_service['title'];
-    $object->display_title = $shipping_service['display_title'];
-    $object->description = $shipping_service['description'];
-    // Prefix with shipping method machine name.
-    $object->name = $shipping_service['name'];
-    i18n_string_object_update('commerce_flat_rate', $object);
-  }
-
   if (!$op) {
     drupal_set_message(t('The flat rate service failed to save properly. Please review the form and try again.'), 'error');
     $form_state['rebuild'] = TRUE;
@@ -235,6 +225,11 @@ function commerce_flat_rate_service_form_submit($form, &$form_state) {
   else {
     drupal_set_message(t('Flat rate service saved.'));
     $form_state['redirect'] = 'admin/commerce/config/shipping/services/flat-rate';
+
+    // Update string translations.
+    if (module_exists('i18n_string')) {
+      i18n_string_object_update('commerce_flat_rate', $shipping_service);
+    }
   }
 }