From f39c51f9a74bdf2b00c4939c02abf12090781446 Mon Sep 17 00:00:00 2001
From: Simon Tatham <anakin@pobox.com>
Date: Fri, 23 Apr 2021 06:19:05 +0100
Subject: [PATCH] Rename most of the platform source files.

This gets rid of all those annoying 'win', 'ux' and 'gtk' prefixes
which made filenames annoying to type and to tab-complete. Also, as
with my other recent renaming sprees, I've taken the opportunity to
expand and clarify some of the names so that they're not such cryptic
abbreviations.
---
 unix/CMakeLists.txt                       | 99 ++++++++++++-----------
 unix/{uxagentc.c => agent-client.c}       |  0
 unix/{uxagentsock.c => agent-socket.c}    |  0
 unix/{gtkask.c => askpass.c}              |  2 +-
 unix/{uxcliloop.c => cliloop.c}           |  0
 unix/{gtkcols.c => columns.c}             |  2 +-
 unix/{gtkcols.h => columns.h}             |  2 +-
 unix/{gtkcfg.c => config-gtk.c}           |  0
 unix/{uxcfg.c => config-unix.c}           |  0
 unix/{uxcons.c => console.c}              |  0
 unix/{gtkdlg.c => dialog.c}               |  4 +-
 unix/{uxfdsock.c => fd-socket.c}          |  0
 unix/{uxgss.c => gss.c}                   |  0
 unix/{gtkcomm.c => gtk-common.c}          |  2 +-
 unix/{uxgen.c => keygen-noise.c}          |  0
 unix/{uxproxy.c => local-proxy.c}         |  0
 unix/{gtkapp.c => main-gtk-application.c} |  0
 unix/{gtkmain.c => main-gtk-simple.c}     |  2 +-
 unix/{uxnet.c => network.c}               |  0
 unix/{uxnogtk.c => no-gtk.c}              |  0
 unix/{uxnoise.c => noise.c}               |  0
 unix/{uxpgnt.c => pageant.c}              |  0
 unix/{uxpeer.c => peerinfo.c}             |  0
 unix/{uxplink.c => plink.c}               |  0
 unix/{uxprint.c => printing.c}            |  0
 unix/{uxsocks.c => psocks.c}              |  0
 unix/{uxpsusan.c => psusan.c}             |  0
 unix/{xpmptcfg.c => pterm-config-xpm.c}   |  0
 unix/{xpmpterm.c => pterm-xpm.c}          |  0
 unix/{uxpterm.c => pterm.c}               |  0
 unix/{uxpty.c => pty.c}                   |  0
 unix/{xpmpucfg.c => putty-config-xpm.c}   |  0
 unix/{xpmputty.c => putty-xpm.c}          |  0
 unix/{uxputty.c => putty.c}               |  0
 unix/{uxser.c => serial.c}                |  0
 unix/{uxsftp.c => sftp.c}                 |  0
 unix/{uxsftpserver.c => sftpserver.c}     |  0
 unix/{uxshare.c => sharing.c}             |  0
 unix/{uxstore.c => storage.c}             |  0
 unix/{uxucs.c => unicode.c}               |  0
 unix/{gtkfont.c => unifont.c}             |  2 +-
 unix/{gtkfont.h => unifont.h}             |  0
 unix/{uxserver.c => uppity.c}             |  0
 unix/{gtkwin.c => window.c}               |  2 +-
 unix/{ux_x11.c => x11.c}                  |  0
 windows/CMakeLists.txt                    | 66 +++++++--------
 windows/{winpgntc.c => agent-client.c}    |  4 +-
 windows/{wincliloop.c => cliloop.c}       |  0
 windows/{wincfg.c => config.c}            |  0
 windows/{wincons.c => console.c}          |  0
 windows/{winctrls.c => controls.c}        |  0
 windows/{wincapi.h => cryptoapi.h}        |  2 +-
 windows/{windlg.c => dialog.c}            |  4 +-
 windows/{wingss.c => gss.c}               |  0
 windows/{winhandl.c => handle-io.c}       |  0
 windows/{winhsock.c => handle-socket.c}   |  0
 windows/{winhelp.c => help.c}             |  2 +-
 windows/{winhelp.h => help.h}             |  2 +-
 windows/{winhelp.rc2 => help.rc2}         |  2 +-
 windows/{winjump.c => jump-list.c}        |  0
 windows/{winproxy.c => local-proxy.c}     |  0
 windows/{winnpc.c => named-pipe-client.c} |  2 +-
 windows/{winnps.c => named-pipe-server.c} |  2 +-
 windows/{winnet.c => network.c}           |  0
 windows/{winnojmp.c => no-jump-list.c}    |  0
 windows/{winnohlp.c => nohelp.c}          |  0
 windows/{winnoise.c => noise.c}           |  0
 windows/{winpgnt.c => pageant.c}          |  4 +-
 windows/pageant.rc                        |  2 +-
 windows/platform.h                        |  2 +-
 windows/{winplink.c => plink.c}           |  2 +-
 windows/{winprint.c => printing.c}        |  0
 windows/{winsocks.c => psocks.c}          |  0
 windows/{win_res.rc2 => putty-common.rc2} |  2 +-
 windows/{win_res.h => putty-rc.h}         |  2 +-
 windows/putty.rc                          |  4 +-
 windows/{winpgen.c => puttygen.c}         |  2 +-
 windows/puttygen.rc                       |  2 +-
 windows/puttytel.rc                       |  4 +-
 windows/{winsecur.h => security-api.h}    |  2 +-
 windows/{winselcli.c => select-cli.c}     |  0
 windows/{winselgui.c => select-gui.c}     |  0
 windows/{winser.c => serial.c}            |  0
 windows/{winsftp.c => sftp.c}             |  2 +-
 windows/{winshare.c => sharing.c}         |  4 +-
 windows/{winstore.c => storage.c}         |  0
 windows/{winucs.c => unicode.c}           |  0
 windows/utils/{capi.c => cryptoapi.c}     |  4 +-
 windows/utils/security.c                  |  4 +-
 windows/{winseat.h => win-gui-seat.h}     |  0
 windows/window.c                          |  6 +-
 windows/{winx11.c => x11.c}               |  0
 92 files changed, 127 insertions(+), 124 deletions(-)
 rename unix/{uxagentc.c => agent-client.c} (100%)
 rename unix/{uxagentsock.c => agent-socket.c} (100%)
 rename unix/{gtkask.c => askpass.c} (99%)
 rename unix/{uxcliloop.c => cliloop.c} (100%)
 rename unix/{gtkcols.c => columns.c} (99%)
 rename unix/{gtkcols.h => columns.h} (96%)
 rename unix/{gtkcfg.c => config-gtk.c} (100%)
 rename unix/{uxcfg.c => config-unix.c} (100%)
 rename unix/{uxcons.c => console.c} (100%)
 rename unix/{gtkdlg.c => dialog.c} (99%)
 rename unix/{uxfdsock.c => fd-socket.c} (100%)
 rename unix/{uxgss.c => gss.c} (100%)
 rename unix/{gtkcomm.c => gtk-common.c} (99%)
 rename unix/{uxgen.c => keygen-noise.c} (100%)
 rename unix/{uxproxy.c => local-proxy.c} (100%)
 rename unix/{gtkapp.c => main-gtk-application.c} (100%)
 rename unix/{gtkmain.c => main-gtk-simple.c} (99%)
 rename unix/{uxnet.c => network.c} (100%)
 rename unix/{uxnogtk.c => no-gtk.c} (100%)
 rename unix/{uxnoise.c => noise.c} (100%)
 rename unix/{uxpgnt.c => pageant.c} (100%)
 rename unix/{uxpeer.c => peerinfo.c} (100%)
 rename unix/{uxplink.c => plink.c} (100%)
 rename unix/{uxprint.c => printing.c} (100%)
 rename unix/{uxsocks.c => psocks.c} (100%)
 rename unix/{uxpsusan.c => psusan.c} (100%)
 rename unix/{xpmptcfg.c => pterm-config-xpm.c} (100%)
 rename unix/{xpmpterm.c => pterm-xpm.c} (100%)
 rename unix/{uxpterm.c => pterm.c} (100%)
 rename unix/{uxpty.c => pty.c} (100%)
 rename unix/{xpmpucfg.c => putty-config-xpm.c} (100%)
 rename unix/{xpmputty.c => putty-xpm.c} (100%)
 rename unix/{uxputty.c => putty.c} (100%)
 rename unix/{uxser.c => serial.c} (100%)
 rename unix/{uxsftp.c => sftp.c} (100%)
 rename unix/{uxsftpserver.c => sftpserver.c} (100%)
 rename unix/{uxshare.c => sharing.c} (100%)
 rename unix/{uxstore.c => storage.c} (100%)
 rename unix/{uxucs.c => unicode.c} (100%)
 rename unix/{gtkfont.c => unifont.c} (99%)
 rename unix/{gtkfont.h => unifont.h} (100%)
 rename unix/{uxserver.c => uppity.c} (100%)
 rename unix/{gtkwin.c => window.c} (99%)
 rename unix/{ux_x11.c => x11.c} (100%)
 rename windows/{winpgntc.c => agent-client.c} (99%)
 rename windows/{wincliloop.c => cliloop.c} (100%)
 rename windows/{wincfg.c => config.c} (100%)
 rename windows/{wincons.c => console.c} (100%)
 rename windows/{winctrls.c => controls.c} (100%)
 rename windows/{wincapi.h => cryptoapi.h} (93%)
 rename windows/{windlg.c => dialog.c} (99%)
 rename windows/{wingss.c => gss.c} (100%)
 rename windows/{winhandl.c => handle-io.c} (100%)
 rename windows/{winhsock.c => handle-socket.c} (100%)
 rename windows/{winhelp.c => help.c} (99%)
 rename windows/{winhelp.h => help.h} (99%)
 rename windows/{winhelp.rc2 => help.rc2} (89%)
 rename windows/{winjump.c => jump-list.c} (100%)
 rename windows/{winproxy.c => local-proxy.c} (100%)
 rename windows/{winnpc.c => named-pipe-client.c} (99%)
 rename windows/{winnps.c => named-pipe-server.c} (99%)
 rename windows/{winnet.c => network.c} (100%)
 rename windows/{winnojmp.c => no-jump-list.c} (100%)
 rename windows/{winnohlp.c => nohelp.c} (100%)
 rename windows/{winnoise.c => noise.c} (100%)
 rename windows/{winpgnt.c => pageant.c} (99%)
 rename windows/{winplink.c => plink.c} (99%)
 rename windows/{winprint.c => printing.c} (100%)
 rename windows/{winsocks.c => psocks.c} (100%)
 rename windows/{win_res.rc2 => putty-common.rc2} (99%)
 rename windows/{win_res.h => putty-rc.h} (93%)
 rename windows/{winpgen.c => puttygen.c} (99%)
 rename windows/{winsecur.h => security-api.h} (96%)
 rename windows/{winselcli.c => select-cli.c} (100%)
 rename windows/{winselgui.c => select-gui.c} (100%)
 rename windows/{winser.c => serial.c} (100%)
 rename windows/{winsftp.c => sftp.c} (99%)
 rename windows/{winshare.c => sharing.c} (98%)
 rename windows/{winstore.c => storage.c} (100%)
 rename windows/{winucs.c => unicode.c} (100%)
 rename windows/utils/{capi.c => cryptoapi.c} (96%)
 rename windows/{winseat.h => win-gui-seat.h} (100%)
 rename windows/{winx11.c => x11.c} (100%)

diff --git a/unix/CMakeLists.txt b/unix/CMakeLists.txt
index e33fbff2..56786b94 100644
--- a/unix/CMakeLists.txt
+++ b/unix/CMakeLists.txt
@@ -19,38 +19,41 @@ add_sources_from_current_dir(utils
   utils/signal.c
   utils/x11_ignore_error.c
   # Compiled icon pixmap files
-  xpmpucfg.c xpmputty.c xpmptcfg.c xpmpterm.c
+  putty-xpm.c
+  putty-config-xpm.c
+  pterm-xpm.c
+  pterm-config-xpm.c
   # We want the ISO C implementation of ltime(), because we don't have
   # a local better alternative
   ../utils/ltime.c)
 add_sources_from_current_dir(eventloop
-  uxcliloop.c uxsel.c)
+  cliloop.c uxsel.c)
 add_sources_from_current_dir(console
-  uxcons.c)
+  console.c)
 add_sources_from_current_dir(settings
-  uxstore.c)
+  storage.c)
 add_sources_from_current_dir(network
-  uxnet.c uxfdsock.c uxagentsock.c uxpeer.c uxproxy.c ux_x11.c)
+  network.c fd-socket.c agent-socket.c peerinfo.c local-proxy.c x11.c)
 add_sources_from_current_dir(sshcommon
-  uxnoise.c)
+  noise.c)
 add_sources_from_current_dir(sshclient
-  uxgss.c uxagentc.c uxshare.c)
+  gss.c agent-client.c sharing.c)
 add_sources_from_current_dir(sshserver
-  uxsftpserver.c procnet.c)
+  sftpserver.c procnet.c)
 add_sources_from_current_dir(sftpclient
-  uxsftp.c)
+  sftp.c)
 add_sources_from_current_dir(otherbackends
-  uxser.c)
+  serial.c)
 add_sources_from_current_dir(agent
-  uxagentc.c)
+  agent-client.c)
 
 add_executable(fuzzterm
   ${CMAKE_SOURCE_DIR}/fuzzterm.c
   ${CMAKE_SOURCE_DIR}/be_none.c
   ${CMAKE_SOURCE_DIR}/logging.c
   ${CMAKE_SOURCE_DIR}/noprint.c
-  uxucs.c
-  uxnogtk.c)
+  unicode.c
+  no-gtk.c)
 add_dependencies(fuzzterm generated_licence_h)
 target_link_libraries(fuzzterm
   guiterminal eventloop charset settings utils)
@@ -59,9 +62,9 @@ add_executable(osxlaunch
   osxlaunch.c)
 
 add_executable(plink
-  uxplink.c
+  plink.c
   ${CMAKE_SOURCE_DIR}/be_all_s.c
-  uxnogtk.c)
+  no-gtk.c)
 target_link_libraries(plink
   eventloop noterminal console sshclient otherbackends settings network crypto
   utils)
@@ -70,7 +73,7 @@ installed_program(plink)
 add_executable(pscp
   ${CMAKE_SOURCE_DIR}/pscp.c
   ${CMAKE_SOURCE_DIR}/be_ssh.c
-  uxnogtk.c)
+  no-gtk.c)
 target_link_libraries(pscp
   sftpclient eventloop console sshclient settings network crypto utils)
 installed_program(pscp)
@@ -78,38 +81,38 @@ installed_program(pscp)
 add_executable(psftp
   ${CMAKE_SOURCE_DIR}/psftp.c
   ${CMAKE_SOURCE_DIR}/be_ssh.c
-  uxnogtk.c)
+  no-gtk.c)
 target_link_libraries(psftp
   sftpclient eventloop console sshclient settings network crypto utils)
 installed_program(psftp)
 
 add_executable(psocks
-  uxsocks.c
+  psocks.c
   ${CMAKE_SOURCE_DIR}/psocks.c
   ${CMAKE_SOURCE_DIR}/norand.c
   ${CMAKE_SOURCE_DIR}/nocproxy.c
   ${CMAKE_SOURCE_DIR}/ssh/portfwd.c
-  uxnogtk.c)
+  no-gtk.c)
 target_link_libraries(psocks
   eventloop console network utils)
 
 add_executable(psusan
-  uxpsusan.c
+  psusan.c
   ${CMAKE_SOURCE_DIR}/be_none.c
   ${CMAKE_SOURCE_DIR}/nogss.c
   ${CMAKE_SOURCE_DIR}/ssh/scpserver.c
-  uxnogtk.c
-  uxpty.c)
+  no-gtk.c
+  pty.c)
 target_link_libraries(psusan
   eventloop sshserver keygen settings network crypto utils)
 installed_program(psusan)
 
 add_library(puttygen-common OBJECT
   ${CMAKE_SOURCE_DIR}/notiming.c
-  uxgen.c
-  uxnogtk.c
-  uxnoise.c
-  uxstore.c
+  keygen-noise.c
+  no-gtk.c
+  noise.c
+  storage.c
   ${CMAKE_SOURCE_DIR}/sshpubk.c
   ${CMAKE_SOURCE_DIR}/sshrand.c)
 
@@ -134,11 +137,11 @@ add_executable(testzlib
 target_link_libraries(testzlib utils)
 
 add_executable(uppity
-  uxserver.c
+  uppity.c
   ${CMAKE_SOURCE_DIR}/be_none.c
   ${CMAKE_SOURCE_DIR}/ssh/scpserver.c
-  uxnogtk.c
-  uxpty.c
+  no-gtk.c
+  pty.c
   ${CMAKE_SOURCE_DIR}/nogss.c)
 target_link_libraries(uppity
   eventloop sshserver keygen settings network crypto utils)
@@ -151,19 +154,19 @@ if(GTK_FOUND)
     utils/get_x11_display.c
     utils/our_dialog.c
     utils/string_width.c
-    gtkcols.c)
+    columns.c)
   add_sources_from_current_dir(guiterminal
-    gtkwin.c gtkfont.c gtkdlg.c gtkcfg.c gtkcomm.c uxcfg.c uxucs.c uxprint.c)
-  add_dependencies(guiterminal generated_licence_h) # gtkdlg.c uses licence.h
+    window.c unifont.c dialog.c config-gtk.c gtk-common.c config-unix.c unicode.c printing.c)
+  add_dependencies(guiterminal generated_licence_h) # dialog.c uses licence.h
 
   add_executable(pageant
-    uxpgnt.c
+    pageant.c
     ${CMAKE_SOURCE_DIR}/be_misc.c
     ${CMAKE_SOURCE_DIR}/be_none.c
     ${CMAKE_SOURCE_DIR}/nogss.c
-    gtkask.c
-    ux_x11.c
-    uxnoise.c
+    askpass.c
+    x11.c
+    noise.c
     ${CMAKE_SOURCE_DIR}/ssh/x11fwd.c)
   target_link_libraries(pageant
     eventloop console agent settings network crypto utils
@@ -171,30 +174,30 @@ if(GTK_FOUND)
   installed_program(pageant)
 
   add_executable(pterm
-    uxpterm.c
-    gtkmain.c
+    pterm.c
+    main-gtk-simple.c
     ${CMAKE_SOURCE_DIR}/be_none.c
     ${CMAKE_SOURCE_DIR}/nogss.c
-    uxpty.c)
+    pty.c)
   target_link_libraries(pterm
     guiterminal eventloop settings charset utils
     ${GTK_LIBRARIES} ${X11_LIBRARIES})
   installed_program(pterm)
 
   add_executable(ptermapp
-    uxpterm.c
-    gtkapp.c
+    pterm.c
+    main-gtk-application.c
     ${CMAKE_SOURCE_DIR}/nocmdline.c
     ${CMAKE_SOURCE_DIR}/be_none.c
     ${CMAKE_SOURCE_DIR}/nogss.c
-    uxpty.c)
+    pty.c)
   target_link_libraries(ptermapp
     guiterminal eventloop settings charset utils
     ${GTK_LIBRARIES} ${X11_LIBRARIES})
 
   add_executable(putty
-    uxputty.c
-    gtkmain.c
+    putty.c
+    main-gtk-simple.c
     ${CMAKE_SOURCE_DIR}/be_all_s.c)
   target_link_libraries(putty
     guiterminal eventloop sshclient otherbackends settings
@@ -205,8 +208,8 @@ if(GTK_FOUND)
   installed_program(putty)
 
   add_executable(puttyapp
-    uxputty.c
-    gtkapp.c
+    putty.c
+    main-gtk-application.c
     ${CMAKE_SOURCE_DIR}/nocmdline.c
     ${CMAKE_SOURCE_DIR}/be_all_s.c)
   target_link_libraries(puttyapp
@@ -215,8 +218,8 @@ if(GTK_FOUND)
     ${GTK_LIBRARIES} ${X11_LIBRARIES})
 
   add_executable(puttytel
-    uxputty.c
-    gtkmain.c
+    putty.c
+    main-gtk-simple.c
     ${CMAKE_SOURCE_DIR}/be_nos_s.c
     ${CMAKE_SOURCE_DIR}/nogss.c
     ${CMAKE_SOURCE_DIR}/norand.c
diff --git a/unix/uxagentc.c b/unix/agent-client.c
similarity index 100%
rename from unix/uxagentc.c
rename to unix/agent-client.c
diff --git a/unix/uxagentsock.c b/unix/agent-socket.c
similarity index 100%
rename from unix/uxagentsock.c
rename to unix/agent-socket.c
diff --git a/unix/gtkask.c b/unix/askpass.c
similarity index 99%
rename from unix/gtkask.c
rename to unix/askpass.c
index 4e95ba1a..841912d9 100644
--- a/unix/gtkask.c
+++ b/unix/askpass.c
@@ -15,7 +15,7 @@
 #endif
 
 #include "defs.h"
-#include "gtkfont.h"
+#include "unifont.h"
 #include "gtkcompat.h"
 #include "gtkmisc.h"
 
diff --git a/unix/uxcliloop.c b/unix/cliloop.c
similarity index 100%
rename from unix/uxcliloop.c
rename to unix/cliloop.c
diff --git a/unix/gtkcols.c b/unix/columns.c
similarity index 99%
rename from unix/gtkcols.c
rename to unix/columns.c
index 35c02875..d1c0cb28 100644
--- a/unix/gtkcols.c
+++ b/unix/columns.c
@@ -6,7 +6,7 @@
 #include <gtk/gtk.h>
 #include "defs.h"
 #include "gtkcompat.h"
-#include "gtkcols.h"
+#include "columns.h"
 
 #if GTK_CHECK_VERSION(2,0,0)
 /* The "focus" method lives in GtkWidget from GTK 2 onwards, but it
diff --git a/unix/gtkcols.h b/unix/columns.h
similarity index 96%
rename from unix/gtkcols.h
rename to unix/columns.h
index e589cf79..a850a166 100644
--- a/unix/gtkcols.h
+++ b/unix/columns.h
@@ -1,5 +1,5 @@
 /*
- * gtkcols.h - header file for a columns-based widget container
+ * columns.h - header file for a columns-based widget container
  * capable of supporting the PuTTY portable dialog box layout
  * mechanism.
  */
diff --git a/unix/gtkcfg.c b/unix/config-gtk.c
similarity index 100%
rename from unix/gtkcfg.c
rename to unix/config-gtk.c
diff --git a/unix/uxcfg.c b/unix/config-unix.c
similarity index 100%
rename from unix/uxcfg.c
rename to unix/config-unix.c
diff --git a/unix/uxcons.c b/unix/console.c
similarity index 100%
rename from unix/uxcons.c
rename to unix/console.c
diff --git a/unix/gtkdlg.c b/unix/dialog.c
similarity index 99%
rename from unix/gtkdlg.c
rename to unix/dialog.c
index 8e7421db..f6a98a55 100644
--- a/unix/gtkdlg.c
+++ b/unix/dialog.c
@@ -16,8 +16,8 @@
 
 #include "putty.h"
 #include "gtkcompat.h"
-#include "gtkcols.h"
-#include "gtkfont.h"
+#include "columns.h"
+#include "unifont.h"
 #include "gtkmisc.h"
 
 #ifndef NOT_X_WINDOWS
diff --git a/unix/uxfdsock.c b/unix/fd-socket.c
similarity index 100%
rename from unix/uxfdsock.c
rename to unix/fd-socket.c
diff --git a/unix/uxgss.c b/unix/gss.c
similarity index 100%
rename from unix/uxgss.c
rename to unix/gss.c
diff --git a/unix/gtkcomm.c b/unix/gtk-common.c
similarity index 99%
rename from unix/gtkcomm.c
rename to unix/gtk-common.c
index fa52bfb4..af39a83c 100644
--- a/unix/gtkcomm.c
+++ b/unix/gtk-common.c
@@ -34,7 +34,7 @@
 #include "putty.h"
 #include "terminal.h"
 #include "gtkcompat.h"
-#include "gtkfont.h"
+#include "unifont.h"
 #include "gtkmisc.h"
 
 #ifndef NOT_X_WINDOWS
diff --git a/unix/uxgen.c b/unix/keygen-noise.c
similarity index 100%
rename from unix/uxgen.c
rename to unix/keygen-noise.c
diff --git a/unix/uxproxy.c b/unix/local-proxy.c
similarity index 100%
rename from unix/uxproxy.c
rename to unix/local-proxy.c
diff --git a/unix/gtkapp.c b/unix/main-gtk-application.c
similarity index 100%
rename from unix/gtkapp.c
rename to unix/main-gtk-application.c
diff --git a/unix/gtkmain.c b/unix/main-gtk-simple.c
similarity index 99%
rename from unix/gtkmain.c
rename to unix/main-gtk-simple.c
index ec8f7da4..4ee43e7b 100644
--- a/unix/gtkmain.c
+++ b/unix/main-gtk-simple.c
@@ -33,7 +33,7 @@
 #include "putty.h"
 #include "terminal.h"
 #include "gtkcompat.h"
-#include "gtkfont.h"
+#include "unifont.h"
 #include "gtkmisc.h"
 
 #ifndef NOT_X_WINDOWS
diff --git a/unix/uxnet.c b/unix/network.c
similarity index 100%
rename from unix/uxnet.c
rename to unix/network.c
diff --git a/unix/uxnogtk.c b/unix/no-gtk.c
similarity index 100%
rename from unix/uxnogtk.c
rename to unix/no-gtk.c
diff --git a/unix/uxnoise.c b/unix/noise.c
similarity index 100%
rename from unix/uxnoise.c
rename to unix/noise.c
diff --git a/unix/uxpgnt.c b/unix/pageant.c
similarity index 100%
rename from unix/uxpgnt.c
rename to unix/pageant.c
diff --git a/unix/uxpeer.c b/unix/peerinfo.c
similarity index 100%
rename from unix/uxpeer.c
rename to unix/peerinfo.c
diff --git a/unix/uxplink.c b/unix/plink.c
similarity index 100%
rename from unix/uxplink.c
rename to unix/plink.c
diff --git a/unix/uxprint.c b/unix/printing.c
similarity index 100%
rename from unix/uxprint.c
rename to unix/printing.c
diff --git a/unix/uxsocks.c b/unix/psocks.c
similarity index 100%
rename from unix/uxsocks.c
rename to unix/psocks.c
diff --git a/unix/uxpsusan.c b/unix/psusan.c
similarity index 100%
rename from unix/uxpsusan.c
rename to unix/psusan.c
diff --git a/unix/xpmptcfg.c b/unix/pterm-config-xpm.c
similarity index 100%
rename from unix/xpmptcfg.c
rename to unix/pterm-config-xpm.c
diff --git a/unix/xpmpterm.c b/unix/pterm-xpm.c
similarity index 100%
rename from unix/xpmpterm.c
rename to unix/pterm-xpm.c
diff --git a/unix/uxpterm.c b/unix/pterm.c
similarity index 100%
rename from unix/uxpterm.c
rename to unix/pterm.c
diff --git a/unix/uxpty.c b/unix/pty.c
similarity index 100%
rename from unix/uxpty.c
rename to unix/pty.c
diff --git a/unix/xpmpucfg.c b/unix/putty-config-xpm.c
similarity index 100%
rename from unix/xpmpucfg.c
rename to unix/putty-config-xpm.c
diff --git a/unix/xpmputty.c b/unix/putty-xpm.c
similarity index 100%
rename from unix/xpmputty.c
rename to unix/putty-xpm.c
diff --git a/unix/uxputty.c b/unix/putty.c
similarity index 100%
rename from unix/uxputty.c
rename to unix/putty.c
diff --git a/unix/uxser.c b/unix/serial.c
similarity index 100%
rename from unix/uxser.c
rename to unix/serial.c
diff --git a/unix/uxsftp.c b/unix/sftp.c
similarity index 100%
rename from unix/uxsftp.c
rename to unix/sftp.c
diff --git a/unix/uxsftpserver.c b/unix/sftpserver.c
similarity index 100%
rename from unix/uxsftpserver.c
rename to unix/sftpserver.c
diff --git a/unix/uxshare.c b/unix/sharing.c
similarity index 100%
rename from unix/uxshare.c
rename to unix/sharing.c
diff --git a/unix/uxstore.c b/unix/storage.c
similarity index 100%
rename from unix/uxstore.c
rename to unix/storage.c
diff --git a/unix/uxucs.c b/unix/unicode.c
similarity index 100%
rename from unix/uxucs.c
rename to unix/unicode.c
diff --git a/unix/gtkfont.c b/unix/unifont.c
similarity index 99%
rename from unix/gtkfont.c
rename to unix/unifont.c
index b910d14b..d50a7810 100644
--- a/unix/gtkfont.c
+++ b/unix/unifont.c
@@ -21,7 +21,7 @@
 #define MAY_REFER_TO_GTK_IN_HEADERS
 
 #include "putty.h"
-#include "gtkfont.h"
+#include "unifont.h"
 #include "gtkcompat.h"
 #include "gtkmisc.h"
 #include "tree234.h"
diff --git a/unix/gtkfont.h b/unix/unifont.h
similarity index 100%
rename from unix/gtkfont.h
rename to unix/unifont.h
diff --git a/unix/uxserver.c b/unix/uppity.c
similarity index 100%
rename from unix/uxserver.c
rename to unix/uppity.c
diff --git a/unix/gtkwin.c b/unix/window.c
similarity index 99%
rename from unix/gtkwin.c
rename to unix/window.c
index 2a2353d4..4da0cb13 100644
--- a/unix/gtkwin.c
+++ b/unix/window.c
@@ -32,7 +32,7 @@
 #include "putty.h"
 #include "terminal.h"
 #include "gtkcompat.h"
-#include "gtkfont.h"
+#include "unifont.h"
 #include "gtkmisc.h"
 
 #ifndef NOT_X_WINDOWS
diff --git a/unix/ux_x11.c b/unix/x11.c
similarity index 100%
rename from unix/ux_x11.c
rename to unix/x11.c
diff --git a/windows/CMakeLists.txt b/windows/CMakeLists.txt
index c37abd1e..739b49f3 100644
--- a/windows/CMakeLists.txt
+++ b/windows/CMakeLists.txt
@@ -2,7 +2,7 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
 
 add_sources_from_current_dir(utils
   utils/arm_arch_queries.c
-  utils/capi.c
+  utils/cryptoapi.c
   utils/defaults.c
   utils/dll_hijacking_protection.c
   utils/dputs.c
@@ -26,38 +26,38 @@ add_sources_from_current_dir(utils
   utils/split_into_argv.c
   utils/version.c
   utils/win_strerror.c
-  winucs.c)
+  unicode.c)
 if(NOT HAVE_STRTOUMAX)
   add_sources_from_current_dir(utils utils/strtoumax.c)
 endif()
 add_sources_from_current_dir(eventloop
-  wincliloop.c winhandl.c)
+  cliloop.c handle-io.c)
 add_sources_from_current_dir(console
-  winselcli.c winnohlp.c wincons.c)
+  select-cli.c nohelp.c console.c)
 add_sources_from_current_dir(settings
-  winstore.c)
+  storage.c)
 add_sources_from_current_dir(network
-  winnet.c winhsock.c winnpc.c winnps.c winproxy.c winx11.c)
+  network.c handle-socket.c named-pipe-client.c named-pipe-server.c local-proxy.c x11.c)
 add_sources_from_current_dir(sshcommon
-  winnoise.c)
+  noise.c)
 add_sources_from_current_dir(sshclient
-  winpgntc.c wingss.c winshare.c)
+  agent-client.c gss.c sharing.c)
 add_sources_from_current_dir(sftpclient
-  winsftp.c)
+  sftp.c)
 add_sources_from_current_dir(otherbackends
-  winser.c)
+  serial.c)
 add_sources_from_current_dir(agent
-  winpgntc.c)
+  agent-client.c)
 add_sources_from_current_dir(guiterminal
-  windlg.c winctrls.c wincfg.c winprint.c winjump.c sizetip.c)
-add_dependencies(guiterminal generated_licence_h) # windlg.c uses licence.h
+  dialog.c controls.c config.c printing.c jump-list.c sizetip.c)
+add_dependencies(guiterminal generated_licence_h) # dialog.c uses licence.h
 
 add_library(guimisc STATIC
-  winselgui.c)
+  select-gui.c)
 
 add_executable(pageant
-  winpgnt.c
-  winhelp.c
+  pageant.c
+  help.c
   pageant.rc)
 add_dependencies(pageant generated_licence_h)
 target_link_libraries(pageant
@@ -69,10 +69,10 @@ set_target_properties(pageant PROPERTIES
 installed_program(pageant)
 
 add_executable(plink
-  winplink.c
+  plink.c
   ${CMAKE_SOURCE_DIR}/be_all_s.c
-  winnojmp.c
-  winnohlp.c
+  no-jump-list.c
+  nohelp.c
   plink.rc)
 add_dependencies(plink generated_licence_h)
 target_link_libraries(plink
@@ -84,8 +84,8 @@ installed_program(plink)
 add_executable(pscp
   ${CMAKE_SOURCE_DIR}/pscp.c
   ${CMAKE_SOURCE_DIR}/be_ssh.c
-  winnojmp.c
-  winnohlp.c
+  no-jump-list.c
+  nohelp.c
   pscp.rc)
 add_dependencies(pscp generated_licence_h)
 target_link_libraries(pscp
@@ -96,8 +96,8 @@ installed_program(pscp)
 add_executable(psftp
   ${CMAKE_SOURCE_DIR}/psftp.c
   ${CMAKE_SOURCE_DIR}/be_ssh.c
-  winnojmp.c
-  winnohlp.c
+  no-jump-list.c
+  nohelp.c
   psftp.rc)
 add_dependencies(psftp generated_licence_h)
 target_link_libraries(psftp
@@ -106,8 +106,8 @@ target_link_libraries(psftp
 installed_program(psftp)
 
 add_executable(psocks
-  winsocks.c
-  winnohlp.c
+  psocks.c
+  nohelp.c
   ${CMAKE_SOURCE_DIR}/psocks.c
   ${CMAKE_SOURCE_DIR}/norand.c
   ${CMAKE_SOURCE_DIR}/nocproxy.c
@@ -118,7 +118,7 @@ target_link_libraries(psocks
 
 add_executable(putty
   window.c
-  winhelp.c
+  help.c
   ${CMAKE_SOURCE_DIR}/be_all_s.c
   putty.rc)
 add_dependencies(putty generated_licence_h)
@@ -133,7 +133,7 @@ installed_program(putty)
 
 add_executable(puttytel
   window.c
-  winhelp.c
+  help.c
   ${CMAKE_SOURCE_DIR}/be_nos_s.c
   ${CMAKE_SOURCE_DIR}/nogss.c
   ${CMAKE_SOURCE_DIR}/norand.c
@@ -149,15 +149,15 @@ set_target_properties(puttytel PROPERTIES
 installed_program(puttytel)
 
 add_executable(puttygen
-  winpgen.c
+  puttygen.c
   ${CMAKE_SOURCE_DIR}/notiming.c
-  winnoise.c
-  winnojmp.c
-  winstore.c
-  winhelp.c
+  noise.c
+  no-jump-list.c
+  storage.c
+  help.c
   ${CMAKE_SOURCE_DIR}/sshpubk.c
   ${CMAKE_SOURCE_DIR}/sshrand.c
-  winctrls.c
+  controls.c
   puttygen.rc)
 add_dependencies(puttygen generated_licence_h)
 target_link_libraries(puttygen
diff --git a/windows/winpgntc.c b/windows/agent-client.c
similarity index 99%
rename from windows/winpgntc.c
rename to windows/agent-client.c
index 0fc98cc5..47123cc9 100644
--- a/windows/winpgntc.c
+++ b/windows/agent-client.c
@@ -9,8 +9,8 @@
 #include "putty.h"
 #include "pageant.h" /* for AGENT_MAX_MSGLEN */
 
-#include "winsecur.h"
-#include "wincapi.h"
+#include "security-api.h"
+#include "cryptoapi.h"
 
 #define AGENT_COPYDATA_ID 0x804e50ba   /* random goop */
 
diff --git a/windows/wincliloop.c b/windows/cliloop.c
similarity index 100%
rename from windows/wincliloop.c
rename to windows/cliloop.c
diff --git a/windows/wincfg.c b/windows/config.c
similarity index 100%
rename from windows/wincfg.c
rename to windows/config.c
diff --git a/windows/wincons.c b/windows/console.c
similarity index 100%
rename from windows/wincons.c
rename to windows/console.c
diff --git a/windows/winctrls.c b/windows/controls.c
similarity index 100%
rename from windows/winctrls.c
rename to windows/controls.c
diff --git a/windows/wincapi.h b/windows/cryptoapi.h
similarity index 93%
rename from windows/wincapi.h
rename to windows/cryptoapi.h
index 07f48cbe..4ea7fe49 100644
--- a/windows/wincapi.h
+++ b/windows/cryptoapi.h
@@ -1,5 +1,5 @@
 /*
- * wincapi.h: Windows Crypto API functions defined in wincapi.c that
+ * cryptoapi.h: Windows Crypto API functions defined in PuTTY that
  * use the crypt32 library. Also centralises the machinery for
  * dynamically loading that library, and our own functions using that
  * in turn.
diff --git a/windows/windlg.c b/windows/dialog.c
similarity index 99%
rename from windows/windlg.c
rename to windows/dialog.c
index 9c5fdb76..c1ac0599 100644
--- a/windows/windlg.c
+++ b/windows/dialog.c
@@ -11,8 +11,8 @@
 
 #include "putty.h"
 #include "ssh.h"
-#include "win_res.h"
-#include "winseat.h"
+#include "putty-rc.h"
+#include "win-gui-seat.h"
 #include "storage.h"
 #include "dialog.h"
 #include "licence.h"
diff --git a/windows/wingss.c b/windows/gss.c
similarity index 100%
rename from windows/wingss.c
rename to windows/gss.c
diff --git a/windows/winhandl.c b/windows/handle-io.c
similarity index 100%
rename from windows/winhandl.c
rename to windows/handle-io.c
diff --git a/windows/winhsock.c b/windows/handle-socket.c
similarity index 100%
rename from windows/winhsock.c
rename to windows/handle-socket.c
diff --git a/windows/winhelp.c b/windows/help.c
similarity index 99%
rename from windows/winhelp.c
rename to windows/help.c
index df6ac37b..daea282a 100644
--- a/windows/winhelp.c
+++ b/windows/help.c
@@ -8,7 +8,7 @@
 #include <assert.h>
 
 #include "putty.h"
-#include "win_res.h"
+#include "putty-rc.h"
 
 #ifdef NO_HTMLHELP
 
diff --git a/windows/winhelp.h b/windows/help.h
similarity index 99%
rename from windows/winhelp.h
rename to windows/help.h
index ae5a7a7f..5b11af3c 100644
--- a/windows/winhelp.h
+++ b/windows/help.h
@@ -1,5 +1,5 @@
 /*
- * winhelp.h - define Windows Help context names.
+ * help.h - define Windows Help context names.
  * Each definition is simply a string which matches up with the
  * section names in the Halibut source, and is used for HTML Help.
  */
diff --git a/windows/winhelp.rc2 b/windows/help.rc2
similarity index 89%
rename from windows/winhelp.rc2
rename to windows/help.rc2
index e331629e..16bb41f0 100644
--- a/windows/winhelp.rc2
+++ b/windows/help.rc2
@@ -1,4 +1,4 @@
-#include "win_res.h"
+#include "putty-rc.h"
 
 #ifdef EMBEDDED_CHM_FILE
 ID_CUSTOM_CHMFILE TYPE_CUSTOM_CHMFILE EMBEDDED_CHM_FILE
diff --git a/windows/winjump.c b/windows/jump-list.c
similarity index 100%
rename from windows/winjump.c
rename to windows/jump-list.c
diff --git a/windows/winproxy.c b/windows/local-proxy.c
similarity index 100%
rename from windows/winproxy.c
rename to windows/local-proxy.c
diff --git a/windows/winnpc.c b/windows/named-pipe-client.c
similarity index 99%
rename from windows/winnpc.c
rename to windows/named-pipe-client.c
index 9f7fcb1c..bd43998a 100644
--- a/windows/winnpc.c
+++ b/windows/named-pipe-client.c
@@ -11,7 +11,7 @@
 #include "proxy.h"
 #include "ssh.h"
 
-#include "winsecur.h"
+#include "security-api.h"
 
 HANDLE connect_to_named_pipe(const char *pipename, char **err)
 {
diff --git a/windows/winnps.c b/windows/named-pipe-server.c
similarity index 99%
rename from windows/winnps.c
rename to windows/named-pipe-server.c
index 4f9b638d..cdda500d 100644
--- a/windows/winnps.c
+++ b/windows/named-pipe-server.c
@@ -11,7 +11,7 @@
 #include "proxy.h"
 #include "ssh.h"
 
-#include "winsecur.h"
+#include "security-api.h"
 
 typedef struct NamedPipeServerSocket {
     /* Parameters for (repeated) creation of named pipe objects */
diff --git a/windows/winnet.c b/windows/network.c
similarity index 100%
rename from windows/winnet.c
rename to windows/network.c
diff --git a/windows/winnojmp.c b/windows/no-jump-list.c
similarity index 100%
rename from windows/winnojmp.c
rename to windows/no-jump-list.c
diff --git a/windows/winnohlp.c b/windows/nohelp.c
similarity index 100%
rename from windows/winnohlp.c
rename to windows/nohelp.c
diff --git a/windows/winnoise.c b/windows/noise.c
similarity index 100%
rename from windows/winnoise.c
rename to windows/noise.c
diff --git a/windows/winpgnt.c b/windows/pageant.c
similarity index 99%
rename from windows/winpgnt.c
rename to windows/pageant.c
index 84291e6b..9159a5aa 100644
--- a/windows/winpgnt.c
+++ b/windows/pageant.c
@@ -13,8 +13,8 @@
 #include "ssh.h"
 #include "misc.h"
 #include "tree234.h"
-#include "winsecur.h"
-#include "wincapi.h"
+#include "security-api.h"
+#include "cryptoapi.h"
 #include "pageant.h"
 #include "licence.h"
 #include "pageant-rc.h"
diff --git a/windows/pageant.rc b/windows/pageant.rc
index a4a15195..5bea40e7 100644
--- a/windows/pageant.rc
+++ b/windows/pageant.rc
@@ -9,7 +9,7 @@
 
 #include "pageant-rc.h"
 
-#include "winhelp.rc2"
+#include "help.rc2"
 
 IDI_MAINICON ICON "pageant.ico"
 IDI_TRAYICON ICON "pageants.ico"
diff --git a/windows/platform.h b/windows/platform.h
index 0011ed24..f84f4236 100644
--- a/windows/platform.h
+++ b/windows/platform.h
@@ -25,7 +25,7 @@
 
 #include "tree234.h"
 
-#include "winhelp.h"
+#include "help.h"
 
 #if defined _M_IX86 || defined _M_AMD64
 #define BUILDINFO_PLATFORM "x86 Windows"
diff --git a/windows/winplink.c b/windows/plink.c
similarity index 99%
rename from windows/winplink.c
rename to windows/plink.c
index 9bda0712..3166178f 100644
--- a/windows/winplink.c
+++ b/windows/plink.c
@@ -10,7 +10,7 @@
 #include "putty.h"
 #include "storage.h"
 #include "tree234.h"
-#include "winsecur.h"
+#include "security-api.h"
 
 void cmdline_error(const char *fmt, ...)
 {
diff --git a/windows/winprint.c b/windows/printing.c
similarity index 100%
rename from windows/winprint.c
rename to windows/printing.c
diff --git a/windows/winsocks.c b/windows/psocks.c
similarity index 100%
rename from windows/winsocks.c
rename to windows/psocks.c
diff --git a/windows/win_res.rc2 b/windows/putty-common.rc2
similarity index 99%
rename from windows/win_res.rc2
rename to windows/putty-common.rc2
index ccec3122..79b79ea1 100644
--- a/windows/win_res.rc2
+++ b/windows/putty-common.rc2
@@ -13,7 +13,7 @@
  * from it (which happens if the extension is '.h').
  */
 
-#include "win_res.h"
+#include "putty-rc.h"
 
 IDI_MAINICON ICON "putty.ico"
 
diff --git a/windows/win_res.h b/windows/putty-rc.h
similarity index 93%
rename from windows/win_res.h
rename to windows/putty-rc.h
index d34f6852..cdfae94a 100644
--- a/windows/win_res.h
+++ b/windows/putty-rc.h
@@ -1,5 +1,5 @@
 /*
- * win_res.h - constants shared between win_res.rc2 and the C code.
+ * putty-rc.h - constants shared between putty-common.rc2 and the C code.
  */
 
 #ifndef PUTTY_WIN_RES_H
diff --git a/windows/putty.rc b/windows/putty.rc
index 08969abf..887342c3 100644
--- a/windows/putty.rc
+++ b/windows/putty.rc
@@ -3,8 +3,8 @@
 #define APPNAME "PuTTY"
 #define APPDESC "SSH, Telnet, Rlogin, and SUPDUP client"
 
-#include "winhelp.rc2"
-#include "win_res.rc2"
+#include "help.rc2"
+#include "putty-common.rc2"
 
 #ifndef NO_MANIFESTS
 1 RT_MANIFEST "putty.mft"
diff --git a/windows/winpgen.c b/windows/puttygen.c
similarity index 99%
rename from windows/winpgen.c
rename to windows/puttygen.c
index e1c1b5b3..cf98b6fe 100644
--- a/windows/winpgen.c
+++ b/windows/puttygen.c
@@ -11,7 +11,7 @@
 #include "ssh.h"
 #include "sshkeygen.h"
 #include "licence.h"
-#include "winsecur.h"
+#include "security-api.h"
 #include "puttygen-rc.h"
 
 #include <commctrl.h>
diff --git a/windows/puttygen.rc b/windows/puttygen.rc
index b910b6a3..d1cef50d 100644
--- a/windows/puttygen.rc
+++ b/windows/puttygen.rc
@@ -7,7 +7,7 @@
 #define APPNAME "PuTTYgen"
 #define APPDESC "PuTTY SSH key generation utility"
 
-#include "winhelp.rc2"
+#include "help.rc2"
 #include "puttygen-rc.h"
 
 200 ICON "puttygen.ico"
diff --git a/windows/puttytel.rc b/windows/puttytel.rc
index 259bc683..6f2bfaab 100644
--- a/windows/puttytel.rc
+++ b/windows/puttytel.rc
@@ -3,8 +3,8 @@
 #define APPNAME "PuTTYtel"
 #define APPDESC "Telnet and Rlogin client"
 
-#include "winhelp.rc2"
-#include "win_res.rc2"
+#include "help.rc2"
+#include "putty-common.rc2"
 
 #ifndef NO_MANIFESTS
 1 RT_MANIFEST "puttytel.mft"
diff --git a/windows/winsecur.h b/windows/security-api.h
similarity index 96%
rename from windows/winsecur.h
rename to windows/security-api.h
index 6ca736a3..95e9353d 100644
--- a/windows/winsecur.h
+++ b/windows/security-api.h
@@ -1,5 +1,5 @@
 /*
- * winsecur.h: some miscellaneous security-related helper functions,
+ * security-api.h: some miscellaneous security-related helper functions,
  * defined in winsecur.c, that use the advapi32 library. Also
  * centralises the machinery for dynamically loading that library.
  */
diff --git a/windows/winselcli.c b/windows/select-cli.c
similarity index 100%
rename from windows/winselcli.c
rename to windows/select-cli.c
diff --git a/windows/winselgui.c b/windows/select-gui.c
similarity index 100%
rename from windows/winselgui.c
rename to windows/select-gui.c
diff --git a/windows/winser.c b/windows/serial.c
similarity index 100%
rename from windows/winser.c
rename to windows/serial.c
diff --git a/windows/winsftp.c b/windows/sftp.c
similarity index 99%
rename from windows/winsftp.c
rename to windows/sftp.c
index 0c695d2e..e316f8f8 100644
--- a/windows/winsftp.c
+++ b/windows/sftp.c
@@ -10,7 +10,7 @@
 #include "putty.h"
 #include "psftp.h"
 #include "ssh.h"
-#include "winsecur.h"
+#include "security-api.h"
 
 int filexfer_get_userpass_input(Seat *seat, prompts_t *p, bufchain *input)
 {
diff --git a/windows/winshare.c b/windows/sharing.c
similarity index 98%
rename from windows/winshare.c
rename to windows/sharing.c
index 51a84438..6ded0716 100644
--- a/windows/winshare.c
+++ b/windows/sharing.c
@@ -11,8 +11,8 @@
 #include "proxy.h"
 #include "ssh.h"
 
-#include "wincapi.h"
-#include "winsecur.h"
+#include "cryptoapi.h"
+#include "security-api.h"
 
 #define CONNSHARE_PIPE_PREFIX "\\\\.\\pipe\\putty-connshare"
 #define CONNSHARE_MUTEX_PREFIX "Local\\putty-connshare-mutex"
diff --git a/windows/winstore.c b/windows/storage.c
similarity index 100%
rename from windows/winstore.c
rename to windows/storage.c
diff --git a/windows/winucs.c b/windows/unicode.c
similarity index 100%
rename from windows/winucs.c
rename to windows/unicode.c
diff --git a/windows/utils/capi.c b/windows/utils/cryptoapi.c
similarity index 96%
rename from windows/utils/capi.c
rename to windows/utils/cryptoapi.c
index 3d38ae04..1c017903 100644
--- a/windows/utils/capi.c
+++ b/windows/utils/cryptoapi.c
@@ -1,5 +1,5 @@
 /*
- * windows/utils/capi.c: implementation of wincapi.h.
+ * windows/utils/cryptoapi.c: implementation of cryptoapi.h.
  */
 
 #include "putty.h"
@@ -7,7 +7,7 @@
 #include "putty.h"
 #include "ssh.h"
 
-#include "wincapi.h"
+#include "cryptoapi.h"
 
 DEF_WINDOWS_FUNCTION(CryptProtectMemory);
 
diff --git a/windows/utils/security.c b/windows/utils/security.c
index 69ac96f1..2d899b83 100644
--- a/windows/utils/security.c
+++ b/windows/utils/security.c
@@ -1,5 +1,5 @@
 /*
- * windows/utils/security.c: implementation of winsecur.h.
+ * windows/utils/security.c: implementation of security-api.h.
  */
 
 #include <stdio.h>
@@ -7,7 +7,7 @@
 
 #include "putty.h"
 
-#include "winsecur.h"
+#include "security-api.h"
 
 /* Initialised once, then kept around to reuse forever */
 static PSID worldsid, networksid, usersid;
diff --git a/windows/winseat.h b/windows/win-gui-seat.h
similarity index 100%
rename from windows/winseat.h
rename to windows/win-gui-seat.h
diff --git a/windows/window.c b/windows/window.c
index d147b980..7876f7b8 100644
--- a/windows/window.c
+++ b/windows/window.c
@@ -15,9 +15,9 @@
 #include "putty.h"
 #include "terminal.h"
 #include "storage.h"
-#include "win_res.h"
-#include "winsecur.h"
-#include "winseat.h"
+#include "putty-rc.h"
+#include "security-api.h"
+#include "win-gui-seat.h"
 #include "tree234.h"
 
 #ifdef NO_MULTIMON
diff --git a/windows/winx11.c b/windows/x11.c
similarity index 100%
rename from windows/winx11.c
rename to windows/x11.c