--- fivestar.module.before	2009-07-04 20:05:51.000000000 +0200
+++ fivestar.module	2009-07-04 20:06:18.000000000 +0200
@@ -628,8 +628,8 @@
   }
 
   $suffix = fivestar_get_suffix($node->type, $tag);
-  $star_display = variable_get('fivestar_style' . $suffix, 'average');
-  $text_display = variable_get('fivestar_text' . $suffix, 'dual');
+  $star_display = variable_get('fivestar_style_' . $suffix, 'average');
+  $text_display = variable_get('fivestar_text_' . $suffix, 'dual');
 
   if ($star_display == 'average' && ($text_display == 'average' || $text_display == 'none')) {
     // Save a query and don't retrieve the user vote unnecessarily.
@@ -646,18 +646,18 @@
   );
 
   $settings = array(
-    'stars' => variable_get('fivestar_stars' . $suffix, 5),
-    'allow_clear' => variable_get('fivestar_unvote' . $suffix, FALSE),
+    'stars' => variable_get('fivestar_stars_' . $suffix, 5),
+    'allow_clear' => variable_get('fivestar_unvote_' . $suffix, FALSE),
     'style' => $star_display,
     'text' => $text_display,
     'content_type' => $content_type,
     'content_id' => $content_id,
     'tag' => 'vote',
     'autosubmit' => TRUE,
-    'title' => variable_get('fivestar_title' . $suffix, 1) ? NULL : FALSE,
-    'feedback_enable' => variable_get('fivestar_feedback' . $suffix, 1),
-    'labels_enable' => variable_get('fivestar_labels_enable' . $suffix, 1),
-    'labels' => variable_get('fivestar_labels' . $suffix, array()),
+    'title' => variable_get('fivestar_title_' . $suffix, 1) ? NULL : FALSE,
+    'feedback_enable' => variable_get('fivestar_feedback_' . $suffix, 1),
+    'labels_enable' => variable_get('fivestar_labels_enable_' . $suffix, 1),
+    'labels' => variable_get('fivestar_labels_' . $suffix, array()),
     'tag' => $tag,
   );