diff --git a/legacy/elementary/src/lib/elm_gengrid.c b/legacy/elementary/src/lib/elm_gengrid.c
index b9c6eb3bff..82b3b87b74 100644
--- a/legacy/elementary/src/lib/elm_gengrid.c
+++ b/legacy/elementary/src/lib/elm_gengrid.c
@@ -12,7 +12,8 @@ EAPI Eo_Op ELM_OBJ_GENGRID_PAN_BASE_ID = EO_NOOP;
 
 #define MY_PAN_CLASS ELM_OBJ_GENGRID_PAN_CLASS
 
-#define MY_PAN_CLASS_NAME "elm_gengrid_pan"
+#define MY_PAN_CLASS_NAME "Elm_Gengrid_Pan"
+#define MY_PAN_CLASS_NAME_LEGACY "elm_gengrid_pan"
 
 EAPI Eo_Op ELM_OBJ_GENGRID_BASE_ID = EO_NOOP;
 
@@ -1454,7 +1455,7 @@ _gengrid_pan_class_constructor(Eo_Class *klass)
       };
       eo_class_funcs_set(klass, func_desc);
 
-      evas_smart_legacy_type_register(MY_PAN_CLASS_NAME, klass);
+      evas_smart_legacy_type_register(MY_PAN_CLASS_NAME_LEGACY, klass);
 }
 
 static const Eo_Class_Description _elm_obj_gengrid_pan_class_desc = {
diff --git a/legacy/elementary/src/lib/elm_genlist.c b/legacy/elementary/src/lib/elm_genlist.c
index f6d2ef647d..c9a1487976 100644
--- a/legacy/elementary/src/lib/elm_genlist.c
+++ b/legacy/elementary/src/lib/elm_genlist.c
@@ -15,7 +15,8 @@ EAPI Eo_Op ELM_OBJ_GENLIST_PAN_BASE_ID = EO_NOOP;
 
 #define MY_PAN_CLASS ELM_OBJ_GENLIST_PAN_CLASS
 
-#define MY_PAN_CLASS_NAME "elm_genlist_pan"
+#define MY_PAN_CLASS_NAME "Elm_Genlist_Pan"
+#define MY_PAN_CLASS_NAME_LEGACY "elm_genlist_pan"
 
 EAPI Eo_Op ELM_OBJ_GENLIST_BASE_ID = EO_NOOP;
 
@@ -2281,7 +2282,7 @@ _genlist_pan_class_constructor(Eo_Class *klass)
       };
       eo_class_funcs_set(klass, func_desc);
 
-      evas_smart_legacy_type_register(MY_PAN_CLASS_NAME, klass);
+      evas_smart_legacy_type_register(MY_PAN_CLASS_NAME_LEGACY, klass);
 }
 
 static const Eo_Class_Description _genlist_pan_class_desc = {
diff --git a/legacy/elementary/src/lib/elm_interface_scrollable.c b/legacy/elementary/src/lib/elm_interface_scrollable.c
index 6af482f1e1..f94f8f817e 100644
--- a/legacy/elementary/src/lib/elm_interface_scrollable.c
+++ b/legacy/elementary/src/lib/elm_interface_scrollable.c
@@ -386,7 +386,8 @@ EAPI Eo_Op ELM_SCROLLABLE_INTERFACE_BASE_ID = EO_NOOP;
 
 #define MY_SCROLLABLE_INTERFACE ELM_SCROLLABLE_INTERFACE
 
-#define MY_SCROLLABLE_INTERFACE_NAME "elm_interface_scrollable"
+#define MY_SCROLLABLE_INTERFACE_NAME "Elm_Interface_Scrollable"
+#define MY_SCROLLABLE_INTERFACE_NAME_LEGACY "elm_interface_scrollable"
 
 #define ELM_SCROLL_IFACE_DATA_GET_OR_RETURN(o, ptr)     \
   Elm_Scrollable_Smart_Interface_Data *ptr =            \
@@ -4702,7 +4703,7 @@ _elm_scrollable_interface_constructor(Eo_Class *klass)
       };
       eo_class_funcs_set(klass, func_desc);
 
-      evas_smart_legacy_type_register(MY_SCROLLABLE_INTERFACE_NAME, klass);
+      evas_smart_legacy_type_register(MY_SCROLLABLE_INTERFACE_NAME_LEGACY, klass);
 }
 
 static const Eo_Op_Description op_desc[] = {
diff --git a/legacy/elementary/src/lib/elm_map.c b/legacy/elementary/src/lib/elm_map.c
index e6f800fb53..6465403be4 100644
--- a/legacy/elementary/src/lib/elm_map.c
+++ b/legacy/elementary/src/lib/elm_map.c
@@ -19,7 +19,8 @@ EAPI Eo_Op ELM_OBJ_MAP_BASE_ID = EO_NOOP;
 
 #define MY_CLASS ELM_OBJ_MAP_CLASS
 
-#define MY_CLASS_NAME "elm_map"
+#define MY_CLASS_NAME "Elm_Map"
+#define MY_CLASS_NAME_LEGACY "elm_map"
 
 #define OVERLAY_CLASS_ZOOM_MAX  255
 #define MAX_CONCURRENT_DOWNLOAD 10
@@ -4208,7 +4209,7 @@ _constructor(Eo *obj, void *_pd EINA_UNUSED, va_list *list EINA_UNUSED)
 
    eo_do_super(obj, MY_CLASS, eo_constructor());
    eo_do(obj,
-         evas_obj_type_set(MY_CLASS_NAME),
+         evas_obj_type_set(MY_CLASS_NAME_LEGACY),
          evas_obj_smart_callbacks_descriptions_set(_smart_callbacks, NULL));
 #else
    eo_error_set(obj);
@@ -6556,7 +6557,7 @@ _class_constructor(Eo_Class *klass)
    };
    eo_class_funcs_set(klass, func_desc);
 
-   evas_smart_legacy_type_register(MY_CLASS_NAME, klass);
+   evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass);
 }
 
 static const Eo_Op_Description op_desc[] = {
diff --git a/legacy/elementary/src/lib/elm_systray.c b/legacy/elementary/src/lib/elm_systray.c
index bdc7bc1625..2c850e343f 100644
--- a/legacy/elementary/src/lib/elm_systray.c
+++ b/legacy/elementary/src/lib/elm_systray.c
@@ -642,7 +642,7 @@ static const Eo_Op_Description op_desc[] = {
 
 static const Eo_Class_Description class_desc = {
      EO_VERSION,
-     "elm_systray",
+     "Elm_Systray",
      EO_CLASS_TYPE_REGULAR,
      EO_CLASS_DESCRIPTION_OPS
      (&ELM_OBJ_SYSTRAY_BASE_ID, op_desc, ELM_OBJ_SYSTRAY_SUB_ID_LAST),