diff --git a/contrib/views_slideshow_cycle/views_slideshow_cycle.views_slideshow.inc b/contrib/views_slideshow_cycle/views_slideshow_cycle.views_slideshow.inc
index 10ed401..2e77033 100644
--- a/contrib/views_slideshow_cycle/views_slideshow_cycle.views_slideshow.inc
+++ b/contrib/views_slideshow_cycle/views_slideshow_cycle.views_slideshow.inc
@@ -5,7 +5,7 @@
  * The default options available with Views Slideshow: cycle.
  */
 
-function views_slideshow_cycle_views_slideshow_slideshow_types() {
+function views_slideshow_cycle_views_slideshow_slideshow_info() {
   $options = array(
     'views_slideshow_cycle' => array(
       'name' => t('Cycle'),
diff --git a/theme/views_slideshow.theme.inc b/theme/views_slideshow.theme.inc
index e0351ae..2f4e313 100644
--- a/theme/views_slideshow.theme.inc
+++ b/theme/views_slideshow.theme.inc
@@ -34,7 +34,7 @@ function template_preprocess_views_slideshow(&$vars) {
   
   // Pull all widget info and slideshow info and merge them together.
   $widgets = module_invoke_all('views_slideshow_widget_info');
-  $slideshows = module_invoke_all('views_slideshow_slideshow_types');
+  $slideshows = module_invoke_all('views_slideshow_slideshow_info');
   $addons = array_merge($widgets, $slideshows);
   
   // Loop through all the addons and call their methods if needed.
@@ -70,7 +70,7 @@ function template_preprocess_views_slideshow(&$vars) {
   // Make sure $skin_info has all the values.
   $skin_info += array(
     'class' => 'default',
-    'title' => t('Untitled skin'),
+    'name' => t('Untitled skin'),
     'module' => 'views_slideshow',
     'path' => '',
     'stylesheets' => array(),
diff --git a/views_slideshow.api.php b/views_slideshow.api.php
index 25b514f..cfdbecd 100644
--- a/views_slideshow.api.php
+++ b/views_slideshow.api.php
@@ -16,7 +16,7 @@
  * @return
  *  Associative array of slideshow type and its information.
  */
-function hook_views_slideshow_slideshow_types() {
+function hook_views_slideshow_slideshow_info() {
   $options = array(
     'views_slideshow_cycle' => array(
       'name' => t('Cycle'),
@@ -102,10 +102,10 @@ function hook_views_slideshow_options_form_submit($form, &$form_state) {
 /**
  * Define slideshow skins to be available to the end user.
  */
-function hook_views_slideshow_skins() {
+function hook_views_slideshow_skin_info() {
   return array(
     'default' => array(
-      'title' => t('Default'),
+      'name' => t('Default'),
     ),
   );
 }
@@ -176,7 +176,7 @@ function [widget-type]_views_slideshow_widget_form_options(&$form, $form_state,
 /**
  * Hook called by the pager widget to configure it, the fields that should be shown.
  */
-function hook_views_slideshow_widget_pager_settings($view) {
+function hook_views_slideshow_widget_pager_info($view) {
 }
 
 /**
@@ -186,5 +186,17 @@ function [widget-type]_views_slideshow_widget_pager_form_options(&$form, &$form_
 }
 
 /**
+ * Hook called by the controls widget to configure it, the fields that should be shown.
+ */
+function hook_views_slideshow_widget_controls_info($view) {
+}
+
+/**
+ * Hook called by the controls widget to add form items.
+ */
+function [widget-type]_views_slideshow_widget_controls_form_options(&$form, &$form_state, &$view, $defaults, $dependency) {  
+}
+
+/**
  * @} End of "addtogroup hooks".
  */
diff --git a/views_slideshow.module b/views_slideshow.module
index 856bae4..6cd43a4 100644
--- a/views_slideshow.module
+++ b/views_slideshow.module
@@ -97,12 +97,12 @@ function views_slideshow_init() {
 }
 
 /**
- * Implementation of hook_views_slideshow_skins().
+ * Implementation of hook_views_slideshow_skin_info().
  */
-function views_slideshow_views_slideshow_skins() {
+function views_slideshow_views_slideshow_skin_info() {
   return array(
     'default' => array(
-      'title' => t('Default'),
+      'name' => t('Default'),
     ),
   );
 }
@@ -157,11 +157,15 @@ function views_slideshow_views_slideshow_widget_info() {
  */
 function views_slideshow_pager_views_slideshow_widget_form_options(&$form, &$form_state, &$view, $defaults, $dependency) {
   // Get all the pager info from other modules.
-  // hook_views_slideshow_pager_settings($view, $option_values, $dependency_prefix)
-  $pagers = module_invoke_all('views_slideshow_widget_pager_settings', $view);
+  // hook_views_slideshow_pager_info($view, $option_values, $dependency_prefix)
+  $pagers = module_invoke_all('views_slideshow_widget_pager_info', $view);
 
   if (!empty($pagers)) {
-    asort($pagers);
+    $pager_options = array();
+    foreach($pagers as $pager_id => $pager_info) {
+      $pager_options[$pager_id] = $pager_info['name'];
+    }
+    asort($pager_options);
     
     // Create the widget type field.
     $form['type'] = array(
@@ -169,7 +173,7 @@ function views_slideshow_pager_views_slideshow_widget_form_options(&$form, &$for
       '#title' => t('Pager Type'),
       '#description' => t('Style of the pager'),
       '#default_value' => $defaults['type'],
-      '#options' => $pagers,
+      '#options' => $pager_options,
       '#states' => array(
         'visible' => array(
           ':input[name="' . $dependency . '[enable]"]' => array('checked' => TRUE),
@@ -188,7 +192,7 @@ function views_slideshow_pager_views_slideshow_widget_form_options(&$form, &$for
       $dependency,
     );
     
-    foreach ($pagers as $pager_key => $pager_title) {
+    foreach ($pagers as $pager_key => $pager_info) {
       $function = $pager_key . '_views_slideshow_widget_pager_form_options';
       if (function_exists($function)) {
         call_user_func_array($function, $arguments);
@@ -203,15 +207,17 @@ function views_slideshow_pager_views_slideshow_widget_form_options(&$form, &$for
 }
 
 /**
- * Implementation of hook_views_slideshow_pager_settings
+ * Implementation of hook_views_slideshow_widget_pager_info
  */
-function views_slideshow_views_slideshow_widget_pager_settings($view) {
+function views_slideshow_views_slideshow_widget_pager_info($view) {
   $settings = array();
   // Settings for fields pager.
   // First verfiy that the view is using fields.
   if ($view->row_plugin->uses_fields()) {
     $settings = array(
-      'views_slideshow_pager_fields' => t('Fields'),
+      'views_slideshow_pager_fields' => array(
+        'name' => t('Fields'),
+      ),
     );
   }
   
@@ -269,10 +275,14 @@ function views_slideshow_pager_fields_views_slideshow_widget_pager_form_options(
 function views_slideshow_controls_views_slideshow_widget_form_options(&$form, &$form_state, &$view, $defaults, $dependency) {
   // Get all the pager info from other modules.
   // hook_views_slideshow_controls_settings($view, $option_values, $dependency_prefix)
-  $controls = module_invoke_all('views_slideshow_widget_controls_settings', $view);
+  $controls = module_invoke_all('views_slideshow_widget_controls_info', $view);
   
   if (!empty($controls)) {
-    asort($controls);
+    $control_type_options = array();
+    foreach($controls as $control_id => $control_info) {
+      $control_type_options[$control_id] = $control_info['name'];
+    }
+    asort($control_type_options);
     
     // Create the widget type field.
     $form['type'] = array(
@@ -280,7 +290,7 @@ function views_slideshow_controls_views_slideshow_widget_form_options(&$form, &$
       '#title' => t('Controls Type'),
       '#description' => t('Style of the controls'),
       '#default_value' => $defaults['type'],
-      '#options' => $controls,
+      '#options' => $control_type_options,
       '#states' => array(
         'visible' => array(
           ':input[name="' . $dependency . '[enable]"]' => array('checked' => TRUE),
@@ -299,7 +309,7 @@ function views_slideshow_controls_views_slideshow_widget_form_options(&$form, &$
       $dependency,
     );
     
-    foreach ($controls as $control_key => $control_title) {
+    foreach ($controls as $control_key => $control_info) {
       $function = $control_key . '_views_slideshow_widget_controls_form_options';
       if (function_exists($function)) {
         call_user_func_array($function, $arguments);
@@ -314,14 +324,14 @@ function views_slideshow_controls_views_slideshow_widget_form_options(&$form, &$
 }
 
 /**
- * Implementation of hook_views_slideshow_controls_settings
+ * Implementation of hook_views_slideshow_controls_info
  */
-function views_slideshow_views_slideshow_widget_controls_settings($view) {
-  $settings = array(
-    'views_slideshow_controls_text' => t('Text'),
+function views_slideshow_views_slideshow_widget_controls_info($view) {
+  return array(
+    'views_slideshow_controls_text' => array(
+      'name' => t('Text'),
+    )
   );
-  
-  return $settings;
 }
 
 /**
@@ -335,7 +345,7 @@ function views_slideshow_views_slideshow_option_definition() {
   $options['skin_info'] = array(
     'default' => array(
       'class' => 'default',
-      'title' => t('Untitled skin'),
+      'name' => t('Untitled skin'),
       'module' => 'views_slideshow',
       'path' => '',
       'stylesheets' => array(),
diff --git a/views_slideshow_plugin_style_slideshow.inc b/views_slideshow_plugin_style_slideshow.inc
index 4d4ccd2..fd62933 100644
--- a/views_slideshow_plugin_style_slideshow.inc
+++ b/views_slideshow_plugin_style_slideshow.inc
@@ -42,7 +42,7 @@ class views_slideshow_plugin_style_slideshow extends views_plugin_style_list {
     // Get a list of all available skins.
     $skin_info = $this->views_slideshow_get_skins();
     foreach ($skin_info as $skin => $info) {
-      $skins[$skin] = $info['title'];
+      $skins[$skin] = $info['name'];
     }
     asort($skins);
   
@@ -63,7 +63,7 @@ class views_slideshow_plugin_style_slideshow extends views_plugin_style_list {
     );
     
     // Get all slideshow types.
-    $slideshows = module_invoke_all('views_slideshow_slideshow_types');
+    $slideshows = module_invoke_all('views_slideshow_slideshow_info');
     
     $slideshow_options = array();
     
@@ -264,16 +264,16 @@ class views_slideshow_plugin_style_slideshow extends views_plugin_style_list {
     if (empty($skins)) {
       $skins = array();
       
-      // Call all modules that use hook_views_slideshow_skins
-      foreach (module_implements('views_slideshow_skins') as $module) {
-        $skin_items = call_user_func($module . '_views_slideshow_skins');
+      // Call all modules that use hook_views_slideshow_skin_info
+      foreach (module_implements('views_slideshow_skin_info') as $module) {
+        $skin_items = call_user_func($module . '_views_slideshow_skin_info');
         if (isset($skin_items) && is_array($skin_items)) {
           foreach (array_keys($skin_items) as $skin) {
             // Ensure that the definition is complete, so we don't need lots
             // of error checking later.
             $skin_items[$skin] += array(
               'class' => 'default',
-              'title' => t('Untitled skin'),
+              'name' => t('Untitled skin'),
               'module' => $module,
               'path' => '',
               'stylesheets' => array(),