From d623a30032d729cbed6e239fd4d589427e7245c7 Mon Sep 17 00:00:00 2001
From: Kai Huuhko <kai.huuhko@gmail.com>
Date: Thu, 7 Nov 2013 16:45:02 +0200
Subject: [PATCH] Follow Eo class name changes.

See commits c7addf40839c85cf2568f322a34220e8082d26f0 and
7b10fdb8f39c3b36f575dd22d26a1efe6ecd28ec
---
 TODO                                   | 1 +
 efl/edje/efl.edje_object.pxi           | 2 +-
 efl/elementary/access.pyx              | 2 +-
 efl/elementary/actionslider.pyx        | 2 +-
 efl/elementary/background.pyx          | 2 +-
 efl/elementary/box.pyx                 | 2 +-
 efl/elementary/bubble.pyx              | 2 +-
 efl/elementary/button.pyx              | 2 +-
 efl/elementary/calendar_elm.pyx        | 2 +-
 efl/elementary/check.pyx               | 2 +-
 efl/elementary/clock.pyx               | 2 +-
 efl/elementary/colorselector.pyx       | 2 +-
 efl/elementary/conformant.pyx          | 2 +-
 efl/elementary/ctxpopup.pyx            | 2 +-
 efl/elementary/datetime_elm.pyx        | 2 +-
 efl/elementary/dayselector.pyx         | 2 +-
 efl/elementary/diskselector.pyx        | 2 +-
 efl/elementary/entry.pyx               | 2 +-
 efl/elementary/fileselector.pyx        | 2 +-
 efl/elementary/fileselector_button.pyx | 2 +-
 efl/elementary/fileselector_entry.pyx  | 2 +-
 efl/elementary/flip.pyx                | 2 +-
 efl/elementary/flipselector.pyx        | 2 +-
 efl/elementary/frame.pyx               | 2 +-
 efl/elementary/gengrid.pyx             | 2 +-
 efl/elementary/genlist.pyx             | 2 +-
 efl/elementary/gesture_layer.pyx       | 2 +-
 efl/elementary/grid.pyx                | 2 +-
 efl/elementary/hover.pyx               | 2 +-
 efl/elementary/hoversel.pyx            | 2 +-
 efl/elementary/icon.pyx                | 2 +-
 efl/elementary/image.pyx               | 2 +-
 efl/elementary/index.pyx               | 2 +-
 efl/elementary/innerwindow.pyx         | 2 +-
 efl/elementary/label.pyx               | 2 +-
 efl/elementary/layout.pyx              | 2 +-
 efl/elementary/list.pyx                | 2 +-
 efl/elementary/map.pyx                 | 2 +-
 efl/elementary/mapbuf.pyx              | 2 +-
 efl/elementary/menu.pyx                | 2 +-
 efl/elementary/multibuttonentry.pyx    | 2 +-
 efl/elementary/naviframe.pyx           | 2 +-
 efl/elementary/notify.pyx              | 2 +-
 efl/elementary/object.pyx              | 3 +++
 efl/elementary/object_item.pyx         | 3 ---
 efl/elementary/panel.pyx               | 2 +-
 efl/elementary/panes.pyx               | 2 +-
 efl/elementary/photo.pyx               | 2 +-
 efl/elementary/photocam.pyx            | 2 +-
 efl/elementary/plug.pyx                | 2 +-
 efl/elementary/popup.pyx               | 2 +-
 efl/elementary/progressbar.pyx         | 2 +-
 efl/elementary/radio.pyx               | 2 +-
 efl/elementary/scroller.pyx            | 2 +-
 efl/elementary/segment_control.pyx     | 2 +-
 efl/elementary/separator.pyx           | 2 +-
 efl/elementary/slider.pyx              | 2 +-
 efl/elementary/slideshow.pyx           | 2 +-
 efl/elementary/spinner.pyx             | 2 +-
 efl/elementary/store.pyx               | 1 +
 efl/elementary/table.pyx               | 2 +-
 efl/elementary/thumb.pyx               | 2 +-
 efl/elementary/toolbar.pyx             | 2 +-
 efl/elementary/video.pyx               | 4 ++--
 efl/elementary/web.pyx                 | 2 +-
 efl/elementary/window.pyx              | 2 +-
 efl/evas/efl.evas_object_box.pxi       | 2 +-
 efl/evas/efl.evas_object_grid.pxi      | 2 ++
 efl/evas/efl.evas_object_image.pxi     | 5 +++--
 efl/evas/efl.evas_object_line.pxi      | 2 +-
 efl/evas/efl.evas_object_polygon.pxi   | 2 +-
 efl/evas/efl.evas_object_rectangle.pxi | 2 +-
 efl/evas/efl.evas_object_smart.pxi     | 3 ++-
 efl/evas/efl.evas_object_table.pxi     | 2 ++
 efl/evas/efl.evas_object_text.pxi      | 2 +-
 efl/evas/efl.evas_object_textblock.pxi | 2 +-
 efl/evas/efl.evas_object_textgrid.pxi  | 2 ++
 77 files changed, 85 insertions(+), 75 deletions(-)

diff --git a/TODO b/TODO
index 6844dc1..d4552e6 100644
--- a/TODO
+++ b/TODO
@@ -26,6 +26,7 @@ TODO
 * Add more logging
 * Evas: SmartObject needs testing, work. Make it inheritable by extension
   classes?
+* Add missing Eo type mappings, mostly in Ecore
 
 Elementary
 ==========
diff --git a/efl/edje/efl.edje_object.pxi b/efl/edje/efl.edje_object.pxi
index 05a7936..372e581 100644
--- a/efl/edje/efl.edje_object.pxi
+++ b/efl/edje/efl.edje_object.pxi
@@ -1322,4 +1322,4 @@ def on_text_change(func):
     return func
 
 
-_object_mapping_register("edje", Edje)
+_object_mapping_register("Edje", Edje)
diff --git a/efl/elementary/access.pyx b/efl/elementary/access.pyx
index 326e012..74537b2 100644
--- a/efl/elementary/access.pyx
+++ b/efl/elementary/access.pyx
@@ -140,4 +140,4 @@ cdef class Accessible(Object):
         """
         elm_access_highlight_set(self.obj)
 
-_object_mapping_register("elm_access", Accessible)
+_object_mapping_register("Elm_Access", Accessible)
diff --git a/efl/elementary/actionslider.pyx b/efl/elementary/actionslider.pyx
index 54d6f5b..615f3fb 100644
--- a/efl/elementary/actionslider.pyx
+++ b/efl/elementary/actionslider.pyx
@@ -194,4 +194,4 @@ cdef class Actionslider(LayoutClass):
         self._callback_del_full("pos_changed", _cb_string_conv, func)
 
 
-_object_mapping_register("elm_actionslider", Actionslider)
+_object_mapping_register("Elm_Actionslider", Actionslider)
diff --git a/efl/elementary/background.pyx b/efl/elementary/background.pyx
index ca43033..55c1e35 100644
--- a/efl/elementary/background.pyx
+++ b/efl/elementary/background.pyx
@@ -219,4 +219,4 @@ cdef class Background(LayoutClass):
     def load_size_set(self, w, h):
         elm_bg_load_size_set(self.obj, w, h)
 
-_object_mapping_register("elm_bg", Background)
+_object_mapping_register("Elm_Bg", Background)
diff --git a/efl/elementary/box.pyx b/efl/elementary/box.pyx
index 2eebf13..b47be39 100644
--- a/efl/elementary/box.pyx
+++ b/efl/elementary/box.pyx
@@ -487,4 +487,4 @@ cdef class Box(Object):
                            elm_box_transition_free)
 
 
-_object_mapping_register("elm_box", Box)
+_object_mapping_register("Elm_Box", Box)
diff --git a/efl/elementary/bubble.pyx b/efl/elementary/bubble.pyx
index 53aacaf..2310bfd 100644
--- a/efl/elementary/bubble.pyx
+++ b/efl/elementary/bubble.pyx
@@ -159,4 +159,4 @@ cdef class Bubble(LayoutClass):
     def callback_unfocused_del(self, func):
         self._callback_del("unfocused", func)
 
-_object_mapping_register("elm_bubble", Bubble)
+_object_mapping_register("Elm_Bubble", Bubble)
diff --git a/efl/elementary/button.pyx b/efl/elementary/button.pyx
index ad4c8d3..20ccc7d 100644
--- a/efl/elementary/button.pyx
+++ b/efl/elementary/button.pyx
@@ -193,4 +193,4 @@ cdef class Button(LayoutClass):
     def callback_unfocused_del(self, func):
         self._callback_del("unfocused", func)
 
-_object_mapping_register("elm_button", Button)
+_object_mapping_register("Elm_Button", Button)
diff --git a/efl/elementary/calendar_elm.pyx b/efl/elementary/calendar_elm.pyx
index 3b591f1..2811d1f 100644
--- a/efl/elementary/calendar_elm.pyx
+++ b/efl/elementary/calendar_elm.pyx
@@ -581,4 +581,4 @@ cdef class Calendar(LayoutClass):
     def callback_unfocused_del(self, func):
         self._callback_del("unfocused", func)
 
-_object_mapping_register("elm_calendar", Calendar)
+_object_mapping_register("Elm_Calendar", Calendar)
diff --git a/efl/elementary/check.pyx b/efl/elementary/check.pyx
index 9543ace..8824d33 100644
--- a/efl/elementary/check.pyx
+++ b/efl/elementary/check.pyx
@@ -112,4 +112,4 @@ cdef class Check(LayoutClass):
     def callback_unfocused_del(self, func):
         self._callback_del("unfocused", func)
 
-_object_mapping_register("elm_check", Check)
+_object_mapping_register("Elm_Check", Check)
diff --git a/efl/elementary/clock.pyx b/efl/elementary/clock.pyx
index 8c823b7..d707cc1 100644
--- a/efl/elementary/clock.pyx
+++ b/efl/elementary/clock.pyx
@@ -307,4 +307,4 @@ cdef class Clock(LayoutClass):
     def callback_unfocused_del(self, func):
         self._callback_del("unfocused", func)
 
-_object_mapping_register("elm_clock", Clock)
+_object_mapping_register("Elm_Clock", Clock)
diff --git a/efl/elementary/colorselector.pyx b/efl/elementary/colorselector.pyx
index 61573d9..a69a9b4 100644
--- a/efl/elementary/colorselector.pyx
+++ b/efl/elementary/colorselector.pyx
@@ -265,4 +265,4 @@ cdef class Colorselector(LayoutClass):
     def callback_unfocused_del(self, func):
         self._callback_del("unfocused", func)
 
-_object_mapping_register("elm_colorselector", Colorselector)
+_object_mapping_register("Elm_Colorselector", Colorselector)
diff --git a/efl/elementary/conformant.pyx b/efl/elementary/conformant.pyx
index fc5b996..01f57a0 100644
--- a/efl/elementary/conformant.pyx
+++ b/efl/elementary/conformant.pyx
@@ -97,4 +97,4 @@ cdef class Conformant(LayoutClass):
         self._callback_del("clipboard,state,off", func)
 
 
-_object_mapping_register("elm_conformant", Conformant)
+_object_mapping_register("Elm_Conformant", Conformant)
diff --git a/efl/elementary/ctxpopup.pyx b/efl/elementary/ctxpopup.pyx
index 0b529df..2c6cf81 100644
--- a/efl/elementary/ctxpopup.pyx
+++ b/efl/elementary/ctxpopup.pyx
@@ -314,4 +314,4 @@ cdef class Ctxpopup(LayoutClass):
     def callback_unfocused_del(self, func):
         self._callback_del("unfocused", func)
 
-_object_mapping_register("elm_ctxpopup", Ctxpopup)
+_object_mapping_register("Elm_Ctxpopup", Ctxpopup)
diff --git a/efl/elementary/datetime_elm.pyx b/efl/elementary/datetime_elm.pyx
index 82fe719..da58f14 100644
--- a/efl/elementary/datetime_elm.pyx
+++ b/efl/elementary/datetime_elm.pyx
@@ -612,4 +612,4 @@ cdef class Datetime(Object):
     def callback_unfocused_del(self, func):
         self._callback_del("unfocused", func)
 
-_object_mapping_register("elm_datetime", Datetime)
+_object_mapping_register("Elm_Datetime", Datetime)
diff --git a/efl/elementary/dayselector.pyx b/efl/elementary/dayselector.pyx
index 5dd0162..639702b 100644
--- a/efl/elementary/dayselector.pyx
+++ b/efl/elementary/dayselector.pyx
@@ -243,4 +243,4 @@ cdef class Dayselector(LayoutClass):
         self._callback_del("language,changed", func)
 
 
-_object_mapping_register("elm_dayselector", Dayselector)
+_object_mapping_register("Elm_Dayselector", Dayselector)
diff --git a/efl/elementary/diskselector.pyx b/efl/elementary/diskselector.pyx
index f668152..b2b834a 100644
--- a/efl/elementary/diskselector.pyx
+++ b/efl/elementary/diskselector.pyx
@@ -500,4 +500,4 @@ cdef class Diskselector(Object):
         return (h, v)
 
 
-_object_mapping_register("elm_diskselector", Diskselector)
+_object_mapping_register("Elm_Diskselector", Diskselector)
diff --git a/efl/elementary/entry.pyx b/efl/elementary/entry.pyx
index 00bd2d3..42842d9 100644
--- a/efl/elementary/entry.pyx
+++ b/efl/elementary/entry.pyx
@@ -2194,4 +2194,4 @@ cdef class Entry(Object):
         return (h, v)
 
 
-_object_mapping_register("elm_entry", Entry)
+_object_mapping_register("Elm_Entry", Entry)
diff --git a/efl/elementary/fileselector.pyx b/efl/elementary/fileselector.pyx
index 9ee6a45..ea2d0fa 100644
--- a/efl/elementary/fileselector.pyx
+++ b/efl/elementary/fileselector.pyx
@@ -352,4 +352,4 @@ cdef class Fileselector(LayoutClass):
         self._callback_del_full("done", _cb_string_conv, func)
 
 
-_object_mapping_register("elm_fileselector", Fileselector)
+_object_mapping_register("Elm_Fileselector", Fileselector)
diff --git a/efl/elementary/fileselector_button.pyx b/efl/elementary/fileselector_button.pyx
index aaa2f11..9774663 100644
--- a/efl/elementary/fileselector_button.pyx
+++ b/efl/elementary/fileselector_button.pyx
@@ -284,4 +284,4 @@ cdef class FileselectorButton(Button):
         self._callback_del_full("file,chosen", _cb_string_conv, func)
 
 
-_object_mapping_register("elm_fileselector_button", FileselectorButton)
+_object_mapping_register("Elm_Fileselector_Button", FileselectorButton)
diff --git a/efl/elementary/fileselector_entry.pyx b/efl/elementary/fileselector_entry.pyx
index 612ee3e..e5e82ec 100644
--- a/efl/elementary/fileselector_entry.pyx
+++ b/efl/elementary/fileselector_entry.pyx
@@ -411,4 +411,4 @@ cdef class FileselectorEntry(Object):
         self._callback_del_full("file,chosen", _cb_string_conv, func)
 
 
-_object_mapping_register("elm_fileselector_entry", FileselectorEntry)
+_object_mapping_register("Elm_Fileselector_Entry", FileselectorEntry)
diff --git a/efl/elementary/flip.pyx b/efl/elementary/flip.pyx
index 6373009..f4beafc 100644
--- a/efl/elementary/flip.pyx
+++ b/efl/elementary/flip.pyx
@@ -390,4 +390,4 @@ cdef class Flip(Object):
         self._callback_del("animate,done", func)
 
 
-_object_mapping_register("elm_flip", Flip)
+_object_mapping_register("Elm_Flip", Flip)
diff --git a/efl/elementary/flipselector.pyx b/efl/elementary/flipselector.pyx
index 20488db..c2880fc 100644
--- a/efl/elementary/flipselector.pyx
+++ b/efl/elementary/flipselector.pyx
@@ -409,4 +409,4 @@ cdef class FlipSelector(Object):
     def callback_unfocused_del(self, func):
         self._callback_del("unfocused", func)
 
-_object_mapping_register("elm_flipselector", FlipSelector)
+_object_mapping_register("Elm_Flipselector", FlipSelector)
diff --git a/efl/elementary/frame.pyx b/efl/elementary/frame.pyx
index 3e6fff0..623cc39 100644
--- a/efl/elementary/frame.pyx
+++ b/efl/elementary/frame.pyx
@@ -129,4 +129,4 @@ cdef class Frame(LayoutClass):
         self._callback_del("clicked", func)
 
 
-_object_mapping_register("elm_frame", Frame)
+_object_mapping_register("Elm_Frame", Frame)
diff --git a/efl/elementary/gengrid.pyx b/efl/elementary/gengrid.pyx
index 16fe207..85f6b48 100644
--- a/efl/elementary/gengrid.pyx
+++ b/efl/elementary/gengrid.pyx
@@ -1839,4 +1839,4 @@ cdef class Gengrid(Object):
         return (h, v)
 
 
-_object_mapping_register("elm_gengrid", Gengrid)
+_object_mapping_register("Elm_Gengrid", Gengrid)
diff --git a/efl/elementary/genlist.pyx b/efl/elementary/genlist.pyx
index 57701d0..3c599e0 100644
--- a/efl/elementary/genlist.pyx
+++ b/efl/elementary/genlist.pyx
@@ -721,4 +721,4 @@ include "genlist_widget.pxi"
 #class Genlist(GenlistWidget, ScrollableInterface):
     #pass
 
-_object_mapping_register("elm_genlist", Genlist)
+_object_mapping_register("Elm_Genlist", Genlist)
diff --git a/efl/elementary/gesture_layer.pyx b/efl/elementary/gesture_layer.pyx
index ccac853..3610787 100644
--- a/efl/elementary/gesture_layer.pyx
+++ b/efl/elementary/gesture_layer.pyx
@@ -861,4 +861,4 @@ cdef class GestureLayer(Object):
     #     """
     #     elm_gesture_layer_tap_longpress_cb_del(self.obj, Elm_Gesture_State state, Elm_Gesture_Event_Cb cb, void *data)
 
-_object_mapping_register("elm_gesture_layer", GestureLayer)
+_object_mapping_register("Elm_Gesture_Layer", GestureLayer)
diff --git a/efl/elementary/grid.pyx b/efl/elementary/grid.pyx
index 72d4650..7966ce9 100644
--- a/efl/elementary/grid.pyx
+++ b/efl/elementary/grid.pyx
@@ -164,4 +164,4 @@ def grid_pack_get(evasObject subobj):
     return (x, y, w, h)
 
 
-_object_mapping_register("elm_grid", Grid)
+_object_mapping_register("Elm_Grid", Grid)
diff --git a/efl/elementary/hover.pyx b/efl/elementary/hover.pyx
index b4918af..8af934a 100644
--- a/efl/elementary/hover.pyx
+++ b/efl/elementary/hover.pyx
@@ -251,4 +251,4 @@ cdef class Hover(LayoutClass):
         self._callback_del("unfocused", func)
 
 
-_object_mapping_register("elm_hover", Hover)
+_object_mapping_register("Elm_Hover", Hover)
diff --git a/efl/elementary/hoversel.pyx b/efl/elementary/hoversel.pyx
index fe9c206..6a70611 100644
--- a/efl/elementary/hoversel.pyx
+++ b/efl/elementary/hoversel.pyx
@@ -353,4 +353,4 @@ cdef class Hoversel(Button):
         self._callback_del("dismissed", func)
 
 
-_object_mapping_register("elm_hoversel", Hoversel)
+_object_mapping_register("Elm_Hoversel", Hoversel)
diff --git a/efl/elementary/icon.pyx b/efl/elementary/icon.pyx
index 26c4f36..55ad4fa 100644
--- a/efl/elementary/icon.pyx
+++ b/efl/elementary/icon.pyx
@@ -268,4 +268,4 @@ cdef class Icon(Image):
         self._callback_del("thumb,error", func)
 
 
-_object_mapping_register("elm_icon", Icon)
+_object_mapping_register("Elm_Icon", Icon)
diff --git a/efl/elementary/image.pyx b/efl/elementary/image.pyx
index ff04475..d24aa90 100644
--- a/efl/elementary/image.pyx
+++ b/efl/elementary/image.pyx
@@ -569,4 +569,4 @@ cdef class Image(Object):
         self._callback_add_full("download,error", _image_download_error_conv, func)
 
 
-_object_mapping_register("elm_image", Image)
+_object_mapping_register("Elm_Image", Image)
diff --git a/efl/elementary/index.pyx b/efl/elementary/index.pyx
index e89905d..168aaaa 100644
--- a/efl/elementary/index.pyx
+++ b/efl/elementary/index.pyx
@@ -636,4 +636,4 @@ cdef class Index(LayoutClass):
     def callback_unfocused_del(self, func):
         self._callback_del("unfocused", func)
 
-_object_mapping_register("elm_index", Index)
+_object_mapping_register("Elm_Index", Index)
diff --git a/efl/elementary/innerwindow.pyx b/efl/elementary/innerwindow.pyx
index 3a464f8..926ce5c 100644
--- a/efl/elementary/innerwindow.pyx
+++ b/efl/elementary/innerwindow.pyx
@@ -102,4 +102,4 @@ cdef class InnerWindow(LayoutClass):
             elm_win_inwin_content_unset(self.obj)
 
 
-_object_mapping_register("elm_inwin", InnerWindow)
+_object_mapping_register("Elm_Inwin", InnerWindow)
diff --git a/efl/elementary/label.pyx b/efl/elementary/label.pyx
index 9a5c490..40d3cc9 100644
--- a/efl/elementary/label.pyx
+++ b/efl/elementary/label.pyx
@@ -276,4 +276,4 @@ cdef class Label(LayoutClass):
     def callback_slide_end_del(self, func):
         self._callback_del("slide,end", func)
 
-_object_mapping_register("elm_label", Label)
+_object_mapping_register("Elm_Label", Label)
diff --git a/efl/elementary/layout.pyx b/efl/elementary/layout.pyx
index c4edb53..08e9af2 100644
--- a/efl/elementary/layout.pyx
+++ b/efl/elementary/layout.pyx
@@ -252,4 +252,4 @@ cdef class Layout(LayoutClass):
             <const_char *>part if part is not None else NULL))
 
 
-_object_mapping_register("elm_layout", Layout)
+_object_mapping_register("Elm_Layout", Layout)
diff --git a/efl/elementary/list.pyx b/efl/elementary/list.pyx
index 863471f..ab04f76 100644
--- a/efl/elementary/list.pyx
+++ b/efl/elementary/list.pyx
@@ -1026,4 +1026,4 @@ cdef class List(Object):
         elm_scroller_bounce_get(self.obj, &h, &v)
         return (h, v)
 
-_object_mapping_register("elm_list", List)
+_object_mapping_register("Elm_List", List)
diff --git a/efl/elementary/map.pyx b/efl/elementary/map.pyx
index cd0f73e..04da78f 100644
--- a/efl/elementary/map.pyx
+++ b/efl/elementary/map.pyx
@@ -1887,4 +1887,4 @@ cdef class Map(Object):
         elm_scroller_bounce_get(self.obj, &h, &v)
         return (h, v)
 
-_object_mapping_register("elm_map", Map)
+_object_mapping_register("Elm_Map", Map)
diff --git a/efl/elementary/mapbuf.pyx b/efl/elementary/mapbuf.pyx
index 1505c4e..0f13d28 100644
--- a/efl/elementary/mapbuf.pyx
+++ b/efl/elementary/mapbuf.pyx
@@ -128,4 +128,4 @@ cdef class Mapbuf(Object):
         return bool(elm_mapbuf_auto_get(self.obj))
 
 
-_object_mapping_register("elm_mapbuf", Mapbuf)
+_object_mapping_register("Elm_Mapbuf", Mapbuf)
diff --git a/efl/elementary/menu.pyx b/efl/elementary/menu.pyx
index d7bbd79..0bd9fea 100644
--- a/efl/elementary/menu.pyx
+++ b/efl/elementary/menu.pyx
@@ -442,4 +442,4 @@ cdef class Menu(Object):
         self._callback_del("dismissed", func)
 
 
-_object_mapping_register("elm_menu", Menu)
+_object_mapping_register("Elm_Menu", Menu)
diff --git a/efl/elementary/multibuttonentry.pyx b/efl/elementary/multibuttonentry.pyx
index 8e66f17..c362aff 100644
--- a/efl/elementary/multibuttonentry.pyx
+++ b/efl/elementary/multibuttonentry.pyx
@@ -401,4 +401,4 @@ cdef class MultiButtonEntry(Object):
         self._callback_del("expand,state,changed", func)
 
 
-_object_mapping_register("elm_multibuttonentry", MultiButtonEntry)
+_object_mapping_register("Elm_Multibuttonentry", MultiButtonEntry)
diff --git a/efl/elementary/naviframe.pyx b/efl/elementary/naviframe.pyx
index 5e8bcb8..8b5a3ed 100644
--- a/efl/elementary/naviframe.pyx
+++ b/efl/elementary/naviframe.pyx
@@ -533,4 +533,4 @@ cdef class Naviframe(LayoutClass):
     def callback_unfocused_del(self, func):
         self._callback_del("unfocused", func)
 
-_object_mapping_register("elm_naviframe", Naviframe)
+_object_mapping_register("Elm_Naviframe", Naviframe)
diff --git a/efl/elementary/notify.pyx b/efl/elementary/notify.pyx
index c766218..b9b2c27 100644
--- a/efl/elementary/notify.pyx
+++ b/efl/elementary/notify.pyx
@@ -265,4 +265,4 @@ cdef class Notify(Object):
         self._callback_del("block,clicked", func)
 
 
-_object_mapping_register("elm_notify", Notify)
+_object_mapping_register("Elm_Notify", Notify)
diff --git a/efl/elementary/object.pyx b/efl/elementary/object.pyx
index 902106d..1b6b119 100644
--- a/efl/elementary/object.pyx
+++ b/efl/elementary/object.pyx
@@ -1977,3 +1977,6 @@ cdef class Object(evasObject):
 
     #     """
     #     elm_access_highlight_set(self.obj)
+
+# TODO: Check if this is used correctly here
+_object_mapping_register("Elm_Widget", Object)
diff --git a/efl/elementary/object_item.pyx b/efl/elementary/object_item.pyx
index 51afb69..c3192f3 100644
--- a/efl/elementary/object_item.pyx
+++ b/efl/elementary/object_item.pyx
@@ -650,6 +650,3 @@ cdef class ObjectItem(object):
     #     def __del__(self):
     #         elm_object_item_access_order_unset(self.item)
 
-
-_object_mapping_register("elm_object_item", ObjectItem)
-
diff --git a/efl/elementary/panel.pyx b/efl/elementary/panel.pyx
index 5e0b398..f4654af 100644
--- a/efl/elementary/panel.pyx
+++ b/efl/elementary/panel.pyx
@@ -151,4 +151,4 @@ cdef class Panel(Object):
     def callback_unfocused_del(self, func):
         self._callback_del("unfocused", func)
 
-_object_mapping_register("elm_panel", Panel)
+_object_mapping_register("Elm_Panel", Panel)
diff --git a/efl/elementary/panes.pyx b/efl/elementary/panes.pyx
index 752b4c6..1ac398f 100644
--- a/efl/elementary/panes.pyx
+++ b/efl/elementary/panes.pyx
@@ -168,4 +168,4 @@ cdef class Panes(LayoutClass):
         self._callback_del("clicked,double", func)
 
 
-_object_mapping_register("elm_panes", Panes)
+_object_mapping_register("Elm_Panes", Panes)
diff --git a/efl/elementary/photo.pyx b/efl/elementary/photo.pyx
index 322c216..02d7a39 100644
--- a/efl/elementary/photo.pyx
+++ b/efl/elementary/photo.pyx
@@ -188,4 +188,4 @@ cdef class Photo(Object):
         self._callback_del("drag,end", func)
 
 
-_object_mapping_register("elm_photo", Photo)
+_object_mapping_register("Elm_Photo", Photo)
diff --git a/efl/elementary/photocam.pyx b/efl/elementary/photocam.pyx
index 65e5fb7..4f5d8fe 100644
--- a/efl/elementary/photocam.pyx
+++ b/efl/elementary/photocam.pyx
@@ -582,4 +582,4 @@ cdef class Photocam(Object):
         elm_scroller_bounce_get(self.obj, &h, &v)
         return (h, v)
 
-_object_mapping_register("elm_photocam", Photocam)
+_object_mapping_register("Elm_Photocam", Photocam)
diff --git a/efl/elementary/plug.pyx b/efl/elementary/plug.pyx
index 10cdbf7..529ddba 100644
--- a/efl/elementary/plug.pyx
+++ b/efl/elementary/plug.pyx
@@ -126,4 +126,4 @@ cdef class Plug(Object):
     #     self._callback_del("image,resized", func)
 
 
-_object_mapping_register("elm_plug", Plug)
+_object_mapping_register("Elm_Plug", Plug)
diff --git a/efl/elementary/popup.pyx b/efl/elementary/popup.pyx
index dd2b048..aa3dd55 100644
--- a/efl/elementary/popup.pyx
+++ b/efl/elementary/popup.pyx
@@ -407,4 +407,4 @@ cdef class Popup(Object):
         self._callback_del("language,changed", func)
 
 
-_object_mapping_register("elm_popup", Popup)
+_object_mapping_register("Elm_Popup", Popup)
diff --git a/efl/elementary/progressbar.pyx b/efl/elementary/progressbar.pyx
index f40df27..642373f 100644
--- a/efl/elementary/progressbar.pyx
+++ b/efl/elementary/progressbar.pyx
@@ -318,4 +318,4 @@ cdef class Progressbar(LayoutClass):
     def callback_unfocused_del(self, func):
         self._callback_del("unfocused", func)
 
-_object_mapping_register("elm_progressbar", Progressbar)
+_object_mapping_register("Elm_Progressbar", Progressbar)
diff --git a/efl/elementary/radio.pyx b/efl/elementary/radio.pyx
index c788ac7..71f5b9a 100644
--- a/efl/elementary/radio.pyx
+++ b/efl/elementary/radio.pyx
@@ -194,4 +194,4 @@ cdef class Radio(LayoutClass):
     def callback_unfocused_del(self, func):
         self._callback_del("unfocused", func)
 
-_object_mapping_register("elm_radio", Radio)
+_object_mapping_register("Elm_Radio", Radio)
diff --git a/efl/elementary/scroller.pyx b/efl/elementary/scroller.pyx
index 38ba60b..72a5d1b 100644
--- a/efl/elementary/scroller.pyx
+++ b/efl/elementary/scroller.pyx
@@ -859,4 +859,4 @@ class Scroller(Scrollable, ScrollerWidget):
 
     """
 
-_object_mapping_register("elm_scroller", Scroller)
+_object_mapping_register("Elm_Scroller", Scroller)
diff --git a/efl/elementary/segment_control.pyx b/efl/elementary/segment_control.pyx
index d7455ea..6964af7 100644
--- a/efl/elementary/segment_control.pyx
+++ b/efl/elementary/segment_control.pyx
@@ -334,4 +334,4 @@ cdef class SegmentControl(LayoutClass):
         self._callback_del_full("changed", _cb_object_item_conv, func)
 
 
-_object_mapping_register("elm_segment_control", SegmentControl)
+_object_mapping_register("Elm_Segment_Control", SegmentControl)
diff --git a/efl/elementary/separator.pyx b/efl/elementary/separator.pyx
index 8ec06f7..dae280a 100644
--- a/efl/elementary/separator.pyx
+++ b/efl/elementary/separator.pyx
@@ -62,4 +62,4 @@ cdef class Separator(LayoutClass):
         return elm_separator_horizontal_get(self.obj)
 
 
-_object_mapping_register("elm_separator", Separator)
+_object_mapping_register("Elm_Separator", Separator)
diff --git a/efl/elementary/slider.pyx b/efl/elementary/slider.pyx
index fa2de7f..8687ec3 100644
--- a/efl/elementary/slider.pyx
+++ b/efl/elementary/slider.pyx
@@ -405,4 +405,4 @@ cdef class Slider(LayoutClass):
     def callback_unfocused_del(self, func):
         self._callback_del("unfocused", func)
 
-_object_mapping_register("elm_slider", Slider)
+_object_mapping_register("Elm_Slider", Slider)
diff --git a/efl/elementary/slideshow.pyx b/efl/elementary/slideshow.pyx
index 8a1c564..0842a29 100644
--- a/efl/elementary/slideshow.pyx
+++ b/efl/elementary/slideshow.pyx
@@ -740,4 +740,4 @@ cdef class Slideshow(LayoutClass):
     def callback_unfocused_del(self, func):
         self._callback_del("unfocused", func)
 
-_object_mapping_register("elm_slideshow", Slideshow)
+_object_mapping_register("Elm_Slideshow", Slideshow)
diff --git a/efl/elementary/spinner.pyx b/efl/elementary/spinner.pyx
index c467e7f..c01389b 100644
--- a/efl/elementary/spinner.pyx
+++ b/efl/elementary/spinner.pyx
@@ -434,4 +434,4 @@ cdef class Spinner(LayoutClass):
     def callback_unfocused_del(self, func):
         self._callback_del("unfocused", func)
 
-_object_mapping_register("elm_spinner", Spinner)
+_object_mapping_register("Elm_Spinner", Spinner)
diff --git a/efl/elementary/store.pyx b/efl/elementary/store.pyx
index 7c51c92..6a27fb8 100644
--- a/efl/elementary/store.pyx
+++ b/efl/elementary/store.pyx
@@ -469,6 +469,7 @@ cdef class Store(object):
     def sorted_get(self):
         return bool(elm_store_sorted_get(self.st))
 
+_object_mapping_register("Elm_Store", Store)
 
 cdef class StoreItem(object):
 
diff --git a/efl/elementary/table.pyx b/efl/elementary/table.pyx
index 078a76f..8605619 100644
--- a/efl/elementary/table.pyx
+++ b/efl/elementary/table.pyx
@@ -200,4 +200,4 @@ def table_pack_get(evasObject subobj):
     elm_table_pack_get(subobj.obj, &x, &y, &w, &h)
     return (x, y, w, h)
 
-_object_mapping_register("elm_table", Table)
+_object_mapping_register("Elm_Table", Table)
diff --git a/efl/elementary/thumb.pyx b/efl/elementary/thumb.pyx
index 50d528d..bc8ddfd 100644
--- a/efl/elementary/thumb.pyx
+++ b/efl/elementary/thumb.pyx
@@ -534,4 +534,4 @@ cdef class Thumb(Object):
         self._callback_del("load,error", func)
 
 
-_object_mapping_register("elm_thumb", Thumb)
+_object_mapping_register("Elm_Thumb", Thumb)
diff --git a/efl/elementary/toolbar.pyx b/efl/elementary/toolbar.pyx
index cab1cb3..a341aff 100644
--- a/efl/elementary/toolbar.pyx
+++ b/efl/elementary/toolbar.pyx
@@ -1156,4 +1156,4 @@ cdef class Toolbar(Object):
         elm_scroller_bounce_get(self.obj, &h, &v)
         return (h, v)
 
-_object_mapping_register("elm_toolbar", Toolbar)
+_object_mapping_register("Elm_Toolbar", Toolbar)
diff --git a/efl/elementary/video.pyx b/efl/elementary/video.pyx
index 6abd16c..17497b8 100644
--- a/efl/elementary/video.pyx
+++ b/efl/elementary/video.pyx
@@ -254,7 +254,7 @@ cdef class Video(LayoutClass):
     def callback_unfocused_del(self, func):
         self._callback_del("unfocused", func)
 
-_object_mapping_register("elm_video", Video)
+_object_mapping_register("Elm_Video", Video)
 
 
 cdef class Player(LayoutClass):
@@ -366,4 +366,4 @@ cdef class Player(LayoutClass):
     def callback_unfocused_del(self, func):
         self._callback_del("unfocused", func)
 
-_object_mapping_register("elm_player", Player)
+_object_mapping_register("Elm_Player", Player)
diff --git a/efl/elementary/web.pyx b/efl/elementary/web.pyx
index 5362b0a..2b8e1fb 100644
--- a/efl/elementary/web.pyx
+++ b/efl/elementary/web.pyx
@@ -245,4 +245,4 @@ cdef class Web(Object):
             elm_web_console_message_hook_set(self.obj, NULL, NULL)
 
 
-_object_mapping_register("elm_web", Web)
+_object_mapping_register("Elm_Web", Web)
diff --git a/efl/elementary/window.pyx b/efl/elementary/window.pyx
index 2150a4f..94bc432 100644
--- a/efl/elementary/window.pyx
+++ b/efl/elementary/window.pyx
@@ -1740,7 +1740,7 @@ cdef class Window(Object):
     def callback_unfocused_del(self, func):
         self._callback_del("unfocused", func)
 
-_object_mapping_register("elm_win", Window)
+_object_mapping_register("Elm_Win", Window)
 
 
 cdef class StandardWindow(Window):
diff --git a/efl/evas/efl.evas_object_box.pxi b/efl/evas/efl.evas_object_box.pxi
index 85ac3ca..dbf84e9 100644
--- a/efl/evas/efl.evas_object_box.pxi
+++ b/efl/evas/efl.evas_object_box.pxi
@@ -299,4 +299,4 @@ cdef class Box(Object):
         return evas_object_box_remove_all(self.obj, clear)
 
 
-_object_mapping_register("Evas_Object_Box", Box)
+_object_mapping_register("Evas_Box", Box)
diff --git a/efl/evas/efl.evas_object_grid.pxi b/efl/evas/efl.evas_object_grid.pxi
index 00319e4..d597609 100644
--- a/efl/evas/efl.evas_object_grid.pxi
+++ b/efl/evas/efl.evas_object_grid.pxi
@@ -153,3 +153,5 @@ cdef class Grid(Object):
             list ret = eina_list_objects_to_python_list(lst)
         eina_list_free(lst)
         return ret
+
+_object_mapping_register("Evas_Grid", Grid)
diff --git a/efl/evas/efl.evas_object_image.pxi b/efl/evas/efl.evas_object_image.pxi
index f698db9..0a7a90c 100644
--- a/efl/evas/efl.evas_object_image.pxi
+++ b/efl/evas/efl.evas_object_image.pxi
@@ -1330,7 +1330,7 @@ cdef class Image(Object):
         self.event_callback_del(EVAS_CALLBACK_IMAGE_UNLOADED, func)
 
 
-_object_mapping_register("Evas_Object_Image", Image)
+_object_mapping_register("Evas_Image", Image)
 
 
 cdef void _cb_on_filled_image_resize(void *data, Evas *e,
@@ -1379,7 +1379,8 @@ cdef class FilledImage(Image):
         raise NotImplementedError("FilledImage doesn't support fill_set()")
 
 
-_object_mapping_register("Evas_Object_FilledImage", FilledImage)
+#TODO: Check if this is right
+_object_mapping_register("Evas_FilledImage", FilledImage)
 
 def extension_can_load(filename):
     """extension_can_load(unicode filename) -> bool
diff --git a/efl/evas/efl.evas_object_line.pxi b/efl/evas/efl.evas_object_line.pxi
index ee1acd3..f834aca 100644
--- a/efl/evas/efl.evas_object_line.pxi
+++ b/efl/evas/efl.evas_object_line.pxi
@@ -160,4 +160,4 @@ cdef class Line(Object):
         return (x2, y2)
 
 
-_object_mapping_register("Evas_Object_Line", Line)
+_object_mapping_register("Evas_Line", Line)
diff --git a/efl/evas/efl.evas_object_polygon.pxi b/efl/evas/efl.evas_object_polygon.pxi
index 0faf16a..b657255 100644
--- a/efl/evas/efl.evas_object_polygon.pxi
+++ b/efl/evas/efl.evas_object_polygon.pxi
@@ -61,4 +61,4 @@ cdef class Polygon(Object):
         evas_object_polygon_points_clear(self.obj)
 
 
-_object_mapping_register("Evas_Object_Polygon", Polygon)
+_object_mapping_register("Evas_Polygon", Polygon)
diff --git a/efl/evas/efl.evas_object_rectangle.pxi b/efl/evas/efl.evas_object_rectangle.pxi
index 7aea59e..cb11162 100644
--- a/efl/evas/efl.evas_object_rectangle.pxi
+++ b/efl/evas/efl.evas_object_rectangle.pxi
@@ -140,4 +140,4 @@ cdef class Rectangle(Object):
         self._set_common_params(**kargs)
 
 
-_object_mapping_register("Evas_Object_Rectangle", Rectangle)
+_object_mapping_register("Evas_Rectangle", Rectangle)
diff --git a/efl/evas/efl.evas_object_smart.pxi b/efl/evas/efl.evas_object_smart.pxi
index f5ce408..80f68fb 100644
--- a/efl/evas/efl.evas_object_smart.pxi
+++ b/efl/evas/efl.evas_object_smart.pxi
@@ -744,7 +744,7 @@ cdef class SmartObject(Object):
 #         self.member_add(obj)
 #         return obj
 
-_object_mapping_register("Evas_Object_Smart", SmartObject)
+_object_mapping_register("Evas_Smart", SmartObject)
 
 # cdef extern from "Evas.h": # hack to force type to be known
 #     cdef PyTypeObject PyEvasSmartObject_Type # hack to install metaclass
@@ -836,6 +836,7 @@ cdef class ClippedSmartObject(SmartObject):
         """Default implementation that acts on the the clipper."""
         evas_object_clip_unset(self.clipper.obj)
 
+_object_mapping_register("Evas_Smart_Clipped", ClippedSmartObject)
 
 # cdef extern from "Evas.h": # hack to force type to be known
 #     cdef PyTypeObject PyEvasClippedSmartObject_Type # hack to install metaclass
diff --git a/efl/evas/efl.evas_object_table.pxi b/efl/evas/efl.evas_object_table.pxi
index 756db09..7d4a404 100644
--- a/efl/evas/efl.evas_object_table.pxi
+++ b/efl/evas/efl.evas_object_table.pxi
@@ -285,3 +285,5 @@ cdef class Table(Object):
 
         """
         return object_from_instance(evas_object_table_child_get(self.obj, col, row))
+
+_object_mapping_register("Evas_Table", Table)
diff --git a/efl/evas/efl.evas_object_text.pxi b/efl/evas/efl.evas_object_text.pxi
index 7fde8be..f3acc54 100644
--- a/efl/evas/efl.evas_object_text.pxi
+++ b/efl/evas/efl.evas_object_text.pxi
@@ -364,4 +364,4 @@ cdef class Text(Object):
         return (l, r, t, b)
 
 
-_object_mapping_register("Evas_Object_Text", Text)
+_object_mapping_register("Evas_Text", Text)
diff --git a/efl/evas/efl.evas_object_textblock.pxi b/efl/evas/efl.evas_object_textblock.pxi
index 0fd29b6..3d933f9 100644
--- a/efl/evas/efl.evas_object_textblock.pxi
+++ b/efl/evas/efl.evas_object_textblock.pxi
@@ -205,5 +205,5 @@ cdef class Textblock(Object):
         return (l, r, t, b)
 
 
-_object_mapping_register("Evas_Object_Textblock", Textblock)
+_object_mapping_register("Evas_Textblock", Textblock)
 
diff --git a/efl/evas/efl.evas_object_textgrid.pxi b/efl/evas/efl.evas_object_textgrid.pxi
index d7482e2..6bf0805 100644
--- a/efl/evas/efl.evas_object_textgrid.pxi
+++ b/efl/evas/efl.evas_object_textgrid.pxi
@@ -477,3 +477,5 @@ cdef class Textgrid(Object):
 
         """
         evas_object_textgrid_update_add(self.obj, x, y, w, h)
+
+_object_mapping_register("Evas_Textgrid", Textgrid)