diff --git a/src/dialog.c b/src/dialog.c
index df48d617..d25875f8 100644
--- a/src/dialog.c
+++ b/src/dialog.c
@@ -593,8 +593,8 @@ DialogShowArranged(Dialog * d, int center)
 	if (EoGetDesk(ewin) != DesksGetCurrent())
 	   EwinMoveToDesktop(ewin, DesksGetCurrent());
 #endif
-	RaiseEwin(ewin);
-	ShowEwin(ewin);
+	EwinRaise(ewin);
+	EwinShow(ewin);
 	return;
      }
 
@@ -663,7 +663,7 @@ DialogShowArranged(Dialog * d, int center)
 
    DialogRedraw(d);
    DialogUpdate(d);
-   ShowEwin(ewin);
+   EwinShow(ewin);
 }
 
 void
@@ -687,7 +687,7 @@ DialogClose(Dialog * d)
    if (d->exit_func)
       d->exit_func(d, d->exit_val, NULL);
 
-   HideEwin(d->ewin);
+   EwinHide(d->ewin);
 }
 
 static DItem       *
diff --git a/src/ewin-ops.c b/src/ewin-ops.c
index 28e39def..67bbadf0 100644
--- a/src/ewin-ops.c
+++ b/src/ewin-ops.c
@@ -492,7 +492,7 @@ doEwinMoveResize(EWin * ewin, Desk * dsk, int x, int y, int w, int h, int flags)
    if (raise)
      {
 	EoSetFloating(ewin, floating);
-	RaiseEwin(ewin);
+	EwinRaise(ewin);
      }
 
    if (Mode.mode == MODE_NONE || Conf.movres.update_while_moving)
@@ -652,7 +652,7 @@ EwinIconify(EWin * ewin)
       ModulesSignal(ESIGNAL_EWIN_ICONIFY, ewin);
 
    ewin->state.iconified = 1;
-   HideEwin(ewin);
+   EwinHide(ewin);
 
    /* Save position at which the window was iconified */
    EwinRememberPositionSet(ewin);
@@ -733,8 +733,8 @@ EwinDeIconify1(EWin * ewin, int dx, int dy)
    ewin->state.iconified = 0;
    ewin->state.showingdesk = 0;
 
-   RaiseEwin(ewin);
-   ShowEwin(ewin);
+   EwinRaise(ewin);
+   EwinShow(ewin);
    ICCCM_DeIconify(ewin);
 
    lst = EwinListTransients(ewin, &num, 0);
@@ -1386,7 +1386,7 @@ EwinOpFullscreen(EWin * ewin, int source __UNUSED__, int on)
 		Efree(lst);
 	  }
 
-	RaiseEwin(ewin);
+	EwinRaise(ewin);
 	EwinMoveResize(ewin, x, y, w, h);
 	ewin->state.maximized_horz = ewin->state.maximized_vert = 0;
 	ewin->state.fullscreen = 1;
@@ -1414,7 +1414,7 @@ EwinOpFullscreen(EWin * ewin, int source __UNUSED__, int on)
 
 	ewin->state.fullscreen = 0;
 	EwinStateUpdate(ewin);
-	RaiseEwin(ewin);
+	EwinRaise(ewin);
 	EwinMoveResize(ewin, x, y, w, h);
      }
 
@@ -1515,7 +1515,7 @@ EwinOpRaise(EWin * ewin, int source __UNUSED__)
    gwins = ListWinGroupMembersForEwin(ewin, GROUP_ACTION_RAISE,
 				      Mode.nogroup, &num);
    for (i = 0; i < num; i++)
-      RaiseEwin(gwins[i]);
+      EwinRaise(gwins[i]);
    Efree(gwins);
 }
 
@@ -1529,7 +1529,7 @@ EwinOpLower(EWin * ewin, int source __UNUSED__)
    gwins = ListWinGroupMembersForEwin(ewin, GROUP_ACTION_LOWER,
 				      Mode.nogroup, &num);
    for (i = 0; i < num; i++)
-      LowerEwin(gwins[i]);
+      EwinLower(gwins[i]);
    Efree(gwins);
 }
 
@@ -1581,13 +1581,13 @@ EwinOpRaiseLower(EWin * ewin)
      {
 	SoundPlay("SOUND_LOWER");
 	for (j = 0; j < gnum; j++)
-	   LowerEwin(gwins[j]);
+	   EwinLower(gwins[j]);
      }
    else
      {
 	SoundPlay("SOUND_RAISE");
 	for (j = 0; j < gnum; j++)
-	   RaiseEwin(gwins[j]);
+	   EwinRaise(gwins[j]);
      }
 
    if (gwins)
@@ -1747,7 +1747,7 @@ EwinOpSetLayer(EWin * ewin, int source __UNUSED__, int layer)
 	SoundPlay("SOUND_WINDOW_CHANGE_LAYER_UP");
      }
    EoSetLayer(ewin, layer);
-   RaiseEwin(ewin);
+   EwinRaise(ewin);
    EwinStateUpdate(ewin);
    HintsSetWindowState(ewin);
    SnapshotEwinUpdate(ewin, SNAP_USE_LAYER);
@@ -1825,7 +1825,7 @@ EwinOpMoveToDesk(EWin * ewin, int source __UNUSED__, Desk * dsk, int inc)
 
    EoSetSticky(ewin, 0);
    EwinMoveToDesktop(ewin, dsk);
-   RaiseEwin(ewin);
+   EwinRaise(ewin);
    EwinBorderUpdateState(ewin);
    EwinStateUpdate(ewin);
    HintsSetWindowState(ewin);
diff --git a/src/ewins.c b/src/ewins.c
index a55a4868..0b9670fd 100644
--- a/src/ewins.c
+++ b/src/ewins.c
@@ -800,7 +800,7 @@ AddToFamily(EWin * ewin, Window win)
 	EwinOpFullscreen(ewin, OPSRC_WM, 2);
 	ewin->state.placed = 1;
 	EwinMoveToDesktopAt(ewin, dsk, EoGetX(ewin), EoGetY(ewin));
-	ShowEwin(ewin);
+	EwinShow(ewin);
 	goto done;
      }
 
@@ -894,7 +894,7 @@ AddToFamily(EWin * ewin, Window win)
 	y = Mode.events.y + 1;
 	EwinMoveToDesktopAt(ewin, dsk, x, y);
 	EwinMove(ewin, x, y);
-	ShowEwin(ewin);
+	EwinShow(ewin);
 	GrabPointerSet(VRoot.win, ECSR_GRAB, 0);
 	Mode.place.doing_manual = 1;
 	EoSetFloating(ewin, 1);	/* Causes reparenting to root */
@@ -929,7 +929,7 @@ AddToFamily(EWin * ewin, Window win)
 	FocusEnable(0);
 
 	EwinMoveToDesktopAt(ewin, dsk, fx, fy);
-	ShowEwin(ewin);
+	EwinShow(ewin);
 	ewin->req_x = x;
 	ewin->req_y = y;
 	DoIn("Slide", 0.05, EwinSlideIn, 0, ewin);
@@ -937,7 +937,7 @@ AddToFamily(EWin * ewin, Window win)
    else
      {
 	EwinMoveToDesktopAt(ewin, dsk, x, y);
-	ShowEwin(ewin);
+	EwinShow(ewin);
      }
 
  done:
@@ -1082,7 +1082,7 @@ EwinEventMapRequest(EWin * ewin, Window win)
 		     _EwinGetClientXwin(ewin));
 	     EReparentWindow(_EwinGetClientWin(ewin), ewin->win_container, 0,
 			     0);
-	     ShowEwin(ewin);
+	     EwinShow(ewin);
 	  }
 	else
 	   AddToFamily(NULL, win);
@@ -1229,9 +1229,9 @@ EwinEventConfigureRequest(EWin * ewin, XEvent * ev)
 	     if (Mode.mode == MODE_NONE)
 	       {
 		  if (xwc.stack_mode == Above)
-		     RaiseEwin(ewin);
+		     EwinRaise(ewin);
 		  else if (xwc.stack_mode == Below)
-		     LowerEwin(ewin);
+		     EwinLower(ewin);
 	       }
 	  }
 
@@ -1282,9 +1282,9 @@ EwinEventCirculateRequest(EWin * ewin, XEvent * ev)
    if (ewin)
      {
 	if (ev->xcirculaterequest.place == PlaceOnTop)
-	   RaiseEwin(ewin);
+	   EwinRaise(ewin);
 	else
-	   LowerEwin(ewin);
+	   EwinLower(ewin);
      }
    else
      {
@@ -1338,7 +1338,7 @@ EwinReparent(EWin * ewin, Win parent)
 }
 
 void
-RaiseEwin(EWin * ewin)
+EwinRaise(EWin * ewin)
 {
    static int          call_depth = 0;
    EWin              **lst;
@@ -1351,7 +1351,7 @@ RaiseEwin(EWin * ewin)
    num = EoRaise(ewin);
 
    if (EventDebug(EDBUG_TYPE_RAISELOWER))
-      Eprintf("RaiseEwin(%d) %#lx %s n=%d\n", call_depth,
+      Eprintf("EwinRaise(%d) %#lx %s n=%d\n", call_depth,
 	      _EwinGetClientXwin(ewin), EwinGetName(ewin), num);
 
    if (num == 0)		/* Quit if stacking is unchanged */
@@ -1359,7 +1359,7 @@ RaiseEwin(EWin * ewin)
 
    lst = EwinListTransients(ewin, &num, 1);
    for (i = 0; i < num; i++)
-      RaiseEwin(lst[i]);
+      EwinRaise(lst[i]);
    if (lst)
       Efree(lst);
 
@@ -1371,7 +1371,7 @@ RaiseEwin(EWin * ewin)
 }
 
 void
-LowerEwin(EWin * ewin)
+EwinLower(EWin * ewin)
 {
    static int          call_depth = 0;
    EWin              **lst;
@@ -1384,7 +1384,7 @@ LowerEwin(EWin * ewin)
    num = EoLower(ewin);
 
    if (EventDebug(EDBUG_TYPE_RAISELOWER))
-      Eprintf("LowerEwin(%d) %#lx %s n=%d\n", call_depth,
+      Eprintf("EwinLower(%d) %#lx %s n=%d\n", call_depth,
 	      _EwinGetClientXwin(ewin), EwinGetName(ewin), num);
 
    if (num == 0)		/* Quit if stacking is unchanged */
@@ -1392,7 +1392,7 @@ LowerEwin(EWin * ewin)
 
    lst = EwinListTransientFor(ewin, &num);
    for (i = 0; i < num; i++)
-      LowerEwin(lst[i]);
+      EwinLower(lst[i]);
    if (lst)
       Efree(lst);
 
@@ -1404,7 +1404,7 @@ LowerEwin(EWin * ewin)
 }
 
 void
-ShowEwin(EWin * ewin)
+EwinShow(EWin * ewin)
 {
    if (EoIsShown(ewin))
       return;
@@ -1434,7 +1434,7 @@ ShowEwin(EWin * ewin)
 }
 
 void
-HideEwin(EWin * ewin)
+EwinHide(EWin * ewin)
 {
    if (!EwinIsInternal(ewin) && (!EoIsShown(ewin) || !EwinIsMapped(ewin)))
       return;
diff --git a/src/ewins.h b/src/ewins.h
index 3ff95c65..4713dfeb 100644
--- a/src/ewins.h
+++ b/src/ewins.h
@@ -291,10 +291,10 @@ struct _ewin
 #define EWIN_CHANGE_ATTENTION   (1<<6)
 
 void                EwinShapeSet(EWin * ewin);
-void                RaiseEwin(EWin * ewin);
-void                LowerEwin(EWin * ewin);
-void                ShowEwin(EWin * ewin);
-void                HideEwin(EWin * ewin);
+void                EwinRaise(EWin * ewin);
+void                EwinLower(EWin * ewin);
+void                EwinShow(EWin * ewin);
+void                EwinHide(EWin * ewin);
 void                DetermineEwinFloat(EWin * ewin, int dx, int dy);
 EWin               *GetEwinPointerInClient(void);
 EWin               *GetEwinByCurrentPointer(void);
diff --git a/src/focus.c b/src/focus.c
index d4bc5c96..c4438bbe 100644
--- a/src/focus.c
+++ b/src/focus.c
@@ -142,7 +142,7 @@ AutoraiseTimeout(int val, void *data __UNUSED__)
 
    ewin = EwinFindByClient(val);
    if (ewin)
-      RaiseEwin(ewin);
+      EwinRaise(ewin);
 }
 
 static void
@@ -394,7 +394,7 @@ doFocusToEwin(EWin * ewin, int why)
      }
 
    if (do_raise)
-      RaiseEwin(ewin);
+      EwinRaise(ewin);
 
    if (Conf.focus.warp_always)
       do_warp = 1;
@@ -609,7 +609,7 @@ void
 FocusHandleClick(EWin * ewin, Win win)
 {
    if (Conf.focus.clickraises)
-      RaiseEwin(ewin);
+      EwinRaise(ewin);
 
    if (Conf.focus.mode == MODE_FOCUS_CLICK || ewin->props.focusclick)
       FocusToEWin(ewin, FOCUS_CLICK);
diff --git a/src/gnome.c b/src/gnome.c
index 069d1792..fd0131f3 100644
--- a/src/gnome.c
+++ b/src/gnome.c
@@ -785,7 +785,7 @@ GNOME_ProcessClientMessage(XClientMessageEvent * event)
 	     EoSetLayer(ewin, val);
 	     ecore_x_window_prop_card32_set(_EwinGetClientXwin(ewin), a4,
 					    &val, 1);
-	     RaiseEwin(ewin);
+	     EwinRaise(ewin);
 	  }
 	return;
      }
diff --git a/src/icccm.c b/src/icccm.c
index 1394be89..8eb5cdc0 100644
--- a/src/icccm.c
+++ b/src/icccm.c
@@ -108,7 +108,7 @@ ICCCM_Delete(const EWin * ewin)
 {
    if (EwinIsInternal(ewin))
      {
-	HideEwin((EWin *) ewin);
+	EwinHide((EWin *) ewin);
 	return;
      }
 
diff --git a/src/iconify.c b/src/iconify.c
index a8624c4b..d8561242 100644
--- a/src/iconify.c
+++ b/src/iconify.c
@@ -620,7 +620,7 @@ IconboxShow(Iconbox * ib)
 	EwinMove(ewin, VRoot.w - EoGetW(ewin), VRoot.h - EoGetH(ewin));
      }
 
-   ShowEwin(ewin);
+   EwinShow(ewin);
 }
 
 /*
diff --git a/src/icons.c b/src/icons.c
index d5ca4266..7fc1fb1d 100644
--- a/src/icons.c
+++ b/src/icons.c
@@ -83,7 +83,7 @@ IB_SnapEWin(EWin * ewin, int size)
 
    if (ewin->state.shaded)
       EwinInstantUnShade(ewin);
-   RaiseEwin(ewin);
+   EwinRaise(ewin);
 
    w = h = size;
 
diff --git a/src/menus.c b/src/menus.c
index d989e48b..f613a0bd 100644
--- a/src/menus.c
+++ b/src/menus.c
@@ -177,7 +177,7 @@ MenuHide(Menu * m)
      {
 	EUnmapWindow(m->win);
 	EReparentWindow(m->win, VRoot.win, ewin->client.x, ewin->client.y);
-	HideEwin(ewin);
+	EwinHide(ewin);
      }
    m->ewin = NULL;
 
@@ -275,8 +275,8 @@ MenuShow(Menu * m, char noshow)
    if (ewin)
      {
 #if 0				/* ??? */
-	RaiseEwin(ewin);
-	ShowEwin(ewin);
+	EwinRaise(ewin);
+	EwinShow(ewin);
 	return;
 #else
 	MenuHide(m);
@@ -357,7 +357,7 @@ MenuShow(Menu * m, char noshow)
 	  {
 	     ICCCM_Cmap(NULL);
 	     EwinOpFloatAt(ewin, OPSRC_NA, EoGetX(ewin), EoGetY(ewin));
-	     ShowEwin(ewin);
+	     EwinShow(ewin);
 	     if (Conf.menus.animate)
 		EwinUnShade(ewin);
 	  }
@@ -637,7 +637,7 @@ MenuRepack(Menu * m)
    ICCCM_SetSizeConstraints(ewin, m->w, m->h, m->w, m->h, 0, 0, 1, 1,
 			    0.0, 65535.0);
    EwinResize(ewin, m->w, m->h);
-   RaiseEwin(ewin);
+   EwinRaise(ewin);
 }
 
 void
@@ -1582,8 +1582,8 @@ SubmenuShowTimeout(int val __UNUSED__, void *dat)
    EwinMove(ewin2, EoGetX(ewin) + xo, EoGetY(ewin) + yo);
    Mode.move.check = 1;
    EwinOpFloatAt(ewin2, OPSRC_NA, EoGetX(ewin2), EoGetY(ewin2));
-   RaiseEwin(ewin2);
-   ShowEwin(ewin2);
+   EwinRaise(ewin2);
+   EwinShow(ewin2);
 
    if (Conf.menus.animate)
       EwinUnShade(ewin2);
diff --git a/src/moveresize.c b/src/moveresize.c
index c3be0ece..8b1c253d 100644
--- a/src/moveresize.c
+++ b/src/moveresize.c
@@ -86,7 +86,7 @@ ActionMoveStart(EWin * ewin, int grab, char constrained, int nogroup)
    Mode_mr.win_x = Mode.events.x - (EoGetX(ewin) + EoGetX(EoGetDesk(ewin)));
    Mode_mr.win_y = Mode.events.y - (EoGetY(ewin) + EoGetY(EoGetDesk(ewin)));
 
-   RaiseEwin(ewin);
+   EwinRaise(ewin);
    gwins = ListWinGroupMembersForEwin(ewin, GROUP_ACTION_MOVE, nogroup
 				      || Mode.move.swap, &num);
 
diff --git a/src/pager.c b/src/pager.c
index 5463a833..1d9fe4d1 100644
--- a/src/pager.c
+++ b/src/pager.c
@@ -648,7 +648,7 @@ PagerShow(Pager * p)
 
    if (p->ewin)
      {
-	ShowEwin(p->ewin);
+	EwinShow(p->ewin);
 	return;
      }
 
@@ -691,7 +691,7 @@ PagerShow(Pager * p)
 		 VRoot.h - (DesksGetNumber() - p->dsk->num) * EoGetH(ewin));
      }
 
-   ShowEwin(ewin);
+   EwinShow(ewin);
 }
 
 static void
@@ -956,7 +956,7 @@ PagerMenuShow(Pager * p, int x, int y)
 static void
 PagerClose(Pager * p)
 {
-   HideEwin(p->ewin);
+   EwinHide(p->ewin);
 }
 
 static void
@@ -1372,7 +1372,7 @@ PagerHandleMouseUp(Pager * p, int px, int py, int button)
 	ewin = EwinInPagerAt(p, px, py);
 	if (ewin)
 	  {
-	     RaiseEwin(ewin);
+	     EwinRaise(ewin);
 	     FocusToEWin(ewin, FOCUS_SET);
 	  }
      }
diff --git a/src/warp.c b/src/warp.c
index 5cfe5edc..cad4cb08 100644
--- a/src/warp.c
+++ b/src/warp.c
@@ -335,7 +335,7 @@ WarpFocus(int delta)
    WarpFocusShow();
 
    if (Conf.focus.raise_on_next)
-      RaiseEwin(ewin);
+      EwinRaise(ewin);
    if (Conf.focus.warp_on_next)
       if (ewin != Mode.mouse_over_ewin && !ewin->state.iconified)
 	{
@@ -358,7 +358,7 @@ WarpFocusClick(int ix)
    if (!EwinFindByPtr(ewin))
       return;
 
-   RaiseEwin(ewin);
+   EwinRaise(ewin);
    if (ewin->state.iconified)
       EwinDeIconify(ewin);
    FocusToEWin(ewin, FOCUS_SET);
@@ -381,7 +381,7 @@ WarpFocusFinish(void)
    if (ewin->state.shaded)
       EwinUnShade(ewin);
    if (Conf.warplist.raise_on_select)
-      RaiseEwin(ewin);
+      EwinRaise(ewin);
    if (Conf.warplist.warp_on_select)
       if (ewin != Mode.mouse_over_ewin)
 	{
diff --git a/src/zoom.c b/src/zoom.c
index bad4c66b..0257ed61 100644
--- a/src/zoom.c
+++ b/src/zoom.c
@@ -246,7 +246,7 @@ Zoom(EWin * ewin)
 	y2 = mode->vdisplay - ewin->client.h - y1;
 	if (y2 < 0)
 	   y2 = 0;
-	RaiseEwin(ewin);
+	EwinRaise(ewin);
 	EwinBorderGetSize(ewin, &bl, &br, &bt, &bb);
 	EwinMove(ewin, -bl + x1, -bt + y1);
 	FocusToEWin(ewin, FOCUS_SET);