diff --git a/build/bakefiles/config.bkl b/build/bakefiles/config.bkl
index 5e430df793..f4fed35f76 100644
--- a/build/bakefiles/config.bkl
+++ b/build/bakefiles/config.bkl
@@ -66,7 +66,7 @@
             </option>
         </if>
 
-        <!-- We must make TOOLKIT a constant under MSW -->
+        <!-- We must make TOOLKIT a constant under Windows -->
         <if cond="FORMAT in ['borland','mingw','msvc','watcom', 'msvc6prj', 'msvs2003prj', 'msvs2005prj', 'msvs2008prj']">
             <set var="TOOLKIT">MSW</set>
         </if>
diff --git a/docs/changes.txt b/docs/changes.txt
index 621e4aae7b..0e824dccee 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -689,7 +689,7 @@ All (GUI):
 wxGTK:
 
 - Allow building wxGTK3 with Broadway and Wayland backends (Kolya Kosenko).
-- Further improvements to wxGTK/MSW port (Kolya Kosenko).
+- Further improvements to wxGTK/Win32 port (Kolya Kosenko).
 - Provide native implementation of wxNotificationMessage using libnotify.
 - Generate clipboard events for wxComboBox and not only wxTextCtrl.
 - Improve drag-and-drop of URLs.
diff --git a/docs/msw/gtk.txt b/docs/msw/gtk.txt
index 8dfac942ff..7e7640c845 100644
--- a/docs/msw/gtk.txt
+++ b/docs/msw/gtk.txt
@@ -24,7 +24,7 @@ diff build/bakefiles/config.bkl build/bakefiles/config.bkl
 @@ -67,9 +67,9 @@
          </if>
  
-         <!-- We must make TOOLKIT a constant under MSW -->
+         <!-- We must make TOOLKIT a constant under Windows -->
 -        <if cond="FORMAT in ['borland','mingw','msvc','watcom', 'msvc6prj', 'msvs2003prj', 'msvs2005prj', 'msvs2008prj']">
 +        <!--if cond="FORMAT in ['borland','mingw','msvc','watcom', 'msvc6prj', 'msvs2003prj', 'msvs2005prj', 'msvs2008prj']">
              <set var="TOOLKIT">MSW</set>