diff --git a/common/Makefile.am b/common/Makefile.am
index bc063ec16..2621634c4 100644
--- a/common/Makefile.am
+++ b/common/Makefile.am
@@ -102,7 +102,7 @@ common_sources = \
 
 
 if HAVE_W32_SYSTEM
-common_sources += w32-reg.c w32-misc.c
+common_sources += w32-reg.c w32-cmdline.c
 endif
 
 # To make the code easier to read we have split home some code into
@@ -222,7 +222,7 @@ t_name_value_LDADD = $(t_common_ldadd)
 t_ccparray_LDADD = $(t_common_ldadd)
 t_recsel_LDADD = $(t_common_ldadd)
 
-t_w32_cmdline_SOURCES = t-w32-cmdline.c w32-misc.c $(t_extra_src)
+t_w32_cmdline_SOURCES = t-w32-cmdline.c w32-cmdline.c $(t_extra_src)
 t_w32_cmdline_LDADD = $(t_common_ldadd)
 
 # System specific test
diff --git a/common/w32-misc.c b/common/w32-cmdline.c
similarity index 99%
rename from common/w32-misc.c
rename to common/w32-cmdline.c
index 2a0ba86e5..85d57523a 100644
--- a/common/w32-misc.c
+++ b/common/w32-cmdline.c
@@ -1,4 +1,4 @@
-/* w32-misc.c - Helper functions needed in Windows
+/* w32-cmdline.c - Command line helper functions needed in Windows
  * Copyright (C) 2021 g10 Code GmbH
  *
  * This file is part of GnuPG.
diff --git a/common/w32help.h b/common/w32help.h
index 7f97f0d3e..edb51b8b7 100644
--- a/common/w32help.h
+++ b/common/w32help.h
@@ -31,7 +31,7 @@
 #ifndef GNUPG_COMMON_W32HELP_H
 #define GNUPG_COMMON_W32HELP_H
 
-/*-- w32-misc.c --*/
+/*-- w32-cmdline.c --*/
 
 /* This module is also part of the Unix tests.  */
 char **w32_parse_commandline (char *cmdline, int globing, int *r_argv,