Index: mailchimp.admin.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/mailchimp/Attic/mailchimp.admin.inc,v
retrieving revision 1.1.2.1
diff -u -p -r1.1.2.1 mailchimp.admin.inc
--- mailchimp.admin.inc	29 Jun 2010 00:07:21 -0000	1.1.2.1
+++ mailchimp.admin.inc	7 Sep 2010 18:05:52 -0000
@@ -72,6 +72,13 @@ function mailchimp_admin_settings() {
             );
           }
 
+          $form['mailchimp_lists']['mailchimp_list_'. $list['id']]['alias'] = array(
+              '#type'               => 'textfield',
+              '#title'              => 'User friendly alias (optional)',
+              '#default_value'      => $saved_list ? $saved_list->alias : '',
+              '#description'        => t('If filled in, the contents of this field will be used in place of the name listed in MailChimp when displaying the list name to users.')
+          );
+
           $form['mailchimp_lists']['mailchimp_list_'. $list['id']]['description'] = array(
               '#type'           => 'textarea',
               '#title'          => t('List Description'),
@@ -238,6 +245,7 @@ function mailchimp_admin_settings_valida
     $list->id = $form_list['list_id'];
     $list->name = $form_list['name'];
     $list->roles = array_filter($form_list['roles']);
+    $list->alias = $form_list['alias'];
     $list->description = $form_list['description'];
     $list->listtype = $form_list['listtype'];
     $list->doublein = $form_list['doublein'];
Index: mailchimp.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/mailchimp/mailchimp.module,v
retrieving revision 1.2.2.1.2.3.2.8.2.64
diff -u -p -r1.2.2.1.2.3.2.8.2.64 mailchimp.module
--- mailchimp.module	29 Jul 2010 16:43:37 -0000	1.2.2.1.2.3.2.8.2.64
+++ mailchimp.module	7 Sep 2010 18:05:52 -0000
@@ -161,7 +161,7 @@ function mailchimp_auth_newsletter_form(
       '#prefix' => '<div class="mailchimp-newsletter-wrapper">',
       '#suffix' => '</div>'
     );
-
+    $list->name = ($list->alias != NULL) ? $list->alias : $list->name;
     $form['wrapper'. $list->id]['mailchimp_list_'. $list->id] = array(
         '#type'           => 'checkbox',
         '#title'          => t('Subscribe to the @newsletter newsletter', array('@newsletter' => $list->name)),
@@ -429,6 +429,7 @@ function mailchimp_subscribe_anon_form_a
   
   $lists =_mailchimp_get_available_lists($user);
   foreach ($lists as $list) {
+    $list->name = ($list->alias != NULL) ? $list->alias : $list->name;
     $form['mailchimp_lists'][$list->id] = array(
       '#type' => 'fieldset',
       '#title' => t('@name', array('@name' => $list->name)),
@@ -838,6 +839,7 @@ function _mailchimp_subscribe_user($list
       $action = 'updated in';
       $success = $q->listUpdateMember($list->id, $email, $merge_vars);
       if($success && $message){
+        $list->name = ($list->alias != NULL) ? $list->alias : $list->name;
         drupal_set_message(t('You have updated your settings in %list.', array('%list' => $list->name)));
       }
     }
@@ -849,6 +851,7 @@ function _mailchimp_subscribe_user($list
         drupal_set_message(t('You have chosen to subscribe to %list. An email will be sent to your address. Click the link in the email to confirm the subscription.', array('%list' => $list->name)));
       }
       elseif ($message && $success) {
+        $list->name = ($list->alias != NULL) ? $list->alias : $list->name;
         drupal_set_message(t('You have subscribed to %list.', array('%list' => $list->name)));
       }
     }