Index: reference/c/core/src/core_loop.c
===================================================================
--- reference/c/core/src/core_loop.c
+++ reference/c/core/src/core_loop.c
@@ -119,7 +119,7 @@
    Efl_Loop *loop;
 
    loop = ev->object;
-   version = efl_loop_efl_version_get(loop);
+   version = efl_app_efl_version_get(loop);
    printf("Running on EFL version %d.%d.%d [%s]\n\n", version->major, version->minor,
                                                       version->micro, version->build_id);
    _print_loop(loop, "Application");
Index: reference/c/net/src/net_session.c
===================================================================
--- reference/c/net/src/net_session.c
+++ reference/c/net/src/net_session.c
@@ -68,7 +68,7 @@
           "  state: %s\n"
           "  technology: %s\n"
           "  interface: '%s'\n",
-          efl_net_session_name_get(session),
+          efl_net_session_network_name_get(session),
           _state_name(efl_net_session_state_get(session)),
           _technology_name(efl_net_session_technology_get(session)),
           efl_net_session_interface_get(session));
Index: tutorial/c/eo-classes/src/example_rectangle.c
===================================================================
--- tutorial/c/eo-classes/src/example_rectangle.c
+++ tutorial/c/eo-classes/src/example_rectangle.c
@@ -14,7 +14,7 @@
 }
 
 EOLIAN static int
-_example_rectangle_width_get(Eo *obj EINA_UNUSED, Example_Rectangle_Data *pd)
+_example_rectangle_width_get(const Eo *obj EINA_UNUSED, Example_Rectangle_Data *pd)
 {
    return pd->width;
 }
@@ -26,7 +26,7 @@
 }
 
 EOLIAN static int
-_example_rectangle_height_get(Eo *obj EINA_UNUSED, Example_Rectangle_Data *pd)
+_example_rectangle_height_get(const Eo *obj EINA_UNUSED, Example_Rectangle_Data *pd)
 {
    return pd->height;
 }
Index: tutorial/c/eo-inherit/src/example_rectangle.c
===================================================================
--- tutorial/c/eo-inherit/src/example_rectangle.c
+++ tutorial/c/eo-inherit/src/example_rectangle.c
@@ -14,7 +14,7 @@
 }
 
 EOLIAN static int
-_example_rectangle_width_get(Eo *obj EINA_UNUSED, Example_Rectangle_Data *pd)
+_example_rectangle_width_get(const Eo *obj EINA_UNUSED, Example_Rectangle_Data *pd)
 {
    return pd->width;
 }
@@ -26,7 +26,7 @@
 }
 
 EOLIAN static int
-_example_rectangle_height_get(Eo *obj EINA_UNUSED, Example_Rectangle_Data *pd)
+_example_rectangle_height_get(const Eo *obj EINA_UNUSED, Example_Rectangle_Data *pd)
 {
    return pd->height;
 }
Index: tutorial/c/eo-multiinherit/src/example_circle.c
===================================================================
--- tutorial/c/eo-multiinherit/src/example_circle.c
+++ tutorial/c/eo-multiinherit/src/example_circle.c
@@ -14,7 +14,7 @@
 }
 
 EOLIAN static int
-_example_circle_radius_get(Eo *obj EINA_UNUSED , Example_Circle_Data *pd)
+_example_circle_radius_get(const Eo *obj EINA_UNUSED , Example_Circle_Data *pd)
 {
    return pd->radius;
 }
Index: tutorial/c/eo-multiinherit/src/example_colored.c
===================================================================
--- tutorial/c/eo-multiinherit/src/example_colored.c
+++ tutorial/c/eo-multiinherit/src/example_colored.c
@@ -17,7 +17,7 @@
 }
 
 EOLIAN static void
-_example_colored_color_get(Eo *obj EINA_UNUSED, Example_Colored_Data *pd,
+_example_colored_color_get(const Eo *obj EINA_UNUSED, Example_Colored_Data *pd,
                            int *red, int *green, int *blue)
 {
    if (red)
Index: tutorial/c/eo-multiinherit/src/example_rectangle.c
===================================================================
--- tutorial/c/eo-multiinherit/src/example_rectangle.c
+++ tutorial/c/eo-multiinherit/src/example_rectangle.c
@@ -14,7 +14,7 @@
 }
 
 EOLIAN static int
-_example_rectangle_width_get(Eo *obj EINA_UNUSED, Example_Rectangle_Data *pd)
+_example_rectangle_width_get(const Eo *obj EINA_UNUSED, Example_Rectangle_Data *pd)
 {
    return pd->width;
 }
@@ -26,7 +26,7 @@
 }
 
 EOLIAN static int
-_example_rectangle_height_get(Eo *obj EINA_UNUSED, Example_Rectangle_Data *pd)
+_example_rectangle_height_get(const Eo *obj EINA_UNUSED, Example_Rectangle_Data *pd)
 {
    return pd->height;
 }
Index: tutorial/c/lifecycle/src/lifecycle_main.c
===================================================================
--- tutorial/c/lifecycle/src/lifecycle_main.c
+++ tutorial/c/lifecycle/src/lifecycle_main.c
@@ -21,11 +21,11 @@
      {
         case 0:
           // First call, pause the application
-          efl_event_callback_call(loop, EFL_LOOP_EVENT_PAUSE, NULL);
+          efl_event_callback_call(loop, EFL_APP_EVENT_PAUSE, NULL);
           break;
         case 1:
           // Second call, resume the application
-          efl_event_callback_call(loop, EFL_LOOP_EVENT_RESUME, NULL);
+          efl_event_callback_call(loop, EFL_APP_EVENT_RESUME, NULL);
           break;
         default:
           // Last call, exit the application