diff --git a/src/lib/ecore/ecore_animator.eo b/src/lib/ecore/ecore_animator.eo
index cf5642d9fd..e9a3999dda 100644
--- a/src/lib/ecore/ecore_animator.eo
+++ b/src/lib/ecore/ecore_animator.eo
@@ -1,4 +1,4 @@
-class Ecore_Animator (Eo.Base)
+class Ecore.Animator (Eo.Base)
 {
    eo_prefix: ecore_animator;
    constructors {
@@ -24,4 +24,4 @@ class Ecore_Animator (Eo.Base)
       Eo.Base.event_freeze;
       Eo.Base.event_thaw;
    }
-}
\ No newline at end of file
+}
diff --git a/src/lib/ecore/ecore_idle_enterer.eo b/src/lib/ecore/ecore_idle_enterer.eo
index b938f87402..b7f2c1e477 100644
--- a/src/lib/ecore/ecore_idle_enterer.eo
+++ b/src/lib/ecore/ecore_idle_enterer.eo
@@ -1,4 +1,4 @@
-class Ecore_Idle_Enterer (Eo.Base)
+class Ecore.Idle.Enterer (Eo.Base)
 {
    eo_prefix: ecore_idle_enterer;
    constructors {
@@ -21,4 +21,4 @@ class Ecore_Idle_Enterer (Eo.Base)
       Eo.Base.constructor;
       Eo.Base.destructor;
    }
-}
\ No newline at end of file
+}
diff --git a/src/lib/ecore/ecore_idle_exiter.eo b/src/lib/ecore/ecore_idle_exiter.eo
index a54de0def2..c9eaf39169 100644
--- a/src/lib/ecore/ecore_idle_exiter.eo
+++ b/src/lib/ecore/ecore_idle_exiter.eo
@@ -1,4 +1,4 @@
-class Ecore_Idle_Exiter (Eo.Base)
+class Ecore.Idle.Exiter (Eo.Base)
 {
    eo_prefix: ecore_idle_exiter;
    constructors {
@@ -14,4 +14,4 @@ class Ecore_Idle_Exiter (Eo.Base)
       Eo.Base.constructor;
       Eo.Base.destructor;
    }
-}
\ No newline at end of file
+}
diff --git a/src/lib/ecore/ecore_idler.eo b/src/lib/ecore/ecore_idler.eo
index e81c8efbe3..175cf1f5a6 100644
--- a/src/lib/ecore/ecore_idler.eo
+++ b/src/lib/ecore/ecore_idler.eo
@@ -1,4 +1,4 @@
-class Ecore_Idler (Eo.Base)
+class Ecore.Idler (Eo.Base)
 {
    eo_prefix: ecore_idler;
    constructors {
@@ -14,4 +14,4 @@ class Ecore_Idler (Eo.Base)
       Eo.Base.constructor;
       Eo.Base.destructor;
    }
-}
\ No newline at end of file
+}
diff --git a/src/lib/ecore/ecore_job.eo b/src/lib/ecore/ecore_job.eo
index aa524ffca8..21ed646b1f 100644
--- a/src/lib/ecore/ecore_job.eo
+++ b/src/lib/ecore/ecore_job.eo
@@ -1,4 +1,4 @@
-class Ecore_Job (Eo.Base)
+class Ecore.Job (Eo.Base)
 {
    eo_prefix: ecore_job;
    constructors {
@@ -14,4 +14,4 @@ class Ecore_Job (Eo.Base)
       Eo.Base.constructor;
       Eo.Base.destructor;
    }
-}
\ No newline at end of file
+}
diff --git a/src/lib/ecore/ecore_parent.eo b/src/lib/ecore/ecore_parent.eo
index 3faf761273..6ea1a76f93 100644
--- a/src/lib/ecore/ecore_parent.eo
+++ b/src/lib/ecore/ecore_parent.eo
@@ -1,4 +1,4 @@
-class Ecore_Parent (Eo.Base)
+class Ecore.Parent (Eo.Base)
 {
    data: null;
-}
\ No newline at end of file
+}
diff --git a/src/lib/ecore/ecore_poll.eo b/src/lib/ecore/ecore_poll.eo
index fe754f1081..266bd4e5d0 100644
--- a/src/lib/ecore/ecore_poll.eo
+++ b/src/lib/ecore/ecore_poll.eo
@@ -1,4 +1,4 @@
-class Ecore_Poller (Eo.Base)
+class Ecore.Poller (Eo.Base)
 {
    eo_prefix: ecore_poller;
    constructors {
@@ -41,4 +41,4 @@ class Ecore_Poller (Eo.Base)
       Eo.Base.constructor;
       Eo.Base.destructor;
    }
-}
\ No newline at end of file
+}
diff --git a/src/lib/ecore/ecore_timer.eo b/src/lib/ecore/ecore_timer.eo
index a5ebabca9b..5e7f20aad1 100644
--- a/src/lib/ecore/ecore_timer.eo
+++ b/src/lib/ecore/ecore_timer.eo
@@ -1,4 +1,4 @@
-class Ecore_Timer (Eo.Base)
+class Ecore.Timer (Eo.Base)
 {
    /*@ Timers are objects that will call a given callback at some point
     *  in the future. They may also optionall repeat themselves if the