diff --git a/src/bin/e_border.c b/src/bin/e_border.c
index f127796b1..36e584c15 100644
--- a/src/bin/e_border.c
+++ b/src/bin/e_border.c
@@ -1682,7 +1682,7 @@ e_border_shade(E_Border *bd, E_Direction dir)
 
 	if (e_config->border_shade_animate)
 	  {
-	     bd->shade.start = ecore_time_get();
+	     bd->shade.start = ecore_loop_time_get();
 	     bd->shading = 1;
 	     bd->changes.shading = 1;
 	     bd->changed = 1;
@@ -1780,7 +1780,7 @@ e_border_unshade(E_Border *bd, E_Direction dir)
 	  }
 	if (e_config->border_shade_animate)
 	  {
-	     bd->shade.start = ecore_time_get();
+	     bd->shade.start = ecore_loop_time_get();
 	     bd->shading = 1;
 	     bd->changes.shading = 1;
 	     bd->changed = 1;
@@ -3280,7 +3280,7 @@ e_border_ping(E_Border *bd)
    if (!e_config->ping_clients) return;
    bd->ping_ok = 0;
    ecore_x_netwm_ping_send(bd->client.win);
-   bd->ping = ecore_time_get();
+   bd->ping = ecore_loop_time_get();
    if (bd->ping_poller) ecore_poller_del(bd->ping_poller);
    bd->ping_poller = ecore_poller_add(ECORE_POLLER_CORE,
 				      e_config->ping_clients_interval,
@@ -4827,7 +4827,7 @@ _e_border_cb_sync_alarm(void *data, int ev_type, void *ev)
    bd = e_border_find_by_alarm(e->alarm);
    if (!bd) return 1;
    bd->client.netwm.sync.wait--;
-   bd->client.netwm.sync.send_time = ecore_time_get();
+   bd->client.netwm.sync.send_time = ecore_loop_time_get();
    if (bd->client.netwm.sync.wait <= 0)
      _e_border_resize_handle(bd);
    return 1;
@@ -5278,7 +5278,7 @@ _e_border_cb_mouse_move(void *data, int type, void *event)
 	Eina_List *skiplist = NULL;
 
 #if 0
-	if ((ecore_time_get() - bd->client.netwm.sync.time) > 0.5)
+	if ((ecore_loop_time_get() - bd->client.netwm.sync.time) > 0.5)
 	  bd->client.netwm.sync.wait = 0;
 	if ((bd->client.netwm.sync.request) &&
 	    (bd->client.netwm.sync.alarm) &&
@@ -5320,8 +5320,8 @@ _e_border_cb_mouse_move(void *data, int type, void *event)
 	/* ie our sync wait > 1 often - try eclipse - its slow enough to */
 	/* REALLY show how bad this is */
 	printf("SYNC %i - %3.3f\n", bd->client.netwm.sync.wait,
-	       ecore_time_get() - bd->client.netwm.sync.time);
-	if ((ecore_time_get() - bd->client.netwm.sync.time) > 0.5)
+	       ecore_loop_time_get() - bd->client.netwm.sync.time);
+	if ((ecore_loop_time_get() - bd->client.netwm.sync.time) > 0.5)
 	  bd->client.netwm.sync.wait = 0;
 	if ((bd->client.netwm.sync.request) &&
 	    (bd->client.netwm.sync.alarm) &&
@@ -7381,7 +7381,7 @@ _e_border_shade_animator(void *data)
    double dt, val;
    double dur = bd->client.h / e_config->border_shade_speed;
 
-   dt = ecore_time_get() - bd->shade.start;
+   dt = ecore_loop_time_get() - bd->shade.start;
    val = dt / dur;
 
    if (val < 0.0) val = 0.0;
@@ -7749,7 +7749,7 @@ _e_border_resize_begin(E_Border *bd)
 	bd->client.netwm.sync.alarm = ecore_x_sync_alarm_new(bd->client.netwm.sync.counter);
 	bd->client.netwm.sync.serial = 0;
 	bd->client.netwm.sync.wait = 0;
-	bd->client.netwm.sync.send_time = ecore_time_get();
+	bd->client.netwm.sync.send_time = ecore_loop_time_get();
      }
    if (e_config->resize_info_follows)
      e_move_resize_object_coords_set(bd->x + bd->fx.x, bd->y + bd->fx.y, bd->w, bd->h); 
@@ -7837,7 +7837,7 @@ _e_border_move_begin(E_Border *bd)
 	bd->client.netwm.sync.alarm = ecore_x_sync_alarm_new(bd->client.netwm.sync.counter);
 	bd->client.netwm.sync.serial = 0;
 	bd->client.netwm.sync.wait = 0;
-	bd->client.netwm.sync.time = ecore_time_get();
+	bd->client.netwm.sync.time = ecore_loop_time_get();
      }
 #endif
    if (e_config->move_info_follows)
diff --git a/src/bin/e_desk.c b/src/bin/e_desk.c
index 733bda436..8d16c0614 100644
--- a/src/bin/e_desk.c
+++ b/src/bin/e_desk.c
@@ -559,7 +559,7 @@ _e_desk_show_begin(E_Desk *desk, int mode, int dx, int dy)
    E_Border *bd;
    double t;
 
-   t = ecore_time_get();
+   t = ecore_loop_time_get();
    bl = e_container_border_list_first(desk->zone->container);
    while ((bd = e_container_border_list_next(bl)))
      {
@@ -655,7 +655,7 @@ _e_desk_show_animator(void *data)
    double t, dt, spd;
 
    desk = data;
-   t = ecore_time_get();
+   t = ecore_loop_time_get();
    dt = -1.0;
    spd = e_config->desk_flip_animate_time;
    bl = e_container_border_list_first(desk->zone->container);
@@ -695,7 +695,7 @@ _e_desk_hide_begin(E_Desk *desk, int mode, int dx, int dy)
    E_Border *bd;
    double t;
 
-   t = ecore_time_get();
+   t = ecore_loop_time_get();
    bl = e_container_border_list_first(desk->zone->container);
    while ((bd = e_container_border_list_next(bl)))
      {
@@ -791,7 +791,7 @@ _e_desk_hide_animator(void *data)
    double t, dt, spd;
 
    desk = data;
-   t = ecore_time_get();
+   t = ecore_loop_time_get();
    dt = -1.0;
    spd = e_config->desk_flip_animate_time;
    bl = e_container_border_list_first(desk->zone->container);
diff --git a/src/bin/e_focus.c b/src/bin/e_focus.c
index cf4e1d07c..f94babfd4 100644
--- a/src/bin/e_focus.c
+++ b/src/bin/e_focus.c
@@ -64,7 +64,7 @@ e_focus_event_mouse_out(E_Border* bd)
 	 * since we entered root, we are ignoring mouse in's on the root
 	 * container for a bit after the mosue may have entered it
 	 */
-	if ((ecore_time_get() - e_grabinput_last_focus_time_get()) > 0.2)
+	if ((ecore_loop_time_get() - e_grabinput_last_focus_time_get()) > 0.2)
 	  {
 	     if (!bd->lock_focus_in)
 	       e_border_focus_set(bd, 0, 1);
diff --git a/src/bin/e_grabinput.c b/src/bin/e_grabinput.c
index a84b22991..3bcf7b649 100644
--- a/src/bin/e_grabinput.c
+++ b/src/bin/e_grabinput.c
@@ -132,5 +132,5 @@ _e_grabinput_focus(Ecore_X_Window win, E_Focus_Method method)
       default:
 	break;
      }
-   last_focus_time = ecore_time_get();
+   last_focus_time = ecore_loop_time_get();
 }
diff --git a/src/bin/e_menu.c b/src/bin/e_menu.c
index 42607f45b..74c8e2df4 100644
--- a/src/bin/e_menu.c
+++ b/src/bin/e_menu.c
@@ -2405,7 +2405,7 @@ _e_menu_mouse_autoscroll_check(void)
    if (_e_menu_scroll_animator) return;
    _e_menu_scroll_animator = ecore_animator_add(_e_menu_cb_scroll_animator,
 						NULL);
-   _e_menu_scroll_start = ecore_time_get();
+   _e_menu_scroll_start = ecore_loop_time_get();
 }
 
 static void
@@ -2801,7 +2801,7 @@ _e_menu_cb_scroll_animator(void *data)
    int out;
    double spd;
    
-   t = ecore_time_get();
+   t = ecore_loop_time_get();
    spd = e_config->menus_scroll_speed;
    dt = t - _e_menu_scroll_start;
    _e_menu_scroll_start = t;
diff --git a/src/bin/e_scrollframe.c b/src/bin/e_scrollframe.c
index b8804d990..29652ba68 100644
--- a/src/bin/e_scrollframe.c
+++ b/src/bin/e_scrollframe.c
@@ -449,7 +449,7 @@ _e_smart_event_mouse_down(void *data, Evas *e, Evas_Object *obj, void *event_inf
 	     sd->down.sy = y;
 	     sd->down.locked = 0;
 	     memset(&(sd->down.history[0]), 0, sizeof(sd->down.history[0]) * 20);
-	     sd->down.history[0].timestamp = ecore_time_get();
+	     sd->down.history[0].timestamp = ecore_loop_time_get();
 	     sd->down.history[0].x = ev->canvas.x;
 	     sd->down.history[0].y = ev->canvas.y;
 	  }
@@ -464,7 +464,7 @@ _e_smart_momentum_animator(void *data)
    Evas_Coord x, y, dx, dy;
    
    sd = data;
-   t = ecore_time_get();
+   t = ecore_loop_time_get();
    dt = t - sd->down.anim_start;
    if (dt >= 0.0)
      {
@@ -506,7 +506,7 @@ _e_smart_event_mouse_up(void *data, Evas *e, Evas_Object *obj, void *event_info)
 		  int i;
 		  Evas_Coord ax, ay, dx, dy, vel;
 		  
-		  t = ecore_time_get();
+		  t = ecore_loop_time_get();
 		  ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
 		  ax = ev->canvas.x;
 		  ay = ev->canvas.y;
@@ -564,7 +564,7 @@ _e_smart_event_mouse_move(void *data, Evas *e, Evas_Object *obj, void *event_inf
 	  {
 	     memmove(&(sd->down.history[1]), &(sd->down.history[0]),
 		     sizeof(sd->down.history[0]) * 19);
-	     sd->down.history[0].timestamp = ecore_time_get();
+	     sd->down.history[0].timestamp = ecore_loop_time_get();
 	     sd->down.history[0].x = ev->cur.canvas.x;
 	     sd->down.history[0].y = ev->cur.canvas.y;
 	     
diff --git a/src/bin/e_slidecore.c b/src/bin/e_slidecore.c
index a348ab5e8..108dc02d9 100644
--- a/src/bin/e_slidecore.c
+++ b/src/bin/e_slidecore.c
@@ -95,7 +95,7 @@ e_slidecore_jump(Evas_Object *obj, int num)
    if (!sd->slide_animator)
      sd->slide_animator = ecore_animator_add(_e_smart_cb_slide_animator,
 					     sd);
-   sd->slide_start = ecore_time_get();
+   sd->slide_start = ecore_loop_time_get();
 }
 
 EAPI void
@@ -115,7 +115,7 @@ _e_smart_cb_slide_animator(void *data)
    double t;
 
    sd = data;
-   t = (ecore_time_get() - sd->slide_start) / sd->slide_time;
+   t = (ecore_loop_time_get() - sd->slide_start) / sd->slide_time;
    if (t > 1.0) t = 1.0;
    t = 1.0 - t;
    t = 1.0 - (t * t * t * t); /* more t's - more curve */
@@ -170,7 +170,7 @@ _e_smart_event_mouse_up(void *data, Evas *e, Evas_Object *obj, void *event_info)
 	if (!sd->slide_animator)
 	  sd->slide_animator = ecore_animator_add(_e_smart_cb_slide_animator,
 						  sd);
-	sd->slide_start = ecore_time_get();
+	sd->slide_start = ecore_loop_time_get();
      }
 }
 
diff --git a/src/bin/e_slidesel.c b/src/bin/e_slidesel.c
index 7b79cc77e..b4226a30b 100644
--- a/src/bin/e_slidesel.c
+++ b/src/bin/e_slidesel.c
@@ -125,7 +125,7 @@ _e_smart_event_mouse_down(void *data, Evas *e, Evas_Object *obj, void *event_inf
    ev = event_info;
    if (ev->button == 1)
      {
-	sd->down_time = ecore_time_get();
+	sd->down_time = ecore_loop_time_get();
 	sd->down = 1;
 	sd->down_cancel = 0;
 	sd->down_x = ev->canvas.x;
@@ -146,7 +146,7 @@ _e_smart_event_mouse_up(void *data, Evas *e, Evas_Object *obj, void *event_info)
      {
 	double t;
 	
-	t = ecore_time_get();
+	t = ecore_loop_time_get();
 	if (!sd->down_cancel)
 	  {
 	     edje_object_signal_emit(sd->edje_obj, "e,state,slide,hint,off", "e");
@@ -179,7 +179,6 @@ _e_smart_event_mouse_move(void *data, Evas *e, Evas_Object *obj, void *event_inf
      {
 	Evas_Coord d1, d2, d;
 	
-	printf("DRAG @ %3.3f\n", ecore_time_get());
 	d1 = ev->cur.canvas.x - sd->down_x;
 	d2 = ev->cur.canvas.y - sd->down_y;
 	d = (d1 * d1) + (d2 * d2);
diff --git a/src/modules/illume/e_busywin.c b/src/modules/illume/e_busywin.c
index 19b5c62d6..6039f04d0 100644
--- a/src/modules/illume/e_busywin.c
+++ b/src/modules/illume/e_busywin.c
@@ -152,7 +152,7 @@ _e_busywin_cb_animate(void *data)
    double t, v;
    
    esw = data;
-   t = ecore_time_get() - esw->start;
+   t = ecore_loop_time_get() - esw->start;
    if (t > esw->len) t = esw->len;
    if (esw->len > 0.0)
      {
@@ -186,7 +186,7 @@ static void
 _e_busywin_slide(E_Busywin *esw, int out, double len)
 {
    if (out == esw->out) return;
-   esw->start = ecore_time_get();
+   esw->start = ecore_loop_time_get();
    esw->len = len;
    esw->out = out;
    esw->adjust_start = esw->adjust;
diff --git a/src/modules/illume/e_kbd.c b/src/modules/illume/e_kbd.c
index 6db2ca611..75bbe6304 100644
--- a/src/modules/illume/e_kbd.c
+++ b/src/modules/illume/e_kbd.c
@@ -69,7 +69,7 @@ _e_kbd_cb_animate(void *data)
    double t, v;
    
    kbd = data;
-   t = ecore_time_get() - kbd->start;
+   t = ecore_loop_time_get() - kbd->start;
    if (t > kbd->len) t = kbd->len;
    if (kbd->len > 0.0)
      {
@@ -126,7 +126,7 @@ static void
 _e_kbd_slide(E_Kbd *kbd, int visible, double len)
 {
    _e_kbd_apply_all_job_queue();
-   kbd->start = ecore_time_get();
+   kbd->start = ecore_loop_time_get();
    kbd->len = len;
    kbd->adjust_start = kbd->adjust;
    kbd->adjust_end = 0;
diff --git a/src/modules/illume/e_mod_layout.c b/src/modules/illume/e_mod_layout.c
index ad1fb617d..e86aaa6b3 100644
--- a/src/modules/illume/e_mod_layout.c
+++ b/src/modules/illume/e_mod_layout.c
@@ -207,7 +207,7 @@ _e_mod_layout_cb_effect_animator(void *data)
    double t, p;
    
    ef = data;
-   t = ecore_time_get() - ef->time_start;
+   t = ecore_loop_time_get() - ef->time_start;
    if (ef->in > 0.0)
      {
 	t /= ef->in;
@@ -262,7 +262,7 @@ _e_mod_layout_effect_slide_out(E_Border *bd, double in, int post)
    ef = E_NEW(Effect, 1);
    ef->border = bd;
    ef->animator = ecore_animator_add(_e_mod_layout_cb_effect_animator, ef);
-   ef->time_start = ecore_time_get();
+   ef->time_start = ecore_loop_time_get();
    ef->in = in;
    ef->direction = 0;
    ef->post = post;
@@ -286,7 +286,7 @@ _e_mod_layout_effect_slide_in(E_Border *bd, double in, int post)
    ef = E_NEW(Effect, 1);
    ef->border = bd;
    ef->animator = ecore_animator_add(_e_mod_layout_cb_effect_animator, ef);
-   ef->time_start = ecore_time_get();
+   ef->time_start = ecore_loop_time_get();
    ef->in = in;
    ef->direction = 1;
    ef->post = post;
diff --git a/src/modules/illume/e_slipshelf.c b/src/modules/illume/e_slipshelf.c
index 794176098..d73ba1789 100644
--- a/src/modules/illume/e_slipshelf.c
+++ b/src/modules/illume/e_slipshelf.c
@@ -677,7 +677,7 @@ _e_slipshelf_cb_animate(void *data)
    double t, v;
    
    ess = data;
-   t = ecore_time_get() - ess->start;
+   t = ecore_loop_time_get() - ess->start;
    if (t > ess->len) t = ess->len;
    if (ess->len > 0.0)
      {
@@ -717,7 +717,7 @@ static void
 _e_slipshelf_slide(E_Slipshelf *ess, int out, double len)
 {
    if (out == ess->out) return;
-   ess->start = ecore_time_get();
+   ess->start = ecore_loop_time_get();
    ess->len = len;
    ess->out = out;
    ess->adjust_start = ess->adjust;
diff --git a/src/modules/illume/e_slipwin.c b/src/modules/illume/e_slipwin.c
index 98c5d3015..b36c84dd1 100644
--- a/src/modules/illume/e_slipwin.c
+++ b/src/modules/illume/e_slipwin.c
@@ -231,7 +231,7 @@ _e_slipwin_cb_animate(void *data)
    double t, v;
    
    esw = data;
-   t = ecore_time_get() - esw->start;
+   t = ecore_loop_time_get() - esw->start;
    if (t > esw->len) t = esw->len;
    v = t / esw->len;
    v = 1.0 - v;
@@ -276,7 +276,7 @@ _e_slipwin_slide(E_Slipwin *esw, int out, double len)
    
    if (!esw->animator)
      esw->animator = ecore_animator_add(_e_slipwin_cb_animate, esw);
-   esw->start = ecore_time_get();
+   esw->start = ecore_loop_time_get();
    esw->len = len;
    esw->out = out;
    esw->adjust_start = esw->adjust;