diff --git a/filter/flickr_filter.install b/filter/flickr_filter.install
index c0ba01f..2ec209f 100644
--- a/filter/flickr_filter.install
+++ b/filter/flickr_filter.install
@@ -10,4 +10,5 @@
 function flickr_filter_uninstall() {
   variable_del('flickr_filter_heading');
   variable_del('flickr_filter_default_size');
+  variable_del('flickr_filter_collapsible');
 }
diff --git a/flickr.admin.inc b/flickr.admin.inc
index 479f1eb..e436e85 100644
--- a/flickr.admin.inc
+++ b/flickr.admin.inc
@@ -301,10 +301,10 @@ function flickr_admin_settings() {
       '#title' => t('Photoset settings'),
       '#description' => t('After saving the configuration <a href="?q=admin/config/development/performance">clear the cache</a>.'),
     );
-    $form['photoset_settings']['flickr_setthumb_default_size'] = array(
+    $form['photoset_settings']['flickr_sets_thumb_default_size'] = array(
       '#type' => 'select',
       '#title' => t('Size for the photo representing a set'),
-      '#default_value' => variable_get('flickr_setthumb_default_size', 's'),
+      '#default_value' => variable_get('flickr_sets_thumb_default_size', 's'),
       '#options' => array(
         's' => t('s: 75 px square'),
         't' => t('t: 100 px on longest side'),
@@ -327,11 +327,11 @@ function flickr_admin_settings() {
       '#size' => 2,
       '#maxlength' => 2,
     );
-    $form['photoset_settings']['flickr_photos_per_set'] = array(
+    $form['photoset_settings']['flickr_sets_photos_per_set'] = array(
       '#type' => 'textfield',
       '#title' => t('Number of photos per set'),
       '#required' => TRUE,
-      '#default_value' => variable_get('flickr_photos_per_set', 6),
+      '#default_value' => variable_get('flickr_sets_photos_per_set', 6),
       '#description' => t('The number indicates how many photos display in a set on user profile pages at <em>flickr/%uid/sets/%nsid</em>. After saving the configuration <a href="?q=admin/config/development/performance">clear the cache</a>.'),
       '#size' => 2,
       '#maxlength' => 2,
@@ -400,7 +400,7 @@ function flickr_admin_settings_validate($form, &$form_state) {
   }
   if (module_exists('flickr_sets')) {
     $limit8 = trim($form_state['values']['flickr_sets_per_page']);
-    $limit9 = trim($form_state['values']['flickr_photos_per_set']);
+    $limit9 = trim($form_state['values']['flickr_sets_photos_per_set']);
   }
   if ($key && (preg_match('/^[A-Fa-f\d]{32}$/', $key) != 1)) {
     form_set_error('flickr_api_key', t('This does not appear to be a Flickr API key.'));
@@ -455,7 +455,7 @@ function flickr_admin_settings_validate($form, &$form_state) {
     }
     // Validate photos per set.
     if (!is_numeric($limit9) || $limit9 < 1) {
-      form_set_error('flickr_photos_per_set', t('Set a number from 1 to 99.'));
+      form_set_error('flickr_sets_photos_per_set', t('Set a number from 1 to 99.'));
     }
   }
 }
diff --git a/sets/flickr_sets.install b/sets/flickr_sets.install
index 40ac823..eef3f72 100644
--- a/sets/flickr_sets.install
+++ b/sets/flickr_sets.install
@@ -8,7 +8,7 @@
  * Implements hook_uninstall().
  */
 function flickr_sets_uninstall() {
-  variable_del('flickr_setthumb_default_size');
+  variable_del('flickr_sets_thumb_default_size');
   variable_del('flickr_sets_per_page');
-  variable_del('flickr_photos_per_set');
+  variable_del('flickr_sets_photos_per_set');
 }
diff --git a/sets/flickr_sets.module b/sets/flickr_sets.module
index dac32fe..8500719 100644
--- a/sets/flickr_sets.module
+++ b/sets/flickr_sets.module
@@ -124,7 +124,7 @@ function flickr_sets_photoset($account, $set) {
   // Set this to something else if you want multiple pagers.
   $element = 0;
   $pager_page_array[$element] = empty($_GET['page']) ? 0 : (int) $_GET['page'];
-  $per_page = variable_get('flickr_photos_per_set', 6);
+  $per_page = variable_get('flickr_sets_photos_per_set', 6);
 
   // Request set of photos.
   $set_response = flickr_set_load($id, $pager_page_array[$element] + 1);
@@ -184,7 +184,7 @@ function theme_flickr_sets_photosets($variables) {
       'photoset' => $photoset,
       'uid' => $uid,
       'nsid' => $nsid,
-      'size' => variable_get('flickr_setthumb_default_size', 's'),
+      'size' => variable_get('flickr_sets_thumb_default_size', 's'),
     ));
   }
   $output .= '</div>';
@@ -200,7 +200,7 @@ function theme_flickr_sets_photoset($variables) {
   $per_page = $variables['per_page'];
   $photo_arr = $variables['photo_arr'];
   $set_info = $variables['set_info'];
-  $output = theme('pager', array('quantity' => variable_get('flickr_photos_per_set', 6)));
+  $output = theme('pager', array('quantity' => variable_get('flickr_sets_photos_per_set', 6)));
   $output .= _flickr_album('photoset', $set_info['id'], $per_page, NULL, 'photos', '', '', 101, 'unsorted', 'h1', NULL, NULL, 0, NULL, $photo_arr['photoset']['page']);
   $output .= theme('pager', array('quantity' => variable_get('flickr_photos_per_page', 6)));