diff --git a/unsorted/eolian_cxx/eolian_cxx_callbacks_01.cc b/unsorted/eolian_cxx/eolian_cxx_callbacks_01.cc
index 8c41c0ea..c9334bc5 100644
--- a/unsorted/eolian_cxx/eolian_cxx_callbacks_01.cc
+++ b/unsorted/eolian_cxx/eolian_cxx_callbacks_01.cc
@@ -28,7 +28,7 @@ example_callbacks()
 {
    int count = 0;
    efl::ecore::poller poller(
-     poller.ecore_poller_constructor(ECORE_POLLER_CORE, 1,
+     poller.constructor(ECORE_POLLER_CORE, 1,
        [&count, &poller]
        {
           if (++count == 5)
diff --git a/unsorted/eolian_cxx/eolian_cxx_inherit_01.cc b/unsorted/eolian_cxx/eolian_cxx_inherit_01.cc
index 0e6fce92..bdfa3ad1 100644
--- a/unsorted/eolian_cxx/eolian_cxx_inherit_01.cc
+++ b/unsorted/eolian_cxx/eolian_cxx_inherit_01.cc
@@ -17,7 +17,7 @@ struct ColourableCircle
   : efl::eo::inherit<ColourableCircle, ::colourable>
 {
    ColourableCircle(int rgb)
-     : inherit_base(efl::eo::args<::colourable>(rgb))
+     : inherit_base(::colourable::rgb_24bits_constructor(rgb))
    {}
 
    int colour_get()
@@ -46,7 +46,7 @@ struct ColourableBar
   : efl::eo::inherit<ColourableBar, ::colourablesquare>
 {
    ColourableBar()
-     : inherit_base(efl::eo::args<::colourablesquare>(0))
+     : inherit_base(::colourable::rgb_24bits_constructor(0))
    {}
 
    int colour_get()
diff --git a/unsorted/eolian_cxx/eolian_cxx_simple_01.cc b/unsorted/eolian_cxx/eolian_cxx_simple_01.cc
index 47b98cb4..04acebb1 100644
--- a/unsorted/eolian_cxx/eolian_cxx_simple_01.cc
+++ b/unsorted/eolian_cxx/eolian_cxx_simple_01.cc
@@ -19,13 +19,13 @@ main()
 
    int r, g, b;
    ::colourable obj1(
-     obj1.colourable_rgb_24bits_constructor(0x123456)
+     obj1.rgb_24bits_constructor(0x123456)
    );
    obj1.colour_set(0xc0ffee);
    obj1.composite_colour_get(&r, &g, &b);
 
    ::colourablesquare obj2(
-     obj2.colourablesquare_size_constructor(10)
+     obj2.size_constructor(10)
    );
    obj2.composite_colour_set(r, g, b);
    obj2.size_set(11);