diff --git a/commerce_flat_rate_services.features.inc b/commerce_flat_rate_services.features.inc
index 7346e4b..2044f7d 100644
--- a/commerce_flat_rate_services.features.inc
+++ b/commerce_flat_rate_services.features.inc
@@ -3,8 +3,6 @@
  * Implements hook_features_export().
  */
 function commerce_flat_rate_services_features_export($data, &$export, $module_name = '') {
-  $pipe = array();
-
   $export['dependencies']['features'] = 'features';
   $export['dependencies']['commerce_features'] = 'commerce_features';
   $export['dependencies']['commerce_flat_rate'] = 'commerce_flat_rate';
@@ -16,11 +14,11 @@ function commerce_flat_rate_services_features_export($data, &$export, $module_na
   foreach ($data as $service) {
     if (isset($info[$service]['module'])) {
       $export['dependencies'][$info[$service]['module']] = $info[$service]['module'];
+      $export['features']['commerce_flat_rate_services'][$service] = $service;
+      $export['features']['rules_config']['commerce_shipping_service_' . $service] = 'commerce_shipping_service_' . $service;
     }
-    $export['features']['commerce_flat_rate_services'][$service] = $service;
-    $export['features']['rules_config']['commerce_shipping_service_' . $service] = 'commerce_shipping_service_' . $service;
   }
-  return $pipe;
+  return $export;
 }
 
 /**
@@ -56,7 +54,7 @@ function commerce_flat_rate_services_features_export_render($module, $data, $exp
   $output[] = '  );';
   $output[] = '  return $items;';
   $output = implode("\n", $output);
-  return array('commerce_shipping_service_info' => $output);
+  return array('commerce_flat_rate_default_services' => $output);
 }
 
 /**
@@ -64,8 +62,8 @@ function commerce_flat_rate_services_features_export_render($module, $data, $exp
  */
 function commerce_flat_rate_services_features_revert($module = NULL) {
   // Get default flat rate services
-  if (module_hook($module, 'commerce_shipping_service_info')) {
-    $default_types = module_invoke($module, 'commerce_shipping_service_info');
+  if (module_hook($module, 'commerce_flat_rate_default_services')) {
+    $default_types = module_invoke($module, 'commerce_flat_rate_default_services');
     $existing_types = commerce_shipping_services('flat_rate');
     foreach ($default_types as $type) {
       // Add / or update