diff --git a/client/devkit_client/__init__.py b/client/devkit_client/__init__.py
index eeab25f80b1ca5f64d8d3a9eb9a52e947e560704..42bdb1fc7f9e5757c4985b16da6529ed62a3a420 100644
--- a/client/devkit_client/__init__.py
+++ b/client/devkit_client/__init__.py
@@ -228,7 +228,7 @@ def get_remote_debuggers():
     return g_remote_debuggers
 
 
-def _locate_external_tool(name):
+def _locate_cygwin_tool(name):
     assert sys.platform == 'win32'
     if getattr(sys, 'frozen', False):
         # Scripts that were frozen into a standalone executable via cx_freeze are expected to package the binaries
@@ -262,7 +262,7 @@ def _locate_external_tool(name):
             return ret
     raise Exception('Required external tool not found: {!r}'.format(name))
 
-def locate_external_tools():
+def locate_cygwin_tools():
     '''Returns a tuple of paths (cygpath, ssh, rsync, ssh_know_hosts)'''
     global g_external_tools
     if g_external_tools is not None:
@@ -275,9 +275,9 @@ def locate_external_tools():
                     raise Exception(f'{tool} not found - please install.')
         return g_external_tools
 
-    cygpath = _locate_external_tool('cygpath.exe')
-    ssh = _locate_external_tool('ssh.exe')
-    rsync = _locate_external_tool('rsync.exe')
+    cygpath = _locate_cygwin_tool('cygpath.exe')
+    ssh = _locate_cygwin_tool('ssh.exe')
+    rsync = _locate_cygwin_tool('rsync.exe')
 
     USERPROFILE = os.getenv('USERPROFILE')
     if USERPROFILE is None:
@@ -595,7 +595,7 @@ class DevkitClient(object):
             appdirs.user_config_dir('steamos-devkit'),
             'devkit_rsa',
         )
-        (self.cygpath, self.ssh, self.rsync, self.ssh_known_hosts) = locate_external_tools()
+        (self.cygpath, self.ssh, self.rsync, self.ssh_known_hosts) = locate_cygwin_tools()
         self.ssh_result = {}
         self.last_device_list_time = 0
         self.rsync_process = None
diff --git a/client/devkit_client/gui2/gui2.py b/client/devkit_client/gui2/gui2.py
index 18c86bc10154727c696b5704928583273f31dbc0..bcab326824ea9e6af3f7d589e45f58c9fb519cc8 100644
--- a/client/devkit_client/gui2/gui2.py
+++ b/client/devkit_client/gui2/gui2.py
@@ -1214,7 +1214,7 @@ class DevkitsWindow(ToolWindow):
         # === draw =========================================================================
         if self.first_draw:
             try:
-                devkit_client.locate_external_tools()
+                devkit_client.locate_cygwin_tools()
             except Exception as e:
                 failed_future = concurrent.futures.Future()
                 failed_future.set_exception(e)
diff --git a/setup/package-windows.py b/setup/package-windows.py
index fac8c50e7d3ec7a0b7e7a50d78086d2b8b87e7d1..5e4e505bb45f50a9d255e47fa20d0d8ce6bb35a7 100644
--- a/setup/package-windows.py
+++ b/setup/package-windows.py
@@ -18,7 +18,7 @@ DIST_DIR = os.path.join(ROOT_DIR, 'dist')
 
 # cursed, but delicious
 sys.path.append(CLIENT_DIR)
-from devkit_client import locate_external_tools
+from devkit_client import locate_cygwin_tools
 sys.path.pop()
 
 # don't let python buffering get in the way or readable output
@@ -64,7 +64,7 @@ if __name__ == '__main__':
         dir_path = os.path.join(CLIENT_DIR, name)
         shutil.copytree(dir_path, os.path.join(DIST_DIR, name), dirs_exist_ok=True)
 
-    cygroot =  os.path.dirname(locate_external_tools()[0])
+    cygroot =  os.path.dirname(locate_cygwin_tools()[0])
     assert os.path.isdir(cygroot)
     cygwin_dst_dir = os.path.join(DIST_DIR, 'cygroot/bin')
     os.makedirs(cygwin_dst_dir, exist_ok=True)