diff --git a/WINGs/Tests/wtest.c b/WINGs/Tests/wtest.c
index ca42502..5abfbbe 100644
--- a/WINGs/Tests/wtest.c
+++ b/WINGs/Tests/wtest.c
@@ -570,8 +570,8 @@ void testText(WMScreen * scr)
 
 #define FNAME "Verdana,sans serif:pixelsize=12"
 #define MSG \
-    "WNativeWindow Maker is the GNU window manager for the " \
-    "X WNativeWindow System. It was designed to emulate the " \
+    "Window Maker is the GNU window manager for the " \
+    "X Window System. It was designed to emulate the " \
     "look and feel of part of the NEXTSTEP(tm) GUI. It's " \
     "supposed to be relatively fast and small, feature " \
     "rich, easy to configure and easy to use, with a simple " \
diff --git a/WINGs/WINGs/WINGsP.h.in b/WINGs/WINGs/WINGsP.h.in
index f22bb26..e1a59ef 100644
--- a/WINGs/WINGs/WINGsP.h.in
+++ b/WINGs/WINGs/WINGsP.h.in
@@ -282,7 +282,7 @@ typedef struct W_Screen {
     unsigned ignoreNextDoubleClick:1;
 
     /*
-     * New stuff in WNativeWindow Maker 0.95.7
+     * New stuff in Window Maker 0.95.7
      * Added at the end of the structure to avoid breaking binary compatibility
      * with previous versions of the toolkit
      */
diff --git a/WINGs/error.c b/WINGs/error.c
index 4b1e89c..739fa5e 100644
--- a/WINGs/error.c
+++ b/WINGs/error.c
@@ -1,5 +1,5 @@
 /*
- *  WNativeWindow Maker miscelaneous function library
+ *  Window Maker miscelaneous function library
  *
  *  Copyright (c) 1997-2003 Alfredo K. Kojima
  *
diff --git a/WINGs/error.h b/WINGs/error.h
index 9f6e459..341c909 100644
--- a/WINGs/error.h
+++ b/WINGs/error.h
@@ -1,6 +1,6 @@
 /* WUtil / error.h
  *
- *  Copyright (c) 2014 WNativeWindow Maker Team
+ *  Copyright (c) 2014 Window Maker Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/WINGs/findfile.c b/WINGs/findfile.c
index d173c19..bb2ce7f 100644
--- a/WINGs/findfile.c
+++ b/WINGs/findfile.c
@@ -1,5 +1,5 @@
 /*
- *  WNativeWindow Maker miscelaneous function library
+ *  Window Maker miscelaneous function library
  *
  *  Copyright (c) 1997-2003 Alfredo K. Kojima
  *
diff --git a/WINGs/memory.c b/WINGs/memory.c
index 3cf6f82..e05e17a 100644
--- a/WINGs/memory.c
+++ b/WINGs/memory.c
@@ -1,5 +1,5 @@
 /*
- *  WNativeWindow Maker miscelaneous function library
+ *  Window Maker miscelaneous function library
  *
  *  Copyright (c) 1997-2003 Alfredo K. Kojima
  *
diff --git a/WINGs/menuparser.c b/WINGs/menuparser.c
index 94f4ef9..6d8411c 100644
--- a/WINGs/menuparser.c
+++ b/WINGs/menuparser.c
@@ -1,5 +1,5 @@
 /*
- *  WNativeWindow Maker window manager
+ *  Window Maker window manager
  *
  *  Copyright (c) 2012 Christophe Curis
  *
diff --git a/WINGs/menuparser_macros.c b/WINGs/menuparser_macros.c
index 26c565d..8c12f2d 100644
--- a/WINGs/menuparser_macros.c
+++ b/WINGs/menuparser_macros.c
@@ -1,5 +1,5 @@
 /*
- *  WNativeWindow Maker window manager
+ *  Window Maker window manager
  *
  *  Copyright (c) 2012 Christophe Curis
  *
diff --git a/WINGs/misc.c b/WINGs/misc.c
index 1c715b2..76cf1f5 100644
--- a/WINGs/misc.c
+++ b/WINGs/misc.c
@@ -1,7 +1,7 @@
 /* WUtil / misc.c
  *
  *  Copyright (c) 2001 Dan Pascu
- *  Copyright (c) 2014 WNativeWindow Maker Team
+ *  Copyright (c) 2014 Window Maker Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/WINGs/userdefaults.h b/WINGs/userdefaults.h
index 15b13b5..3e4b46b 100644
--- a/WINGs/userdefaults.h
+++ b/WINGs/userdefaults.h
@@ -1,6 +1,6 @@
 /* WUtil / userdefaults.h
  *
- *  Copyright (c) 2014 WNativeWindow Maker Team
+ *  Copyright (c) 2014 Window Maker Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/WINGs/wcolorpanel_x11.c b/WINGs/wcolorpanel_x11.c
index 5adbce3..797020c 100644
--- a/WINGs/wcolorpanel_x11.c
+++ b/WINGs/wcolorpanel_x11.c
@@ -1362,7 +1362,7 @@ static void modeButtonCallback(WMWidget * w, void *data)
 		WMSetColorPanelPickerMode(panel, WMHSBModeColorPanel);
 }
 
-/******************  Magnifying WMNativeCursor Functions *******************/
+/******************  Magnifying Cursor Functions *******************/
 
 static XImage *magnifyGetImage(WMScreen * scr, XImage * image, int x, int y, int w, int h)
 {
diff --git a/WPrefs.app/Appearance.c b/WPrefs.app/Appearance.c
index dc8e059..0da1ae5 100644
--- a/WPrefs.app/Appearance.c
+++ b/WPrefs.app/Appearance.c
@@ -1,6 +1,6 @@
 /* Apperance.c- color/texture for titlebar etc.
  *
- *  WPrefs - WNativeWindow Maker Preferences Program
+ *  WPrefs - Window Maker Preferences Program
  *
  *  Copyright (c) 1999-2003 Alfredo K. Kojima
  *
@@ -41,11 +41,11 @@ static const struct {
 	WMPoint     hand;	/* The coordinate where the hand is drawn when pointing this item */
 } colorOptions[] = {
 	/* Related to WNativeWindow titles */
-	{ "FTitleColor", "white", N_("Focused WNativeWindow Title"),
+	{ "FTitleColor", "white", N_("Focused Window Title"),
 	  { { 30, 10 }, { 190, 20 } }, { 5, 10 } },
-	{ "UTitleColor", "black", N_("Unfocused WNativeWindow Title"),
+	{ "UTitleColor", "black", N_("Unfocused Window Title"),
 	  { { 30, 40 }, { 190, 20 } }, { 5, 40 } },
-	{ "PTitleColor", "white", N_("Owner of Focused WNativeWindow Title"),
+	{ "PTitleColor", "white", N_("Owner of Focused Window Title"),
 	  { { 30, 70 }, { 190, 20 } }, { 5, 70 } },
 
 	/* Related to Menus */
@@ -68,11 +68,11 @@ static const struct {
 	 */
 
 	/* Related to WNativeWindow's border */
-	{ "FrameFocusedBorderColor", "black", N_("Focused WNativeWindow Border Color") ,
+	{ "FrameFocusedBorderColor", "black", N_("Focused Window Border Color") ,
 	  { { 0, 0 }, { 0, 0 } }, { -22, -21 } },
-	{ "FrameBorderColor", "black", N_("WNativeWindow Border Color") ,
+	{ "FrameBorderColor", "black", N_("Window Border Color") ,
 	  { { 0, 0 }, { 0, 0 } }, { -22, -21 } },
-	{ "FrameSelectedBorderColor", "white", N_("Selected WNativeWindow Border Color") ,
+	{ "FrameSelectedBorderColor", "white", N_("Selected Window Border Color") ,
 	  { { 0, 0 }, { 0, 0 } }, { -22, -21 } },
 
 	/* Related to Icons and Clip */
@@ -392,7 +392,7 @@ static const struct {
 
 #define PRESIZEBAR    3
 	{ "ResizebarBack", "(solid, gray)", N_("[Resizebar]"),
-	  { { 30, 100 }, { 190, 9 } }, { 5, 100 }, N_("WNativeWindow Resizebar") },
+	  { { 30, 100 }, { 190, 9 } }, { 5, 100 }, N_("Window Resizebar") },
 
 #define PMTITLE       4
 	{ "MenuTitleBack", "(solid, black)", N_("[Menu Title]"),
diff --git a/WPrefs.app/Configurations.c b/WPrefs.app/Configurations.c
index 3793b7e..34b716d 100644
--- a/WPrefs.app/Configurations.c
+++ b/WPrefs.app/Configurations.c
@@ -1,6 +1,6 @@
 /* Configurations.c- misc. configurations
  *
- *  WPrefs - WNativeWindow Maker Preferences Program
+ *  WPrefs - Window Maker Preferences Program
  *
  *  Copyright (c) 1998-2003 Alfredo K. Kojima
  *
@@ -347,7 +347,7 @@ static void createPanel(Panel *p)
 	WMMoveWidget(panel->dithF, 237, 120);
 	WMSetFrameTitle(panel->dithF, _("Dithering colormap for 8bpp"));
 
-	WMSetBalloonTextForView(_("Number of colors to reserve for WNativeWindow Maker\n"
+	WMSetBalloonTextForView(_("Number of colors to reserve for Window Maker\n"
 				  "on displays that support only 8bpp (PseudoColor)."),
 				WMWidgetView(panel->dithF));
 
@@ -433,7 +433,7 @@ Panel *InitConfigurations(WMWidget *parent)
 
 	panel->sectionName = _("Other Configurations");
 	panel->description = _("Animation speeds, titlebar styles, various option\n"
-			       "toggling and number of colors to reserve for\n" "WNativeWindow Maker on 8bit displays.");
+			       "toggling and number of colors to reserve for\n" "Window Maker on 8bit displays.");
 
 	panel->parent = parent;
 	panel->callbacks.createWidgets = createPanel;
diff --git a/WPrefs.app/Docks.c b/WPrefs.app/Docks.c
index 69afe59..c83332c 100644
--- a/WPrefs.app/Docks.c
+++ b/WPrefs.app/Docks.c
@@ -1,6 +1,6 @@
 /* Workspace.c- workspace options
  *
- *  WPrefs - WNativeWindow Maker Preferences Program
+ *  WPrefs - Window Maker Preferences Program
  *
  *  Copyright (c) 2012 Daniel Déchelotte (heavily inspired from file (c) Alfredo K. Kojima)
  *
diff --git a/WPrefs.app/Expert.c b/WPrefs.app/Expert.c
index 506f2a2..5b8e820 100644
--- a/WPrefs.app/Expert.c
+++ b/WPrefs.app/Expert.c
@@ -1,10 +1,10 @@
 /* Expert.c- expert user options
  *
- *  WPrefs - WNativeWindow Maker Preferences Program
+ *  WPrefs - Window Maker Preferences Program
  *
- *  Copyright (c) 2014-2023 WNativeWindow Maker Team
+ *  Copyright (c) 2014-2023 Window Maker Team
  *  Copyright (c) 1998-2003 Alfredo K. Kojima
- *  Copyright (c) 2009-2023 WNativeWindow Maker Team
+ *  Copyright (c) 2009-2023 Window Maker Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -54,7 +54,7 @@ static struct expert_option {
 	{ N_("Do not set non-WindowMaker specific parameters (do not use xset)."),
 	  /* default: */ False, OPTION_USERDEF, "NoXSetStuff" },
 
-	{ N_("Automatically save session when exiting WNativeWindow Maker."),
+	{ N_("Automatically save session when exiting Window Maker."),
 	  /* default: */ False, OPTION_WMAKER, "SaveSessionOnExit" },
 
 	{ N_("Use SaveUnder in window frames, icons, menus and other objects."),
diff --git a/WPrefs.app/Focus.c b/WPrefs.app/Focus.c
index 9591871..38a98aa 100644
--- a/WPrefs.app/Focus.c
+++ b/WPrefs.app/Focus.c
@@ -1,6 +1,6 @@
 /* Focus.c- input and colormap focus stuff
  *
- *  WPrefs - WNativeWindow Maker Preferences Program
+ *  WPrefs - Window Maker Preferences Program
  *
  *  Copyright (c) 1998-2003 Alfredo K. Kojima
  *
@@ -251,7 +251,7 @@ static void createPanel(Panel * p)
 	panel->raisF = WMCreateFrame(panel->box);
 	WMResizeWidget(panel->raisF, 245, 68);
 	WMMoveWidget(panel->raisF, 265, 10);
-	WMSetFrameTitle(panel->raisF, _("Automatic WNativeWindow Raise Delay"));
+	WMSetFrameTitle(panel->raisF, _("Automatic Window Raise Delay"));
 
 	buf1 = wmalloc(strlen(DELAY_ICON) + 1);
 	buf2 = wmalloc(strlen(DELAY_ICON_S) + 1);
@@ -349,7 +349,7 @@ Panel *InitFocus(WMWidget *parent)
 
 	panel = wmalloc(sizeof(_Panel));
 
-	panel->sectionName = _("WNativeWindow Focus Preferences");
+	panel->sectionName = _("Window Focus Preferences");
 	panel->description = _("Keyboard focus switching policy and related options.");
 	panel->parent = parent;
 
diff --git a/WPrefs.app/FontSimple.c b/WPrefs.app/FontSimple.c
index e0d29f9..2147b98 100644
--- a/WPrefs.app/FontSimple.c
+++ b/WPrefs.app/FontSimple.c
@@ -1,6 +1,6 @@
 /* FontSimple.c- simplified font configuration panel
  *
- *  WPrefs - WNativeWindow Maker Preferences Program
+ *  WPrefs - Window Maker Preferences Program
  *
  *  Copyright (c) 1998-2004 Alfredo K. Kojima
  *
@@ -96,7 +96,7 @@ static const struct {
 	const char *option;
 	const char *label;
 } fontOptions[] = {
-	{ "WindowTitleFont", N_("WNativeWindow Title") },
+	{ "WindowTitleFont", N_("Window Title") },
 	{ "MenuTitleFont", N_("Menu Title") },
 	{ "MenuTextFont", N_("Menu Text") },
 	{ "IconTitleFont", N_("Icon Title") },
@@ -738,7 +738,7 @@ Panel *InitFontSimple(WMWidget *parent)
 
 	panel->sectionName = _("Font Configuration");
 
-	panel->description = _("Configure fonts for WNativeWindow Maker titlebars, menus etc.");
+	panel->description = _("Configure fonts for Window Maker titlebars, menus etc.");
 
 	panel->parent = parent;
 
diff --git a/WPrefs.app/HotCornerShortcuts.c b/WPrefs.app/HotCornerShortcuts.c
index d80fe19..b8c944a 100644
--- a/WPrefs.app/HotCornerShortcuts.c
+++ b/WPrefs.app/HotCornerShortcuts.c
@@ -1,8 +1,8 @@
 /* HotCornerShortcuts.c - screen corners actions
  *
- *  WPrefs - WNativeWindow Maker Preferences Program
+ *  WPrefs - Window Maker Preferences Program
  *
- *  Copyright (c) 2023 WNativeWindow Maker Team
+ *  Copyright (c) 2023 Window Maker Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/WPrefs.app/Icons.c b/WPrefs.app/Icons.c
index c6e6a99..510a437 100644
--- a/WPrefs.app/Icons.c
+++ b/WPrefs.app/Icons.c
@@ -1,6 +1,6 @@
 /* Icons.c- icon preferences
  *
- *  WPrefs - WNativeWindow Maker Preferences Program
+ *  WPrefs - Window Maker Preferences Program
  *
  *  Copyright (c) 1998-2003 Alfredo K. Kojima
  *
diff --git a/WPrefs.app/KeyboardSettings.c b/WPrefs.app/KeyboardSettings.c
index d224ea7..9c4b94d 100644
--- a/WPrefs.app/KeyboardSettings.c
+++ b/WPrefs.app/KeyboardSettings.c
@@ -1,6 +1,6 @@
 /* KeyboardSettings.c- keyboard options (equivalent to xset)
  *
- *  WPrefs - WNativeWindow Maker Preferences Program
+ *  WPrefs - Window Maker Preferences Program
  *
  *  Copyright (c) 1998-2003 Alfredo K. Kojima
  *
diff --git a/WPrefs.app/KeyboardShortcuts.c b/WPrefs.app/KeyboardShortcuts.c
index 496fea6..f018ab8 100644
--- a/WPrefs.app/KeyboardShortcuts.c
+++ b/WPrefs.app/KeyboardShortcuts.c
@@ -1,6 +1,6 @@
 /* KeyboardShortcuts.c- keyboard shortcut bindings
  *
- *  WPrefs - WNativeWindow Maker Preferences Program
+ *  WPrefs - Window Maker Preferences Program
  *
  *  Copyright (c) 1998-2003 Alfredo K. Kojima
  *
@@ -138,7 +138,7 @@ static struct keyOption {
 	{ "MoveToWorkspace9Key",  N_("Move window to workspace 9") },
 	{ "MoveToWorkspace10Key", N_("Move window to workspace 10") },
 
-	/* WNativeWindow Selection */
+	/* Window Selection */
 	{ "WindowShortcut1Key",  N_("Shortcut for window 1") },
 	{ "WindowShortcut2Key",  N_("Shortcut for window 2") },
 	{ "WindowShortcut3Key",  N_("Shortcut for window 3") },
@@ -158,7 +158,7 @@ static struct keyOption {
 	{ "WindowRelaunchKey", N_("Launch new instance of application") },
 	{ "ScreenSwitchKey",   N_("Switch to next screen/monitor") },
 	{ "RunKey",            N_("Run application") },
-	{ "ExitKey",            N_("Exit WNativeWindow Maker") },
+	{ "ExitKey",            N_("Exit Window Maker") },
 	{ "DockRaiseLowerKey", N_("Raise/Lower Dock") },
 	{ "ClipRaiseLowerKey", N_("Raise/Lower Clip") },
 	{ "ScreenCaptureKey", N_("Capture the entire screen") },
diff --git a/WPrefs.app/Menu.c b/WPrefs.app/Menu.c
index 9d98a8f..0317cf0 100644
--- a/WPrefs.app/Menu.c
+++ b/WPrefs.app/Menu.c
@@ -1,6 +1,6 @@
 /* Menu.c- menu definition
  *
- *  WPrefs - WNativeWindow Maker Preferences Program
+ *  WPrefs - Window Maker Preferences Program
  *
  *  Copyright (c) 2000-2003 Alfredo K. Kojima
  *
@@ -434,7 +434,7 @@ static void createPanel(_Panel * p)
 		putNewItem(panel, pad, PLPipeInfo, _("Generated PL Menu"));
 		putNewItem(panel, pad, DirectoryInfo, _("Directory Contents"));
 		putNewItem(panel, pad, WSMenuInfo, _("Workspace Menu"));
-		putNewItem(panel, pad, WWindowListInfo, _("WNativeWindow List Menu"));
+		putNewItem(panel, pad, WWindowListInfo, _("Window List Menu"));
 
 		panel->itemPad[0] = pad;
 	}
@@ -486,7 +486,7 @@ static void createPanel(_Panel * p)
 		data = putNewItem(panel, pad, ExecInfo, _("ghostview"));
 		data->param.exec.command = "gv";
 
-		data = putNewItem(panel, pad, CommandInfo, _("Exit WNativeWindow Maker"));
+		data = putNewItem(panel, pad, CommandInfo, _("Exit Window Maker"));
 		data->param.command.command = 3;
 
 		WMMapWidget(pad);
@@ -764,10 +764,10 @@ static void createPanel(_Panel * p)
 	WMInsertListItem(panel->icommandL, 1, _("Hide All Windows Except For The Focused One"));
 	WMInsertListItem(panel->icommandL, 2, _("Show All Windows"));
 
-	WMInsertListItem(panel->icommandL, 3, _("Exit WNativeWindow Maker"));
+	WMInsertListItem(panel->icommandL, 3, _("Exit Window Maker"));
 	WMInsertListItem(panel->icommandL, 4, _("Exit X Session"));
-	WMInsertListItem(panel->icommandL, 5, _("Restart WNativeWindow Maker"));
-	WMInsertListItem(panel->icommandL, 6, _("Start Another WNativeWindow Manager   : ("));
+	WMInsertListItem(panel->icommandL, 5, _("Restart Window Maker"));
+	WMInsertListItem(panel->icommandL, 6, _("Start Another Window Manager   : ("));
 
 	WMInsertListItem(panel->icommandL, 7, _("Save Current Session"));
 	WMInsertListItem(panel->icommandL, 8, _("Clear Saved Session"));
@@ -778,7 +778,7 @@ static void createPanel(_Panel * p)
 	panel->paramF = WMCreateFrame(panel->optionsF);
 	WMResizeWidget(panel->paramF, width, 50);
 	WMMoveWidget(panel->paramF, 10, 105);
-	WMSetFrameTitle(panel->paramF, _("WNativeWindow Manager to Start"));
+	WMSetFrameTitle(panel->paramF, _("Window Manager to Start"));
 
 	panel->paramT = WMCreateTextField(panel->paramF);
 	WMResizeWidget(panel->paramT, width - 20, 20);
@@ -1100,7 +1100,7 @@ static void updateFrameTitle(_Panel * panel, const char *title, InfoType type)
 			break;
 
 		case WWindowListInfo:
-			tmp = wstrconcat(title, _(": Open WNativeWindow List Submenu"));
+			tmp = wstrconcat(title, _(": Open Window List Submenu"));
 			break;
 
 		default:
diff --git a/WPrefs.app/MenuPreferences.c b/WPrefs.app/MenuPreferences.c
index 0685e5c..2ae3b10 100644
--- a/WPrefs.app/MenuPreferences.c
+++ b/WPrefs.app/MenuPreferences.c
@@ -1,6 +1,6 @@
 /* MenuPreferences.c- menu related preferences
  *
- *  WPrefs - WNativeWindow Maker Preferences Program
+ *  WPrefs - Window Maker Preferences Program
  *
  *  Copyright (c) 1998-2003 Alfredo K. Kojima
  *
diff --git a/WPrefs.app/MouseSettings.c b/WPrefs.app/MouseSettings.c
index 1800c8f..4a72af2 100644
--- a/WPrefs.app/MouseSettings.c
+++ b/WPrefs.app/MouseSettings.c
@@ -1,7 +1,7 @@
 
 /* MouseSettings.c- mouse options (some are equivalent to xset)
  *
- *  WPrefs - WNativeWindow Maker Preferences Program
+ *  WPrefs - Window Maker Preferences Program
  *
  *  Copyright (c) 1998-2003 Alfredo K. Kojima
  *
@@ -55,7 +55,7 @@ static const struct {
 } button_actions[] = {
 	{ "None",                  N_("None") },
 	{ "OpenApplicationsMenu",  N_("Applications Menu") },
-	{ "OpenWindowListMenu",    N_("WNativeWindow List Menu") },
+	{ "OpenWindowListMenu",    N_("Window List Menu") },
 	{ "SelectWindows",         N_("Select Windows") },
 	{ "MoveToPrevWorkspace",   N_("Previous Workspace") },
 	{ "MoveToNextWorkspace",   N_("Next Workspace") },
diff --git a/WPrefs.app/Paths.c b/WPrefs.app/Paths.c
index 8bc6e61..6a7348e 100644
--- a/WPrefs.app/Paths.c
+++ b/WPrefs.app/Paths.c
@@ -1,6 +1,6 @@
 /* Paths.c- pixmap/icon paths
  *
- *  WPrefs - WNativeWindow Maker Preferences Program
+ *  WPrefs - Window Maker Preferences Program
  *
  *  Copyright (c) 1998-2003 Alfredo K. Kojima
  *
diff --git a/WPrefs.app/Preferences.c b/WPrefs.app/Preferences.c
index efb24ce..6a9f827 100644
--- a/WPrefs.app/Preferences.c
+++ b/WPrefs.app/Preferences.c
@@ -1,6 +1,6 @@
 /* Preferences.c- misc ergonomic preferences
  *
- *  WPrefs - WNativeWindow Maker Preferences Program
+ *  WPrefs - Window Maker Preferences Program
  *
  *  Copyright (c) 1998-2003 Alfredo K. Kojima
  *
diff --git a/WPrefs.app/Themes.c b/WPrefs.app/Themes.c
index 0b7e700..66ba311 100644
--- a/WPrefs.app/Themes.c
+++ b/WPrefs.app/Themes.c
@@ -1,6 +1,6 @@
 /* Themes.c- Theme stuff
  *
- *  WPrefs - WNativeWindow Maker Preferences Program
+ *  WPrefs - Window Maker Preferences Program
  *
  *  Copyright (c) 1998-2003 Alfredo K. Kojima
  *
diff --git a/WPrefs.app/WPrefs.c b/WPrefs.app/WPrefs.c
index ac5b1a7..9b0637d 100644
--- a/WPrefs.app/WPrefs.c
+++ b/WPrefs.app/WPrefs.c
@@ -1,6 +1,6 @@
 /* WPrefs.c- main window and other basic stuff
  *
- *  WPrefs - WNativeWindow Maker Preferences Program
+ *  WPrefs - Window Maker Preferences Program
  *
  *  Copyright (c) 1998-2003 Alfredo K. Kojima
  *
@@ -209,7 +209,7 @@ static void createMainWindow(WMScreen * scr)
 
 	WPrefs.win = WMCreateWindow(scr, "wprefs");
 	WMResizeWidget(WPrefs.win, 520, 390);
-	WMSetWindowTitle(WPrefs.win, _("WNativeWindow Maker Preferences"));
+	WMSetWindowTitle(WPrefs.win, _("Window Maker Preferences"));
 	WMSetWindowCloseAction(WPrefs.win, quit, NULL);
 	WMSetWindowMaxSize(WPrefs.win, 520, 390);
 	WMSetWindowMinSize(WPrefs.win, 520, 390);
@@ -279,7 +279,7 @@ static void createMainWindow(WMScreen * scr)
 	WMResizeWidget(WPrefs.nameL, FRAME_WIDTH - 20, 60);
 	WMMoveWidget(WPrefs.nameL, 10, 50);
 	WMSetLabelFont(WPrefs.nameL, font);
-	WMSetLabelText(WPrefs.nameL, _("WNativeWindow Maker Preferences"));
+	WMSetLabelText(WPrefs.nameL, _("Window Maker Preferences"));
 	WMReleaseFont(font);
 
 	WPrefs.versionL = WMCreateLabel(WPrefs.banner);
@@ -551,7 +551,7 @@ void Initialize(WMScreen * scr)
 
 	WMMapWidget(WPrefs.win);
 	XFlush(WMScreenDisplay(scr));
-	WMSetLabelText(WPrefs.statusL, _("Loading WNativeWindow Maker configuration files..."));
+	WMSetLabelText(WPrefs.statusL, _("Loading Window Maker configuration files..."));
 	XFlush(WMScreenDisplay(scr));
 	loadConfigurations(scr, WPrefs.win);
 
@@ -614,11 +614,11 @@ static void loadConfigurations(WMScreen * scr, WMWindow * mainw)
 		if (!WMIsPLDictionary(db)) {
 			WMReleasePropList(db);
 			db = NULL;
-			sprintf(mbuf, _("WNativeWindow Maker domain (%s) is corrupted!"), path);
+			sprintf(mbuf, _("Window Maker domain (%s) is corrupted!"), path);
 			WMRunAlertPanel(scr, mainw, _("Error"), mbuf, _("OK"), NULL, NULL);
 		}
 	} else {
-		sprintf(mbuf, _("Could not load WNativeWindow Maker domain (%s) from defaults database."), path);
+		sprintf(mbuf, _("Could not load Window Maker domain (%s) from defaults database."), path);
 		WMRunAlertPanel(scr, mainw, _("Error"), mbuf, _("OK"), NULL, NULL);
 	}
 
@@ -633,29 +633,29 @@ static void loadConfigurations(WMScreen * scr, WMWindow * mainw)
 		wfree(command);
 	}
 	if (!file || !fgets(buffer, 1023, file)) {
-		werror(_("could not extract version information from WNativeWindow Maker"));
+		werror(_("could not extract version information from Window Maker"));
 		wfatal(_("Make sure wmaker is in your search path."));
 
 		WMRunAlertPanel(scr, mainw, _("Error"),
 				_
-				("Could not extract version from WNativeWindow Maker. Make sure it is correctly installed and is in your PATH environment variable."),
+				("Could not extract version from Window Maker. Make sure it is correctly installed and is in your PATH environment variable."),
 				_("OK"), NULL, NULL);
 		exit(1);
 	}
 	if (file)
 		pclose(file);
 
-	if (sscanf(buffer, "WNativeWindow Maker %i.%i.%i", &v1, &v2, &v3) != 3
+	if (sscanf(buffer, "Window Maker %i.%i.%i", &v1, &v2, &v3) != 3
 	    && sscanf(buffer, "WindowMaker %i.%i.%i", &v1, &v2, &v3) != 3) {
 		WMRunAlertPanel(scr, mainw, _("Error"),
-				_("Could not extract version from WNativeWindow Maker. "
+				_("Could not extract version from Window Maker. "
 				  "Make sure it is correctly installed and the path "
 				  "where it installed is in the PATH environment "
 				  "variable."), _("OK"), NULL, NULL);
 		exit(1);
 	}
 	if (v1 == 0 && (v2 < 18 || v3 < 0)) {
-		sprintf(mbuf, _("WPrefs only supports WNativeWindow Maker 0.18.0 or newer.\n"
+		sprintf(mbuf, _("WPrefs only supports Window Maker 0.18.0 or newer.\n"
 				"The version installed is %i.%i.%i\n"), v1, v2, v3);
 		WMRunAlertPanel(scr, mainw, _("Error"), mbuf, _("OK"), NULL, NULL);
 		exit(1);
@@ -664,7 +664,7 @@ static void loadConfigurations(WMScreen * scr, WMWindow * mainw)
 	if (v1 > 1 || (v1 == 1 && (v2 > 0))) {
 		sprintf(mbuf,
 			_
-			("WNativeWindow Maker %i.%i.%i, which is installed in your system, is not fully supported by this version of WPrefs."),
+			("Window Maker %i.%i.%i, which is installed in your system, is not fully supported by this version of WPrefs."),
 			v1, v2, v3);
 		WMRunAlertPanel(scr, mainw, _("Warning"), mbuf, _("OK"), NULL, NULL);
 	}
@@ -696,11 +696,11 @@ static void loadConfigurations(WMScreen * scr, WMWindow * mainw)
 		if (!WMIsPLDictionary(gdb)) {
 			WMReleasePropList(gdb);
 			gdb = NULL;
-			sprintf(mbuf, _("WNativeWindow Maker domain (%s) is corrupted!"), buffer);
+			sprintf(mbuf, _("Window Maker domain (%s) is corrupted!"), buffer);
 			WMRunAlertPanel(scr, mainw, _("Error"), mbuf, _("OK"), NULL, NULL);
 		}
 	} else {
-		sprintf(mbuf, _("Could not load global WNativeWindow Maker domain (%s)."), buffer);
+		sprintf(mbuf, _("Could not load global Window Maker domain (%s)."), buffer);
 		WMRunAlertPanel(scr, mainw, _("Error"), mbuf, _("OK"), NULL, NULL);
 	}
 
diff --git a/WPrefs.app/WPrefs.h b/WPrefs.app/WPrefs.h
index 9c9ef44..171a8dd 100644
--- a/WPrefs.app/WPrefs.h
+++ b/WPrefs.app/WPrefs.h
@@ -1,6 +1,6 @@
 /* WPrefs.h- general definitions
  *
- *  WPrefs - WNativeWindow Maker Preferences Program
+ *  WPrefs - Window Maker Preferences Program
  *
  *  Copyright (c) 1998-2003 Alfredo K. Kojima
  *
diff --git a/WPrefs.app/WindowHandling.c b/WPrefs.app/WindowHandling.c
index e9d39d2..182dd75 100644
--- a/WPrefs.app/WindowHandling.c
+++ b/WPrefs.app/WindowHandling.c
@@ -1,6 +1,6 @@
 /* WindowHandling.c- options for handling windows
  *
- *  WPrefs - WNativeWindow Maker Preferences Program
+ *  WPrefs - Window Maker Preferences Program
  *
  *  Copyright (c) 1998-2003 Alfredo K. Kojima
  *
@@ -303,11 +303,11 @@ static void createPanel(Panel * p)
 	WMSetBoxHorizontal(hbox, True);
 	WMAddBoxSubview(panel->box, WMWidgetView(hbox), False, True, 110, 0, 10);
 
-    /************** WNativeWindow Placement ***************/
+    /************** Window Placement ***************/
 	panel->placF = WMCreateFrame(panel->box);
 	WMResizeWidget(panel->placF, 222, 163);
 	WMMoveWidget(panel->placF, 8, 6);
-	WMSetFrameTitle(panel->placF, _("WNativeWindow Placement"));
+	WMSetFrameTitle(panel->placF, _("Window Placement"));
 	WMSetBalloonTextForView(_("How to place windows when they are first put\n"
 				  "on screen."), WMWidgetView(panel->placF));
 
@@ -595,7 +595,7 @@ Panel *InitWindowHandling(WMWidget *parent)
 
 	panel = wmalloc(sizeof(_Panel));
 
-	panel->sectionName = _("WNativeWindow Handling Preferences");
+	panel->sectionName = _("Window Handling Preferences");
 
 	panel->description = _("WNativeWindow handling options. Initial placement style\n"
 			       "edge resistance, opaque move etc.");
diff --git a/WPrefs.app/Workspace.c b/WPrefs.app/Workspace.c
index d7a7a5a..e87d6a3 100644
--- a/WPrefs.app/Workspace.c
+++ b/WPrefs.app/Workspace.c
@@ -1,6 +1,6 @@
 /* Workspace.c- workspace options
  *
- *  WPrefs - WNativeWindow Maker Preferences Program
+ *  WPrefs - Window Maker Preferences Program
  *
  *  Copyright (c) 1998-2003 Alfredo K. Kojima
  *
diff --git a/WPrefs.app/editmenu.c b/WPrefs.app/editmenu.c
index af99565..772dce6 100644
--- a/WPrefs.app/editmenu.c
+++ b/WPrefs.app/editmenu.c
@@ -1,6 +1,6 @@
 /* editmenu.c - editable menus
  *
- *  WPrefs - WNativeWindow Maker Preferences Program
+ *  WPrefs - Window Maker Preferences Program
  *
  *  Copyright (c) 2000-2003 Alfredo K. Kojima
  *
diff --git a/WPrefs.app/editmenu.h b/WPrefs.app/editmenu.h
index 272461a..1195fe0 100644
--- a/WPrefs.app/editmenu.h
+++ b/WPrefs.app/editmenu.h
@@ -1,6 +1,6 @@
 /* editmenu.h - editable menus
  *
- *  WPrefs - WNativeWindow Maker Preferences Program
+ *  WPrefs - Window Maker Preferences Program
  *
  *  Copyright (c) 2000-2003 Alfredo K. Kojima
  *
diff --git a/WPrefs.app/main.c b/WPrefs.app/main.c
index a6bb396..53a8ea5 100644
--- a/WPrefs.app/main.c
+++ b/WPrefs.app/main.c
@@ -1,5 +1,5 @@
 /*
- *  WPrefs - WNativeWindow Maker Preferences Program
+ *  WPrefs - Window Maker Preferences Program
  *
  *  Copyright (c) 1998-2003 Alfredo K. Kojima
  *
@@ -109,7 +109,7 @@ int main(int argc, char **argv)
 	if (argc > 1) {
 		for (i = 1; i < argc; i++) {
 			if (strcmp(argv[i], "-version") == 0 || strcmp(argv[i], "--version") == 0) {
-				printf("WPrefs (WNativeWindow Maker) %s\n", VERSION);
+				printf("WPrefs (Window Maker) %s\n", VERSION);
 				exit(0);
 			} else if (strcmp(argv[i], "-display") == 0) {
 				i++;
diff --git a/src/GNUstep.h b/src/GNUstep.h
index aba2eba..9afd4ea 100644
--- a/src/GNUstep.h
+++ b/src/GNUstep.h
@@ -1,6 +1,6 @@
 /* GNUstep.h-- stuff for compatibility with GNUstep applications
  *
- *  WNativeWindow Maker window manager
+ *  Window Maker window manager
  *
  *  Copyright (c) 1997-2003 Alfredo K. Kojima
  *
diff --git a/src/WindowMaker.h b/src/WindowMaker.h
index 881f72b..2e29687 100644
--- a/src/WindowMaker.h
+++ b/src/WindowMaker.h
@@ -1,8 +1,8 @@
 /*
- *  WNativeWindow Maker window manager
+ *  Window Maker window manager
  *
  *  Copyright (c) 1997-2003 Alfredo K. Kojima
- *  Copyright (c) 2014-2023 WNativeWindow Maker Team
+ *  Copyright (c) 2014-2023 Window Maker Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -275,7 +275,7 @@ typedef enum {
 }
 
 
-/* Flags for the WNativeWindow Maker state when restarting/crash situations */
+/* Flags for the Window Maker state when restarting/crash situations */
 #define WFLAGS_NONE       (0)
 #define WFLAGS_CRASHED    (1<<0)
 
diff --git a/src/actions.c b/src/actions.c
index 11a10ea..7ad0dfa 100644
--- a/src/actions.c
+++ b/src/actions.c
@@ -1,10 +1,10 @@
 /* action.c- misc. window commands (miniaturize, hide etc.)
  *
- *  WNativeWindow Maker window manager
+ *  Window Maker window manager
  *
  *  Copyright (c) 1997-2003 Alfredo K. Kojima
  *  Copyright (c) 1998-2003 Dan Pascu
- *  Copyright (c) 2014-2023 WNativeWindow Maker Team
+ *  Copyright (c) 2014-2023 Window Maker Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/src/actions.h b/src/actions.h
index e913371..8569193 100644
--- a/src/actions.h
+++ b/src/actions.h
@@ -1,5 +1,5 @@
 /*
- *  WNativeWindow Maker window manager
+ *  Window Maker window manager
  *
  *  Copyright (c) 1997-2003 Alfredo K. Kojima
  *
diff --git a/src/appicon.c b/src/appicon.c
index 9c3054b..56d146d 100644
--- a/src/appicon.c
+++ b/src/appicon.c
@@ -1,6 +1,6 @@
 /* appicon.c- icon for applications (not mini-window)
  *
- *  WNativeWindow Maker window manager
+ *  Window Maker window manager
  *
  *  Copyright (c) 1997-2003 Alfredo K. Kojima
  *  Copyright (c) 1998-2003 Dan Pascu
diff --git a/src/appicon.h b/src/appicon.h
index ac41ce7..dc3db0a 100644
--- a/src/appicon.h
+++ b/src/appicon.h
@@ -1,6 +1,6 @@
 /* appicon.h- application icon
  *
- *  WNativeWindow Maker window manager
+ *  Window Maker window manager
  *
  *  Copyright (c) 1997-2003 Alfredo K. Kojima
  *
diff --git a/src/application.c b/src/application.c
index 522f2d1..d25f0b5 100644
--- a/src/application.c
+++ b/src/application.c
@@ -1,5 +1,5 @@
 /*
- *  WNativeWindow Maker window manager
+ *  Window Maker window manager
  *
  *  Copyright (c) 1997-2003 Alfredo K. Kojima
  *  Copyright (c) 1998-2003 Dan Pascu
diff --git a/src/application.h b/src/application.h
index 267644c..a2a6bf3 100644
--- a/src/application.h
+++ b/src/application.h
@@ -1,5 +1,5 @@
 /*
- *  WNativeWindow Maker window manager
+ *  Window Maker window manager
  *
  *  Copyright (c) 1997-2003 Alfredo K. Kojima
  *
diff --git a/src/appmenu.c b/src/appmenu.c
index a5ed57c..886d693 100644
--- a/src/appmenu.c
+++ b/src/appmenu.c
@@ -1,6 +1,6 @@
 /* appmenu.c- application defined menu
  *
- *  WNativeWindow Maker window manager
+ *  Window Maker window manager
  *
  *  Copyright (c) 1997-2003 Alfredo K. Kojima
  *
diff --git a/src/appmenu.h b/src/appmenu.h
index 9de11e2..14effe5 100644
--- a/src/appmenu.h
+++ b/src/appmenu.h
@@ -1,6 +1,6 @@
 /* appmenu.h- application defined menu
  *
- *  WNativeWindow Maker window manager
+ *  Window Maker window manager
  *
  *  Copyright (c) 1997-2003 Alfredo K. Kojima
  *
diff --git a/src/backend/wayland/wl_backend.c b/src/backend/wayland/wl_backend.c
index e2207bf..a946b46 100644
--- a/src/backend/wayland/wl_backend.c
+++ b/src/backend/wayland/wl_backend.c
@@ -1,5 +1,5 @@
 /*
- * wl_backend.c -- wlroots-based Wayland compositor backend for WNativeWindow Maker
+ * wl_backend.c -- wlroots-based Wayland compositor backend for Window Maker
  *
  * Phase 31: complete stub vtable.  Every slot compiles and returns a safe
  * zero/null/false value.  Subsequent phases will replace stubs with real
@@ -14,7 +14,7 @@
  * Phase 37: frame callbacks driven by output frame event; XDG configure
  * sent on new toplevel so clients complete their first frame.
  * Phase 38: per-toplevel view struct with map/unmap/destroy lifecycle;
- * synthetic WNativeWindow IDs; context_save/find/delete implemented.
+ * synthetic Window IDs; context_save/find/delete implemented.
  * Phase 39: handle_toplevel_map wires XDG toplevel map to wManageWindow so
  * Wayland surfaces appear in scr->focused_window list.
  * Phase 40: handle_toplevel_unmap wires XDG toplevel unmap to wUnmanageWindow.
@@ -55,14 +55,14 @@
  * listener responds immediately with CLIENT_SIDE mode so clients draw their
  * own title bars (no X11 frame rendering in the Wayland path).
  * Phase 65: prop_get_transient_for implemented — walks xdg_toplevel->parent
- * chain and returns the synthetic WNativeWindow ID of the parent view so
+ * chain and returns the synthetic Window ID of the parent view so
  * dialog windows are correctly identified as transients by the policy layer.
  * Phase 66: XDG popup initial configure — schedule configure for
  * WLR_XDG_SURFACE_ROLE_POPUP so context menus and autocomplete dropdowns
  * can commit their first buffer without stalling on the compositor.
  * Phase 17: XWayland support — wlr_xwayland started alongside the headless
  * backend; X11 windows (e.g. GNUstep apps) appear via new_surface events,
- * receive synthetic WNativeWindow IDs equal to their xcb_window_t, and
+ * receive synthetic Window IDs equal to their xcb_window_t, and
  * are managed through the same wl_toplevel_view / wManageWindow lifecycle
  * as XDG toplevels.  DISPLAY env var is set so X11 clients can connect.
  * Phase 37: zwlr_data_control_manager_v1, zwlr_input_inhibitor_v1,
@@ -234,7 +234,7 @@ static void wm_dock_app_remove(WNativeWindow id);
 /*
  * wl_toplevel_view -- one entry per XDG toplevel managed by the compositor.
  * Holds the wlroots surface pointer, three lifecycle listeners, and a
- * synthetic WNativeWindow ID used as the policy-layer window handle.
+ * synthetic Window ID used as the policy-layer window handle.
  */
 struct wl_toplevel_view {
     struct wlr_xdg_surface  *xdg_surface;
@@ -718,7 +718,7 @@ static void handle_pointer_motion_absolute(struct wl_listener *listener, void *d
 static void handle_pointer_button(struct wl_listener *listener, void *data);
 static void handle_pointer_frame(struct wl_listener *listener, void *data);
 
-/* Phase 41: look up the view for a given synthetic WNativeWindow ID. */
+/* Phase 41: look up the view for a given synthetic Window ID. */
 static struct wl_toplevel_view *
 wl_find_view_by_id(WNativeWindow id)
 {
@@ -1611,7 +1611,7 @@ handle_xwayland_ready(struct wl_listener *listener, void *data)
 
 /*
  * handle_xwayland_new_surface — called when a new X11 window connects.
- * Allocates a wl_toplevel_view, uses window_id as the WNativeWindow ID,
+ * Allocates a wl_toplevel_view, uses window_id as the Window ID,
  * and wires the lifecycle listeners to XWayland signals.
  */
 static void
@@ -1815,7 +1815,7 @@ handle_toplevel_commit(struct wl_listener *listener, void *data)
 /*
  * Phase 36 / 38: new XDG toplevel listener (wlroots 0.19+).
  * Fires when the client calls get_toplevel on an xdg_surface.
- * Allocates a wl_toplevel_view, assigns a synthetic WNativeWindow ID,
+ * Allocates a wl_toplevel_view, assigns a synthetic Window ID,
  * wires lifecycle listeners, and sets up the initial commit handler.
  */
 static void
@@ -2187,7 +2187,7 @@ handle_backend_new_output(struct wl_listener *listener, void *data)
     /* Set window title when running as a nested compositor. */
     if (wl_state.is_nested && wl_state.wl_backend_inner &&
         wlr_backend_is_wl(wl_state.wl_backend_inner))
-        wlr_wl_output_set_title(output, "WNativeWindow Maker");
+        wlr_wl_output_set_title(output, "Window Maker");
 
     /* Create scene output and wire the frame renderer. */
     if (wl_state.scene) {
diff --git a/src/backend/wayland/wl_backend.h b/src/backend/wayland/wl_backend.h
index 9fdd731..7232541 100644
--- a/src/backend/wayland/wl_backend.h
+++ b/src/backend/wayland/wl_backend.h
@@ -1,5 +1,5 @@
 /*
- * wl_backend.h -- wlroots-based Wayland compositor backend for WNativeWindow Maker
+ * wl_backend.h -- wlroots-based Wayland compositor backend for Window Maker
  *
  * Declares the WMBackend vtable instance implemented in wl_backend.c.
  * Include this only from files that need to reference wl_backend directly
diff --git a/src/balloon.c b/src/balloon.c
index 07b5eb1..4e83606 100644
--- a/src/balloon.c
+++ b/src/balloon.c
@@ -1,8 +1,8 @@
 /*
- *  WNativeWindow Maker window manager
+ *  Window Maker window manager
  *
  *  Copyright (c) 1998-2003 Alfredo K. Kojima
- *  Copyright (c) 2014-2016 WNativeWindow Maker Team
+ *  Copyright (c) 2014-2016 Window Maker Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/src/balloon.h b/src/balloon.h
index 7397726..c0fa830 100644
--- a/src/balloon.h
+++ b/src/balloon.h
@@ -1,5 +1,5 @@
 /*
- *  WNativeWindow Maker window manager
+ *  Window Maker window manager
  *
  *  Copyright (c) 1997-2003 Alfredo K. Kojima
  *
diff --git a/src/client.c b/src/client.c
index 44a51d7..473b55f 100644
--- a/src/client.c
+++ b/src/client.c
@@ -1,5 +1,5 @@
 /*
- *  WNativeWindow Maker window manager
+ *  Window Maker window manager
  *
  *  Copyright (c) 1997-2003 Alfredo K. Kojima
  *
diff --git a/src/client.h b/src/client.h
index 070b7bd..1807843 100644
--- a/src/client.h
+++ b/src/client.h
@@ -1,5 +1,5 @@
 /*
- *  WNativeWindow Maker window manager
+ *  Window Maker window manager
  *
  *  Copyright (c) 1997-2003 Alfredo K. Kojima
  *
diff --git a/src/colormap.c b/src/colormap.c
index bb67c69..41c26a9 100644
--- a/src/colormap.c
+++ b/src/colormap.c
@@ -1,6 +1,6 @@
 /* colormap.c - colormap handling code
  *
- *  WNativeWindow Maker window manager
+ *  Window Maker window manager
  *
  *  Copyright (c) 1998-2003 Alfredo K. Kojima
  *
diff --git a/src/colormap.h b/src/colormap.h
index affb1f5..0236541 100644
--- a/src/colormap.h
+++ b/src/colormap.h
@@ -1,5 +1,5 @@
 /*
- *  WNativeWindow Maker window manager
+ *  Window Maker window manager
  *
  *  Copyright (c) 2000-2003 Alfredo K. Kojima
  *
diff --git a/src/cycling.c b/src/cycling.c
index d7949c6..08e31bb 100644
--- a/src/cycling.c
+++ b/src/cycling.c
@@ -1,6 +1,6 @@
 /* cycling.c- window cycling
  *
- *  WNativeWindow Maker window manager
+ *  Window Maker window manager
  *
  *  Copyright (c) 2000-2003 Alfredo K. Kojima
  *
diff --git a/src/cycling.h b/src/cycling.h
index 66c3af0..e56a9c2 100644
--- a/src/cycling.h
+++ b/src/cycling.h
@@ -1,8 +1,8 @@
 /*
- *  WNativeWindow Maker window manager
+ *  Window Maker window manager
  *
  *  Copyright (c) 1997-2003 Alfredo K. Kojima
- *  Copyright (c) 2013 WNativeWindow Maker Team
+ *  Copyright (c) 2013 Window Maker Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/src/defaults.c b/src/defaults.c
index a03d776..65215e6 100644
--- a/src/defaults.c
+++ b/src/defaults.c
@@ -1,10 +1,10 @@
 /* defaults.c - manage configuration through defaults db
  *
- *  WNativeWindow Maker window manager
+ *  Window Maker window manager
  *
  *  Copyright (c) 1997-2003 Alfredo K. Kojima
  *  Copyright (c) 1998-2003 Dan Pascu
- *  Copyright (c) 2014-2023 WNativeWindow Maker Team
+ *  Copyright (c) 2014-2023 Window Maker Team
 
  *
  *  This program is free software; you can redistribute it and/or modify
diff --git a/src/defaults.h b/src/defaults.h
index c9cc4ac..a03ff34 100644
--- a/src/defaults.h
+++ b/src/defaults.h
@@ -1,5 +1,5 @@
 /*
- *  WNativeWindow Maker window manager
+ *  Window Maker window manager
  *
  *  Copyright (c) 1997-2003 Alfredo K. Kojima
  *
diff --git a/src/dialog.c b/src/dialog.c
index b7b8389..9cddcf4 100644
--- a/src/dialog.c
+++ b/src/dialog.c
@@ -1,10 +1,10 @@
 /* dialog.c - dialog windows for internal use
  *
- *  WNativeWindow Maker window manager
+ *  Window Maker window manager
  *
  *  Copyright (c) 1997-2003 Alfredo K. Kojima
  *  Copyright (c) 1998-2003 Dan Pascu
- *  Copyright (c) 2014-2023 WNativeWindow Maker Team
+ *  Copyright (c) 2014-2023 Window Maker Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -1147,7 +1147,7 @@ typedef struct {
 #define COPYRIGHT_TEXT  \
     "Copyright \xc2\xa9 1997-2006 Alfredo K. Kojima\n"\
     "Copyright \xc2\xa9 1998-2006 Dan Pascu\n"\
-    "Copyright \xc2\xa9 2013-%hu WNativeWindow Maker Developers Team"
+    "Copyright \xc2\xa9 2013-%hu Window Maker Developers Team"
 
 static InfoPanel *infoPanel = NULL;
 
@@ -1296,7 +1296,7 @@ void wShowInfoPanel(WScreen *scr)
 		"Lucida Sans,Comic Sans MS,URW Gothic L,Trebuchet MS:italic:pixelsize=%d:antialias=true",
 		WMScaleY(24));
 	font = WMCreateFont(scr->wmscreen, buffer);
-	strbuf = "WNativeWindow Maker";
+	strbuf = "Window Maker";
 	if (font) {
 		width = WMWidthOfString(font, strbuf, strlen(strbuf));
 		WMSetLabelFont(panel->name1L, font);
@@ -1322,7 +1322,7 @@ void wShowInfoPanel(WScreen *scr)
 		font = NULL;
 	}
 	WMSetLabelTextAlignment(panel->name2L, WACenter);
-	WMSetLabelText(panel->name2L, _("WNativeWindow Manager for X"));
+	WMSetLabelText(panel->name2L, _("Window Manager for X"));
 
 	snprintf(buffer, sizeof(buffer), _("Version %s"), VERSION);
 	panel->versionL = WMCreateLabel(panel->win);
@@ -1570,11 +1570,11 @@ void wShowLegalPanel(WScreen *scr)
 	WMMoveWidget(panel->licenseL, WMScaleX(8), WMScaleY(8));
 	WMSetLabelTextAlignment(panel->licenseL, WALeft);
 	WMSetLabelText(panel->licenseL,
-		       _("    WNativeWindow Maker is free software; you can redistribute it and/or "
+		       _("    Window Maker is free software; you can redistribute it and/or "
 			 "modify it under the terms of the GNU General Public License as "
 			 "published by the Free Software Foundation; either version 2 of the "
 			 "License, or (at your option) any later version.\n\n"
-			 "    WNativeWindow Maker is distributed in the hope that it will be useful, "
+			 "    Window Maker is distributed in the hope that it will be useful, "
 			 "but WITHOUT ANY WARRANTY; without even the implied warranty "
 			 "of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. "
 			 "See the GNU General Public License for more details.\n\n"
@@ -1745,7 +1745,7 @@ int wShowCrashingDialogPanel(int whatSig)
 	WMResizeWidget(panel->noteL, PWIDTH - 20, 40);
 	WMMoveWidget(panel->noteL, 10, 90);
 	WMSetLabelTextAlignment(panel->noteL, WAJustified);
-	snprintf(buf, sizeof(buf), _("WNativeWindow Maker received signal %i."), whatSig);
+	snprintf(buf, sizeof(buf), _("Window Maker received signal %i."), whatSig);
 	WMSetLabelText(panel->noteL, buf);
 
 	panel->note2L = WMCreateLabel(panel->win);
@@ -1770,7 +1770,7 @@ int wShowCrashingDialogPanel(int whatSig)
 	WMSetPopUpButtonPullsDown(panel->whatP, False);
 	WMSetPopUpButtonText(panel->whatP, _("Select action"));
 	WMAddPopUpButtonItem(panel->whatP, _("Abort and leave a core file"));
-	WMAddPopUpButtonItem(panel->whatP, _("Restart WNativeWindow Maker"));
+	WMAddPopUpButtonItem(panel->whatP, _("Restart Window Maker"));
 	WMAddPopUpButtonItem(panel->whatP, _("Start alternate window manager"));
 	WMSetPopUpButtonAction(panel->whatP, setCrashAction, panel);
 	WMSetPopUpButtonSelectedItem(panel->whatP, WMRestart);
diff --git a/src/dialog.h b/src/dialog.h
index 52cddcb..c39e2af 100644
--- a/src/dialog.h
+++ b/src/dialog.h
@@ -1,5 +1,5 @@
 /*
- *  WNativeWindow Maker window manager
+ *  Window Maker window manager
  *
  *  Copyright (c) 1997-2003 Alfredo K. Kojima
  *
diff --git a/src/dock.c b/src/dock.c
index 25d0746..056f3b1 100644
--- a/src/dock.c
+++ b/src/dock.c
@@ -1,10 +1,10 @@
 /* dock.c- built-in Dock module for WindowMaker
  *
- *  WNativeWindow Maker window manager
+ *  Window Maker window manager
  *
  *  Copyright (c) 1997-2003 Alfredo K. Kojima
  *  Copyright (c) 1998-2003 Dan Pascu
- *  Copyright (c) 2009-2023 WNativeWindow Maker Team
+ *  Copyright (c) 2009-2023 Window Maker Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/src/dock.h b/src/dock.h
index 710c45b..0f8b6bf 100644
--- a/src/dock.h
+++ b/src/dock.h
@@ -1,6 +1,6 @@
 /* dock.h- built-in Dock module for WindowMaker
  *
- *  WNativeWindow Maker window manager
+ *  Window Maker window manager
  *
  *  Copyright (c) 1997-2003 Alfredo K. Kojima
  *  Copyright (c) 1998-2003 Dan Pascu
diff --git a/src/dockedapp.c b/src/dockedapp.c
index f3d8145..47fb77c 100644
--- a/src/dockedapp.c
+++ b/src/dockedapp.c
@@ -1,6 +1,6 @@
 /* dockedapp.c- docked application settings panel
  *
- *  WNativeWindow Maker window manager
+ *  Window Maker window manager
  *
  *  Copyright (c) 1998-2003 Alfredo K. Kojima
  *
@@ -274,7 +274,7 @@ void ShowDockAppSettingsPanel(WAppIcon * aicon)
 
 	panel->autoLaunchBtn = WMCreateSwitchButton(vbox);
 	WMAddBoxSubview(vbox, WMWidgetView(panel->autoLaunchBtn), False, True, WMScaleY(20), WMScaleY(20), WMScaleY(2));
-	WMSetButtonText(panel->autoLaunchBtn, _("Start when WNativeWindow Maker is started"));
+	WMSetButtonText(panel->autoLaunchBtn, _("Start when Window Maker is started"));
 	WMSetButtonSelected(panel->autoLaunchBtn, aicon->auto_launch);
 
 	panel->lockBtn = WMCreateSwitchButton(vbox);
diff --git a/src/dockedapp.h b/src/dockedapp.h
index 359f245..67fd07c 100644
--- a/src/dockedapp.h
+++ b/src/dockedapp.h
@@ -1,5 +1,5 @@
 /*
- *  WNativeWindow Maker window manager
+ *  Window Maker window manager
  *
  *  Copyright (c) 1997-2003 Alfredo K. Kojima
  *  Copyright (c) 1998-2003 Dan Pascu
diff --git a/src/event.c b/src/event.c
index e19a2df..9cd3ecd 100644
--- a/src/event.c
+++ b/src/event.c
@@ -1,9 +1,9 @@
 /* event.c- event loop and handling
  *
- *  WNativeWindow Maker window manager
+ *  Window Maker window manager
  *
  *  Copyright (c) 1997-2003 Alfredo K. Kojima
- *  Copyright (c) 2014-2023 WNativeWindow Maker Team
+ *  Copyright (c) 2014-2023 Window Maker Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/src/event.h b/src/event.h
index 7bdeeb4..91272b1 100644
--- a/src/event.h
+++ b/src/event.h
@@ -1,8 +1,8 @@
 /*
- *  WNativeWindow Maker window manager
+ *  Window Maker window manager
  *
  *  Copyright (c) 1997-2003 Alfredo K. Kojima
- *  Copyright (c) 2013 WNativeWindow Maker Team
+ *  Copyright (c) 2013 Window Maker Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/src/framewin.c b/src/framewin.c
index 82f391d..0ea9423 100644
--- a/src/framewin.c
+++ b/src/framewin.c
@@ -1,5 +1,5 @@
 /*
- *  WNativeWindow Maker window manager
+ *  Window Maker window manager
  *
  *  Copyright (c) 1997-2003 Alfredo K. Kojima
  *
diff --git a/src/framewin.h b/src/framewin.h
index 327b1f2..0475e45 100644
--- a/src/framewin.h
+++ b/src/framewin.h
@@ -1,5 +1,5 @@
 /*
- *  WNativeWindow Maker window manager
+ *  Window Maker window manager
  *
  *  Copyright (c) 1997-2003 Alfredo K. Kojima
  *
diff --git a/src/icon.c b/src/icon.c
index f7a8080..ca2bcd6 100644
--- a/src/icon.c
+++ b/src/icon.c
@@ -1,6 +1,6 @@
 /* icon.c - window icon and dock and appicon parent
  *
- *  WNativeWindow Maker window manager
+ *  Window Maker window manager
  *
  *  Copyright (c) 1997-2003 Alfredo K. Kojima
  *
diff --git a/src/icon.h b/src/icon.h
index d832708..4b9feb1 100644
--- a/src/icon.h
+++ b/src/icon.h
@@ -1,5 +1,5 @@
 /*
- *  WNativeWindow Maker window manager
+ *  Window Maker window manager
  *
  *  Copyright (c) 1997-2003 Alfredo K. Kojima
  *
diff --git a/src/keybind.h b/src/keybind.h
index b71e2f0..a947857 100644
--- a/src/keybind.h
+++ b/src/keybind.h
@@ -1,8 +1,8 @@
 /*
- *  WNativeWindow Maker window manager
+ *  Window Maker window manager
  *
  *  Copyright (c) 1997-2003 Alfredo K. Kojima
- *  Copyright (c) 2014-2023 WNativeWindow Maker Team
+ *  Copyright (c) 2014-2023 Window Maker Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/src/main.c b/src/main.c
index 631b418..abccfda 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1,5 +1,5 @@
 /*
- *  WNativeWindow Maker window manager
+ *  Window Maker window manager
  *
  *  Copyright (c) 1997-2003 Alfredo K. Kojima
  *
@@ -225,7 +225,7 @@ void Restart(char *manager, Bool abortOnFailure)
 	wm_backend->display_close();
 	if (!prog) {
 		execvp(Arguments[0], Arguments);
-		wfatal(_("failed to restart WNativeWindow Maker."));
+		wfatal(_("failed to restart Window Maker."));
 	} else {
 		execvp(prog, argv);
 		werror(_("could not exec %s"), prog);
@@ -440,7 +440,7 @@ noreturn void wAbort(Bool dumpCore)
 static void print_help(void)
 {
 	printf(_("Usage: %s [options]\n"), ProgName);
-	puts(_("The WNativeWindow Maker window manager for the X window system"));
+	puts(_("The Window Maker window manager for the X window system"));
 	puts("");
 	puts(_(" -display host:dpy	display to use"));
 #ifdef USE_ICCCM_WMREPLACE
@@ -475,7 +475,7 @@ static void check_defaults(void)
 
 		if (system("wmaker.inst --batch") != 0) {
 			wwarning(_("There was an error while creating GNUstep directory, please "
-				   "make sure you have installed WNativeWindow Maker correctly and run wmaker.inst"));
+				   "make sure you have installed Window Maker correctly and run wmaker.inst"));
 		} else {
 			wwarning(_("%s directory created with default configuration."), path);
 		}
@@ -665,7 +665,7 @@ static int real_main(int argc, char **argv)
 				wPreferences.flags.replace = 1;
 #endif
 			} else if (strcmp(argv[i], "-version") == 0 || strcmp(argv[i], "--version") == 0) {
-				printf("WNativeWindow Maker %s\n", VERSION);
+				printf("Window Maker %s\n", VERSION);
 				exit(0);
 			} else if (strcmp(argv[i], "--global_defaults_path") == 0) {
 				printf("%s\n", PKGCONFDIR);
@@ -700,7 +700,7 @@ static int real_main(int argc, char **argv)
 #ifndef HAVE_INOTIFY
 				wPreferences.flags.noupdates = 1;
 #else
-				wmessage(_("your version of WNativeWindow Maker was compiled with INotify support, so \"--no-polling\" has no effect"));
+				wmessage(_("your version of Window Maker was compiled with INotify support, so \"--no-polling\" has no effect"));
 #endif
 			} else if (strcmp(argv[i], "--help") == 0) {
 				print_help();
diff --git a/src/main.h b/src/main.h
index d6385af..55c6ce6 100644
--- a/src/main.h
+++ b/src/main.h
@@ -1,5 +1,5 @@
 /*
- *  WNativeWindow Maker window manager
+ *  Window Maker window manager
  *
  *  Copyright (c) 1997-2003 Alfredo K. Kojima
  *  Copyright (c) 1998-2003 Dan Pascu
diff --git a/src/menu.c b/src/menu.c
index 3a6258b..7c5e7b6 100644
--- a/src/menu.c
+++ b/src/menu.c
@@ -1,6 +1,6 @@
 /* menu.c- generic menu, used for root menu, application menus etc.
  *
- *  WNativeWindow Maker window manager
+ *  Window Maker window manager
  *
  *  Copyright (c) 1997-2003 Alfredo K. Kojima
  *  Copyright (c) 1998-2003 Dan Pascu
diff --git a/src/menu.h b/src/menu.h
index c09a32f..d308247 100644
--- a/src/menu.h
+++ b/src/menu.h
@@ -1,5 +1,5 @@
 /*
- *  WNativeWindow Maker window manager
+ *  Window Maker window manager
  *
  *  Copyright (c) 1997-2003 Alfredo K. Kojima
  *
diff --git a/src/misc.c b/src/misc.c
index edcc6a4..a810669 100644
--- a/src/misc.c
+++ b/src/misc.c
@@ -1,5 +1,5 @@
 /*
- *  WNativeWindow Maker window manager
+ *  Window Maker window manager
  *
  *  Copyright (c) 1997-2003 Alfredo K. Kojima
  *
@@ -558,7 +558,7 @@ void ExecuteExitCommand(WScreen *scr, long quickmode)
 
 		oldSaveSessionFlag = wPreferences.save_session_on_exit;
 		r = wExitDialog(scr, _("Exit"),
-				_("Are you sure you want to quit WNativeWindow Maker?"), _("Exit"), _("Cancel"), NULL);
+				_("Are you sure you want to quit Window Maker?"), _("Exit"), _("Cancel"), NULL);
 
 		if (r == WAPRDefault) {
 			result = R_EXIT;
diff --git a/src/misc.h b/src/misc.h
index 383c5d1..ce1249d 100644
--- a/src/misc.h
+++ b/src/misc.h
@@ -1,8 +1,8 @@
 /*
- *  WNativeWindow Maker window manager
+ *  Window Maker window manager
  *
  *  Copyright (c) 1997-2003 Alfredo K. Kojima
- *  Copyright (c) 2013-2023 WNativeWindow Maker Team
+ *  Copyright (c) 2013-2023 Window Maker Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/src/monitor.c b/src/monitor.c
index f299621..a40359f 100644
--- a/src/monitor.c
+++ b/src/monitor.c
@@ -1,6 +1,6 @@
 /* monitor.c - monitors the wmaker process
  *
- *  WNativeWindow Maker window manager
+ *  Window Maker window manager
  *
  *  Copyright (c) 1997-2004 Alfredo K. Kojima
  *
@@ -77,21 +77,21 @@ int MonitorLoop(int argc, char **argv)
 	for (;;) {
 		last_start = time(NULL);
 
-		/* Start WNativeWindow Maker */
+		/* Start Window Maker */
 		pid = fork();
 		if (pid == 0) {
 			execvp(child_argv[0], child_argv);
-			werror(_("Error respawning WNativeWindow Maker"));
+			werror(_("Error respawning Window Maker"));
 			exit(1);
 		} else if (pid < 0) {
-			werror(_("Error respawning WNativeWindow Maker"));
+			werror(_("Error respawning Window Maker"));
 			exit(1);
 		}
 
 		do {
 			exited = waitpid(-1, &status, 0);
 			if (exited < 0) {
-				werror(_("Error during monitoring of WNativeWindow Maker process."));
+				werror(_("Error during monitoring of Window Maker process."));
 				error = True;
 				break;
 			}
@@ -116,7 +116,7 @@ int MonitorLoop(int argc, char **argv)
 					return 1;
 				}
 			}
-			wwarning(_("WNativeWindow Maker exited due to a crash (signal %i) and will be restarted."),
+			wwarning(_("Window Maker exited due to a crash (signal %i) and will be restarted."),
 				 WTERMSIG(status));
 		} else
 			break;
diff --git a/src/monitor.h b/src/monitor.h
index ccecac0..fb9f7f1 100644
--- a/src/monitor.h
+++ b/src/monitor.h
@@ -1,8 +1,8 @@
 /*
- *  WNativeWindow Maker window manager
+ *  Window Maker window manager
  *
  *  Copyright (c) 1997-2003 Alfredo K. Kojima
- *  Copyright (c) 2013 WNativeWindow Maker Team
+ *  Copyright (c) 2013 Window Maker Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/src/motif.c b/src/motif.c
index 9b19f56..ef4a0db 100644
--- a/src/motif.c
+++ b/src/motif.c
@@ -1,6 +1,6 @@
 /* motif.c-- stuff for support for mwm hints
  *
- *  WNativeWindow Maker window manager
+ *  Window Maker window manager
  *
  *  Copyright (c) 1998-2003 Alfredo K. Kojima
  *
diff --git a/src/motif.h b/src/motif.h
index 46442cc..a5619ee 100644
--- a/src/motif.h
+++ b/src/motif.h
@@ -1,6 +1,6 @@
 /* motif.h-- stuff for support for mwm hints
  *
- *  WNativeWindow Maker window manager
+ *  Window Maker window manager
  *
  *  Copyright (c) 1998-2003 Alfredo K. Kojima
  *
diff --git a/src/moveres.c b/src/moveres.c
index 3f7f248..a739a2b 100644
--- a/src/moveres.c
+++ b/src/moveres.c
@@ -1,5 +1,5 @@
 /*
- *  WNativeWindow Maker window manager
+ *  Window Maker window manager
  *
  *  Copyright (c) 1997-2003 Alfredo K. Kojima
  *
diff --git a/src/osdep.h b/src/osdep.h
index c128d28..485995c 100644
--- a/src/osdep.h
+++ b/src/osdep.h
@@ -1,5 +1,5 @@
 /*
- *  WNativeWindow Maker window manager
+ *  Window Maker window manager
  *
  *  Copyright (c) 1997-2003 Alfredo K. Kojima
  *
diff --git a/src/pixmap.c b/src/pixmap.c
index 7b6e3e6..9dcded1 100644
--- a/src/pixmap.c
+++ b/src/pixmap.c
@@ -1,5 +1,5 @@
 /*
- *  WNativeWindow Maker window manager
+ *  Window Maker window manager
  *
  *  Copyright (c) 1997-2003 Alfredo K. Kojima
  *
diff --git a/src/pixmap.h b/src/pixmap.h
index 445c27e..a0e73f3 100644
--- a/src/pixmap.h
+++ b/src/pixmap.h
@@ -1,5 +1,5 @@
 /*
- *  WNativeWindow Maker window manager
+ *  Window Maker window manager
  *
  *  Copyright (c) 1997-2003 Alfredo K. Kojima
  *
diff --git a/src/placement.c b/src/placement.c
index ede31dd..6d1ade5 100644
--- a/src/placement.c
+++ b/src/placement.c
@@ -1,6 +1,6 @@
 /* placement.c - window and icon placement on screen
  *
- *  WNativeWindow Maker window manager
+ *  Window Maker window manager
  *
  *  Copyright (c) 1997-2003 Alfredo K. Kojima
  *
diff --git a/src/placement.h b/src/placement.h
index 1a9ed31..37d2441 100644
--- a/src/placement.h
+++ b/src/placement.h
@@ -1,9 +1,9 @@
 /* placement.h - window and icon placement on screen
  *
- *  WNativeWindow Maker window manager
+ *  Window Maker window manager
  *
  *  Copyright (c) 1997-2003 Alfredo K. Kojima
- *  Copyright (c) 2013-2016 WNativeWindow Maker Team
+ *  Copyright (c) 2013-2016 Window Maker Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/src/properties.c b/src/properties.c
index 9a2d3db..d09c97f 100644
--- a/src/properties.c
+++ b/src/properties.c
@@ -1,5 +1,5 @@
 /*
- *  WNativeWindow Maker window manager
+ *  Window Maker window manager
  *
  *  Copyright (c) 1997-2003 Alfredo K. Kojima
  *
diff --git a/src/properties.h b/src/properties.h
index 432f4cf..b17e1f3 100644
--- a/src/properties.h
+++ b/src/properties.h
@@ -1,5 +1,5 @@
 /*
- *  WNativeWindow Maker window manager
+ *  Window Maker window manager
  *
  *  Copyright (c) 1997-2003 Alfredo K. Kojima
  *
diff --git a/src/resources.c b/src/resources.c
index 2dffc7e..f128514 100644
--- a/src/resources.c
+++ b/src/resources.c
@@ -1,6 +1,6 @@
 /* resources.c - manage X resources (colors etc)
  *
- *  WNativeWindow Maker window manager
+ *  Window Maker window manager
  *
  *  Copyright (c) 1997-2003 Alfredo K. Kojima
  *
diff --git a/src/resources.h b/src/resources.h
index e9d872a..c07c146 100644
--- a/src/resources.h
+++ b/src/resources.h
@@ -1,5 +1,5 @@
 /*
- *  WNativeWindow Maker window manager
+ *  Window Maker window manager
  *
  *  Copyright (c) 1997-2003 Alfredo K. Kojima
  *
diff --git a/src/rootmenu.c b/src/rootmenu.c
index fa761e1..765dfeb 100644
--- a/src/rootmenu.c
+++ b/src/rootmenu.c
@@ -1,10 +1,10 @@
 /* rootmenu.c- user defined menu
  *
- *  WNativeWindow Maker window manager
+ *  Window Maker window manager
  *
  *  Copyright (c) 1997-2003 Alfredo K. Kojima
  *  Copyright (c) 1998-2003 Dan Pascu
- *  Copyright (c) 2014-2023 WNativeWindow Maker Team
+ *  Copyright (c) 2014-2023 Window Maker Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -176,7 +176,7 @@ static void shutdownCommand(WMenu * menu, WMenuEntry * entry)
 
 		r = wExitDialog(menu->frame->screen_ptr,
 				_("Kill X session"),
-				_("Kill WNativeWindow System session?\n"
+				_("Kill Window System session?\n"
 				  "(all applications will be closed)"), _("Kill"), _("Cancel"), NULL);
 		if (r == WAPRDefault) {
 			result = R_KILL;
@@ -801,7 +801,7 @@ static WMenuEntry *addWindowsMenu(WScreen *scr, WMenu *menu, const char *title)
 	} else {
 		scr->flags.added_windows_menu = 1;
 
-		wwmenu = wMenuCreate(scr, _("WNativeWindow List"), False);
+		wwmenu = wMenuCreate(scr, _("Window List"), False);
 		wwmenu->on_destroy = cleanupWindowsMenu;
 		scr->switch_menu = wwmenu;
 		wwin = scr->focused_window;
diff --git a/src/rootmenu.h b/src/rootmenu.h
index aa2e99d..c62ffbe 100644
--- a/src/rootmenu.h
+++ b/src/rootmenu.h
@@ -1,6 +1,6 @@
 /* rootmenu.h- user defined menu
  *
- *  WNativeWindow Maker window manager
+ *  Window Maker window manager
  *
  *  Copyright (c) 2000-2003 Alfredo K. Kojima
  *
diff --git a/src/screen.c b/src/screen.c
index 05bac2c..1accdf0 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -1,6 +1,6 @@
 /* screen.c - screen management
  *
- *  WNativeWindow Maker window manager
+ *  Window Maker window manager
  *
  *  Copyright (c) 1997-2003 Alfredo K. Kojima
  *
@@ -626,7 +626,7 @@ void ScreenCapture(WScreen *scr, int mode)
 	}
 
 	if (img) {
-		if (RSaveTitledImage(img, filepath, (char *)(filetype + 1), "Screenshot from WNativeWindow Maker")) {
+		if (RSaveTitledImage(img, filepath, (char *)(filetype + 1), "Screenshot from Window Maker")) {
 			scale_img = RSmoothScaleImage(img, scr->scr_width / 10, scr->scr_height / 10);
 			wm_backend->screen_show_mini_screenshot(scr, scale_img);
 			RReleaseImage(scale_img);
diff --git a/src/screen.h b/src/screen.h
index 1bf8a5c..c00db4f 100644
--- a/src/screen.h
+++ b/src/screen.h
@@ -1,5 +1,5 @@
 /*
- *  WNativeWindow Maker window manager
+ *  Window Maker window manager
  *
  *  Copyright (c) 1997-2003 Alfredo K. Kojima
  *
diff --git a/src/session.c b/src/session.c
index cd266a9..5fd79bc 100644
--- a/src/session.c
+++ b/src/session.c
@@ -3,7 +3,7 @@
  *  Copyright (c) 1998-2003 Dan Pascu
  *  Copyright (c) 1998-2003 Alfredo Kojima
  *
- *  WNativeWindow Maker window manager
+ *  Window Maker window manager
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/src/session.h b/src/session.h
index b27d026..4a7b9b4 100644
--- a/src/session.h
+++ b/src/session.h
@@ -2,7 +2,7 @@
  *
  *  Copyright (c) 1999-2003 Alfredo K. Kojima
  *
- *  WNativeWindow Maker window manager
+ *  Window Maker window manager
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/src/shutdown.c b/src/shutdown.c
index 7b48673..164100e 100644
--- a/src/shutdown.c
+++ b/src/shutdown.c
@@ -1,5 +1,5 @@
 /*
- *  WNativeWindow Maker window manager
+ *  Window Maker window manager
  *
  *  Copyright (c) 1997-2003 Alfredo K. Kojima
  *
diff --git a/src/shutdown.h b/src/shutdown.h
index f5a40f9..718ae9b 100644
--- a/src/shutdown.h
+++ b/src/shutdown.h
@@ -1,8 +1,8 @@
 /* shutdown.c - Shutdown functions
  *
- *  WNativeWindow Maker window manager
+ *  Window Maker window manager
  *
- *  Copyright (c) 2013 WNativeWindow Maker Team
+ *  Copyright (c) 2013 Window Maker Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/src/stacking.c b/src/stacking.c
index 324aaf2..b0a543b 100644
--- a/src/stacking.c
+++ b/src/stacking.c
@@ -1,5 +1,5 @@
 /*
- *  WNativeWindow Maker window manager
+ *  Window Maker window manager
  *
  *  Copyright (c) 1997-2003 Alfredo K. Kojima
  *  Copyright (c) 1998-2003 Dan Pascu
diff --git a/src/stacking.h b/src/stacking.h
index de781dd..574ed74 100644
--- a/src/stacking.h
+++ b/src/stacking.h
@@ -1,5 +1,5 @@
 /*
- *  WNativeWindow Maker window manager
+ *  Window Maker window manager
  *
  *  Copyright (c) 1997-2003 Alfredo K. Kojima
  *
diff --git a/src/startup.c b/src/startup.c
index e3d1e46..635965f 100644
--- a/src/startup.c
+++ b/src/startup.c
@@ -1,5 +1,5 @@
 /*
- *  WNativeWindow Maker window manager
+ *  Window Maker window manager
  *
  *  Copyright (c) 1997-2003 Alfredo K. Kojima
  *  Copyright (c) 1998-2003 Dan Pascu
@@ -360,7 +360,7 @@ void StartUp(Bool defaultScreenOnly)
 	sigaction(SIGCHLD, &sig_action, NULL);
 
 	/* Now we unblock all signals, that may have been blocked by the parent
-	 * who exec()-ed us. This can happen for example if WNativeWindow Maker crashes
+	 * who exec()-ed us. This can happen for example if Window Maker crashes
 	 * and restarts itself or another window manager from the signal handler.
 	 * In this case, the new process inherits the blocked signal mask and
 	 * will no longer react to that signal, until unblocked.
diff --git a/src/startup.h b/src/startup.h
index 12f38a5..3111978 100644
--- a/src/startup.h
+++ b/src/startup.h
@@ -1,8 +1,8 @@
 /*
- *  WNativeWindow Maker window manager
+ *  Window Maker window manager
  *
  *  Copyright (c) 1997-2003 Alfredo K. Kojima
- *  Copyright (c) 2013 WNativeWindow Maker Team
+ *  Copyright (c) 2013 Window Maker Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/src/superfluous.c b/src/superfluous.c
index 80607be..bebec68 100644
--- a/src/superfluous.c
+++ b/src/superfluous.c
@@ -1,5 +1,5 @@
 /*
- *  WNativeWindow Maker window manager
+ *  Window Maker window manager
  *
  *  Copyright (c) 1997-2003 Alfredo K. Kojima
  *  Copyright (c) 1998-2003 Dan Pascu
diff --git a/src/superfluous.h b/src/superfluous.h
index 5d9baf7..6794690 100644
--- a/src/superfluous.h
+++ b/src/superfluous.h
@@ -1,5 +1,5 @@
 /*
- *  WNativeWindow Maker window manager
+ *  Window Maker window manager
  *
  *  Copyright (c) 1997-2003 Alfredo K. Kojima
  *
diff --git a/src/switchmenu.c b/src/switchmenu.c
index abd0ca7..ad56304 100644
--- a/src/switchmenu.c
+++ b/src/switchmenu.c
@@ -1,5 +1,5 @@
 /*
- *  WNativeWindow Maker window manager
+ *  Window Maker window manager
  *
  *  Copyright (c) 1997      Shige Abe
  *  Copyright (c) 1997-2003 Alfredo K. Kojima
diff --git a/src/switchmenu.h b/src/switchmenu.h
index cd194b7..810286a 100644
--- a/src/switchmenu.h
+++ b/src/switchmenu.h
@@ -1,8 +1,8 @@
 /*
- *  WNativeWindow Maker window manager
+ *  Window Maker window manager
  *
  *  Copyright (c) 1997-2003 Alfredo K. Kojima
- *  Copyright (c) 2013 WNativeWindow Maker Team
+ *  Copyright (c) 2013 Window Maker Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/src/switchpanel.c b/src/switchpanel.c
index 8b6ebd1..5732bff 100644
--- a/src/switchpanel.c
+++ b/src/switchpanel.c
@@ -1,5 +1,5 @@
 /*
- *  WNativeWindow Maker window manager
+ *  Window Maker window manager
  *
  *  Copyright (c) 1997-2004 Alfredo K. Kojima
  *
diff --git a/src/switchpanel.h b/src/switchpanel.h
index 4bc1555..6943e11 100644
--- a/src/switchpanel.h
+++ b/src/switchpanel.h
@@ -1,5 +1,5 @@
 /*
- *  WNativeWindow Maker window manager
+ *  Window Maker window manager
  *
  *  Copyright (c) 1997-2004 Alfredo K. Kojima
  *
diff --git a/src/texture.c b/src/texture.c
index c52a774..bd1f44f 100644
--- a/src/texture.c
+++ b/src/texture.c
@@ -1,5 +1,5 @@
 /*
- *  WNativeWindow Maker window manager
+ *  Window Maker window manager
  *
  *  Copyright (c) 1997-2003 Alfredo K. Kojima
  *
diff --git a/src/texture.h b/src/texture.h
index 162e0ab..485f654 100644
--- a/src/texture.h
+++ b/src/texture.h
@@ -1,5 +1,5 @@
 /*
- *  WNativeWindow Maker window manager
+ *  Window Maker window manager
  *
  *  Copyright (c) 1997-2003 Alfredo K. Kojima
  *
diff --git a/src/usermenu.c b/src/usermenu.c
index 712ab0f..b1df5ee 100644
--- a/src/usermenu.c
+++ b/src/usermenu.c
@@ -1,6 +1,6 @@
 /* usermenu.c- user defined menu
  *
- *  WNativeWindow Maker window manager
+ *  Window Maker window manager
  *
  *  Copyright (c) hmmm... Should I put everybody's name here?
  *  Where's my lawyer?? -- ]d :D
diff --git a/src/usermenu.h b/src/usermenu.h
index ea8db47..2a9cde8 100644
--- a/src/usermenu.h
+++ b/src/usermenu.h
@@ -1,6 +1,6 @@
 /* usermenu.h- user defined menu
  *
- *  WNativeWindow Maker window manager
+ *  Window Maker window manager
  *
  *  Copyright (c) hmmm... Should I put everybody's name here?
  *  Where's my lawyer?? -- ]d :D
diff --git a/src/wcore.c b/src/wcore.c
index d46b2dc..394677c 100644
--- a/src/wcore.c
+++ b/src/wcore.c
@@ -1,5 +1,5 @@
 /*
- *  WNativeWindow Maker window manager
+ *  Window Maker window manager
  *
  *  Copyright (c) 1997-2003 Alfredo K. Kojima
  *
diff --git a/src/wcore.h b/src/wcore.h
index d8d9d0d..11121e0 100644
--- a/src/wcore.h
+++ b/src/wcore.h
@@ -1,5 +1,5 @@
 /*
- *  WNativeWindow Maker window manager
+ *  Window Maker window manager
  *
  *  Copyright (c) 1997-2003 Alfredo K. Kojima
  *
diff --git a/src/wdefaults.c b/src/wdefaults.c
index 08d6bff..e725564 100644
--- a/src/wdefaults.c
+++ b/src/wdefaults.c
@@ -1,6 +1,6 @@
 /* wdefaults.c - window specific defaults
  *
- *  WNativeWindow Maker window manager
+ *  Window Maker window manager
  *
  *  Copyright (c) 1997-2003 Alfredo K. Kojima
  *
diff --git a/src/wdefaults.h b/src/wdefaults.h
index e869dbe..c8cbff5 100644
--- a/src/wdefaults.h
+++ b/src/wdefaults.h
@@ -1,5 +1,5 @@
 /*
- *  WNativeWindow Maker window manager
+ *  Window Maker window manager
  *
  *  Copyright (c) 1997-2003 Alfredo K. Kojima
  *
diff --git a/src/window.c b/src/window.c
index a215943..ce7fa27 100644
--- a/src/window.c
+++ b/src/window.c
@@ -1,9 +1,9 @@
 /* window.c - client window managing stuffs
  *
- *  WNativeWindow Maker window manager
+ *  Window Maker window manager
  *
  *  Copyright (c) 1997-2003 Alfredo K. Kojima
- *  Copyright (c) 2008-2023 WNativeWindow Maker Team
+ *  Copyright (c) 2008-2023 Window Maker Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/src/window.h b/src/window.h
index bf737ca..4d941eb 100644
--- a/src/window.h
+++ b/src/window.h
@@ -1,5 +1,5 @@
 /*
- *  WNativeWindow Maker window manager
+ *  Window Maker window manager
  *
  *  Copyright (c) 1997-2003 Alfredo K. Kojima
  *
@@ -292,7 +292,7 @@ typedef struct WWindow {
 						 * else is NULL! */
 	int icon_x, icon_y;			/* position of the icon */
 	int icon_w, icon_h;
-	RImage *net_icon_image;			/* WNativeWindow Image */
+	RImage *net_icon_image;			/* Window Image */
 	WNETWindowType window_type;		/* _NET_WM_WINDOW_TYPE (WNW_TYPE_*) */
 	/* Phase 67: workspace slot for Wayland path (frame is NULL, so
 	 * frame->workspace is unavailable; workspace operations use this
diff --git a/src/winmenu.c b/src/winmenu.c
index 7aad3ad..ba30cb8 100644
--- a/src/winmenu.c
+++ b/src/winmenu.c
@@ -1,6 +1,6 @@
 /* winmenu.c - command menu for windows
  *
- *  WNativeWindow Maker window manager
+ *  Window Maker window manager
  *
  *  Copyright (c) 1997-2003 Alfredo K. Kojima
  *
@@ -97,7 +97,7 @@ static const struct {
  * Defines the menu entries for the Options sub-menu
  *
  * These options will be placed at the beginning of the menu, the rest will
- * be populated with the WNativeWindow Shortcut possibilities
+ * be populated with the Window Shortcut possibilities
  */
 enum
 {
diff --git a/src/winmenu.h b/src/winmenu.h
index dab52dc..f8b6e88 100644
--- a/src/winmenu.h
+++ b/src/winmenu.h
@@ -1,8 +1,8 @@
 /*
- *  WNativeWindow Maker window manager
+ *  Window Maker window manager
  *
  *  Copyright (c) 1997-2003 Alfredo K. Kojima
- *  Copyright (c) 2013 WNativeWindow Maker Team
+ *  Copyright (c) 2013 Window Maker Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/src/winspector.c b/src/winspector.c
index 12d9888..5de762a 100644
--- a/src/winspector.c
+++ b/src/winspector.c
@@ -1,6 +1,6 @@
 /* winspector.c - window attribute inspector
  *
- *  WNativeWindow Maker window manager
+ *  Window Maker window manager
  *
  *  Copyright (c) 1997-2003 Alfredo K. Kojima
  *  Copyright (c) 1998-2003 Dan Pascu
@@ -108,7 +108,7 @@ static const struct {
 
 }, advanced_option[] = {
 	{ "NoKeyBindings", { .no_bind_keys = 1 }, N_("Do not bind keyboard shortcuts"),
-	  N_("Do not bind keyboard shortcuts from WNativeWindow Maker\n"
+	  N_("Do not bind keyboard shortcuts from Window Maker\n"
 	     "when this window is focused. This will allow the\n"
 	     "window to receive all key combinations regardless\n"
 	     "of your shortcut configuration.") },
@@ -139,16 +139,16 @@ static const struct {
 	{ "DontSaveSession", { .dont_save_session = 1 }, N_("Ignore 'Save Session'"),
 	  N_("Do not save the associated application in the\n"
 	     "session's state, so that it won't be restarted\n"
-	     "together with other applications when WNativeWindow Maker\n"
+	     "together with other applications when Window Maker\n"
 	     "starts.") },
 
 	{ "EmulateAppIcon", { .emulate_appicon = 1 }, N_("Emulate application icon"),
 	  N_("Make this window act as an application that provides\n"
-	     "enough information to WNativeWindow Maker for a dockable\n"
+	     "enough information to Window Maker for a dockable\n"
 	     "application icon to be created.") },
 
 	{ "FocusAcrossWorkspace", { .focus_across_wksp = 1 }, N_("Focus across workspaces"),
-	  N_("Allow WNativeWindow Maker to switch workspace to satisfy\n"
+	  N_("Allow Window Maker to switch workspace to satisfy\n"
 	     "a focus request (annoying).") },
 
 	{ "NoMiniaturizable", { .no_miniaturizable = 1 }, N_("Do not let it be minimized"),
@@ -641,7 +641,7 @@ static void saveSettings(WMWidget *button, void *client_data)
 
 	flags |= IS_BOOLEAN;
 
-	/* Attributes... --> WNativeWindow Attributes */
+	/* Attributes... --> Window Attributes */
 	for (i = 0; i < wlengthof(window_attribute); i++) {
 		value = (WMGetButtonSelected(panel->attrChk[i]) != 0) ? Yes : No;
 		different |= insertAttribute(dict, winDic, pl_attribute[i], value, flags);
@@ -725,7 +725,7 @@ static void applySettings(WMWidget *button, void *client_data)
 
 	showIconFor(WMWidgetScreen(button), panel, NULL, NULL, USE_TEXT_FIELD);
 
-	/* Attributes... --> WNativeWindow Attributes */
+	/* Attributes... --> Window Attributes */
 	for (i = 0; i < wlengthof(window_attribute); i++) {
 		if (WMGetButtonSelected(panel->attrChk[i]))
 			set_attr_flag(&wwin->user_flags, &window_attribute[i].flag);
@@ -897,7 +897,7 @@ static void revertSettings(WMWidget *button, void *client_data)
 
 	wWindowSetupInitialAttributes(wwin, &level, &workspace);
 
-	/* Attributes... --> WNativeWindow Attributes */
+	/* Attributes... --> Window Attributes */
 	for (i = 0; i < wlengthof(window_attribute); i++) {
 		int is_userdef, flag;
 
@@ -1104,8 +1104,8 @@ static InspectorPanel *createInspectorForWindow(WWindow *wwin, int xpos, int ypo
 	WMMoveWidget(panel->pagePopUp, 25, 15);
 	WMResizeWidget(panel->pagePopUp, PWIDTH - 50, 20);
 
-	WMAddPopUpButtonItem(panel->pagePopUp, _("WNativeWindow Specification"));
-	WMAddPopUpButtonItem(panel->pagePopUp, _("WNativeWindow Attributes"));
+	WMAddPopUpButtonItem(panel->pagePopUp, _("Window Specification"));
+	WMAddPopUpButtonItem(panel->pagePopUp, _("Window Attributes"));
 	WMAddPopUpButtonItem(panel->pagePopUp, _("Advanced Options"));
 	WMAddPopUpButtonItem(panel->pagePopUp, _("Icon and Initial Workspace"));
 	WMAddPopUpButtonItem(panel->pagePopUp, _("Application Specific"));
@@ -1114,7 +1114,7 @@ static InspectorPanel *createInspectorForWindow(WWindow *wwin, int xpos, int ypo
 	frame_width = PWIDTH - (2 * 15);
 
 	panel->specFrm = WMCreateFrame(panel->win);
-	WMSetFrameTitle(panel->specFrm, _("WNativeWindow Specification"));
+	WMSetFrameTitle(panel->specFrm, _("Window Specification"));
 	WMMoveWidget(panel->specFrm, 15, 65);
 	WMResizeWidget(panel->specFrm, frame_width, 145);
 
diff --git a/src/winspector.h b/src/winspector.h
index 762ae30..a9df71a 100644
--- a/src/winspector.h
+++ b/src/winspector.h
@@ -1,6 +1,6 @@
 /* winspector.h - window attribute inspector header file
  *
- *  WNativeWindow Maker window manager
+ *  Window Maker window manager
  *
  *  Copyright (c) 1997-2003 Alfredo K. Kojima
  *
diff --git a/src/workspace.c b/src/workspace.c
index 92aaf87..0eab313 100644
--- a/src/workspace.c
+++ b/src/workspace.c
@@ -1,6 +1,6 @@
 /* workspace.c- Workspace management
  *
- *  WNativeWindow Maker window manager
+ *  Window Maker window manager
  *
  *  Copyright (c) 1997-2003 Alfredo K. Kojima
  *
diff --git a/src/workspace.h b/src/workspace.h
index fc48ac2..0c93a2f 100644
--- a/src/workspace.h
+++ b/src/workspace.h
@@ -1,6 +1,6 @@
 /* workspace.c- Workspace management
  *
- *  WNativeWindow Maker window manager
+ *  Window Maker window manager
  *
  *  Copyright (c) 1997-2003 Alfredo K. Kojima
  *
diff --git a/src/wsmap.c b/src/wsmap.c
index 332cc01..2f6c1e5 100644
--- a/src/wsmap.c
+++ b/src/wsmap.c
@@ -1,8 +1,8 @@
 /*  wsmap.c - worskpace map
  *
- *  WNativeWindow Maker window manager
+ *  Window Maker window manager
  *
- *  Copyright (c) 2014-2023 WNativeWindow Maker Team - David Maciejak
+ *  Copyright (c) 2014-2023 Window Maker Team - David Maciejak
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/src/wsmap.h b/src/wsmap.h
index 210e1f4..27a45cc 100644
--- a/src/wsmap.h
+++ b/src/wsmap.h
@@ -1,7 +1,7 @@
 /*
- *  WNativeWindow Maker window manager
+ *  Window Maker window manager
  *
- *  Copyright (c) 2014 WNativeWindow Maker Team
+ *  Copyright (c) 2014 Window Maker Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/src/xinerama.c b/src/xinerama.c
index d22468c..6faafa9 100644
--- a/src/xinerama.c
+++ b/src/xinerama.c
@@ -1,5 +1,5 @@
 /*
- *  WNativeWindow Maker window manager
+ *  Window Maker window manager
  *
  *  Copyright (c) 1997-2003 Alfredo K. Kojima
  *
diff --git a/src/xinerama.h b/src/xinerama.h
index ec51892..11aa6ae 100644
--- a/src/xinerama.h
+++ b/src/xinerama.h
@@ -1,5 +1,5 @@
 /*
- *  WNativeWindow Maker window manager
+ *  Window Maker window manager
  *
  *  Copyright (c) 1997-2001 Alfredo K. Kojima
  *