diff --git a/docs/doxygen/mainpages/devtips.h b/docs/doxygen/mainpages/devtips.h
index 065e6f42af..b0b119e078 100644
--- a/docs/doxygen/mainpages/devtips.h
+++ b/docs/doxygen/mainpages/devtips.h
@@ -128,7 +128,7 @@ On Windows using a compiler other than MinGW/Cygwin, you would build the
 wxWidgets library from the @c "build/msw" directory which contains the relevant
 makefiles.
 
-On Windows using MinGW/Cygwin, and on Unix, MacOS X and OS/2, you invoke
+On Windows using MinGW/Cygwin, and on Unix, OS X and OS/2, you invoke
 'configure' (found in the top-level of the wxWidgets source hierarchy), from
 within a suitable empty directory for containing makefiles, object files and
 libraries.
diff --git a/docs/doxygen/mainpages/platdetails.h b/docs/doxygen/mainpages/platdetails.h
index 022de6b397..8ee92c7ba2 100644
--- a/docs/doxygen/mainpages/platdetails.h
+++ b/docs/doxygen/mainpages/platdetails.h
@@ -62,7 +62,7 @@ distribution.
 @subsection page_port_wxosx_carbon wxOSX/Carbon
 
 wxOSX/Carbon is a port of wxWidgets for the Macintosh OS platform. Currently
-MacOS X 10.5 or higher are supported. wxOSX/Carbon can be compiled both using
+OS X 10.5 or higher are supported. wxOSX/Carbon can be compiled both using
 Apple's command line developer tools as well as Apple's Xcode IDE. wxOSX/Carbon
 supports both the Intel and PowerPC architectures and can be used to produce
 "universal binaries" in order create application which can run both
@@ -81,7 +81,7 @@ distribution.
 @subsection page_port_wxosx_cocoa wxOSX/Cocoa
 
 wxOSX/Cocoa is another port of wxWidgets for the Macintosh OS platform.
-Currently MacOS X 10.5 or higher are supported.  In contrast to wxOSX/Carbon,
+Currently OS X 10.5 or higher are supported.  In contrast to wxOSX/Carbon,
 it uses the Cocoa API  in place of Carbon. Much work has gone into this port
 and many  controls are functional, but the port has not reached the maturity of
 the wxOSX/Carbon port yet. It is possible to use wxOSX/Cocoa on 64-bit
diff --git a/docs/gtk/wxGNOME/wxGNOME.html b/docs/gtk/wxGNOME/wxGNOME.html
index bb230bf4a3..6f83576715 100644
--- a/docs/gtk/wxGNOME/wxGNOME.html
+++ b/docs/gtk/wxGNOME/wxGNOME.html
@@ -43,11 +43,11 @@ most aspects of GUI and non-GUI application programming. Sometimes,
 various aspects of these design goals contradict each other and this
 holds true especially for the Linux platform which – from the
 point of view of the desktop environment integration – is
-lagging behind the other two major desktops (Windows and MacOS X)
+lagging behind the other two major desktops (Windows and OS X)
 mostly because of the schism between the GTK+ based GNOME desktop and
 the Qt<A HREF="http://www.trolltech.com/"><SUP>[5]</SUP></A> based
 KDE<A HREF="http://www.kde.org/"><SUP>[6]</SUP></A> desktop. So far,
-the typical wxWidgets user targeted Windows, maybe MacOS X and Linux
+the typical wxWidgets user targeted Windows, maybe OS X and Linux
 <I>in general</I>, so the aim was to make wxGTK applications run as
 well as possible on as many versions of Linux as possible, including
 those using the KDE environment. Luckily, most of these distributions
diff --git a/interface/wx/menu.h b/interface/wx/menu.h
index 9571021c8d..636771f2e1 100644
--- a/interface/wx/menu.h
+++ b/interface/wx/menu.h
@@ -433,8 +433,8 @@ public:
     @note
     Please note that @e wxID_ABOUT and @e wxID_EXIT are predefined by wxWidgets
     and have a special meaning since entries using these IDs will be taken out
-    of the normal menus under MacOS X and will be inserted into the system menu
-    (following the appropriate MacOS X interface guideline).
+    of the normal menus under OS X and will be inserted into the system menu
+    (following the appropriate OS X interface guideline).
 
     Menu items may be either @e normal items, @e check items or @e radio items.
     Normal items don't have any special properties while the check items have a