diff --git a/efl/elementary/layout.pxi b/efl/elementary/layout.pxi
index e35e81f..e5e1e5c 100644
--- a/efl/elementary/layout.pxi
+++ b/efl/elementary/layout.pxi
@@ -949,5 +949,5 @@ cdef class Layout(LayoutClass):
         self._set_properties_from_keyword_args(kwargs)
 
 
-_object_mapping_register("Elm.Layout", Layout)
+_object_mapping_register("Efl.Ui.Layout", Layout)
 
diff --git a/efl/elementary/panes.pxi b/efl/elementary/panes.pxi
index 4ddb316..6b23d17 100644
--- a/efl/elementary/panes.pxi
+++ b/efl/elementary/panes.pxi
@@ -204,4 +204,4 @@ cdef class Panes(LayoutClass):
         self._callback_del("clicked,double", func)
 
 
-_object_mapping_register("Elm.Panes", Panes)
+_object_mapping_register("Efl.Ui.Panes", Panes)
diff --git a/efl/elementary/photocam.pxi b/efl/elementary/photocam.pxi
index 5e59703..ea24df4 100644
--- a/efl/elementary/photocam.pxi
+++ b/efl/elementary/photocam.pxi
@@ -530,4 +530,4 @@ cdef class Photocam(Object):
         elm_scroller_bounce_get(self.obj, &h, &v)
         return (h, v)
 
-_object_mapping_register("Efl.Ui.Image.Zoomable", Photocam)
+_object_mapping_register("Efl.Ui.Image_Zoomable", Photocam)
diff --git a/efl/elementary/spinner.pxi b/efl/elementary/spinner.pxi
index 5d80c8b..0153cc5 100644
--- a/efl/elementary/spinner.pxi
+++ b/efl/elementary/spinner.pxi
@@ -410,4 +410,4 @@ cdef class Spinner(LayoutClass):
         self._callback_del("max,reached", func)
 
 
-_object_mapping_register("Elm.Spinner", Spinner)
+_object_mapping_register("Efl.Ui.Spinner", Spinner)