diff --git a/cde/programs/dtwm/WmCEvent.c b/cde/programs/dtwm/WmCEvent.c
index 1245c9f65..4da46eec5 100644
--- a/cde/programs/dtwm/WmCEvent.c
+++ b/cde/programs/dtwm/WmCEvent.c
@@ -611,7 +611,8 @@ Boolean HandleEventsOnSpecialWindows (XEvent *pEvent)
 	    case ClientMessage:
 	    {
 		if (pCD = InitClientData (pEvent->xclient.window)) {
-		    ProcessEwmh (pCD, (XClientMessageEvent *) pEvent);
+		    HandleClientMessageEwmh(pCD,
+				    (XClientMessageEvent *) pEvent);
 		    dispatchEvent = False;
 		}
 		break;
@@ -840,7 +841,8 @@ void HandleCPropertyNotify (ClientData *pCD, XPropertyEvent *propertyEvent)
 		    ProcessColormapList (ACTIVE_PSD, pCD);
 		}
 	    }
-	    else if (propertyEvent->atom == wmGD.xa_MWM_HINTS) {
+	    else if (propertyEvent->atom == wmGD.xa_MWM_HINTS)
+	    {
 		long suppliedReturn;
 		XSizeHints hintsReturn = {0};
 
@@ -856,6 +858,10 @@ void HandleCPropertyNotify (ClientData *pCD, XPropertyEvent *propertyEvent)
 		ProcessMwmHints (pCD);
 		SetClientOffset (pCD);
 	    }
+	    else
+	    {
+		HandlePropertyNotifyEwmh (pCD, propertyEvent);
+	    }
 	    break;
 	}
     }
@@ -2602,7 +2608,7 @@ void HandleClientMessage (ClientData *pCD, XClientMessageEvent *clientEvent)
     }
     else
     {
-	ProcessEwmh (pCD, clientEvent);
+	HandleClientMessageEwmh (pCD, clientEvent);
     }
 } /* END OF FUNCTION HandleClientMessage */
 
diff --git a/cde/programs/dtwm/WmWinInfo.c b/cde/programs/dtwm/WmWinInfo.c
index 5a877da67..5aaa07b19 100644
--- a/cde/programs/dtwm/WmWinInfo.c
+++ b/cde/programs/dtwm/WmWinInfo.c
@@ -261,6 +261,7 @@ GetClientInfo (WmScreenData *pSD, Window clientWindow, long manageFlags)
 {
     ClientData *pCD;
     XSetWindowAttributes sAttributes;
+    XPropertyEvent propertyEvent;
 
     if (!(pCD = InitClientData (clientWindow)))
     {
@@ -420,6 +421,8 @@ GetClientInfo (WmScreenData *pSD, Window clientWindow, long manageFlags)
      */
 
     ProcessWmWindowTitle (pCD, TRUE);
+    propertyEvent.atom = wmGD.xa_NET_WM_NAME;
+    HandlePropertyNotifyEwmh (pCD, &propertyEvent);
 
 
     /*
@@ -427,6 +430,8 @@ GetClientInfo (WmScreenData *pSD, Window clientWindow, long manageFlags)
      */
 
     ProcessWmIconTitle (pCD, TRUE);
+    propertyEvent.atom = wmGD.xa_NET_WM_ICON_NAME;
+    HandlePropertyNotifyEwmh (pCD, &propertyEvent);
 
 
     /*