diff --git a/src/bin/e_int_menus.c b/src/bin/e_int_menus.c
index ef46c8af3..25438269c 100644
--- a/src/bin/e_int_menus.c
+++ b/src/bin/e_int_menus.c
@@ -1425,9 +1425,8 @@ _e_int_menus_shelves_pre_cb(void *data __UNUSED__, E_Menu *m)
 	if (s->zone->num != zone->num) continue;
 	if (s->cfg->container != (int) con->num) continue;
 
-	name = s->name;
-	if (!name) name = _("Shelf #");	
-	snprintf(buf, sizeof(buf), "%s %i", name, s->id);
+    name = e_shelf_orient_string_get (s);
+	snprintf(buf, sizeof(buf), "Shelf %s", name);
 
 	mi = e_menu_item_new(m);
 	e_menu_item_label_set(mi, buf);
diff --git a/src/bin/e_shelf.c b/src/bin/e_shelf.c
index bb3061bce..ef2068c62 100644
--- a/src/bin/e_shelf.c
+++ b/src/bin/e_shelf.c
@@ -1,7 +1,6 @@
 #include "e.h"
 
 static void _e_shelf_free(E_Shelf *es);
-static const char *_e_shelf_orient_string_get(E_Shelf *es);
 static void _e_shelf_gadcon_min_size_request(void *data, E_Gadcon *gc, Evas_Coord w, Evas_Coord h);
 static void _e_shelf_gadcon_size_request(void *data, E_Gadcon *gc, Evas_Coord w, Evas_Coord h);
 static Evas_Object *_e_shelf_gadcon_frame_request(void *data, E_Gadcon_Client *gcc, const char *style);
@@ -176,7 +175,7 @@ e_shelf_zone_new(E_Zone *zone, const char *name, const char *style, int popup, i
 				       _e_shelf_gadcon_frame_request, es);
    e_gadcon_orient(es->gadcon, E_GADCON_ORIENT_TOP);
    snprintf(buf, sizeof(buf), "e,state,orientation,%s", 
-	    _e_shelf_orient_string_get(es));
+	    e_shelf_orient_string_get(es));
    edje_object_signal_emit(es->o_base, buf, "e");
    edje_object_message_signal_process(es->o_base);
    e_gadcon_zone_set(es->gadcon, zone);
@@ -508,13 +507,71 @@ e_shelf_orient(E_Shelf *es, E_Gadcon_Orient orient)
 
    e_gadcon_orient(es->gadcon, orient);
    snprintf(buf, sizeof(buf), "e,state,orientation,%s", 
-            _e_shelf_orient_string_get(es));
+            e_shelf_orient_string_get(es));
    edje_object_signal_emit(es->o_base, buf, "e");
    edje_object_message_signal_process(es->o_base);
    e_gadcon_location_set_icon_name(es->gadcon->location, _e_shelf_orient_icon_name_get(es));
    e_zone_useful_geometry_dirty(es->zone);
 }
 
+EAPI const char *
+e_shelf_orient_string_get(E_Shelf *es)
+{
+   const char *sig = "";
+
+   switch (es->gadcon->orient)
+     {
+      case E_GADCON_ORIENT_FLOAT:
+	sig = "float";
+	break;
+      case E_GADCON_ORIENT_HORIZ:
+	sig = "horizontal";
+	break;
+      case E_GADCON_ORIENT_VERT:
+	sig = "vertical";
+	break;
+      case E_GADCON_ORIENT_LEFT:
+	sig = "left";
+	break;
+      case E_GADCON_ORIENT_RIGHT:
+	sig = "right";
+	break;
+      case E_GADCON_ORIENT_TOP:
+	sig = "top";
+	break;
+      case E_GADCON_ORIENT_BOTTOM:
+	sig = "bottom";
+	break;
+      case E_GADCON_ORIENT_CORNER_TL:
+	sig = "top_left";
+	break;
+      case E_GADCON_ORIENT_CORNER_TR:
+	sig = "top_right";
+	break;
+      case E_GADCON_ORIENT_CORNER_BL:
+	sig = "bottom_left";
+	break;
+      case E_GADCON_ORIENT_CORNER_BR:
+	sig = "bottom_right";
+	break;
+      case E_GADCON_ORIENT_CORNER_LT:
+	sig = "left_top";
+	break;
+      case E_GADCON_ORIENT_CORNER_RT:
+	sig = "right_top";
+	break;
+      case E_GADCON_ORIENT_CORNER_LB:
+	sig = "left_bottom";
+	break;
+      case E_GADCON_ORIENT_CORNER_RB:
+	sig = "right_bottom";
+	break;
+      default:
+	break;
+     }
+   return sig;
+}
+
 EAPI void
 e_shelf_position_calc(E_Shelf *es)
 {
@@ -812,64 +869,6 @@ _e_shelf_free(E_Shelf *es)
    free(es);
 }
 
-static const char *
-_e_shelf_orient_string_get(E_Shelf *es)
-{
-   const char *sig = "";
-
-   switch (es->gadcon->orient)
-     {
-      case E_GADCON_ORIENT_FLOAT:
-	sig = "float";
-	break;
-      case E_GADCON_ORIENT_HORIZ:
-	sig = "horizontal";
-	break;
-      case E_GADCON_ORIENT_VERT:
-	sig = "vertical";
-	break;
-      case E_GADCON_ORIENT_LEFT:
-	sig = "left";
-	break;
-      case E_GADCON_ORIENT_RIGHT:
-	sig = "right";
-	break;
-      case E_GADCON_ORIENT_TOP:
-	sig = "top";
-	break;
-      case E_GADCON_ORIENT_BOTTOM:
-	sig = "bottom";
-	break;
-      case E_GADCON_ORIENT_CORNER_TL:
-	sig = "top_left";
-	break;
-      case E_GADCON_ORIENT_CORNER_TR:
-	sig = "top_right";
-	break;
-      case E_GADCON_ORIENT_CORNER_BL:
-	sig = "bottom_left";
-	break;
-      case E_GADCON_ORIENT_CORNER_BR:
-	sig = "bottom_right";
-	break;
-      case E_GADCON_ORIENT_CORNER_LT:
-	sig = "left_top";
-	break;
-      case E_GADCON_ORIENT_CORNER_RT:
-	sig = "right_top";
-	break;
-      case E_GADCON_ORIENT_CORNER_LB:
-	sig = "left_bottom";
-	break;
-      case E_GADCON_ORIENT_CORNER_RB:
-	sig = "right_bottom";
-	break;
-      default:
-	break;
-     }
-   return sig;
-}
-
 static void
 _e_shelf_gadcon_min_size_request(void *data __UNUSED__, E_Gadcon *gc __UNUSED__, Evas_Coord w __UNUSED__, Evas_Coord h __UNUSED__)
 {
@@ -1067,7 +1066,7 @@ _e_shelf_gadcon_frame_request(void *data, E_Gadcon_Client *gcc, const char *styl
 	  }
      }
    snprintf(buf, sizeof(buf), "e,state,orientation,%s", 
-            _e_shelf_orient_string_get(es));
+            e_shelf_orient_string_get(es));
    edje_object_signal_emit(es->o_base, buf, "e");
    edje_object_message_signal_process(o);
    return o;
@@ -1166,9 +1165,8 @@ _e_shelf_menu_append(E_Shelf *es, E_Menu *mn)
    const char *name;
    char buf[256];
 
-   name = es->name;
-   if (!name) name = _("Shelf #");
-   snprintf(buf, sizeof(buf), "%s %i", name, es->id);
+   name = e_shelf_orient_string_get (es);
+   snprintf(buf, sizeof(buf), "Shelf %s", name);
 
    e_shelf_locked_set(es, 1);
 
diff --git a/src/bin/e_shelf.h b/src/bin/e_shelf.h
index 53fe7f2fa..6bb8c7bc6 100644
--- a/src/bin/e_shelf.h
+++ b/src/bin/e_shelf.h
@@ -64,6 +64,7 @@ EAPI void             e_shelf_layer_set(E_Shelf *es, int layer);
 EAPI void             e_shelf_save(E_Shelf *es);
 EAPI void             e_shelf_unsave(E_Shelf *es);
 EAPI void             e_shelf_orient(E_Shelf *es, E_Gadcon_Orient orient);
+EAPI const char      *e_shelf_orient_string_get(E_Shelf *es);
 EAPI void             e_shelf_position_calc(E_Shelf *es);
 EAPI void             e_shelf_style_set(E_Shelf *es, const char *style);
 EAPI void             e_shelf_popup_set(E_Shelf *es, int popup);
diff --git a/src/modules/conf_shelves/e_int_config_shelf.c b/src/modules/conf_shelves/e_int_config_shelf.c
index 4957a94a9..edc770f69 100644
--- a/src/modules/conf_shelves/e_int_config_shelf.c
+++ b/src/modules/conf_shelves/e_int_config_shelf.c
@@ -128,9 +128,8 @@ _ilist_fill(E_Config_Dialog_Data *cfdata)
 	es = l->data;
 	if (!es) continue;
 
-	label = es->name;
-	if (!label) label = _("Shelf #");
-	snprintf(buf, sizeof(buf), "%s %i", label, es->id);
+    label = e_shelf_orient_string_get (es);
+    snprintf(buf, sizeof(buf), "Shelf %s", label);
 
 	ob = e_icon_add(evas);
         switch (es->cfg->orient)