Index: bookmarks/bookmarks.admin.inc
===================================================================
--- bookmarks/bookmarks.admin.inc	(revision 4249)
+++ bookmarks/bookmarks.admin.inc	(working copy)
@@ -522,7 +522,7 @@
     $form['menu_name'] = array(
       '#type' => 'textfield',
       '#title' => t('Menu name'),
-      '#maxsize' => MENU_MAX_MENU_NAME_LENGTH_UI,
+      '#maxsize' => BOOKMARKS_MENU_MAX_MENU_NAME_LENGTH_UI,
       '#description' => t('The machine-readable name of this menu. This text will be used for constructing the URL of the <em>menu overview</em> page for this menu. This name must contain only lowercase letters, numbers, and hyphens, and must be unique.'),
       '#required' => TRUE,
     );
@@ -622,8 +622,8 @@
   if (preg_match('/[^a-z0-9-]/', $item['menu_name'])) {
     form_set_error('menu_name', t('The menu name may only consist of lowercase letters, numbers, and hyphens.'));
   }
-  if (drupal_strlen($item['menu_name']) > MENU_MAX_MENU_NAME_LENGTH_UI) {
-    form_set_error('menu_name', format_plural(MENU_MAX_MENU_NAME_LENGTH_UI, "The menu name can't be longer than 1 character.", "The menu name can't be longer than @count characters."));
+  if (drupal_strlen($item['menu_name']) > BOOKMARKS_MENU_MAX_MENU_NAME_LENGTH_UI) {
+    form_set_error('menu_name', format_plural(BOOKMARKS_MENU_MAX_MENU_NAME_LENGTH_UI, "The menu name can't be longer than 1 character.", "The menu name can't be longer than @count characters."));
   }
   if ($form['#insert']) {
     // We will add 'bookmarks-' to the menu name to help avoid name-space conflicts.
Index: bookmarks/bookmarks.module
===================================================================
--- bookmarks/bookmarks.module	(revision 4249)
+++ bookmarks/bookmarks.module	(working copy)
@@ -10,7 +10,7 @@
  * Maximum length of menu name as entered by the user. Database length is 32
  * and we add a bookmarks- prefix.
  */
-define('MENU_MAX_MENU_NAME_LENGTH_UI', 23);
+define('BOOKMARKS_MENU_MAX_MENU_NAME_LENGTH_UI', 23);
 define('PRESETS_URL', 'bookmarks/mine/presets');
 
 /**
