diff --git a/flag_lists.admin.inc b/flag_lists.admin.inc
index 88d0a58..121d5b9 100644
--- a/flag_lists.admin.inc
+++ b/flag_lists.admin.inc
@@ -103,7 +103,7 @@ function flag_lists_add_js($type = NULL) {
   }
 
   if (flag_lists_title_exists($name, $type)) {
-    drupal_json_output(array('error' => t('You already have a @name with this name for this type of content.', array('@name' => variable_get('flag_lists_name', t('list'))))));
+    drupal_json_output(array('error' => t('You already have a @name with this name for this type of content.', array('@name' => variable_get('flag_lists_name', 'list')))));
     exit();
   }
 
@@ -164,7 +164,7 @@ function flag_lists_form($form, $form_state, $name = NULL, $type = NULL) {
   }
   // Adding a new list.
   if (!isset($name)) {
-    drupal_set_title(t('Add a new list'));
+    drupal_set_title(t('Add a new @name', array('@name' => variable_get('flag_lists_name', 'list'))));
     $form['edit'] = array(
       '#type' => 'hidden',
       '#value' => FALSE,
@@ -175,7 +175,7 @@ function flag_lists_form($form, $form_state, $name = NULL, $type = NULL) {
   else {
     $flag = flag_lists_get_flag($name);
 
-    $title_string_name = variable_get('flag_lists_name', 'list');
+    $title_string_name = t('@name', array('@name' => variable_get('flag_lists_name', 'list')));
     $title_string = t('Edit your "@title" @name title', array('@title' => $flag->get_title(), '@name' => $title_string_name));
     drupal_set_title();
 
@@ -193,7 +193,7 @@ function flag_lists_form($form, $form_state, $name = NULL, $type = NULL) {
     '#type' => 'textfield',
     '#title' => t('Title'),
     '#default_value' => empty($flag->title) ? '' : $flag->title,
-    '#description' => t('A short, descriptive title for this @name list. Limit to 255 characters.', array('@name' => variable_get('flag_lists_name', t('list')))),
+    '#description' => t('A short, descriptive title for this @name list. Limit to 255 characters.', array('@name' => variable_get('flag_lists_name', 'list'))),
     '#maxlength' => 255,
     '#required' => TRUE,
     '#access' => empty($flag->locked['title']),
@@ -216,12 +216,12 @@ function flag_lists_form($form, $form_state, $name = NULL, $type = NULL) {
 function flag_lists_form_validate($form, $form_state) {
   // Ensure 255 charactor or less name.
   if (drupal_strlen($form_state['values']['title']) > 255) {
-    form_set_error('name', t('The @name title may only be 255 characters long.', array('@name' => variable_get('flag_lists_name', t('list')))));
+    form_set_error('name', t('The @name title may only be 255 characters long.', array('@name' => variable_get('flag_lists_name', 'list'))));
   }
   // Ensure the machine name is unique.
   if (!$form_state['values']['edit']) {
     if (flag_lists_title_exists($form_state['values']['title'], $form_state['values']['type'])) {
-      form_set_error('title', t('You already have a @name with this name for this type of content.', array('@name' => variable_get('flag_lists_name', t('list')))));
+      form_set_error('title', t('You already have a @name with this name for this type of content.', array('@name' => variable_get('flag_lists_name', 'list'))));
     }
   }
 }
@@ -289,7 +289,7 @@ function flag_lists_settings_form($form, $form_state) {
   $form['flag_lists_name'] = array(
     '#type' => 'textfield',
     '#title' => t('Substitute "list" with your own terminology'),
-    '#default_value' => variable_get('flag_lists_name', t('list')),
+    '#default_value' => t('@name', array('@name' => variable_get('flag_lists_name', 'list'))),
     '#description' => t('You can choose to use another name for "list", such as "favorites" or "bookmarks". Lowercase and plural names usually work best.'),
     '#required' => TRUE,
   );
@@ -361,7 +361,7 @@ function flag_lists_delete_confirm_submit($form, &$form_state) {
  * Form to create a new template.
  */
 function flag_lists_create_template_form($form, $form_state) {
-  drupal_set_title(t('Add a new list template'));
+  drupal_set_title(t('Add a new @name template', array('@name' => variable_get('flag_lists_name', 'list'))));
   $form['help'] = array(
     '#value' => t('This form creates a new, blank list template. After saving, you will be able to configure further options.'),
   );
diff --git a/flag_lists.module b/flag_lists.module
index aeccd0e..bd6b865 100644
--- a/flag_lists.module
+++ b/flag_lists.module
@@ -123,7 +123,7 @@ function flag_lists_menu() {
   );
 
   $items['user/%user/flag/lists'] = array(
-    'title' => ucfirst(variable_get('flag_lists_name', 'list')),
+    'title' =>drupal_ucfirst(variable_get('flag_lists_name', 'list')),
     'page callback' => 'flag_lists_user_page',
     'page arguments' => array(1),
     'access callback' => 'user_access',
@@ -131,7 +131,8 @@ function flag_lists_menu() {
     'type' => MENU_LOCAL_TASK,
   );
   $items['user/%user/flag/lists/%'] = array(
-    'title' => ucfirst(variable_get('flag_lists_name', 'list')) . ' content',
+    'title' =>drupal_ucfirst(variable_get('flag_lists_name', 'list') 
+      . ' ' . 'content'),
     'page callback' => 'flag_lists_user_list',
     'page arguments' => array(1, 4),
     'access callback' => 'user_access',
@@ -222,7 +223,7 @@ function theme_flag_lists_user_list($variables) {
   }
 
   $breadcrumb = menu_get_active_breadcrumb();
-  $breadcrumb[] = l(t('@name lists', array('@name' => drupal_ucfirst(variable_get('flag_lists_name', t('lists'))))), 'user/' . arg(1) . '/flag/lists');
+  $breadcrumb[] = l(t('@name lists', array('@name' => drupal_ucfirst(variable_get('flag_lists_name', 'list')))), 'user/' . arg(1) . '/flag/lists');
   drupal_set_breadcrumb($breadcrumb);
   return theme('item_list', array('items' => $items));
 }
@@ -393,17 +394,17 @@ function flag_lists_ops_form($form, &$form_state, $flo) {
   // Group items into a fieldset for easier theming.
   $form['flag_lists_' . $form_state['flo_operation']] = array(
     '#type' => 'fieldset',
-    '#title' => t('List operations'),
+    '#title' => t('@name operations', array( '@name' =>  drupal_ucfirst( variable_get('flag_lists_name', 'list')))),
     '#tree' => TRUE,
     '#attributes' => array('class' => array('flag-lists-ops-fieldset')),
   );
   switch ($flo->options['flo']['operation']) {
     case 'unflag':
-      $null_text = 'Remove from a list';
+      $null_text = t('Remove from a @name', array('@name' => variable_get('flag_lists_name', 'list')));
       $operation = 'unflag';
       $form['flag_lists_' . $form_state['flo_operation']]['list'] = array(
         '#type' => 'button',
-        '#value' => t('Remove from list'),
+        '#value' => t('Remove from @name', array('@name' => variable_get('flag_lists_name', 'list'))),
         '#ajax' => array(
           'callback' => 'flag_lists_ops_form_ajax_callback',
           'wrapper' => 'flag-list-ops-container-' . $flo->options['flo']['operation'],
@@ -411,7 +412,7 @@ function flag_lists_ops_form($form, &$form_state, $flo) {
       );
       break;
     default:
-      $null_text = 'Add to a list';
+      $null_text = t('Add to a @name', array('@name' => variable_get('flag_lists_name', 'list')));
       $operation = 'flag';
       drupal_add_library('system', 'ui.dialog');
       $form['flag_lists_' . $form_state['flo_operation']]['list'] = array(
@@ -718,11 +719,11 @@ function flag_lists_get_content_fids() {
 function flag_lists_block_info() {
   return array(
     'flag_lists' => array(
-      'info' => t('Lists'),
+      'info' => drupal_ucfirst(t('@name', array('@name' => variable_get('flag_lists_name','list')))),
       'cache' => DRUPAL_NO_CACHE,
     ),
     'flag_lists_list' => array(
-      'info' => t('My lists'),
+      'info' => t('My @name', array('@name' => variable_get('flag_lists_name', 'list'))),
       'cache' => DRUPAL_NO_CACHE,
     ),
   );
@@ -784,7 +785,7 @@ function flag_lists_block_view($delta = '') {
     case 'flag_lists':
       if (user_access('create flag lists')) {
         $block = array(
-          'subject' => t('My lists'),
+          'subject' => t('My @name', array('@name' => variable_get('flag_lists_name', 'list'))),
           'content' => theme('flag_lists_list', array(
             'node' => NULL,
             'create' => variable_get('flag_lists_create_lists', 0),
@@ -800,7 +801,7 @@ function flag_lists_block_view($delta = '') {
         $account = user_load($user->uid);
 
         $block = array(
-          'subject' => t('My lists'),
+          'subject' => t('My @name', array('@name' => variable_get('flag_lists_name', 'list'))),
           'content' => flag_lists_user_page($account),
         );
       }
@@ -826,7 +827,7 @@ function flag_lists_set_messages(&$flag) {
   // Get the parent flag. These are cached by the flag module.
   $pflag = flag_get_flag(NULL, $flag->pfid);
   $title = $flag->title;
-  $lists_name = variable_get('flag_lists_name', t('list'));
+  $lists_name = t('@name', array('@name' => variable_get('flag_lists_name', 'list')));
   $flag->flag_short = $pflag->flag_short;
   $flag->flag_long = $pflag->flag_long;
   $flag->flag_message = $pflag->flag_message;
@@ -1375,7 +1376,7 @@ function flag_lists_fl_delete($flag, $account = NULL) {
   $flag->is_deleted = TRUE;
   module_invoke_all('flag_lists', $flag, $account);
   _flag_lists_clear_cache();
-  drupal_set_message(t('The @name @title has been deleted.', array('@name' => variable_get('flag_lists_name', t('list')), '@title' => $flag->title)));
+  drupal_set_message(t('The @name @title has been deleted.', array('@name' => variable_get('flag_lists_name', 'list'), '@title' => $flag->title)));
 }
 
 
@@ -1722,7 +1723,7 @@ function flag_lists_tokens($type, $tokens, array $data = array(), array $options
           $replacements[$original] = $flag_list->title;
           break;
         case 'term':
-          $replacements[$original] = variable_get('flag_lists_name', t('list'));
+          $replacements[$original] = variable_get('flag_lists_name', 'list');
           break;
       }
     }