Replace 'w64 mingw-runtime' by 'mingw-w64 runtime'

Also replace 'This file is a part of' by 'This file is part of' for consistency

git-svn-id: svn+ssh://svn.code.sf.net/p/mingw-w64/code/trunk@5147 4407c894-4637-0410-b4f5-ada5f102cad1
diff --git a/DISCLAIMER.PD b/DISCLAIMER.PD
index 5106bec..91fb0d6 100644
--- a/DISCLAIMER.PD
+++ b/DISCLAIMER.PD
@@ -1,9 +1,9 @@
 /**
  * DISCLAIMER
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is a part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  *
- * The w64 mingw-runtime package and its code is distributed in the hope that it 
+ * The mingw-w64 runtime package and its code is distributed in the hope that it 
  * will be useful but WITHOUT ANY WARRANTY.  ALL WARRANTIES, EXPRESSED OR 
  * IMPLIED ARE HEREBY DISCLAIMED.  This includes but is not limited to 
  * warranties of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
diff --git a/mingw-w64-crt/crt/CRT_fp10.c b/mingw-w64-crt/crt/CRT_fp10.c
index 21a8613..c8a8bfb 100644
--- a/mingw-w64-crt/crt/CRT_fp10.c
+++ b/mingw-w64-crt/crt/CRT_fp10.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 
diff --git a/mingw-w64-crt/crt/CRT_fp8.c b/mingw-w64-crt/crt/CRT_fp8.c
index 4a00b86..a7d3a97 100644
--- a/mingw-w64-crt/crt/CRT_fp8.c
+++ b/mingw-w64-crt/crt/CRT_fp8.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 
diff --git a/mingw-w64-crt/crt/CRT_glob.c b/mingw-w64-crt/crt/CRT_glob.c
index 6050003..32fbf36 100644
--- a/mingw-w64-crt/crt/CRT_glob.c
+++ b/mingw-w64-crt/crt/CRT_glob.c
@@ -1,7 +1,7 @@
 /*
  * CRT_glob.c
  * This file has no copyright is assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within the package.
  *
  * Include this object file to set _dowildcard to a state that will turn on
diff --git a/mingw-w64-crt/crt/CRT_noglob.c b/mingw-w64-crt/crt/CRT_noglob.c
index f458db9..82e9438 100644
--- a/mingw-w64-crt/crt/CRT_noglob.c
+++ b/mingw-w64-crt/crt/CRT_noglob.c
@@ -1,7 +1,7 @@
 /*
  * CRT_noglob.c
  * This file has no copyright is assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within the package.
  *
  * Include this object file to set _dowildcard to a state that will turn off
diff --git a/mingw-w64-crt/crt/_newmode.c b/mingw-w64-crt/crt/_newmode.c
index f2fa396..2bb5d94 100644
--- a/mingw-w64-crt/crt/_newmode.c
+++ b/mingw-w64-crt/crt/_newmode.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 
diff --git a/mingw-w64-crt/crt/atonexit.c b/mingw-w64-crt/crt/atonexit.c
index 442be35..2bb2edb 100644
--- a/mingw-w64-crt/crt/atonexit.c
+++ b/mingw-w64-crt/crt/atonexit.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 
diff --git a/mingw-w64-crt/crt/binmode.c b/mingw-w64-crt/crt/binmode.c
index e7b3965..f0473b0 100644
--- a/mingw-w64-crt/crt/binmode.c
+++ b/mingw-w64-crt/crt/binmode.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 
diff --git a/mingw-w64-crt/crt/charmax.c b/mingw-w64-crt/crt/charmax.c
index fbd10c4..cbe5030 100644
--- a/mingw-w64-crt/crt/charmax.c
+++ b/mingw-w64-crt/crt/charmax.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 
diff --git a/mingw-w64-crt/crt/crt0_c.c b/mingw-w64-crt/crt/crt0_c.c
index 165eee1..e42dd32 100644
--- a/mingw-w64-crt/crt/crt0_c.c
+++ b/mingw-w64-crt/crt/crt0_c.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 
diff --git a/mingw-w64-crt/crt/crt0_w.c b/mingw-w64-crt/crt/crt0_w.c
index 9f46e38..ab099c9 100644
--- a/mingw-w64-crt/crt/crt0_w.c
+++ b/mingw-w64-crt/crt/crt0_w.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #include <windows.h>
diff --git a/mingw-w64-crt/crt/crt_handler.c b/mingw-w64-crt/crt/crt_handler.c
index 5d7dc22..a1b51ce 100644
--- a/mingw-w64-crt/crt/crt_handler.c
+++ b/mingw-w64-crt/crt/crt_handler.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 
diff --git a/mingw-w64-crt/crt/crtbegin.c b/mingw-w64-crt/crt/crtbegin.c
index c917f9b..39c0d85 100644
--- a/mingw-w64-crt/crt/crtbegin.c
+++ b/mingw-w64-crt/crt/crtbegin.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 
diff --git a/mingw-w64-crt/crt/crtdll.c b/mingw-w64-crt/crt/crtdll.c
index ed3a73f..07a1840 100644
--- a/mingw-w64-crt/crt/crtdll.c
+++ b/mingw-w64-crt/crt/crtdll.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 
diff --git a/mingw-w64-crt/crt/crtend.c b/mingw-w64-crt/crt/crtend.c
index c917f9b..39c0d85 100644
--- a/mingw-w64-crt/crt/crtend.c
+++ b/mingw-w64-crt/crt/crtend.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 
diff --git a/mingw-w64-crt/crt/crtexe.c b/mingw-w64-crt/crt/crtexe.c
index 57be841..79ddc54 100644
--- a/mingw-w64-crt/crt/crtexe.c
+++ b/mingw-w64-crt/crt/crtexe.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 
diff --git a/mingw-w64-crt/crt/dll_argv.c b/mingw-w64-crt/crt/dll_argv.c
index 06abb8d..22397af 100644
--- a/mingw-w64-crt/crt/dll_argv.c
+++ b/mingw-w64-crt/crt/dll_argv.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 
diff --git a/mingw-w64-crt/crt/dllargv.c b/mingw-w64-crt/crt/dllargv.c
index 769b835..7cd98da 100644
--- a/mingw-w64-crt/crt/dllargv.c
+++ b/mingw-w64-crt/crt/dllargv.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 
diff --git a/mingw-w64-crt/crt/dllentry.c b/mingw-w64-crt/crt/dllentry.c
index d2ed1b5..0e3581b 100644
--- a/mingw-w64-crt/crt/dllentry.c
+++ b/mingw-w64-crt/crt/dllentry.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 
diff --git a/mingw-w64-crt/crt/gccmain.c b/mingw-w64-crt/crt/gccmain.c
index a0e0483..fc0e350 100644
--- a/mingw-w64-crt/crt/gccmain.c
+++ b/mingw-w64-crt/crt/gccmain.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 
diff --git a/mingw-w64-crt/crt/gs_support.c b/mingw-w64-crt/crt/gs_support.c
index 17d9542..4126526 100644
--- a/mingw-w64-crt/crt/gs_support.c
+++ b/mingw-w64-crt/crt/gs_support.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 
diff --git a/mingw-w64-crt/crt/isascii.c b/mingw-w64-crt/crt/isascii.c
index 067b996..39d0bfa 100644
--- a/mingw-w64-crt/crt/isascii.c
+++ b/mingw-w64-crt/crt/isascii.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 
diff --git a/mingw-w64-crt/crt/iscsym.c b/mingw-w64-crt/crt/iscsym.c
index f98e990..f879cfe 100644
--- a/mingw-w64-crt/crt/iscsym.c
+++ b/mingw-w64-crt/crt/iscsym.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 
diff --git a/mingw-w64-crt/crt/iscsymf.c b/mingw-w64-crt/crt/iscsymf.c
index 9ff88af..5b759c5 100644
--- a/mingw-w64-crt/crt/iscsymf.c
+++ b/mingw-w64-crt/crt/iscsymf.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 
diff --git a/mingw-w64-crt/crt/merr.c b/mingw-w64-crt/crt/merr.c
index d1fce73..0d111ac 100644
--- a/mingw-w64-crt/crt/merr.c
+++ b/mingw-w64-crt/crt/merr.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 
diff --git a/mingw-w64-crt/crt/mingw_custom.c b/mingw-w64-crt/crt/mingw_custom.c
index 5920198..431eaba 100644
--- a/mingw-w64-crt/crt/mingw_custom.c
+++ b/mingw-w64-crt/crt/mingw_custom.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 
diff --git a/mingw-w64-crt/crt/mingw_helpers.c b/mingw-w64-crt/crt/mingw_helpers.c
index b1bafd3..28c56bc 100644
--- a/mingw-w64-crt/crt/mingw_helpers.c
+++ b/mingw-w64-crt/crt/mingw_helpers.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 
diff --git a/mingw-w64-crt/crt/natstart.c b/mingw-w64-crt/crt/natstart.c
index 1122d19..06def19 100644
--- a/mingw-w64-crt/crt/natstart.c
+++ b/mingw-w64-crt/crt/natstart.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 
diff --git a/mingw-w64-crt/crt/pesect.c b/mingw-w64-crt/crt/pesect.c
index 8f49e6b..1a1d5ff 100644
--- a/mingw-w64-crt/crt/pesect.c
+++ b/mingw-w64-crt/crt/pesect.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 
diff --git a/mingw-w64-crt/crt/pseudo-reloc-list.c b/mingw-w64-crt/crt/pseudo-reloc-list.c
index 4ce46bb..5b903c2 100644
--- a/mingw-w64-crt/crt/pseudo-reloc-list.c
+++ b/mingw-w64-crt/crt/pseudo-reloc-list.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 
diff --git a/mingw-w64-crt/crt/strcasecmp.c b/mingw-w64-crt/crt/strcasecmp.c
index 17aba0b..02e000a 100644
--- a/mingw-w64-crt/crt/strcasecmp.c
+++ b/mingw-w64-crt/crt/strcasecmp.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 
diff --git a/mingw-w64-crt/crt/strncasecmp.c b/mingw-w64-crt/crt/strncasecmp.c
index b06afda..39349d1 100644
--- a/mingw-w64-crt/crt/strncasecmp.c
+++ b/mingw-w64-crt/crt/strncasecmp.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 
diff --git a/mingw-w64-crt/crt/tlsmcrt.c b/mingw-w64-crt/crt/tlsmcrt.c
index 2450b8b..506bc0a 100644
--- a/mingw-w64-crt/crt/tlsmcrt.c
+++ b/mingw-w64-crt/crt/tlsmcrt.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  *
  * Written by Kai Tietz  <kai.tietz@onevision.com>
diff --git a/mingw-w64-crt/crt/tlsmthread.c b/mingw-w64-crt/crt/tlsmthread.c
index c018abf..2ab0d0f 100644
--- a/mingw-w64-crt/crt/tlsmthread.c
+++ b/mingw-w64-crt/crt/tlsmthread.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  *
  * Written by Kai Tietz  <kai.tietz@onevision.com>
diff --git a/mingw-w64-crt/crt/tlssup.c b/mingw-w64-crt/crt/tlssup.c
index 3a0e635..34ac39f 100644
--- a/mingw-w64-crt/crt/tlssup.c
+++ b/mingw-w64-crt/crt/tlssup.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  *
  * Written by Kai Tietz  <kai.tietz@onevision.com>
diff --git a/mingw-w64-crt/crt/tlsthrd.c b/mingw-w64-crt/crt/tlsthrd.c
index 6fbd47a..5d858a6 100644
--- a/mingw-w64-crt/crt/tlsthrd.c
+++ b/mingw-w64-crt/crt/tlsthrd.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  *
  * Written by Kai Tietz  <kai.tietz@onevision.com>
diff --git a/mingw-w64-crt/crt/toascii.c b/mingw-w64-crt/crt/toascii.c
index 946b321..5ca5eb8 100644
--- a/mingw-w64-crt/crt/toascii.c
+++ b/mingw-w64-crt/crt/toascii.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 
diff --git a/mingw-w64-crt/crt/txtmode.c b/mingw-w64-crt/crt/txtmode.c
index 0c700ee..3db1ff1 100644
--- a/mingw-w64-crt/crt/txtmode.c
+++ b/mingw-w64-crt/crt/txtmode.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 
diff --git a/mingw-w64-crt/crt/ucrtexe.c b/mingw-w64-crt/crt/ucrtexe.c
index 3fcbac7..41f652e 100644
--- a/mingw-w64-crt/crt/ucrtexe.c
+++ b/mingw-w64-crt/crt/ucrtexe.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 
diff --git a/mingw-w64-crt/crt/udll_argv.c b/mingw-w64-crt/crt/udll_argv.c
index 6706c4a..a60927c 100644
--- a/mingw-w64-crt/crt/udll_argv.c
+++ b/mingw-w64-crt/crt/udll_argv.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 
diff --git a/mingw-w64-crt/crt/udllargc.c b/mingw-w64-crt/crt/udllargc.c
index 83e88c3..f6ab6b1 100644
--- a/mingw-w64-crt/crt/udllargc.c
+++ b/mingw-w64-crt/crt/udllargc.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 
diff --git a/mingw-w64-crt/crt/wcscmpi.c b/mingw-w64-crt/crt/wcscmpi.c
index 2fce2b4..d35141c 100644
--- a/mingw-w64-crt/crt/wcscmpi.c
+++ b/mingw-w64-crt/crt/wcscmpi.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 
diff --git a/mingw-w64-crt/crt/wildcard.c b/mingw-w64-crt/crt/wildcard.c
index f996577..b53cc18 100644
--- a/mingw-w64-crt/crt/wildcard.c
+++ b/mingw-w64-crt/crt/wildcard.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 
diff --git a/mingw-w64-crt/crt/xncommod.c b/mingw-w64-crt/crt/xncommod.c
index f4efddb..b2ec312 100644
--- a/mingw-w64-crt/crt/xncommod.c
+++ b/mingw-w64-crt/crt/xncommod.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 
diff --git a/mingw-w64-crt/crt/xthdloc.c b/mingw-w64-crt/crt/xthdloc.c
index 285bc95..973ff45 100644
--- a/mingw-w64-crt/crt/xthdloc.c
+++ b/mingw-w64-crt/crt/xthdloc.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 
diff --git a/mingw-w64-crt/crt/xtxtmode.c b/mingw-w64-crt/crt/xtxtmode.c
index cbc847a..dcbbe11 100644
--- a/mingw-w64-crt/crt/xtxtmode.c
+++ b/mingw-w64-crt/crt/xtxtmode.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 int _fmode = 0;
diff --git a/mingw-w64-crt/include/internal.h b/mingw-w64-crt/include/internal.h
index 727b05f..c6cc796 100644
--- a/mingw-w64-crt/include/internal.h
+++ b/mingw-w64-crt/include/internal.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 
diff --git a/mingw-w64-crt/include/oscalls.h b/mingw-w64-crt/include/oscalls.h
index 8135676..670a6f7 100644
--- a/mingw-w64-crt/include/oscalls.h
+++ b/mingw-w64-crt/include/oscalls.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 
diff --git a/mingw-w64-crt/include/sect_attribs.h b/mingw-w64-crt/include/sect_attribs.h
index 6e59216..31b05da 100644
--- a/mingw-w64-crt/include/sect_attribs.h
+++ b/mingw-w64-crt/include/sect_attribs.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 
diff --git a/mingw-w64-crt/intrincs/cpuid.c b/mingw-w64-crt/intrincs/cpuid.c
index fc63a83..8c70308 100644
--- a/mingw-w64-crt/intrincs/cpuid.c
+++ b/mingw-w64-crt/intrincs/cpuid.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 
diff --git a/mingw-w64-crt/intrincs/inbyte.c b/mingw-w64-crt/intrincs/inbyte.c
index 4ec0c02..e7a60e5 100644
--- a/mingw-w64-crt/intrincs/inbyte.c
+++ b/mingw-w64-crt/intrincs/inbyte.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 
diff --git a/mingw-w64-crt/intrincs/inbytestring.c b/mingw-w64-crt/intrincs/inbytestring.c
index a4fe7e7..9362c8d 100644
--- a/mingw-w64-crt/intrincs/inbytestring.c
+++ b/mingw-w64-crt/intrincs/inbytestring.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 
diff --git a/mingw-w64-crt/intrincs/indword.c b/mingw-w64-crt/intrincs/indword.c
index d4064f5..42754af 100644
--- a/mingw-w64-crt/intrincs/indword.c
+++ b/mingw-w64-crt/intrincs/indword.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 
diff --git a/mingw-w64-crt/intrincs/indwordstring.c b/mingw-w64-crt/intrincs/indwordstring.c
index 7d902e9..8f9b66a 100644
--- a/mingw-w64-crt/intrincs/indwordstring.c
+++ b/mingw-w64-crt/intrincs/indwordstring.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 
diff --git a/mingw-w64-crt/intrincs/inword.c b/mingw-w64-crt/intrincs/inword.c
index 153cdc5..59cb912 100644
--- a/mingw-w64-crt/intrincs/inword.c
+++ b/mingw-w64-crt/intrincs/inword.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 
diff --git a/mingw-w64-crt/intrincs/inwordstring.c b/mingw-w64-crt/intrincs/inwordstring.c
index c7bee0f..894898e 100644
--- a/mingw-w64-crt/intrincs/inwordstring.c
+++ b/mingw-w64-crt/intrincs/inwordstring.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 
diff --git a/mingw-w64-crt/intrincs/outbyte.c b/mingw-w64-crt/intrincs/outbyte.c
index 1a449b1..00f0e46 100644
--- a/mingw-w64-crt/intrincs/outbyte.c
+++ b/mingw-w64-crt/intrincs/outbyte.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 
diff --git a/mingw-w64-crt/intrincs/outbytestring.c b/mingw-w64-crt/intrincs/outbytestring.c
index 04dd004..2fb991d 100644
--- a/mingw-w64-crt/intrincs/outbytestring.c
+++ b/mingw-w64-crt/intrincs/outbytestring.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 
diff --git a/mingw-w64-crt/intrincs/outdword.c b/mingw-w64-crt/intrincs/outdword.c
index 5155dc3..79b10ce 100644
--- a/mingw-w64-crt/intrincs/outdword.c
+++ b/mingw-w64-crt/intrincs/outdword.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 
diff --git a/mingw-w64-crt/intrincs/outdwordstring.c b/mingw-w64-crt/intrincs/outdwordstring.c
index 13bba9a..0c4a307 100644
--- a/mingw-w64-crt/intrincs/outdwordstring.c
+++ b/mingw-w64-crt/intrincs/outdwordstring.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 
diff --git a/mingw-w64-crt/intrincs/outword.c b/mingw-w64-crt/intrincs/outword.c
index a515bd5..52639d2 100644
--- a/mingw-w64-crt/intrincs/outword.c
+++ b/mingw-w64-crt/intrincs/outword.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 
diff --git a/mingw-w64-crt/intrincs/outwordstring.c b/mingw-w64-crt/intrincs/outwordstring.c
index 528360d..a3e2b85 100644
--- a/mingw-w64-crt/intrincs/outwordstring.c
+++ b/mingw-w64-crt/intrincs/outwordstring.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 
diff --git a/mingw-w64-crt/intrincs/rdtsc.c b/mingw-w64-crt/intrincs/rdtsc.c
index 29feca0..3a5e056 100644
--- a/mingw-w64-crt/intrincs/rdtsc.c
+++ b/mingw-w64-crt/intrincs/rdtsc.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 
diff --git a/mingw-w64-crt/intrincs/readcr0.c b/mingw-w64-crt/intrincs/readcr0.c
index fa002b3..95e56e6 100644
--- a/mingw-w64-crt/intrincs/readcr0.c
+++ b/mingw-w64-crt/intrincs/readcr0.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 
diff --git a/mingw-w64-crt/intrincs/readcr2.c b/mingw-w64-crt/intrincs/readcr2.c
index 6d415cd..8e40e01 100644
--- a/mingw-w64-crt/intrincs/readcr2.c
+++ b/mingw-w64-crt/intrincs/readcr2.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 
diff --git a/mingw-w64-crt/intrincs/readcr3.c b/mingw-w64-crt/intrincs/readcr3.c
index b863877..9e8da0d 100644
--- a/mingw-w64-crt/intrincs/readcr3.c
+++ b/mingw-w64-crt/intrincs/readcr3.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 
diff --git a/mingw-w64-crt/intrincs/readcr4.c b/mingw-w64-crt/intrincs/readcr4.c
index 5dcd2ec..167caab 100644
--- a/mingw-w64-crt/intrincs/readcr4.c
+++ b/mingw-w64-crt/intrincs/readcr4.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 
diff --git a/mingw-w64-crt/intrincs/readcr8.c b/mingw-w64-crt/intrincs/readcr8.c
index c90a685..03d8257 100644
--- a/mingw-w64-crt/intrincs/readcr8.c
+++ b/mingw-w64-crt/intrincs/readcr8.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 
diff --git a/mingw-w64-crt/intrincs/readmsr.c b/mingw-w64-crt/intrincs/readmsr.c
index f8c9e5f..35f1c05 100644
--- a/mingw-w64-crt/intrincs/readmsr.c
+++ b/mingw-w64-crt/intrincs/readmsr.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 
diff --git a/mingw-w64-crt/intrincs/writecr0.c b/mingw-w64-crt/intrincs/writecr0.c
index 7675f49..28b71ef 100644
--- a/mingw-w64-crt/intrincs/writecr0.c
+++ b/mingw-w64-crt/intrincs/writecr0.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 
diff --git a/mingw-w64-crt/intrincs/writecr2.c b/mingw-w64-crt/intrincs/writecr2.c
index ae69faa..2bd4704 100644
--- a/mingw-w64-crt/intrincs/writecr2.c
+++ b/mingw-w64-crt/intrincs/writecr2.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 
diff --git a/mingw-w64-crt/intrincs/writecr3.c b/mingw-w64-crt/intrincs/writecr3.c
index d877f7d..96c7a06 100644
--- a/mingw-w64-crt/intrincs/writecr3.c
+++ b/mingw-w64-crt/intrincs/writecr3.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 
diff --git a/mingw-w64-crt/intrincs/writecr4.c b/mingw-w64-crt/intrincs/writecr4.c
index e2d1ce2..f1defbf 100644
--- a/mingw-w64-crt/intrincs/writecr4.c
+++ b/mingw-w64-crt/intrincs/writecr4.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 
diff --git a/mingw-w64-crt/intrincs/writecr8.c b/mingw-w64-crt/intrincs/writecr8.c
index 0d7de76..de1fd39 100644
--- a/mingw-w64-crt/intrincs/writecr8.c
+++ b/mingw-w64-crt/intrincs/writecr8.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 
diff --git a/mingw-w64-crt/intrincs/writemsr.c b/mingw-w64-crt/intrincs/writemsr.c
index 72a1aab..1543cf0 100644
--- a/mingw-w64-crt/intrincs/writemsr.c
+++ b/mingw-w64-crt/intrincs/writemsr.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 
diff --git a/mingw-w64-crt/lib32/crtdll.def b/mingw-w64-crt/lib32/crtdll.def
index d295dcc..928f75e 100644
--- a/mingw-w64-crt/lib32/crtdll.def
+++ b/mingw-w64-crt/lib32/crtdll.def
@@ -1,7 +1,7 @@
 ;
 ;* crtdll.def
 ;* This file has no copyright assigned and is placed in the Public Domain.
-;* This file is a part of the mingw-runtime package.
+;* This file is part of the mingw-runtime package.
 ;* No warranty is given; refer to the file DISCLAIMER.PD within the package.
 ;
 ; Exports from crtdll.dll from Windows 95 SYSTEM directory. Hopefully this
diff --git a/mingw-w64-crt/libsrc/agtctl_i.c b/mingw-w64-crt/libsrc/agtctl_i.c
index 1fd91f5..7a2411e 100644
--- a/mingw-w64-crt/libsrc/agtctl_i.c
+++ b/mingw-w64-crt/libsrc/agtctl_i.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifdef __cplusplus
diff --git a/mingw-w64-crt/libsrc/agtsvr_i.c b/mingw-w64-crt/libsrc/agtsvr_i.c
index 8574ba1..b58c8bc 100644
--- a/mingw-w64-crt/libsrc/agtsvr_i.c
+++ b/mingw-w64-crt/libsrc/agtsvr_i.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifdef __cplusplus
diff --git a/mingw-w64-crt/libsrc/cdoex_i.c b/mingw-w64-crt/libsrc/cdoex_i.c
index 2288a06..78d5d45 100644
--- a/mingw-w64-crt/libsrc/cdoex_i.c
+++ b/mingw-w64-crt/libsrc/cdoex_i.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifdef __cplusplus
diff --git a/mingw-w64-crt/libsrc/cdoexm_i.c b/mingw-w64-crt/libsrc/cdoexm_i.c
index 78f3299..296fac5 100644
--- a/mingw-w64-crt/libsrc/cdoexm_i.c
+++ b/mingw-w64-crt/libsrc/cdoexm_i.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifdef __cplusplus
diff --git a/mingw-w64-crt/libsrc/cdosys_i.c b/mingw-w64-crt/libsrc/cdosys_i.c
index 4ae5a08..4c12002 100644
--- a/mingw-w64-crt/libsrc/cdosys_i.c
+++ b/mingw-w64-crt/libsrc/cdosys_i.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifdef __cplusplus
diff --git a/mingw-w64-crt/libsrc/dxva-uuid.c b/mingw-w64-crt/libsrc/dxva-uuid.c
index 0051cda..9273219 100644
--- a/mingw-w64-crt/libsrc/dxva-uuid.c
+++ b/mingw-w64-crt/libsrc/dxva-uuid.c
@@ -1,9 +1,9 @@
 /**
  * DISCLAIMER
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is a part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  *
- * The w64 mingw-runtime package and its code is distributed in the hope that it
+ * The mingw-w64 runtime package and its code is distributed in the hope that it
  * will be useful but WITHOUT ANY WARRANTY.  ALL WARRANTIES, EXPRESSED OR
  * IMPLIED ARE HEREBY DISCLAIMED.  This includes but is not limited to
  * warranties of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
diff --git a/mingw-w64-crt/libsrc/emostore_i.c b/mingw-w64-crt/libsrc/emostore_i.c
index 3e9e66f..a78ce5b 100644
--- a/mingw-w64-crt/libsrc/emostore_i.c
+++ b/mingw-w64-crt/libsrc/emostore_i.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifdef __cplusplus
diff --git a/mingw-w64-crt/libsrc/iisext_i.c b/mingw-w64-crt/libsrc/iisext_i.c
index da9b9ce..eb359ce 100644
--- a/mingw-w64-crt/libsrc/iisext_i.c
+++ b/mingw-w64-crt/libsrc/iisext_i.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifdef __cplusplus
diff --git a/mingw-w64-crt/libsrc/mtsadmin_i.c b/mingw-w64-crt/libsrc/mtsadmin_i.c
index b4949ac..c0160a6 100644
--- a/mingw-w64-crt/libsrc/mtsadmin_i.c
+++ b/mingw-w64-crt/libsrc/mtsadmin_i.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifdef __cplusplus
diff --git a/mingw-w64-crt/libsrc/mtxadmin_i.c b/mingw-w64-crt/libsrc/mtxadmin_i.c
index b4949ac..c0160a6 100644
--- a/mingw-w64-crt/libsrc/mtxadmin_i.c
+++ b/mingw-w64-crt/libsrc/mtxadmin_i.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifdef __cplusplus
diff --git a/mingw-w64-crt/libsrc/scardssp_i.c b/mingw-w64-crt/libsrc/scardssp_i.c
index 58c959e..b23c29f 100644
--- a/mingw-w64-crt/libsrc/scardssp_i.c
+++ b/mingw-w64-crt/libsrc/scardssp_i.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifdef __cplusplus
diff --git a/mingw-w64-crt/libsrc/scardssp_p.c b/mingw-w64-crt/libsrc/scardssp_p.c
index 3d13980..0de4dec 100644
--- a/mingw-w64-crt/libsrc/scardssp_p.c
+++ b/mingw-w64-crt/libsrc/scardssp_p.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #define USE_STUBLESS_PROXY
diff --git a/mingw-w64-crt/libsrc/tsuserex_i.c b/mingw-w64-crt/libsrc/tsuserex_i.c
index 4f12748..735d6b7 100644
--- a/mingw-w64-crt/libsrc/tsuserex_i.c
+++ b/mingw-w64-crt/libsrc/tsuserex_i.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifdef __cplusplus
diff --git a/mingw-w64-crt/math/_chgsignl.S b/mingw-w64-crt/math/_chgsignl.S
index e9e010d..692d3c7 100644
--- a/mingw-w64-crt/math/_chgsignl.S
+++ b/mingw-w64-crt/math/_chgsignl.S
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  *
  * IEEE 854 double-extended-precision format
diff --git a/mingw-w64-crt/math/acosf.c b/mingw-w64-crt/math/acosf.c
index e76b068..5c0027a 100644
--- a/mingw-w64-crt/math/acosf.c
+++ b/mingw-w64-crt/math/acosf.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 /*
diff --git a/mingw-w64-crt/math/acosl.c b/mingw-w64-crt/math/acosl.c
index aafb94d..511b5de 100644
--- a/mingw-w64-crt/math/acosl.c
+++ b/mingw-w64-crt/math/acosl.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 long double acosl (long double x);
diff --git a/mingw-w64-crt/math/asinf.c b/mingw-w64-crt/math/asinf.c
index a7a6cd7..045a798 100644
--- a/mingw-w64-crt/math/asinf.c
+++ b/mingw-w64-crt/math/asinf.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 /*
diff --git a/mingw-w64-crt/math/asinh.c b/mingw-w64-crt/math/asinh.c
index e90ca5f..826cc6d 100644
--- a/mingw-w64-crt/math/asinh.c
+++ b/mingw-w64-crt/math/asinh.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #include <math.h>
diff --git a/mingw-w64-crt/math/asinhf.c b/mingw-w64-crt/math/asinhf.c
index ffdb43c..fae785a 100644
--- a/mingw-w64-crt/math/asinhf.c
+++ b/mingw-w64-crt/math/asinhf.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #include <math.h>
diff --git a/mingw-w64-crt/math/asinhl.c b/mingw-w64-crt/math/asinhl.c
index f776cc5..bb2ca97 100644
--- a/mingw-w64-crt/math/asinhl.c
+++ b/mingw-w64-crt/math/asinhl.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #include <math.h>
diff --git a/mingw-w64-crt/math/asinl.c b/mingw-w64-crt/math/asinl.c
index 1f48290..a4d8746 100644
--- a/mingw-w64-crt/math/asinl.c
+++ b/mingw-w64-crt/math/asinl.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 /*
diff --git a/mingw-w64-crt/math/atan2f.c b/mingw-w64-crt/math/atan2f.c
index 327a948..0d54e06 100644
--- a/mingw-w64-crt/math/atan2f.c
+++ b/mingw-w64-crt/math/atan2f.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 /*
diff --git a/mingw-w64-crt/math/atan2l.c b/mingw-w64-crt/math/atan2l.c
index 7d7c265..a32b097 100644
--- a/mingw-w64-crt/math/atan2l.c
+++ b/mingw-w64-crt/math/atan2l.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 long double atan2l (long double y, long double x);
diff --git a/mingw-w64-crt/math/atanf.c b/mingw-w64-crt/math/atanf.c
index 8450714..85fadd8 100644
--- a/mingw-w64-crt/math/atanf.c
+++ b/mingw-w64-crt/math/atanf.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 /*
diff --git a/mingw-w64-crt/math/atanh.c b/mingw-w64-crt/math/atanh.c
index b47c74a..429bfea 100644
--- a/mingw-w64-crt/math/atanh.c
+++ b/mingw-w64-crt/math/atanh.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #include <math.h>
diff --git a/mingw-w64-crt/math/atanhf.c b/mingw-w64-crt/math/atanhf.c
index 6301dd9..96d1e9b 100644
--- a/mingw-w64-crt/math/atanhf.c
+++ b/mingw-w64-crt/math/atanhf.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #include <math.h>
diff --git a/mingw-w64-crt/math/atanhl.c b/mingw-w64-crt/math/atanhl.c
index dccad82..59eb1bd 100644
--- a/mingw-w64-crt/math/atanhl.c
+++ b/mingw-w64-crt/math/atanhl.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #include <math.h>
diff --git a/mingw-w64-crt/math/atanl.c b/mingw-w64-crt/math/atanl.c
index 1164b53..b85d053 100644
--- a/mingw-w64-crt/math/atanl.c
+++ b/mingw-w64-crt/math/atanl.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 long double atanl (long double x);
diff --git a/mingw-w64-crt/math/cbrt.c b/mingw-w64-crt/math/cbrt.c
index 835cbe1..0055052 100644
--- a/mingw-w64-crt/math/cbrt.c
+++ b/mingw-w64-crt/math/cbrt.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #include <math.h>
diff --git a/mingw-w64-crt/math/cbrtf.c b/mingw-w64-crt/math/cbrtf.c
index 858cc96..1c37e75 100644
--- a/mingw-w64-crt/math/cbrtf.c
+++ b/mingw-w64-crt/math/cbrtf.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #include <math.h>
diff --git a/mingw-w64-crt/math/cbrtl.c b/mingw-w64-crt/math/cbrtl.c
index 1f3edea..40e02ed 100644
--- a/mingw-w64-crt/math/cbrtl.c
+++ b/mingw-w64-crt/math/cbrtl.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #include "cephes_mconf.h"
diff --git a/mingw-w64-crt/math/ceil.S b/mingw-w64-crt/math/ceil.S
index 92ca9d8..d370d3c 100644
--- a/mingw-w64-crt/math/ceil.S
+++ b/mingw-w64-crt/math/ceil.S
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #include <_mingw_mac.h>
diff --git a/mingw-w64-crt/math/ceilf.S b/mingw-w64-crt/math/ceilf.S
index 923d519..424b3e5 100644
--- a/mingw-w64-crt/math/ceilf.S
+++ b/mingw-w64-crt/math/ceilf.S
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #include <_mingw_mac.h>
diff --git a/mingw-w64-crt/math/ceill.S b/mingw-w64-crt/math/ceill.S
index 6a52e09..338e007 100644
--- a/mingw-w64-crt/math/ceill.S
+++ b/mingw-w64-crt/math/ceill.S
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #include <_mingw_mac.h>
diff --git a/mingw-w64-crt/math/cephes_emath.c b/mingw-w64-crt/math/cephes_emath.c
index bfa2cdf..41e297c 100644
--- a/mingw-w64-crt/math/cephes_emath.c
+++ b/mingw-w64-crt/math/cephes_emath.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #include "cephes_emath.h"
diff --git a/mingw-w64-crt/math/cephes_emath.h b/mingw-w64-crt/math/cephes_emath.h
index cf93048..b92d710 100644
--- a/mingw-w64-crt/math/cephes_emath.h
+++ b/mingw-w64-crt/math/cephes_emath.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _CEPHES_EMATH_H
diff --git a/mingw-w64-crt/math/copysign.c b/mingw-w64-crt/math/copysign.c
index d81c2de..c3fe76f 100644
--- a/mingw-w64-crt/math/copysign.c
+++ b/mingw-w64-crt/math/copysign.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #include <math.h>
diff --git a/mingw-w64-crt/math/copysignf.c b/mingw-w64-crt/math/copysignf.c
index ca3cc39..0fba92b 100644
--- a/mingw-w64-crt/math/copysignf.c
+++ b/mingw-w64-crt/math/copysignf.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #include <math.h>
diff --git a/mingw-w64-crt/math/copysignl.S b/mingw-w64-crt/math/copysignl.S
index dd7cc50..79c69f2 100644
--- a/mingw-w64-crt/math/copysignl.S
+++ b/mingw-w64-crt/math/copysignl.S
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 /*
diff --git a/mingw-w64-crt/math/cosf.c b/mingw-w64-crt/math/cosf.c
index d2329c7..41e2c77 100644
--- a/mingw-w64-crt/math/cosf.c
+++ b/mingw-w64-crt/math/cosf.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #include <math.h>
diff --git a/mingw-w64-crt/math/coshf.c b/mingw-w64-crt/math/coshf.c
index d640d60..72147f5 100644
--- a/mingw-w64-crt/math/coshf.c
+++ b/mingw-w64-crt/math/coshf.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #include <math.h>
diff --git a/mingw-w64-crt/math/coshl.c b/mingw-w64-crt/math/coshl.c
index 9f68fae..d7eb4b7 100644
--- a/mingw-w64-crt/math/coshl.c
+++ b/mingw-w64-crt/math/coshl.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #include "cephes_mconf.h"
diff --git a/mingw-w64-crt/math/cosl_internal.S b/mingw-w64-crt/math/cosl_internal.S
index e61fd56..43ba269 100644
--- a/mingw-w64-crt/math/cosl_internal.S
+++ b/mingw-w64-crt/math/cosl_internal.S
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #include <_mingw_mac.h>
diff --git a/mingw-w64-crt/math/cossin.c b/mingw-w64-crt/math/cossin.c
index 0452b44..0095daa 100644
--- a/mingw-w64-crt/math/cossin.c
+++ b/mingw-w64-crt/math/cossin.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 
diff --git a/mingw-w64-crt/math/erfl.c b/mingw-w64-crt/math/erfl.c
index 6f31c63..3832fe9 100644
--- a/mingw-w64-crt/math/erfl.c
+++ b/mingw-w64-crt/math/erfl.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 /*							erfl.c
diff --git a/mingw-w64-crt/math/exp2.S b/mingw-w64-crt/math/exp2.S
index c095981..9469fec 100644
--- a/mingw-w64-crt/math/exp2.S
+++ b/mingw-w64-crt/math/exp2.S
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #include <_mingw_mac.h>
diff --git a/mingw-w64-crt/math/exp2f.S b/mingw-w64-crt/math/exp2f.S
index a6180a7..97cfbd0 100644
--- a/mingw-w64-crt/math/exp2f.S
+++ b/mingw-w64-crt/math/exp2f.S
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #include <_mingw_mac.h>
diff --git a/mingw-w64-crt/math/exp2l.S b/mingw-w64-crt/math/exp2l.S
index 41e5933..abeff05 100644
--- a/mingw-w64-crt/math/exp2l.S
+++ b/mingw-w64-crt/math/exp2l.S
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #include <_mingw_mac.h>
diff --git a/mingw-w64-crt/math/expf.c b/mingw-w64-crt/math/expf.c
index 9ea7618..69d7edc 100644
--- a/mingw-w64-crt/math/expf.c
+++ b/mingw-w64-crt/math/expf.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #include <math.h>
diff --git a/mingw-w64-crt/math/fabs.c b/mingw-w64-crt/math/fabs.c
index 9e3fe8d..f5e4dbe 100644
--- a/mingw-w64-crt/math/fabs.c
+++ b/mingw-w64-crt/math/fabs.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #define __CRT__NO_INLINE
diff --git a/mingw-w64-crt/math/fabsf.c b/mingw-w64-crt/math/fabsf.c
index c5fe666..0a8fddb 100644
--- a/mingw-w64-crt/math/fabsf.c
+++ b/mingw-w64-crt/math/fabsf.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 float fabsf (float x);
diff --git a/mingw-w64-crt/math/fabsl.c b/mingw-w64-crt/math/fabsl.c
index 8c5d65b..5ffbe41 100644
--- a/mingw-w64-crt/math/fabsl.c
+++ b/mingw-w64-crt/math/fabsl.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 long double fabsl (long double x);
diff --git a/mingw-w64-crt/math/fastmath.h b/mingw-w64-crt/math/fastmath.h
index 53da716..a6bb467 100644
--- a/mingw-w64-crt/math/fastmath.h
+++ b/mingw-w64-crt/math/fastmath.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _MINGWEX_FASTMATH_H_
diff --git a/mingw-w64-crt/math/fdim.c b/mingw-w64-crt/math/fdim.c
index afa0856..aec62c4 100644
--- a/mingw-w64-crt/math/fdim.c
+++ b/mingw-w64-crt/math/fdim.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #include <math.h>
diff --git a/mingw-w64-crt/math/fdimf.c b/mingw-w64-crt/math/fdimf.c
index c139248..3312a93 100644
--- a/mingw-w64-crt/math/fdimf.c
+++ b/mingw-w64-crt/math/fdimf.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #include <errno.h>
diff --git a/mingw-w64-crt/math/fdiml.c b/mingw-w64-crt/math/fdiml.c
index 2c1874c..3be0679 100644
--- a/mingw-w64-crt/math/fdiml.c
+++ b/mingw-w64-crt/math/fdiml.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #include <errno.h>
diff --git a/mingw-w64-crt/math/floor.S b/mingw-w64-crt/math/floor.S
index c4e3d0c..5bd8138 100644
--- a/mingw-w64-crt/math/floor.S
+++ b/mingw-w64-crt/math/floor.S
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #include <_mingw_mac.h>
diff --git a/mingw-w64-crt/math/floorf.S b/mingw-w64-crt/math/floorf.S
index 814bc4b..7c1f4ff 100644
--- a/mingw-w64-crt/math/floorf.S
+++ b/mingw-w64-crt/math/floorf.S
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
  #include <_mingw_mac.h>
diff --git a/mingw-w64-crt/math/floorl.S b/mingw-w64-crt/math/floorl.S
index 41be0ca..ed31bac 100644
--- a/mingw-w64-crt/math/floorl.S
+++ b/mingw-w64-crt/math/floorl.S
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #include <_mingw_mac.h>
diff --git a/mingw-w64-crt/math/fma.S b/mingw-w64-crt/math/fma.S
index 9863afe..1c063ed 100644
--- a/mingw-w64-crt/math/fma.S
+++ b/mingw-w64-crt/math/fma.S
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #include <_mingw_mac.h>
diff --git a/mingw-w64-crt/math/fmaf.S b/mingw-w64-crt/math/fmaf.S
index 3861947..02e0821 100644
--- a/mingw-w64-crt/math/fmaf.S
+++ b/mingw-w64-crt/math/fmaf.S
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #include <_mingw_mac.h>
diff --git a/mingw-w64-crt/math/fmal.c b/mingw-w64-crt/math/fmal.c
index aec373b..3d0eb02 100644
--- a/mingw-w64-crt/math/fmal.c
+++ b/mingw-w64-crt/math/fmal.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 long double fmal ( long double _x,  long double _y,  long double _z);
diff --git a/mingw-w64-crt/math/fmax.c b/mingw-w64-crt/math/fmax.c
index 820ddce..79f330c 100644
--- a/mingw-w64-crt/math/fmax.c
+++ b/mingw-w64-crt/math/fmax.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #include <math.h>
diff --git a/mingw-w64-crt/math/fmaxf.c b/mingw-w64-crt/math/fmaxf.c
index c84dd52..677a8a7 100644
--- a/mingw-w64-crt/math/fmaxf.c
+++ b/mingw-w64-crt/math/fmaxf.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #include <math.h>
diff --git a/mingw-w64-crt/math/fmaxl.c b/mingw-w64-crt/math/fmaxl.c
index da0b74c..15c5b47 100644
--- a/mingw-w64-crt/math/fmaxl.c
+++ b/mingw-w64-crt/math/fmaxl.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #include <math.h>
diff --git a/mingw-w64-crt/math/fmin.c b/mingw-w64-crt/math/fmin.c
index 03d7593..8069574 100644
--- a/mingw-w64-crt/math/fmin.c
+++ b/mingw-w64-crt/math/fmin.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #include <math.h>
diff --git a/mingw-w64-crt/math/fminf.c b/mingw-w64-crt/math/fminf.c
index 32f4196..2703cb1 100644
--- a/mingw-w64-crt/math/fminf.c
+++ b/mingw-w64-crt/math/fminf.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #include <math.h>
diff --git a/mingw-w64-crt/math/fminl.c b/mingw-w64-crt/math/fminl.c
index cf6e304..96f08f7 100644
--- a/mingw-w64-crt/math/fminl.c
+++ b/mingw-w64-crt/math/fminl.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #include <math.h>
diff --git a/mingw-w64-crt/math/fmod.c b/mingw-w64-crt/math/fmod.c
index cdf8ba0..29787e2 100644
--- a/mingw-w64-crt/math/fmod.c
+++ b/mingw-w64-crt/math/fmod.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 double fmod (double x, double y);
diff --git a/mingw-w64-crt/math/fmodf.c b/mingw-w64-crt/math/fmodf.c
index 761f56c..e68fec2 100644
--- a/mingw-w64-crt/math/fmodf.c
+++ b/mingw-w64-crt/math/fmodf.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 /*
diff --git a/mingw-w64-crt/math/fmodl.c b/mingw-w64-crt/math/fmodl.c
index 1c57c0f..6224db1 100644
--- a/mingw-w64-crt/math/fmodl.c
+++ b/mingw-w64-crt/math/fmodl.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 long double fmodl (long double x, long double y);
diff --git a/mingw-w64-crt/math/fp_consts.c b/mingw-w64-crt/math/fp_consts.c
index e07056d..1233039 100644
--- a/mingw-w64-crt/math/fp_consts.c
+++ b/mingw-w64-crt/math/fp_consts.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #include "fp_consts.h"
diff --git a/mingw-w64-crt/math/fp_consts.h b/mingw-w64-crt/math/fp_consts.h
index 248fee5..bcd173e 100644
--- a/mingw-w64-crt/math/fp_consts.h
+++ b/mingw-w64-crt/math/fp_consts.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _FP_CONSTS_H
diff --git a/mingw-w64-crt/math/fp_constsf.c b/mingw-w64-crt/math/fp_constsf.c
index 9f0f73c..97306dc 100644
--- a/mingw-w64-crt/math/fp_constsf.c
+++ b/mingw-w64-crt/math/fp_constsf.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #include "fp_consts.h"
diff --git a/mingw-w64-crt/math/fp_constsl.c b/mingw-w64-crt/math/fp_constsl.c
index 11e5e0e..c9855df 100644
--- a/mingw-w64-crt/math/fp_constsl.c
+++ b/mingw-w64-crt/math/fp_constsl.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #include "fp_consts.h"
diff --git a/mingw-w64-crt/math/fpclassify.c b/mingw-w64-crt/math/fpclassify.c
index 92e9379..0a64c11 100644
--- a/mingw-w64-crt/math/fpclassify.c
+++ b/mingw-w64-crt/math/fpclassify.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #define __CRT__NO_INLINE
diff --git a/mingw-w64-crt/math/fpclassifyf.c b/mingw-w64-crt/math/fpclassifyf.c
index 28af540..7bf88c5 100644
--- a/mingw-w64-crt/math/fpclassifyf.c
+++ b/mingw-w64-crt/math/fpclassifyf.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #define __CRT__NO_INLINE
diff --git a/mingw-w64-crt/math/fpclassifyl.c b/mingw-w64-crt/math/fpclassifyl.c
index 994731c..d161842 100644
--- a/mingw-w64-crt/math/fpclassifyl.c
+++ b/mingw-w64-crt/math/fpclassifyl.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #define __CRT__NO_INLINE
diff --git a/mingw-w64-crt/math/frexpf.c b/mingw-w64-crt/math/frexpf.c
index c369a40..d4b7ab3 100644
--- a/mingw-w64-crt/math/frexpf.c
+++ b/mingw-w64-crt/math/frexpf.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 extern double __cdecl frexp(double _X,int *_Y);
diff --git a/mingw-w64-crt/math/frexpl.S b/mingw-w64-crt/math/frexpl.S
index e442be4..cf6e91f 100644
--- a/mingw-w64-crt/math/frexpl.S
+++ b/mingw-w64-crt/math/frexpl.S
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #include <_mingw_mac.h>
diff --git a/mingw-w64-crt/math/fucom.c b/mingw-w64-crt/math/fucom.c
index 1badde1..722af84 100644
--- a/mingw-w64-crt/math/fucom.c
+++ b/mingw-w64-crt/math/fucom.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 int __fp_unordered_compare (long double x,  long double y);
diff --git a/mingw-w64-crt/math/hypotf.c b/mingw-w64-crt/math/hypotf.c
index 34367fc..cd6b618 100644
--- a/mingw-w64-crt/math/hypotf.c
+++ b/mingw-w64-crt/math/hypotf.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #include <math.h>
diff --git a/mingw-w64-crt/math/hypotl.c b/mingw-w64-crt/math/hypotl.c
index de1796c..9696f2b 100644
--- a/mingw-w64-crt/math/hypotl.c
+++ b/mingw-w64-crt/math/hypotl.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #include <math.h>
diff --git a/mingw-w64-crt/math/ilogb.S b/mingw-w64-crt/math/ilogb.S
index de8a8cb..b2c806a 100644
--- a/mingw-w64-crt/math/ilogb.S
+++ b/mingw-w64-crt/math/ilogb.S
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #include <_mingw_mac.h>
diff --git a/mingw-w64-crt/math/ilogbf.S b/mingw-w64-crt/math/ilogbf.S
index fb8bd7d..0d07370 100644
--- a/mingw-w64-crt/math/ilogbf.S
+++ b/mingw-w64-crt/math/ilogbf.S
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #include <_mingw_mac.h>
diff --git a/mingw-w64-crt/math/ilogbl.S b/mingw-w64-crt/math/ilogbl.S
index 083e142..6c5c5e5 100644
--- a/mingw-w64-crt/math/ilogbl.S
+++ b/mingw-w64-crt/math/ilogbl.S
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #include <_mingw_mac.h>
diff --git a/mingw-w64-crt/math/internal_logl.S b/mingw-w64-crt/math/internal_logl.S
index 4dd028a..153924d 100644
--- a/mingw-w64-crt/math/internal_logl.S
+++ b/mingw-w64-crt/math/internal_logl.S
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #include <_mingw_mac.h>
diff --git a/mingw-w64-crt/math/isnan.c b/mingw-w64-crt/math/isnan.c
index 5b693e0..962df41 100644
--- a/mingw-w64-crt/math/isnan.c
+++ b/mingw-w64-crt/math/isnan.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #include <math.h>
diff --git a/mingw-w64-crt/math/isnanf.c b/mingw-w64-crt/math/isnanf.c
index 0060091..de5c854 100644
--- a/mingw-w64-crt/math/isnanf.c
+++ b/mingw-w64-crt/math/isnanf.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #include <math.h>
diff --git a/mingw-w64-crt/math/isnanl.c b/mingw-w64-crt/math/isnanl.c
index c992dc4..dafe4ba 100644
--- a/mingw-w64-crt/math/isnanl.c
+++ b/mingw-w64-crt/math/isnanl.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #include <math.h>
diff --git a/mingw-w64-crt/math/ldexp.c b/mingw-w64-crt/math/ldexp.c
index c7e8ea3..59917ac 100644
--- a/mingw-w64-crt/math/ldexp.c
+++ b/mingw-w64-crt/math/ldexp.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #include <math.h>
diff --git a/mingw-w64-crt/math/ldexpf.c b/mingw-w64-crt/math/ldexpf.c
index 9c167f9..83cd89d 100644
--- a/mingw-w64-crt/math/ldexpf.c
+++ b/mingw-w64-crt/math/ldexpf.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 extern double __cdecl ldexp(double _X,int _Y);
diff --git a/mingw-w64-crt/math/ldexpl.c b/mingw-w64-crt/math/ldexpl.c
index d7ccbb0..fde31a2 100644
--- a/mingw-w64-crt/math/ldexpl.c
+++ b/mingw-w64-crt/math/ldexpl.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #include <math.h>
diff --git a/mingw-w64-crt/math/lgamma.c b/mingw-w64-crt/math/lgamma.c
index 37aa857..012f27e 100644
--- a/mingw-w64-crt/math/lgamma.c
+++ b/mingw-w64-crt/math/lgamma.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #include "cephes_mconf.h"
diff --git a/mingw-w64-crt/math/lgammaf.c b/mingw-w64-crt/math/lgammaf.c
index 6f35a55..748891c 100644
--- a/mingw-w64-crt/math/lgammaf.c
+++ b/mingw-w64-crt/math/lgammaf.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 /* log gamma(x+2), -.5 < x < .5 */
diff --git a/mingw-w64-crt/math/lgammal.c b/mingw-w64-crt/math/lgammal.c
index d8d496b..3b24b3e 100644
--- a/mingw-w64-crt/math/lgammal.c
+++ b/mingw-w64-crt/math/lgammal.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #include "cephes_mconf.h"
diff --git a/mingw-w64-crt/math/llrint.c b/mingw-w64-crt/math/llrint.c
index 1e374f6..a81ff44 100644
--- a/mingw-w64-crt/math/llrint.c
+++ b/mingw-w64-crt/math/llrint.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #include <math.h>
diff --git a/mingw-w64-crt/math/llrintf.c b/mingw-w64-crt/math/llrintf.c
index 15e04ce..fced07e 100644
--- a/mingw-w64-crt/math/llrintf.c
+++ b/mingw-w64-crt/math/llrintf.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #include <math.h>
diff --git a/mingw-w64-crt/math/llrintl.c b/mingw-w64-crt/math/llrintl.c
index f5e8dff..dba64bf 100644
--- a/mingw-w64-crt/math/llrintl.c
+++ b/mingw-w64-crt/math/llrintl.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #include <math.h>
diff --git a/mingw-w64-crt/math/llround.c b/mingw-w64-crt/math/llround.c
index ad254a3..ef21bcb 100644
--- a/mingw-w64-crt/math/llround.c
+++ b/mingw-w64-crt/math/llround.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #include <math.h>
diff --git a/mingw-w64-crt/math/llroundf.c b/mingw-w64-crt/math/llroundf.c
index f683d67..0a8da17 100644
--- a/mingw-w64-crt/math/llroundf.c
+++ b/mingw-w64-crt/math/llroundf.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #include <math.h>
diff --git a/mingw-w64-crt/math/llroundl.c b/mingw-w64-crt/math/llroundl.c
index a80b1e6..cd75e51 100644
--- a/mingw-w64-crt/math/llroundl.c
+++ b/mingw-w64-crt/math/llroundl.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #include <math.h>
diff --git a/mingw-w64-crt/math/log10f.c b/mingw-w64-crt/math/log10f.c
index 2a295a4..f793e05 100644
--- a/mingw-w64-crt/math/log10f.c
+++ b/mingw-w64-crt/math/log10f.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #include <math.h>
diff --git a/mingw-w64-crt/math/log10l.S b/mingw-w64-crt/math/log10l.S
index 290aa01..c51babc 100644
--- a/mingw-w64-crt/math/log10l.S
+++ b/mingw-w64-crt/math/log10l.S
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #include <_mingw_mac.h>
diff --git a/mingw-w64-crt/math/log1p.S b/mingw-w64-crt/math/log1p.S
index 2bf915a..efdeba2 100644
--- a/mingw-w64-crt/math/log1p.S
+++ b/mingw-w64-crt/math/log1p.S
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #include <_mingw_mac.h>
diff --git a/mingw-w64-crt/math/log1pf.S b/mingw-w64-crt/math/log1pf.S
index 798570f..d6ac51f 100644
--- a/mingw-w64-crt/math/log1pf.S
+++ b/mingw-w64-crt/math/log1pf.S
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #include <_mingw_mac.h>
diff --git a/mingw-w64-crt/math/log1pl.S b/mingw-w64-crt/math/log1pl.S
index 4a56df6..7ff0f5b 100644
--- a/mingw-w64-crt/math/log1pl.S
+++ b/mingw-w64-crt/math/log1pl.S
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #include <_mingw_mac.h>
diff --git a/mingw-w64-crt/math/log2.S b/mingw-w64-crt/math/log2.S
index 00552e9..193864a 100644
--- a/mingw-w64-crt/math/log2.S
+++ b/mingw-w64-crt/math/log2.S
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #include <_mingw_mac.h>
diff --git a/mingw-w64-crt/math/log2f.S b/mingw-w64-crt/math/log2f.S
index cb42287..d43d5ff 100644
--- a/mingw-w64-crt/math/log2f.S
+++ b/mingw-w64-crt/math/log2f.S
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #include <_mingw_mac.h>
diff --git a/mingw-w64-crt/math/log2l.S b/mingw-w64-crt/math/log2l.S
index afc8232..fd4f3ff 100644
--- a/mingw-w64-crt/math/log2l.S
+++ b/mingw-w64-crt/math/log2l.S
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #include <_mingw_mac.h>
diff --git a/mingw-w64-crt/math/logb.c b/mingw-w64-crt/math/logb.c
index a6d2078..5760d26 100644
--- a/mingw-w64-crt/math/logb.c
+++ b/mingw-w64-crt/math/logb.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 /*
diff --git a/mingw-w64-crt/math/logbf.c b/mingw-w64-crt/math/logbf.c
index 1c9a015..5a0429e 100644
--- a/mingw-w64-crt/math/logbf.c
+++ b/mingw-w64-crt/math/logbf.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 /*
diff --git a/mingw-w64-crt/math/logbl.c b/mingw-w64-crt/math/logbl.c
index 9b40fe1..310c445 100644
--- a/mingw-w64-crt/math/logbl.c
+++ b/mingw-w64-crt/math/logbl.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 /*
diff --git a/mingw-w64-crt/math/logf.c b/mingw-w64-crt/math/logf.c
index 0da1dae..b85b592 100644
--- a/mingw-w64-crt/math/logf.c
+++ b/mingw-w64-crt/math/logf.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #include <math.h>
diff --git a/mingw-w64-crt/math/lrint.c b/mingw-w64-crt/math/lrint.c
index bfab4d0..69cd0f6 100644
--- a/mingw-w64-crt/math/lrint.c
+++ b/mingw-w64-crt/math/lrint.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #include <math.h>
diff --git a/mingw-w64-crt/math/lrintf.c b/mingw-w64-crt/math/lrintf.c
index 32465f7..cf17599 100644
--- a/mingw-w64-crt/math/lrintf.c
+++ b/mingw-w64-crt/math/lrintf.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #include <math.h>
diff --git a/mingw-w64-crt/math/lrintl.c b/mingw-w64-crt/math/lrintl.c
index 6b5ade9..21f3009 100644
--- a/mingw-w64-crt/math/lrintl.c
+++ b/mingw-w64-crt/math/lrintl.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #include <math.h>
diff --git a/mingw-w64-crt/math/lround.c b/mingw-w64-crt/math/lround.c
index 5bc4b00..560ef61 100644
--- a/mingw-w64-crt/math/lround.c
+++ b/mingw-w64-crt/math/lround.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #include <math.h>
diff --git a/mingw-w64-crt/math/lroundf.c b/mingw-w64-crt/math/lroundf.c
index 3fff276..04a9354 100644
--- a/mingw-w64-crt/math/lroundf.c
+++ b/mingw-w64-crt/math/lroundf.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #include <math.h>
diff --git a/mingw-w64-crt/math/lroundl.c b/mingw-w64-crt/math/lroundl.c
index ede3bc6..b4584a8 100644
--- a/mingw-w64-crt/math/lroundl.c
+++ b/mingw-w64-crt/math/lroundl.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #include <math.h>
diff --git a/mingw-w64-crt/math/modf.c b/mingw-w64-crt/math/modf.c
index 857a001..5a34452 100644
--- a/mingw-w64-crt/math/modf.c
+++ b/mingw-w64-crt/math/modf.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #include <fenv.h>
diff --git a/mingw-w64-crt/math/modff.c b/mingw-w64-crt/math/modff.c
index 8816db4..36dd3fd 100644
--- a/mingw-w64-crt/math/modff.c
+++ b/mingw-w64-crt/math/modff.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #include <fenv.h>
diff --git a/mingw-w64-crt/math/modfl.c b/mingw-w64-crt/math/modfl.c
index 64265d2..4d34fe5 100644
--- a/mingw-w64-crt/math/modfl.c
+++ b/mingw-w64-crt/math/modfl.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #include <fenv.h>
diff --git a/mingw-w64-crt/math/nearbyint.S b/mingw-w64-crt/math/nearbyint.S
index 5437dbb..cb0fc20 100644
--- a/mingw-w64-crt/math/nearbyint.S
+++ b/mingw-w64-crt/math/nearbyint.S
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #include <_mingw_mac.h>
diff --git a/mingw-w64-crt/math/nearbyintf.S b/mingw-w64-crt/math/nearbyintf.S
index 5c2ccf3..3da8946 100644
--- a/mingw-w64-crt/math/nearbyintf.S
+++ b/mingw-w64-crt/math/nearbyintf.S
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #include <_mingw_mac.h>
diff --git a/mingw-w64-crt/math/nearbyintl.S b/mingw-w64-crt/math/nearbyintl.S
index f0f8a8b..96a50ca 100644
--- a/mingw-w64-crt/math/nearbyintl.S
+++ b/mingw-w64-crt/math/nearbyintl.S
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #include <_mingw_mac.h>
diff --git a/mingw-w64-crt/math/nextafterf.c b/mingw-w64-crt/math/nextafterf.c
index ac12ac4..143a35d 100644
--- a/mingw-w64-crt/math/nextafterf.c
+++ b/mingw-w64-crt/math/nextafterf.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #include <math.h>
diff --git a/mingw-w64-crt/math/nextafterl.c b/mingw-w64-crt/math/nextafterl.c
index ad02b5f..5db3af7 100644
--- a/mingw-w64-crt/math/nextafterl.c
+++ b/mingw-w64-crt/math/nextafterl.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 /*
diff --git a/mingw-w64-crt/math/nexttoward.c b/mingw-w64-crt/math/nexttoward.c
index 386e76b..909f6ea 100644
--- a/mingw-w64-crt/math/nexttoward.c
+++ b/mingw-w64-crt/math/nexttoward.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 /*
diff --git a/mingw-w64-crt/math/nexttowardf.c b/mingw-w64-crt/math/nexttowardf.c
index ba66ef5..0a2f3bf 100644
--- a/mingw-w64-crt/math/nexttowardf.c
+++ b/mingw-w64-crt/math/nexttowardf.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 /*
diff --git a/mingw-w64-crt/math/powf.c b/mingw-w64-crt/math/powf.c
index 046ba12..4835627 100644
--- a/mingw-w64-crt/math/powf.c
+++ b/mingw-w64-crt/math/powf.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #include <math.h>
diff --git a/mingw-w64-crt/math/remainder.S b/mingw-w64-crt/math/remainder.S
index efaf814..635d5f8 100644
--- a/mingw-w64-crt/math/remainder.S
+++ b/mingw-w64-crt/math/remainder.S
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #include <_mingw_mac.h>
diff --git a/mingw-w64-crt/math/remainderf.S b/mingw-w64-crt/math/remainderf.S
index 91783a8..372aba2 100644
--- a/mingw-w64-crt/math/remainderf.S
+++ b/mingw-w64-crt/math/remainderf.S
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #include <_mingw_mac.h>
diff --git a/mingw-w64-crt/math/remainderl.S b/mingw-w64-crt/math/remainderl.S
index 69a77b6..33a408c 100644
--- a/mingw-w64-crt/math/remainderl.S
+++ b/mingw-w64-crt/math/remainderl.S
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #include <_mingw_mac.h>
diff --git a/mingw-w64-crt/math/remquo.S b/mingw-w64-crt/math/remquo.S
index 3f4a56f..312e574 100644
--- a/mingw-w64-crt/math/remquo.S
+++ b/mingw-w64-crt/math/remquo.S
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #include <_mingw_mac.h>
diff --git a/mingw-w64-crt/math/remquof.S b/mingw-w64-crt/math/remquof.S
index f1ce56b..237aca0 100644
--- a/mingw-w64-crt/math/remquof.S
+++ b/mingw-w64-crt/math/remquof.S
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #include <_mingw_mac.h>
diff --git a/mingw-w64-crt/math/remquol.S b/mingw-w64-crt/math/remquol.S
index 9ea6a8f..f866a5d 100644
--- a/mingw-w64-crt/math/remquol.S
+++ b/mingw-w64-crt/math/remquol.S
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #include <_mingw_mac.h>
diff --git a/mingw-w64-crt/math/rint.c b/mingw-w64-crt/math/rint.c
index 89b91e2..ac9512f 100644
--- a/mingw-w64-crt/math/rint.c
+++ b/mingw-w64-crt/math/rint.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #include <math.h>
diff --git a/mingw-w64-crt/math/rintf.c b/mingw-w64-crt/math/rintf.c
index 15fb238..f5a6bf2 100644
--- a/mingw-w64-crt/math/rintf.c
+++ b/mingw-w64-crt/math/rintf.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #include <math.h>
diff --git a/mingw-w64-crt/math/rintl.c b/mingw-w64-crt/math/rintl.c
index 50040a3..a870322 100644
--- a/mingw-w64-crt/math/rintl.c
+++ b/mingw-w64-crt/math/rintl.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #include <math.h>
diff --git a/mingw-w64-crt/math/round.c b/mingw-w64-crt/math/round.c
index bc24add..aecf1d8 100644
--- a/mingw-w64-crt/math/round.c
+++ b/mingw-w64-crt/math/round.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #include <math.h>
diff --git a/mingw-w64-crt/math/roundf.c b/mingw-w64-crt/math/roundf.c
index 4f165a4..2b95427 100644
--- a/mingw-w64-crt/math/roundf.c
+++ b/mingw-w64-crt/math/roundf.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #include <math.h>
diff --git a/mingw-w64-crt/math/roundl.c b/mingw-w64-crt/math/roundl.c
index e088834..9879a82 100644
--- a/mingw-w64-crt/math/roundl.c
+++ b/mingw-w64-crt/math/roundl.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #include <math.h>
diff --git a/mingw-w64-crt/math/scalbn.S b/mingw-w64-crt/math/scalbn.S
index 1bc1bf2..96d7f4c 100644
--- a/mingw-w64-crt/math/scalbn.S
+++ b/mingw-w64-crt/math/scalbn.S
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #include <_mingw_mac.h>
diff --git a/mingw-w64-crt/math/scalbnf.S b/mingw-w64-crt/math/scalbnf.S
index 18f2798..4c36665 100644
--- a/mingw-w64-crt/math/scalbnf.S
+++ b/mingw-w64-crt/math/scalbnf.S
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #include <_mingw_mac.h>
diff --git a/mingw-w64-crt/math/scalbnl.S b/mingw-w64-crt/math/scalbnl.S
index dcfc018..ce7ba99 100644
--- a/mingw-w64-crt/math/scalbnl.S
+++ b/mingw-w64-crt/math/scalbnl.S
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #include <_mingw_mac.h>
diff --git a/mingw-w64-crt/math/signbit.c b/mingw-w64-crt/math/signbit.c
index 809e8b3..3d4900e 100644
--- a/mingw-w64-crt/math/signbit.c
+++ b/mingw-w64-crt/math/signbit.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #define __FP_SIGNBIT  0x0200
diff --git a/mingw-w64-crt/math/signbitf.c b/mingw-w64-crt/math/signbitf.c
index dabe6c8..405baa1 100644
--- a/mingw-w64-crt/math/signbitf.c
+++ b/mingw-w64-crt/math/signbitf.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #define __FP_SIGNBIT  0x0200
diff --git a/mingw-w64-crt/math/signbitl.c b/mingw-w64-crt/math/signbitl.c
index 3748a09..6618bdd 100644
--- a/mingw-w64-crt/math/signbitl.c
+++ b/mingw-w64-crt/math/signbitl.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #define __FP_SIGNBIT  0x0200
diff --git a/mingw-w64-crt/math/sinf.c b/mingw-w64-crt/math/sinf.c
index 1069dcf..29fd3a2 100644
--- a/mingw-w64-crt/math/sinf.c
+++ b/mingw-w64-crt/math/sinf.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #include <math.h>
diff --git a/mingw-w64-crt/math/sinhf.c b/mingw-w64-crt/math/sinhf.c
index f5fab44..9048bf3 100644
--- a/mingw-w64-crt/math/sinhf.c
+++ b/mingw-w64-crt/math/sinhf.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #include <math.h>
diff --git a/mingw-w64-crt/math/sinhl.c b/mingw-w64-crt/math/sinhl.c
index 12ed4d0..f6ecef0 100644
--- a/mingw-w64-crt/math/sinhl.c
+++ b/mingw-w64-crt/math/sinhl.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #include "cephes_mconf.h"
diff --git a/mingw-w64-crt/math/sinl_internal.S b/mingw-w64-crt/math/sinl_internal.S
index af5ce85..b43face 100644
--- a/mingw-w64-crt/math/sinl_internal.S
+++ b/mingw-w64-crt/math/sinl_internal.S
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #include <_mingw_mac.h>
diff --git a/mingw-w64-crt/math/tanf.c b/mingw-w64-crt/math/tanf.c
index f407403..72b4cc4 100644
--- a/mingw-w64-crt/math/tanf.c
+++ b/mingw-w64-crt/math/tanf.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #include <math.h>
diff --git a/mingw-w64-crt/math/tanhf.c b/mingw-w64-crt/math/tanhf.c
index c7e2549..cb6f4c7 100644
--- a/mingw-w64-crt/math/tanhf.c
+++ b/mingw-w64-crt/math/tanhf.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #include <math.h>
diff --git a/mingw-w64-crt/math/tanhl.c b/mingw-w64-crt/math/tanhl.c
index 79ad7f0..2c48a6a 100644
--- a/mingw-w64-crt/math/tanhl.c
+++ b/mingw-w64-crt/math/tanhl.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #include "cephes_mconf.h"
diff --git a/mingw-w64-crt/math/tanl.S b/mingw-w64-crt/math/tanl.S
index 3fecad1..4f8934e 100644
--- a/mingw-w64-crt/math/tanl.S
+++ b/mingw-w64-crt/math/tanl.S
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #include <_mingw_mac.h>
diff --git a/mingw-w64-crt/math/tgamma.c b/mingw-w64-crt/math/tgamma.c
index 2333232..a75f7a9 100644
--- a/mingw-w64-crt/math/tgamma.c
+++ b/mingw-w64-crt/math/tgamma.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #include "cephes_mconf.h"
diff --git a/mingw-w64-crt/math/tgammaf.c b/mingw-w64-crt/math/tgammaf.c
index 2e48b10..771b55c 100644
--- a/mingw-w64-crt/math/tgammaf.c
+++ b/mingw-w64-crt/math/tgammaf.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #include "cephes_mconf.h"
diff --git a/mingw-w64-crt/math/tgammal.c b/mingw-w64-crt/math/tgammal.c
index 0bc09c2..99408ee 100644
--- a/mingw-w64-crt/math/tgammal.c
+++ b/mingw-w64-crt/math/tgammal.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #include "cephes_mconf.h"
diff --git a/mingw-w64-crt/math/trunc.S b/mingw-w64-crt/math/trunc.S
index 7497e1e..80710a9 100755
--- a/mingw-w64-crt/math/trunc.S
+++ b/mingw-w64-crt/math/trunc.S
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #include <_mingw_mac.h>
diff --git a/mingw-w64-crt/math/truncf.S b/mingw-w64-crt/math/truncf.S
index fa3e8ca..c23a098 100755
--- a/mingw-w64-crt/math/truncf.S
+++ b/mingw-w64-crt/math/truncf.S
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #include <_mingw_mac.h>
diff --git a/mingw-w64-crt/math/truncl.c b/mingw-w64-crt/math/truncl.c
index 421a747..52cef3a 100644
--- a/mingw-w64-crt/math/truncl.c
+++ b/mingw-w64-crt/math/truncl.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #include <fenv.h>
diff --git a/mingw-w64-crt/misc/_wctime.c b/mingw-w64-crt/misc/_wctime.c
index 6b5ad10..3379484 100644
--- a/mingw-w64-crt/misc/_wctime.c
+++ b/mingw-w64-crt/misc/_wctime.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __NO_INLINE__
diff --git a/mingw-w64-crt/misc/_wctime32.c b/mingw-w64-crt/misc/_wctime32.c
index b386d33..d8a0efb 100644
--- a/mingw-w64-crt/misc/_wctime32.c
+++ b/mingw-w64-crt/misc/_wctime32.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __NO_INLINE__
diff --git a/mingw-w64-crt/misc/alarm.c b/mingw-w64-crt/misc/alarm.c
index 9d3272a..f0c29cc 100644
--- a/mingw-w64-crt/misc/alarm.c
+++ b/mingw-w64-crt/misc/alarm.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 
diff --git a/mingw-w64-crt/misc/btowc.c b/mingw-w64-crt/misc/btowc.c
index 9535066..da232cb 100644
--- a/mingw-w64-crt/misc/btowc.c
+++ b/mingw-w64-crt/misc/btowc.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef WIN32_LEAN_AND_MEAN
diff --git a/mingw-w64-crt/misc/delay-f.c b/mingw-w64-crt/misc/delay-f.c
index 1cf6e1d..82e0f65 100644
--- a/mingw-w64-crt/misc/delay-f.c
+++ b/mingw-w64-crt/misc/delay-f.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 
diff --git a/mingw-w64-crt/misc/delay-n.c b/mingw-w64-crt/misc/delay-n.c
index 6d1687e..942963e 100644
--- a/mingw-w64-crt/misc/delay-n.c
+++ b/mingw-w64-crt/misc/delay-n.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 
diff --git a/mingw-w64-crt/misc/delayimp.c b/mingw-w64-crt/misc/delayimp.c
index de19759..26afde8 100644
--- a/mingw-w64-crt/misc/delayimp.c
+++ b/mingw-w64-crt/misc/delayimp.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  *
  * This file is derived from Microsoft implementation file delayhlp.cpp, which
diff --git a/mingw-w64-crt/misc/dirent.c b/mingw-w64-crt/misc/dirent.c
index 9adec16..a11f4e7 100644
--- a/mingw-w64-crt/misc/dirent.c
+++ b/mingw-w64-crt/misc/dirent.c
@@ -1,7 +1,7 @@
 /*
  * dirent.c
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is a part of the mingw-runtime package.
+ * This file is part of the mingw-runtime package.
  * No warranty is given; refer to the file DISCLAIMER within the package.
  *
  * Derived from DIRLIB.C by Matt J. Weinstein
diff --git a/mingw-w64-crt/misc/feclearexcept.c b/mingw-w64-crt/misc/feclearexcept.c
index 27ade35..63bf999 100644
--- a/mingw-w64-crt/misc/feclearexcept.c
+++ b/mingw-w64-crt/misc/feclearexcept.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #include <fenv.h>
diff --git a/mingw-w64-crt/misc/fegetenv.c b/mingw-w64-crt/misc/fegetenv.c
index 5dcf2e7..6e08d77 100644
--- a/mingw-w64-crt/misc/fegetenv.c
+++ b/mingw-w64-crt/misc/fegetenv.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #include <fenv.h>
diff --git a/mingw-w64-crt/misc/fegetexceptflag.c b/mingw-w64-crt/misc/fegetexceptflag.c
index 50239e3..aa55826 100644
--- a/mingw-w64-crt/misc/fegetexceptflag.c
+++ b/mingw-w64-crt/misc/fegetexceptflag.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #include <fenv.h>
diff --git a/mingw-w64-crt/misc/fegetround.c b/mingw-w64-crt/misc/fegetround.c
index 9c907c6..7cbc984 100644
--- a/mingw-w64-crt/misc/fegetround.c
+++ b/mingw-w64-crt/misc/fegetround.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #include <fenv.h>
diff --git a/mingw-w64-crt/misc/feholdexcept.c b/mingw-w64-crt/misc/feholdexcept.c
index 9cc105c..c2d8630 100644
--- a/mingw-w64-crt/misc/feholdexcept.c
+++ b/mingw-w64-crt/misc/feholdexcept.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #include <fenv.h>
diff --git a/mingw-w64-crt/misc/feraiseexcept.c b/mingw-w64-crt/misc/feraiseexcept.c
index a9f15a4..4a39966 100644
--- a/mingw-w64-crt/misc/feraiseexcept.c
+++ b/mingw-w64-crt/misc/feraiseexcept.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #include <fenv.h> 
diff --git a/mingw-w64-crt/misc/fesetenv.c b/mingw-w64-crt/misc/fesetenv.c
index cf203a1..a776cd2 100644
--- a/mingw-w64-crt/misc/fesetenv.c
+++ b/mingw-w64-crt/misc/fesetenv.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #include <_mingw.h>
diff --git a/mingw-w64-crt/misc/fesetexceptflag.c b/mingw-w64-crt/misc/fesetexceptflag.c
index 927e2c3..cec7b7c 100644
--- a/mingw-w64-crt/misc/fesetexceptflag.c
+++ b/mingw-w64-crt/misc/fesetexceptflag.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #include <fenv.h>
diff --git a/mingw-w64-crt/misc/fesetround.c b/mingw-w64-crt/misc/fesetround.c
index 70755a4..c33cb0c 100644
--- a/mingw-w64-crt/misc/fesetround.c
+++ b/mingw-w64-crt/misc/fesetround.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #include <fenv.h>
diff --git a/mingw-w64-crt/misc/fetestexcept.c b/mingw-w64-crt/misc/fetestexcept.c
index aaac1eb..12d22da 100644
--- a/mingw-w64-crt/misc/fetestexcept.c
+++ b/mingw-w64-crt/misc/fetestexcept.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 
diff --git a/mingw-w64-crt/misc/feupdateenv.c b/mingw-w64-crt/misc/feupdateenv.c
index d55e5c6..4a89d0b 100644
--- a/mingw-w64-crt/misc/feupdateenv.c
+++ b/mingw-w64-crt/misc/feupdateenv.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #include <fenv.h>
diff --git a/mingw-w64-crt/misc/fwide.c b/mingw-w64-crt/misc/fwide.c
index be88faa..a9662f4 100644
--- a/mingw-w64-crt/misc/fwide.c
+++ b/mingw-w64-crt/misc/fwide.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 
diff --git a/mingw-w64-crt/misc/getlogin.c b/mingw-w64-crt/misc/getlogin.c
index e07e6e4..cb130f3 100644
--- a/mingw-w64-crt/misc/getlogin.c
+++ b/mingw-w64-crt/misc/getlogin.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #include <stddef.h>
diff --git a/mingw-w64-crt/misc/gettimeofday.c b/mingw-w64-crt/misc/gettimeofday.c
index bc1d668..50ffcfc 100644
--- a/mingw-w64-crt/misc/gettimeofday.c
+++ b/mingw-w64-crt/misc/gettimeofday.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #include <time.h>
diff --git a/mingw-w64-crt/misc/imaxabs.c b/mingw-w64-crt/misc/imaxabs.c
index 824b443..2ee550d 100644
--- a/mingw-w64-crt/misc/imaxabs.c
+++ b/mingw-w64-crt/misc/imaxabs.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 /*
diff --git a/mingw-w64-crt/misc/imaxdiv.c b/mingw-w64-crt/misc/imaxdiv.c
index e6a1e8e..5e2a7db 100644
--- a/mingw-w64-crt/misc/imaxdiv.c
+++ b/mingw-w64-crt/misc/imaxdiv.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 /*
diff --git a/mingw-w64-crt/misc/mb_wc_common.h b/mingw-w64-crt/misc/mb_wc_common.h
index bbdb969..64cac2d 100644
--- a/mingw-w64-crt/misc/mb_wc_common.h
+++ b/mingw-w64-crt/misc/mb_wc_common.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 
diff --git a/mingw-w64-crt/misc/mbrtowc.c b/mingw-w64-crt/misc/mbrtowc.c
index d087e8a..ac66a28 100644
--- a/mingw-w64-crt/misc/mbrtowc.c
+++ b/mingw-w64-crt/misc/mbrtowc.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef WIN32_LEAN_AND_MEAN
diff --git a/mingw-w64-crt/misc/mbsinit.c b/mingw-w64-crt/misc/mbsinit.c
index acc9e61..d745402 100644
--- a/mingw-w64-crt/misc/mbsinit.c
+++ b/mingw-w64-crt/misc/mbsinit.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 /*	This source code was extracted from the Q8 package created and placed
diff --git a/mingw-w64-crt/misc/mingw-aligned-malloc.c b/mingw-w64-crt/misc/mingw-aligned-malloc.c
index 96876cc..ca5f866 100644
--- a/mingw-w64-crt/misc/mingw-aligned-malloc.c
+++ b/mingw-w64-crt/misc/mingw-aligned-malloc.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 /*
diff --git a/mingw-w64-crt/misc/mingw-fseek.c b/mingw-w64-crt/misc/mingw-fseek.c
index 5ee50d4..3ae7d85 100644
--- a/mingw-w64-crt/misc/mingw-fseek.c
+++ b/mingw-w64-crt/misc/mingw-fseek.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #include <windows.h>
diff --git a/mingw-w64-crt/misc/mingw_getsp.S b/mingw-w64-crt/misc/mingw_getsp.S
index ac510b0..517a351 100644
--- a/mingw-w64-crt/misc/mingw_getsp.S
+++ b/mingw-w64-crt/misc/mingw_getsp.S
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #include <_mingw_mac.h>
diff --git a/mingw-w64-crt/misc/seterrno.c b/mingw-w64-crt/misc/seterrno.c
index b9ce96a..952675d 100644
--- a/mingw-w64-crt/misc/seterrno.c
+++ b/mingw-w64-crt/misc/seterrno.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #include <errno.h>
diff --git a/mingw-w64-crt/misc/sleep.c b/mingw-w64-crt/misc/sleep.c
index 0e232b2..8447f52 100644
--- a/mingw-w64-crt/misc/sleep.c
+++ b/mingw-w64-crt/misc/sleep.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #include <signal.h>
diff --git a/mingw-w64-crt/misc/strtoimax.c b/mingw-w64-crt/misc/strtoimax.c
index 74e0f4a..eef5da9 100644
--- a/mingw-w64-crt/misc/strtoimax.c
+++ b/mingw-w64-crt/misc/strtoimax.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 /*
diff --git a/mingw-w64-crt/misc/strtold.c b/mingw-w64-crt/misc/strtold.c
index f7500ba..547baed 100644
--- a/mingw-w64-crt/misc/strtold.c
+++ b/mingw-w64-crt/misc/strtold.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 
diff --git a/mingw-w64-crt/misc/strtoumax.c b/mingw-w64-crt/misc/strtoumax.c
index c778acc..e86cd76 100644
--- a/mingw-w64-crt/misc/strtoumax.c
+++ b/mingw-w64-crt/misc/strtoumax.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 /*
diff --git a/mingw-w64-crt/misc/uchar_c16rtomb.c b/mingw-w64-crt/misc/uchar_c16rtomb.c
index b3471bb..94a2aaa 100644
--- a/mingw-w64-crt/misc/uchar_c16rtomb.c
+++ b/mingw-w64-crt/misc/uchar_c16rtomb.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 /* ISO C1x Unicode utilities
diff --git a/mingw-w64-crt/misc/uchar_c32rtomb.c b/mingw-w64-crt/misc/uchar_c32rtomb.c
index 852a035..d05e632 100644
--- a/mingw-w64-crt/misc/uchar_c32rtomb.c
+++ b/mingw-w64-crt/misc/uchar_c32rtomb.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 /* ISO C1x Unicode utilities
diff --git a/mingw-w64-crt/misc/uchar_mbrtoc16.c b/mingw-w64-crt/misc/uchar_mbrtoc16.c
index 2ef0257..9de35fe 100644
--- a/mingw-w64-crt/misc/uchar_mbrtoc16.c
+++ b/mingw-w64-crt/misc/uchar_mbrtoc16.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 /* ISO C1x Unicode utilities
diff --git a/mingw-w64-crt/misc/uchar_mbrtoc32.c b/mingw-w64-crt/misc/uchar_mbrtoc32.c
index eb2ff93..1d63e5c 100644
--- a/mingw-w64-crt/misc/uchar_mbrtoc32.c
+++ b/mingw-w64-crt/misc/uchar_mbrtoc32.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 /* ISO C1x Unicode utilities
diff --git a/mingw-w64-crt/misc/wassert.c b/mingw-w64-crt/misc/wassert.c
index 6829d5d..ff57bd5 100644
--- a/mingw-w64-crt/misc/wassert.c
+++ b/mingw-w64-crt/misc/wassert.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #include <windows.h>
diff --git a/mingw-w64-crt/misc/wcrtomb.c b/mingw-w64-crt/misc/wcrtomb.c
index 385c2dc..3cd6ce8 100644
--- a/mingw-w64-crt/misc/wcrtomb.c
+++ b/mingw-w64-crt/misc/wcrtomb.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef WIN32_LEAN_AND_MEAN
diff --git a/mingw-w64-crt/misc/wcstoimax.c b/mingw-w64-crt/misc/wcstoimax.c
index a1e28bb..9821cf0 100644
--- a/mingw-w64-crt/misc/wcstoimax.c
+++ b/mingw-w64-crt/misc/wcstoimax.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 /*
diff --git a/mingw-w64-crt/misc/wcstold.c b/mingw-w64-crt/misc/wcstold.c
index 68f2a4b..f35c940 100644
--- a/mingw-w64-crt/misc/wcstold.c
+++ b/mingw-w64-crt/misc/wcstold.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 /*  Wide char wrapper for strtold
diff --git a/mingw-w64-crt/misc/wcstoumax.c b/mingw-w64-crt/misc/wcstoumax.c
index 66eb92d..0f1ed54 100644
--- a/mingw-w64-crt/misc/wcstoumax.c
+++ b/mingw-w64-crt/misc/wcstoumax.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 /*
diff --git a/mingw-w64-crt/misc/wctob.c b/mingw-w64-crt/misc/wctob.c
index eaead9f..a2089a5 100644
--- a/mingw-w64-crt/misc/wctob.c
+++ b/mingw-w64-crt/misc/wctob.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef WIN32_LEAN_AND_MEAN
diff --git a/mingw-w64-crt/misc/wctrans.c b/mingw-w64-crt/misc/wctrans.c
index 5056d96..bcd9ef9 100644
--- a/mingw-w64-crt/misc/wctrans.c
+++ b/mingw-w64-crt/misc/wctrans.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 /*
diff --git a/mingw-w64-crt/misc/wctype.c b/mingw-w64-crt/misc/wctype.c
index eee07ef..b6cfc1d 100644
--- a/mingw-w64-crt/misc/wctype.c
+++ b/mingw-w64-crt/misc/wctype.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 /*
diff --git a/mingw-w64-crt/misc/wmemchr.c b/mingw-w64-crt/misc/wmemchr.c
index 8e30468..fb037f7 100644
--- a/mingw-w64-crt/misc/wmemchr.c
+++ b/mingw-w64-crt/misc/wmemchr.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 
diff --git a/mingw-w64-crt/misc/wmemcmp.c b/mingw-w64-crt/misc/wmemcmp.c
index bb84d31..5917b5a 100644
--- a/mingw-w64-crt/misc/wmemcmp.c
+++ b/mingw-w64-crt/misc/wmemcmp.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 /*	This source code was extracted from the Q8 package created and placed
diff --git a/mingw-w64-crt/misc/wmemcpy.c b/mingw-w64-crt/misc/wmemcpy.c
index efe9afa..a840913 100644
--- a/mingw-w64-crt/misc/wmemcpy.c
+++ b/mingw-w64-crt/misc/wmemcpy.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 
diff --git a/mingw-w64-crt/misc/wmemmove.c b/mingw-w64-crt/misc/wmemmove.c
index d2535e2..1b9e42c 100644
--- a/mingw-w64-crt/misc/wmemmove.c
+++ b/mingw-w64-crt/misc/wmemmove.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 
diff --git a/mingw-w64-crt/misc/wmemset.c b/mingw-w64-crt/misc/wmemset.c
index a35eca8..26917b0 100644
--- a/mingw-w64-crt/misc/wmemset.c
+++ b/mingw-w64-crt/misc/wmemset.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 
diff --git a/mingw-w64-crt/profile/mcountFunc.S b/mingw-w64-crt/profile/mcountFunc.S
index f893d20..e1b9136 100644
--- a/mingw-w64-crt/profile/mcountFunc.S
+++ b/mingw-w64-crt/profile/mcountFunc.S
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #include <_mingw_mac.h>
diff --git a/mingw-w64-crt/stdio/_Exit.c b/mingw-w64-crt/stdio/_Exit.c
index 4c5cdd8..5b049f5 100644
--- a/mingw-w64-crt/stdio/_Exit.c
+++ b/mingw-w64-crt/stdio/_Exit.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #define __CRT__NO_INLINE
diff --git a/mingw-w64-crt/stdio/atoll.c b/mingw-w64-crt/stdio/atoll.c
index 5bd6a69..39df013 100644
--- a/mingw-w64-crt/stdio/atoll.c
+++ b/mingw-w64-crt/stdio/atoll.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #define __CRT__NO_INLINE
diff --git a/mingw-w64-crt/stdio/fopen64.c b/mingw-w64-crt/stdio/fopen64.c
index 3556b05..1c6e78d 100644
--- a/mingw-w64-crt/stdio/fopen64.c
+++ b/mingw-w64-crt/stdio/fopen64.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #include <stdio.h>
diff --git a/mingw-w64-crt/stdio/fseeko64.c b/mingw-w64-crt/stdio/fseeko64.c
index 49402fd..5905aa2 100644
--- a/mingw-w64-crt/stdio/fseeko64.c
+++ b/mingw-w64-crt/stdio/fseeko64.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #include <stdio.h>
diff --git a/mingw-w64-crt/stdio/ftello64.c b/mingw-w64-crt/stdio/ftello64.c
index 7bc6fc9..a0192fb 100644
--- a/mingw-w64-crt/stdio/ftello64.c
+++ b/mingw-w64-crt/stdio/ftello64.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #include <stdio.h>
diff --git a/mingw-w64-crt/stdio/lltoa.c b/mingw-w64-crt/stdio/lltoa.c
index 3399ebd..4173639 100644
--- a/mingw-w64-crt/stdio/lltoa.c
+++ b/mingw-w64-crt/stdio/lltoa.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #define __CRT__NO_INLINE
diff --git a/mingw-w64-crt/stdio/lltow.c b/mingw-w64-crt/stdio/lltow.c
index e579c7b..0812faf 100644
--- a/mingw-w64-crt/stdio/lltow.c
+++ b/mingw-w64-crt/stdio/lltow.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #define __CRT__NO_INLINE
diff --git a/mingw-w64-crt/stdio/lseek64.c b/mingw-w64-crt/stdio/lseek64.c
index 5ace896..afda7ce 100644
--- a/mingw-w64-crt/stdio/lseek64.c
+++ b/mingw-w64-crt/stdio/lseek64.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #include <io.h>
diff --git a/mingw-w64-crt/stdio/mingw_fprintfw.c b/mingw-w64-crt/stdio/mingw_fprintfw.c
index 8d0c0df..e5ea41e 100644
--- a/mingw-w64-crt/stdio/mingw_fprintfw.c
+++ b/mingw-w64-crt/stdio/mingw_fprintfw.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #define __BUILD_WIDEAPI 1
diff --git a/mingw-w64-crt/stdio/mingw_pformatw.c b/mingw-w64-crt/stdio/mingw_pformatw.c
index 35cd522..2c7cd1e 100644
--- a/mingw-w64-crt/stdio/mingw_pformatw.c
+++ b/mingw-w64-crt/stdio/mingw_pformatw.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #define __BUILD_WIDEAPI 1
diff --git a/mingw-w64-crt/stdio/mingw_printfw.c b/mingw-w64-crt/stdio/mingw_printfw.c
index 09bcb3c..db65c93 100644
--- a/mingw-w64-crt/stdio/mingw_printfw.c
+++ b/mingw-w64-crt/stdio/mingw_printfw.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #define __BUILD_WIDEAPI 1
diff --git a/mingw-w64-crt/stdio/mingw_snprintfw.c b/mingw-w64-crt/stdio/mingw_snprintfw.c
index abe0ed9..b31cda2 100644
--- a/mingw-w64-crt/stdio/mingw_snprintfw.c
+++ b/mingw-w64-crt/stdio/mingw_snprintfw.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #define __BUILD_WIDEAPI 1
diff --git a/mingw-w64-crt/stdio/mingw_sprintfw.c b/mingw-w64-crt/stdio/mingw_sprintfw.c
index ed70d52..dad7b02 100644
--- a/mingw-w64-crt/stdio/mingw_sprintfw.c
+++ b/mingw-w64-crt/stdio/mingw_sprintfw.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #define __BUILD_WIDEAPI 1
diff --git a/mingw-w64-crt/stdio/mingw_vfprintfw.c b/mingw-w64-crt/stdio/mingw_vfprintfw.c
index 02f291b..0b86387 100644
--- a/mingw-w64-crt/stdio/mingw_vfprintfw.c
+++ b/mingw-w64-crt/stdio/mingw_vfprintfw.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #define __BUILD_WIDEAPI 1
diff --git a/mingw-w64-crt/stdio/mingw_vprintfw.c b/mingw-w64-crt/stdio/mingw_vprintfw.c
index 2e65f9d..2c81073 100644
--- a/mingw-w64-crt/stdio/mingw_vprintfw.c
+++ b/mingw-w64-crt/stdio/mingw_vprintfw.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #define __BUILD_WIDEAPI 1
diff --git a/mingw-w64-crt/stdio/mingw_vsnprintfw.c b/mingw-w64-crt/stdio/mingw_vsnprintfw.c
index 99456f1..fb3dfa5 100644
--- a/mingw-w64-crt/stdio/mingw_vsnprintfw.c
+++ b/mingw-w64-crt/stdio/mingw_vsnprintfw.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #define __BUILD_WIDEAPI 1
diff --git a/mingw-w64-crt/stdio/mingw_vsprintfw.c b/mingw-w64-crt/stdio/mingw_vsprintfw.c
index 7b942de..5e8a489 100644
--- a/mingw-w64-crt/stdio/mingw_vsprintfw.c
+++ b/mingw-w64-crt/stdio/mingw_vsprintfw.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #define __BUILD_WIDEAPI 1
diff --git a/mingw-w64-crt/stdio/snprintf.c b/mingw-w64-crt/stdio/snprintf.c
index f140096..9330011 100644
--- a/mingw-w64-crt/stdio/snprintf.c
+++ b/mingw-w64-crt/stdio/snprintf.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #include <stdarg.h>
diff --git a/mingw-w64-crt/stdio/snwprintf.c b/mingw-w64-crt/stdio/snwprintf.c
index e4caec7..c57a46d 100644
--- a/mingw-w64-crt/stdio/snwprintf.c
+++ b/mingw-w64-crt/stdio/snwprintf.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #include <stdarg.h>
diff --git a/mingw-w64-crt/stdio/strtof.c b/mingw-w64-crt/stdio/strtof.c
index ca646b8..5697eb4 100644
--- a/mingw-w64-crt/stdio/strtof.c
+++ b/mingw-w64-crt/stdio/strtof.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #include <stdlib.h>
diff --git a/mingw-w64-crt/stdio/ulltoa.c b/mingw-w64-crt/stdio/ulltoa.c
index 22e8a5f..9985dfe 100644
--- a/mingw-w64-crt/stdio/ulltoa.c
+++ b/mingw-w64-crt/stdio/ulltoa.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #define __CRT__NO_INLINE
diff --git a/mingw-w64-crt/stdio/ulltow.c b/mingw-w64-crt/stdio/ulltow.c
index 401918a..145e755 100644
--- a/mingw-w64-crt/stdio/ulltow.c
+++ b/mingw-w64-crt/stdio/ulltow.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #define __CRT__NO_INLINE
diff --git a/mingw-w64-crt/stdio/vfscanf.c b/mingw-w64-crt/stdio/vfscanf.c
index 6652408..0b2f18a 100644
--- a/mingw-w64-crt/stdio/vfscanf.c
+++ b/mingw-w64-crt/stdio/vfscanf.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 //  By aaronwl 2003-01-28 for mingw-msvcrt
diff --git a/mingw-w64-crt/stdio/vfscanf2.S b/mingw-w64-crt/stdio/vfscanf2.S
index 166b9c5..e3586eb 100644
--- a/mingw-w64-crt/stdio/vfscanf2.S
+++ b/mingw-w64-crt/stdio/vfscanf2.S
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #include <_mingw_mac.h>
diff --git a/mingw-w64-crt/stdio/vfwscanf.c b/mingw-w64-crt/stdio/vfwscanf.c
index 53b8e5b..89cfc63 100644
--- a/mingw-w64-crt/stdio/vfwscanf.c
+++ b/mingw-w64-crt/stdio/vfwscanf.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 //  By aaronwl 2003-01-28 for mingw-msvcrt.
diff --git a/mingw-w64-crt/stdio/vfwscanf2.S b/mingw-w64-crt/stdio/vfwscanf2.S
index 25f50ad..e3cd28c 100644
--- a/mingw-w64-crt/stdio/vfwscanf2.S
+++ b/mingw-w64-crt/stdio/vfwscanf2.S
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #include <_mingw_mac.h>
diff --git a/mingw-w64-crt/stdio/vscanf.c b/mingw-w64-crt/stdio/vscanf.c
index 24095c6..f255e68 100644
--- a/mingw-w64-crt/stdio/vscanf.c
+++ b/mingw-w64-crt/stdio/vscanf.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 //  By aaronwl 2003-01-28 for mingw-msvcrt
diff --git a/mingw-w64-crt/stdio/vscanf2.S b/mingw-w64-crt/stdio/vscanf2.S
index 73f32e3..191a48a 100644
--- a/mingw-w64-crt/stdio/vscanf2.S
+++ b/mingw-w64-crt/stdio/vscanf2.S
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #include <_mingw_mac.h>
diff --git a/mingw-w64-crt/stdio/vsnprintf.c b/mingw-w64-crt/stdio/vsnprintf.c
index e2688f9..1346c5c 100644
--- a/mingw-w64-crt/stdio/vsnprintf.c
+++ b/mingw-w64-crt/stdio/vsnprintf.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #define __CRT__NO_INLINE
diff --git a/mingw-w64-crt/stdio/vsnprintf_s.c b/mingw-w64-crt/stdio/vsnprintf_s.c
index d1d09d9..1618dbe 100644
--- a/mingw-w64-crt/stdio/vsnprintf_s.c
+++ b/mingw-w64-crt/stdio/vsnprintf_s.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #define __CRT__NO_INLINE
diff --git a/mingw-w64-crt/stdio/vsnwprintf.c b/mingw-w64-crt/stdio/vsnwprintf.c
index ee7d016..b5c5ae6 100644
--- a/mingw-w64-crt/stdio/vsnwprintf.c
+++ b/mingw-w64-crt/stdio/vsnwprintf.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #define __CRT__NO_INLINE
diff --git a/mingw-w64-crt/stdio/vsscanf.c b/mingw-w64-crt/stdio/vsscanf.c
index 91c8b23..e2ad8f0 100644
--- a/mingw-w64-crt/stdio/vsscanf.c
+++ b/mingw-w64-crt/stdio/vsscanf.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 //  By aaronwl 2003-01-28 for mingw-msvcrt.
diff --git a/mingw-w64-crt/stdio/vsscanf2.S b/mingw-w64-crt/stdio/vsscanf2.S
index 147e46c..7e1ffc2 100644
--- a/mingw-w64-crt/stdio/vsscanf2.S
+++ b/mingw-w64-crt/stdio/vsscanf2.S
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #include <_mingw_mac.h>
diff --git a/mingw-w64-crt/stdio/vswscanf.c b/mingw-w64-crt/stdio/vswscanf.c
index e146ec0..419fd18 100644
--- a/mingw-w64-crt/stdio/vswscanf.c
+++ b/mingw-w64-crt/stdio/vswscanf.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 //  By aaronwl 2003-01-28 for mingw-msvcrt
diff --git a/mingw-w64-crt/stdio/vswscanf2.S b/mingw-w64-crt/stdio/vswscanf2.S
index 2adbe27..8b20c31a 100644
--- a/mingw-w64-crt/stdio/vswscanf2.S
+++ b/mingw-w64-crt/stdio/vswscanf2.S
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #include <_mingw_mac.h>
diff --git a/mingw-w64-crt/stdio/vwscanf.c b/mingw-w64-crt/stdio/vwscanf.c
index 8004570..3360eef 100644
--- a/mingw-w64-crt/stdio/vwscanf.c
+++ b/mingw-w64-crt/stdio/vwscanf.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 //  By aaronwl 2003-01-28 for mingw-msvcrt.
diff --git a/mingw-w64-crt/stdio/vwscanf2.S b/mingw-w64-crt/stdio/vwscanf2.S
index 1f16cf6..f1e2cb5 100644
--- a/mingw-w64-crt/stdio/vwscanf2.S
+++ b/mingw-w64-crt/stdio/vwscanf2.S
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #include <_mingw_mac.h>
diff --git a/mingw-w64-crt/stdio/wtoll.c b/mingw-w64-crt/stdio/wtoll.c
index fde0875..eb46043 100644
--- a/mingw-w64-crt/stdio/wtoll.c
+++ b/mingw-w64-crt/stdio/wtoll.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #define __CRT__NO_INLINE
diff --git a/mingw-w64-crt/testcases/tstmain_sys_xxx.c b/mingw-w64-crt/testcases/tstmain_sys_xxx.c
index 10d6731..9af4823 100644
--- a/mingw-w64-crt/testcases/tstmain_sys_xxx.c
+++ b/mingw-w64-crt/testcases/tstmain_sys_xxx.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #include <stdio.h>
diff --git a/mingw-w64-crt/testcases/tstmainc.c b/mingw-w64-crt/testcases/tstmainc.c
index 4f1370b..a92efaa 100644
--- a/mingw-w64-crt/testcases/tstmainc.c
+++ b/mingw-w64-crt/testcases/tstmainc.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #include <stdio.h>
diff --git a/mingw-w64-crt/testcases/tstmaincpp.cpp b/mingw-w64-crt/testcases/tstmaincpp.cpp
index 4f1370b..a92efaa 100644
--- a/mingw-w64-crt/testcases/tstmaincpp.cpp
+++ b/mingw-w64-crt/testcases/tstmaincpp.cpp
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #include <stdio.h>
diff --git a/mingw-w64-crt/testcases/tstwassert.c b/mingw-w64-crt/testcases/tstwassert.c
index 58f17d0..f903b3a 100644
--- a/mingw-w64-crt/testcases/tstwassert.c
+++ b/mingw-w64-crt/testcases/tstwassert.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #include <stdio.h>
diff --git a/mingw-w64-crt/testcases/tstwassert_win.c b/mingw-w64-crt/testcases/tstwassert_win.c
index 27ccb1b..c152f90 100644
--- a/mingw-w64-crt/testcases/tstwassert_win.c
+++ b/mingw-w64-crt/testcases/tstwassert_win.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef WIN32_LEAN_AND_MEAN
diff --git a/mingw-w64-crt/testcases/tstwinmain.c b/mingw-w64-crt/testcases/tstwinmain.c
index ab6b74e..0adc24f 100644
--- a/mingw-w64-crt/testcases/tstwinmain.c
+++ b/mingw-w64-crt/testcases/tstwinmain.c
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef WIN32_LEAN_AND_MEAN
diff --git a/mingw-w64-headers/crt/_bsd_types.h b/mingw-w64-headers/crt/_bsd_types.h
index c119666..0face5c 100644
--- a/mingw-w64-headers/crt/_bsd_types.h
+++ b/mingw-w64-headers/crt/_bsd_types.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 
diff --git a/mingw-w64-headers/crt/_cygwin.h b/mingw-w64-headers/crt/_cygwin.h
index 5539ebc..3990bdb 100644
--- a/mingw-w64-headers/crt/_cygwin.h
+++ b/mingw-w64-headers/crt/_cygwin.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_CYGWIN
diff --git a/mingw-w64-headers/crt/_mingw.h.in b/mingw-w64-headers/crt/_mingw.h.in
index 73f5041..1d68c21 100644
--- a/mingw-w64-headers/crt/_mingw.h.in
+++ b/mingw-w64-headers/crt/_mingw.h.in
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 
diff --git a/mingw-w64-headers/crt/_mingw_mac.h b/mingw-w64-headers/crt/_mingw_mac.h
index 4c31cf0..9a97ca0 100644
--- a/mingw-w64-headers/crt/_mingw_mac.h
+++ b/mingw-w64-headers/crt/_mingw_mac.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 
diff --git a/mingw-w64-headers/crt/_mingw_print_pop.h b/mingw-w64-headers/crt/_mingw_print_pop.h
index c40042e..046b620 100644
--- a/mingw-w64-headers/crt/_mingw_print_pop.h
+++ b/mingw-w64-headers/crt/_mingw_print_pop.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 
diff --git a/mingw-w64-headers/crt/_mingw_print_push.h b/mingw-w64-headers/crt/_mingw_print_push.h
index 25a229d..e0da9d0 100644
--- a/mingw-w64-headers/crt/_mingw_print_push.h
+++ b/mingw-w64-headers/crt/_mingw_print_push.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 
diff --git a/mingw-w64-headers/crt/_mingw_secapi.h b/mingw-w64-headers/crt/_mingw_secapi.h
index f45c21c..2f09786 100644
--- a/mingw-w64-headers/crt/_mingw_secapi.h
+++ b/mingw-w64-headers/crt/_mingw_secapi.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
  
diff --git a/mingw-w64-headers/crt/_mingw_stdarg.h b/mingw-w64-headers/crt/_mingw_stdarg.h
index b48035d..ab9533d 100644
--- a/mingw-w64-headers/crt/_mingw_stdarg.h
+++ b/mingw-w64-headers/crt/_mingw_stdarg.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 
diff --git a/mingw-w64-headers/crt/_mingw_unicode.h b/mingw-w64-headers/crt/_mingw_unicode.h
index 38334bc..ef6fefb 100644
--- a/mingw-w64-headers/crt/_mingw_unicode.h
+++ b/mingw-w64-headers/crt/_mingw_unicode.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 
diff --git a/mingw-w64-headers/crt/_timeval.h b/mingw-w64-headers/crt/_timeval.h
index 407e788..0f52840 100644
--- a/mingw-w64-headers/crt/_timeval.h
+++ b/mingw-w64-headers/crt/_timeval.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 
diff --git a/mingw-w64-headers/crt/assert.h b/mingw-w64-headers/crt/assert.h
index 9b105fc..ddc7ea4 100644
--- a/mingw-w64-headers/crt/assert.h
+++ b/mingw-w64-headers/crt/assert.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 
diff --git a/mingw-w64-headers/crt/complex.h b/mingw-w64-headers/crt/complex.h
index 6426ee2..151a5d5 100644
--- a/mingw-w64-headers/crt/complex.h
+++ b/mingw-w64-headers/crt/complex.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 /*
diff --git a/mingw-w64-headers/crt/conio.h b/mingw-w64-headers/crt/conio.h
index c108e8b..3def72a 100644
--- a/mingw-w64-headers/crt/conio.h
+++ b/mingw-w64-headers/crt/conio.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_CONIO
diff --git a/mingw-w64-headers/crt/crtdbg.h b/mingw-w64-headers/crt/crtdbg.h
index e864e0b..23836df 100644
--- a/mingw-w64-headers/crt/crtdbg.h
+++ b/mingw-w64-headers/crt/crtdbg.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #include <_mingw.h>
diff --git a/mingw-w64-headers/crt/crtdefs.h b/mingw-w64-headers/crt/crtdefs.h
index 8c52dbd..1d7452f 100644
--- a/mingw-w64-headers/crt/crtdefs.h
+++ b/mingw-w64-headers/crt/crtdefs.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #include <_mingw.h>
diff --git a/mingw-w64-headers/crt/ctype.h b/mingw-w64-headers/crt/ctype.h
index eb69877..0cdc2d0 100644
--- a/mingw-w64-headers/crt/ctype.h
+++ b/mingw-w64-headers/crt/ctype.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_CTYPE
diff --git a/mingw-w64-headers/crt/dir.h b/mingw-w64-headers/crt/dir.h
index 05ac92a..f1a9bf5 100644
--- a/mingw-w64-headers/crt/dir.h
+++ b/mingw-w64-headers/crt/dir.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 /* 
diff --git a/mingw-w64-headers/crt/direct.h b/mingw-w64-headers/crt/direct.h
index b7632f5..e3de493 100644
--- a/mingw-w64-headers/crt/direct.h
+++ b/mingw-w64-headers/crt/direct.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_DIRECT
diff --git a/mingw-w64-headers/crt/dirent.h b/mingw-w64-headers/crt/dirent.h
index bb631c2..6cba4b6 100644
--- a/mingw-w64-headers/crt/dirent.h
+++ b/mingw-w64-headers/crt/dirent.h
@@ -1,7 +1,7 @@
 /*
  * DIRENT.H (formerly DIRLIB.H)
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is a part of the mingw-runtime package.
+ * This file is part of the mingw-runtime package.
  * No warranty is given; refer to the file DISCLAIMER within the package.
  *
  */
diff --git a/mingw-w64-headers/crt/dos.h b/mingw-w64-headers/crt/dos.h
index 2983aab..fb4d9d1 100644
--- a/mingw-w64-headers/crt/dos.h
+++ b/mingw-w64-headers/crt/dos.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_DOS
diff --git a/mingw-w64-headers/crt/dvec.h b/mingw-w64-headers/crt/dvec.h
index 5d22e52..363a94c 100644
--- a/mingw-w64-headers/crt/dvec.h
+++ b/mingw-w64-headers/crt/dvec.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _DVEC_H_INCLUDED
diff --git a/mingw-w64-headers/crt/eh.h b/mingw-w64-headers/crt/eh.h
index 9604c4e..e5d4fdd 100644
--- a/mingw-w64-headers/crt/eh.h
+++ b/mingw-w64-headers/crt/eh.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #include <_mingw.h>
diff --git a/mingw-w64-headers/crt/errno.h b/mingw-w64-headers/crt/errno.h
index 310cfd7..94328e6 100644
--- a/mingw-w64-headers/crt/errno.h
+++ b/mingw-w64-headers/crt/errno.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_ERRNO
diff --git a/mingw-w64-headers/crt/excpt.h b/mingw-w64-headers/crt/excpt.h
index 324e26f..27242dd 100644
--- a/mingw-w64-headers/crt/excpt.h
+++ b/mingw-w64-headers/crt/excpt.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_EXCPT
diff --git a/mingw-w64-headers/crt/fcntl.h b/mingw-w64-headers/crt/fcntl.h
index 7b76dd4..d31aa4d 100644
--- a/mingw-w64-headers/crt/fcntl.h
+++ b/mingw-w64-headers/crt/fcntl.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #include <_mingw.h>
diff --git a/mingw-w64-headers/crt/fenv.h b/mingw-w64-headers/crt/fenv.h
index 55340af..eff9051 100644
--- a/mingw-w64-headers/crt/fenv.h
+++ b/mingw-w64-headers/crt/fenv.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _FENV_H_
diff --git a/mingw-w64-headers/crt/float.h b/mingw-w64-headers/crt/float.h
index dfe5504..fe5561b 100644
--- a/mingw-w64-headers/crt/float.h
+++ b/mingw-w64-headers/crt/float.h
@@ -1,7 +1,7 @@
 /*
  * float.h
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is a part of the mingw-runtime package.
+ * This file is part of the mingw-runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within the package.
  *
  * Constants related to floating point arithmetic.
diff --git a/mingw-w64-headers/crt/fpieee.h b/mingw-w64-headers/crt/fpieee.h
index f3bf142..ce52ebb 100644
--- a/mingw-w64-headers/crt/fpieee.h
+++ b/mingw-w64-headers/crt/fpieee.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_FPIEEE
diff --git a/mingw-w64-headers/crt/fvec.h b/mingw-w64-headers/crt/fvec.h
index 8a586ac..5bbdc0c 100644
--- a/mingw-w64-headers/crt/fvec.h
+++ b/mingw-w64-headers/crt/fvec.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _FVEC_H_INCLUDED
diff --git a/mingw-w64-headers/crt/getopt.h b/mingw-w64-headers/crt/getopt.h
index 2e54525..5e45040 100644
--- a/mingw-w64-headers/crt/getopt.h
+++ b/mingw-w64-headers/crt/getopt.h
@@ -2,9 +2,9 @@
 /**
  * DISCLAIMER
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is a part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  *
- * The w64 mingw-runtime package and its code is distributed in the hope that it 
+ * The mingw-w64 runtime package and its code is distributed in the hope that it 
  * will be useful but WITHOUT ANY WARRANTY.  ALL WARRANTIES, EXPRESSED OR 
  * IMPLIED ARE HEREBY DISCLAIMED.  This includes but is not limited to 
  * warranties of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
diff --git a/mingw-w64-headers/crt/intrin.h b/mingw-w64-headers/crt/intrin.h
index 92b5c01..4c5e7d4 100644
--- a/mingw-w64-headers/crt/intrin.h
+++ b/mingw-w64-headers/crt/intrin.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __INTRIN_H_
diff --git a/mingw-w64-headers/crt/inttypes.h b/mingw-w64-headers/crt/inttypes.h
index ba6081e..6937b20 100644
--- a/mingw-w64-headers/crt/inttypes.h
+++ b/mingw-w64-headers/crt/inttypes.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 /* 7.8 Format conversion of integer types <inttypes.h> */
diff --git a/mingw-w64-headers/crt/io.h b/mingw-w64-headers/crt/io.h
index 16c1e86..67ee5ae 100644
--- a/mingw-w64-headers/crt/io.h
+++ b/mingw-w64-headers/crt/io.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _IO_H_
diff --git a/mingw-w64-headers/crt/ivec.h b/mingw-w64-headers/crt/ivec.h
index 98388ba..13e53fd 100644
--- a/mingw-w64-headers/crt/ivec.h
+++ b/mingw-w64-headers/crt/ivec.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _IVEC_H_INCLUDED
diff --git a/mingw-w64-headers/crt/libgen.h b/mingw-w64-headers/crt/libgen.h
index 2e4b414..05a1ce8 100644
--- a/mingw-w64-headers/crt/libgen.h
+++ b/mingw-w64-headers/crt/libgen.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 
diff --git a/mingw-w64-headers/crt/limits.h b/mingw-w64-headers/crt/limits.h
index 22a7ae4..653f125 100644
--- a/mingw-w64-headers/crt/limits.h
+++ b/mingw-w64-headers/crt/limits.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #include <_mingw.h>
diff --git a/mingw-w64-headers/crt/locale.h b/mingw-w64-headers/crt/locale.h
index fda838d..fa3cc75 100644
--- a/mingw-w64-headers/crt/locale.h
+++ b/mingw-w64-headers/crt/locale.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_LOCALE
diff --git a/mingw-w64-headers/crt/malloc.h b/mingw-w64-headers/crt/malloc.h
index 7883266..daf59fa 100644
--- a/mingw-w64-headers/crt/malloc.h
+++ b/mingw-w64-headers/crt/malloc.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _MALLOC_H_
diff --git a/mingw-w64-headers/crt/math.h b/mingw-w64-headers/crt/math.h
index 5279203..c4d52b4 100644
--- a/mingw-w64-headers/crt/math.h
+++ b/mingw-w64-headers/crt/math.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _MATH_H_
diff --git a/mingw-w64-headers/crt/mbctype.h b/mingw-w64-headers/crt/mbctype.h
index 7da43e6..a379f15 100644
--- a/mingw-w64-headers/crt/mbctype.h
+++ b/mingw-w64-headers/crt/mbctype.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_MBCTYPE
diff --git a/mingw-w64-headers/crt/mbstring.h b/mingw-w64-headers/crt/mbstring.h
index bbc11bb..9cd3cf3 100644
--- a/mingw-w64-headers/crt/mbstring.h
+++ b/mingw-w64-headers/crt/mbstring.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_MBSTRING
diff --git a/mingw-w64-headers/crt/mem.h b/mingw-w64-headers/crt/mem.h
index 4ace1b4..04f3af5 100644
--- a/mingw-w64-headers/crt/mem.h
+++ b/mingw-w64-headers/crt/mem.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 /*
diff --git a/mingw-w64-headers/crt/memory.h b/mingw-w64-headers/crt/memory.h
index f8abc82..f3d13df 100644
--- a/mingw-w64-headers/crt/memory.h
+++ b/mingw-w64-headers/crt/memory.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_MEMORY
diff --git a/mingw-w64-headers/crt/new.h b/mingw-w64-headers/crt/new.h
index 0c2790d..3e413c8 100644
--- a/mingw-w64-headers/crt/new.h
+++ b/mingw-w64-headers/crt/new.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_NEW
diff --git a/mingw-w64-headers/crt/process.h b/mingw-w64-headers/crt/process.h
index 434328c..d7e9e6c 100644
--- a/mingw-w64-headers/crt/process.h
+++ b/mingw-w64-headers/crt/process.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_PROCESS
diff --git a/mingw-w64-headers/crt/search.h b/mingw-w64-headers/crt/search.h
index c6262d3..2c72113 100644
--- a/mingw-w64-headers/crt/search.h
+++ b/mingw-w64-headers/crt/search.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_SEARCH
diff --git a/mingw-w64-headers/crt/sec_api/conio_s.h b/mingw-w64-headers/crt/sec_api/conio_s.h
index c7a046b..e873cbd 100644
--- a/mingw-w64-headers/crt/sec_api/conio_s.h
+++ b/mingw-w64-headers/crt/sec_api/conio_s.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 
diff --git a/mingw-w64-headers/crt/sec_api/crtdbg_s.h b/mingw-w64-headers/crt/sec_api/crtdbg_s.h
index 1d2a81f..33d020f 100644
--- a/mingw-w64-headers/crt/sec_api/crtdbg_s.h
+++ b/mingw-w64-headers/crt/sec_api/crtdbg_s.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 
diff --git a/mingw-w64-headers/crt/sec_api/io_s.h b/mingw-w64-headers/crt/sec_api/io_s.h
index fc598ba..af9b7e7 100644
--- a/mingw-w64-headers/crt/sec_api/io_s.h
+++ b/mingw-w64-headers/crt/sec_api/io_s.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_IO_S
diff --git a/mingw-w64-headers/crt/sec_api/mbstring_s.h b/mingw-w64-headers/crt/sec_api/mbstring_s.h
index 1164ac1..0d2de14 100644
--- a/mingw-w64-headers/crt/sec_api/mbstring_s.h
+++ b/mingw-w64-headers/crt/sec_api/mbstring_s.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_MBSTRING_S
diff --git a/mingw-w64-headers/crt/sec_api/memory_s.h b/mingw-w64-headers/crt/sec_api/memory_s.h
index 803f247..da95039 100644
--- a/mingw-w64-headers/crt/sec_api/memory_s.h
+++ b/mingw-w64-headers/crt/sec_api/memory_s.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_MEMORY_S
diff --git a/mingw-w64-headers/crt/sec_api/search_s.h b/mingw-w64-headers/crt/sec_api/search_s.h
index e11eb98..44383f1 100644
--- a/mingw-w64-headers/crt/sec_api/search_s.h
+++ b/mingw-w64-headers/crt/sec_api/search_s.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_SEARCH_S
diff --git a/mingw-w64-headers/crt/sec_api/stdio_s.h b/mingw-w64-headers/crt/sec_api/stdio_s.h
index 9eb9693..5028c1b 100644
--- a/mingw-w64-headers/crt/sec_api/stdio_s.h
+++ b/mingw-w64-headers/crt/sec_api/stdio_s.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_STDIO_S
diff --git a/mingw-w64-headers/crt/sec_api/stdlib_s.h b/mingw-w64-headers/crt/sec_api/stdlib_s.h
index 1c814e0..9fff3f3 100644
--- a/mingw-w64-headers/crt/sec_api/stdlib_s.h
+++ b/mingw-w64-headers/crt/sec_api/stdlib_s.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_STDLIB_S
diff --git a/mingw-w64-headers/crt/sec_api/stralign_s.h b/mingw-w64-headers/crt/sec_api/stralign_s.h
index 92ba557..ffda6a0 100644
--- a/mingw-w64-headers/crt/sec_api/stralign_s.h
+++ b/mingw-w64-headers/crt/sec_api/stralign_s.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __STRALIGN_H_S_
diff --git a/mingw-w64-headers/crt/sec_api/string_s.h b/mingw-w64-headers/crt/sec_api/string_s.h
index 14b80ba..b17c30c 100644
--- a/mingw-w64-headers/crt/sec_api/string_s.h
+++ b/mingw-w64-headers/crt/sec_api/string_s.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_STRING_S
diff --git a/mingw-w64-headers/crt/sec_api/sys/timeb_s.h b/mingw-w64-headers/crt/sec_api/sys/timeb_s.h
index 67fda3d..f635d32 100644
--- a/mingw-w64-headers/crt/sec_api/sys/timeb_s.h
+++ b/mingw-w64-headers/crt/sec_api/sys/timeb_s.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 
diff --git a/mingw-w64-headers/crt/sec_api/tchar_s.h b/mingw-w64-headers/crt/sec_api/tchar_s.h
index 449ad72..1dd6136 100644
--- a/mingw-w64-headers/crt/sec_api/tchar_s.h
+++ b/mingw-w64-headers/crt/sec_api/tchar_s.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_TCHAR_S
diff --git a/mingw-w64-headers/crt/sec_api/time_s.h b/mingw-w64-headers/crt/sec_api/time_s.h
index 9edfa43..bff6bfd9 100644
--- a/mingw-w64-headers/crt/sec_api/time_s.h
+++ b/mingw-w64-headers/crt/sec_api/time_s.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _TIME_H__S
diff --git a/mingw-w64-headers/crt/sec_api/wchar_s.h b/mingw-w64-headers/crt/sec_api/wchar_s.h
index ee4ebac..93c0f65 100644
--- a/mingw-w64-headers/crt/sec_api/wchar_s.h
+++ b/mingw-w64-headers/crt/sec_api/wchar_s.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_WCHAR_S
diff --git a/mingw-w64-headers/crt/sehmap.h b/mingw-w64-headers/crt/sehmap.h
index bd63728..b797899 100644
--- a/mingw-w64-headers/crt/sehmap.h
+++ b/mingw-w64-headers/crt/sehmap.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __cplusplus
diff --git a/mingw-w64-headers/crt/setjmp.h b/mingw-w64-headers/crt/setjmp.h
index 2a68097..5567591 100644
--- a/mingw-w64-headers/crt/setjmp.h
+++ b/mingw-w64-headers/crt/setjmp.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_SETJMP
diff --git a/mingw-w64-headers/crt/setjmpex.h b/mingw-w64-headers/crt/setjmpex.h
index 03cc209..c5540b9 100644
--- a/mingw-w64-headers/crt/setjmpex.h
+++ b/mingw-w64-headers/crt/setjmpex.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_SETJMPEX
diff --git a/mingw-w64-headers/crt/share.h b/mingw-w64-headers/crt/share.h
index 54e459e..be6d819 100644
--- a/mingw-w64-headers/crt/share.h
+++ b/mingw-w64-headers/crt/share.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_SHARE
diff --git a/mingw-w64-headers/crt/signal.h b/mingw-w64-headers/crt/signal.h
index 7c6a009..2ab7d81 100644
--- a/mingw-w64-headers/crt/signal.h
+++ b/mingw-w64-headers/crt/signal.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_SIGNAL
diff --git a/mingw-w64-headers/crt/stddef.h b/mingw-w64-headers/crt/stddef.h
index 1d61f5f..86ad3a6 100644
--- a/mingw-w64-headers/crt/stddef.h
+++ b/mingw-w64-headers/crt/stddef.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 
diff --git a/mingw-w64-headers/crt/stdexcpt.h b/mingw-w64-headers/crt/stdexcpt.h
index b3e2858..d0c2e24 100644
--- a/mingw-w64-headers/crt/stdexcpt.h
+++ b/mingw-w64-headers/crt/stdexcpt.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #include <_mingw.h>
diff --git a/mingw-w64-headers/crt/stdint.h b/mingw-w64-headers/crt/stdint.h
index c69e4d7..dc4c19e 100644
--- a/mingw-w64-headers/crt/stdint.h
+++ b/mingw-w64-headers/crt/stdint.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 /* ISO C9x  7.18  Integer types <stdint.h>
diff --git a/mingw-w64-headers/crt/stdio.h b/mingw-w64-headers/crt/stdio.h
index 1c6b473..ac578f9 100644
--- a/mingw-w64-headers/crt/stdio.h
+++ b/mingw-w64-headers/crt/stdio.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_STDIO
diff --git a/mingw-w64-headers/crt/stdlib.h b/mingw-w64-headers/crt/stdlib.h
index fec1977..41cafda 100644
--- a/mingw-w64-headers/crt/stdlib.h
+++ b/mingw-w64-headers/crt/stdlib.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_STDLIB
diff --git a/mingw-w64-headers/crt/string.h b/mingw-w64-headers/crt/string.h
index 565c558..666eb4f 100644
--- a/mingw-w64-headers/crt/string.h
+++ b/mingw-w64-headers/crt/string.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_STRING
diff --git a/mingw-w64-headers/crt/strings.h b/mingw-w64-headers/crt/strings.h
index 6e64629..be1e2c4 100644
--- a/mingw-w64-headers/crt/strings.h
+++ b/mingw-w64-headers/crt/strings.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 /*
diff --git a/mingw-w64-headers/crt/sys/cdefs.h b/mingw-w64-headers/crt/sys/cdefs.h
index 29a177f..7b169c5 100644
--- a/mingw-w64-headers/crt/sys/cdefs.h
+++ b/mingw-w64-headers/crt/sys/cdefs.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 
diff --git a/mingw-w64-headers/crt/sys/fcntl.h b/mingw-w64-headers/crt/sys/fcntl.h
index 8a0a4b8..d47db9f 100644
--- a/mingw-w64-headers/crt/sys/fcntl.h
+++ b/mingw-w64-headers/crt/sys/fcntl.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 /*
diff --git a/mingw-w64-headers/crt/sys/file.h b/mingw-w64-headers/crt/sys/file.h
index 5cc25de..898b4eb 100644
--- a/mingw-w64-headers/crt/sys/file.h
+++ b/mingw-w64-headers/crt/sys/file.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 /*
diff --git a/mingw-w64-headers/crt/sys/locking.h b/mingw-w64-headers/crt/sys/locking.h
index c1e2825..f4e195e 100644
--- a/mingw-w64-headers/crt/sys/locking.h
+++ b/mingw-w64-headers/crt/sys/locking.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_LOCKING
diff --git a/mingw-w64-headers/crt/sys/param.h b/mingw-w64-headers/crt/sys/param.h
index bd69934..47bbff0 100644
--- a/mingw-w64-headers/crt/sys/param.h
+++ b/mingw-w64-headers/crt/sys/param.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 /*
diff --git a/mingw-w64-headers/crt/sys/stat.h b/mingw-w64-headers/crt/sys/stat.h
index 4f82062..f62e42f 100644
--- a/mingw-w64-headers/crt/sys/stat.h
+++ b/mingw-w64-headers/crt/sys/stat.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_STAT
diff --git a/mingw-w64-headers/crt/sys/time.h b/mingw-w64-headers/crt/sys/time.h
index fbac85c..63c8c49 100644
--- a/mingw-w64-headers/crt/sys/time.h
+++ b/mingw-w64-headers/crt/sys/time.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 
diff --git a/mingw-w64-headers/crt/sys/timeb.h b/mingw-w64-headers/crt/sys/timeb.h
index 53adf7c..32de459 100644
--- a/mingw-w64-headers/crt/sys/timeb.h
+++ b/mingw-w64-headers/crt/sys/timeb.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _TIMEB_H_
diff --git a/mingw-w64-headers/crt/sys/types.h b/mingw-w64-headers/crt/sys/types.h
index 1993f5b..8a116d1 100644
--- a/mingw-w64-headers/crt/sys/types.h
+++ b/mingw-w64-headers/crt/sys/types.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_TYPES
diff --git a/mingw-w64-headers/crt/sys/unistd.h b/mingw-w64-headers/crt/sys/unistd.h
index 3baf694..6a6a893 100644
--- a/mingw-w64-headers/crt/sys/unistd.h
+++ b/mingw-w64-headers/crt/sys/unistd.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 /*
diff --git a/mingw-w64-headers/crt/sys/utime.h b/mingw-w64-headers/crt/sys/utime.h
index 9dca923..d080d66 100644
--- a/mingw-w64-headers/crt/sys/utime.h
+++ b/mingw-w64-headers/crt/sys/utime.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_UTIME
diff --git a/mingw-w64-headers/crt/syslimits.h b/mingw-w64-headers/crt/syslimits.h
index 2503c5d..8d301b3 100644
--- a/mingw-w64-headers/crt/syslimits.h
+++ b/mingw-w64-headers/crt/syslimits.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 /* syslimits.h stands for the system's own limits.h file.
diff --git a/mingw-w64-headers/crt/tchar.h b/mingw-w64-headers/crt/tchar.h
index e8dc6bb..ca5a08c 100644
--- a/mingw-w64-headers/crt/tchar.h
+++ b/mingw-w64-headers/crt/tchar.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #include <_mingw.h>
diff --git a/mingw-w64-headers/crt/time.h b/mingw-w64-headers/crt/time.h
index e1077ed..57c808c 100644
--- a/mingw-w64-headers/crt/time.h
+++ b/mingw-w64-headers/crt/time.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _TIME_H_
diff --git a/mingw-w64-headers/crt/uchar.h b/mingw-w64-headers/crt/uchar.h
index 8ccfdd0..72b377c 100644
--- a/mingw-w64-headers/crt/uchar.h
+++ b/mingw-w64-headers/crt/uchar.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 
diff --git a/mingw-w64-headers/crt/unistd.h b/mingw-w64-headers/crt/unistd.h
index 9cb791a..900d19a 100644
--- a/mingw-w64-headers/crt/unistd.h
+++ b/mingw-w64-headers/crt/unistd.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _UNISTD_H
diff --git a/mingw-w64-headers/crt/utime.h b/mingw-w64-headers/crt/utime.h
index 690425a..903fae4 100644
--- a/mingw-w64-headers/crt/utime.h
+++ b/mingw-w64-headers/crt/utime.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #include <sys/utime.h>
diff --git a/mingw-w64-headers/crt/vadefs.h b/mingw-w64-headers/crt/vadefs.h
index ae70b96..cbf1403 100644
--- a/mingw-w64-headers/crt/vadefs.h
+++ b/mingw-w64-headers/crt/vadefs.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_VADEFS
diff --git a/mingw-w64-headers/crt/varargs.h b/mingw-w64-headers/crt/varargs.h
index bd3ec15..e4b699b 100644
--- a/mingw-w64-headers/crt/varargs.h
+++ b/mingw-w64-headers/crt/varargs.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _VARARGS_H
diff --git a/mingw-w64-headers/crt/wchar.h b/mingw-w64-headers/crt/wchar.h
index 6d51cf2..6cb447f 100644
--- a/mingw-w64-headers/crt/wchar.h
+++ b/mingw-w64-headers/crt/wchar.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_WCHAR
diff --git a/mingw-w64-headers/crt/wctype.h b/mingw-w64-headers/crt/wctype.h
index 40a4921..a435529 100644
--- a/mingw-w64-headers/crt/wctype.h
+++ b/mingw-w64-headers/crt/wctype.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_WCTYPE
diff --git a/mingw-w64-headers/crt/xlocinfo.h b/mingw-w64-headers/crt/xlocinfo.h
index 1f43a16..6e08efa 100644
--- a/mingw-w64-headers/crt/xlocinfo.h
+++ b/mingw-w64-headers/crt/xlocinfo.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _XLOCINFO
diff --git a/mingw-w64-headers/crt/xmath.h b/mingw-w64-headers/crt/xmath.h
index d112d0e..6b47c19 100644
--- a/mingw-w64-headers/crt/xmath.h
+++ b/mingw-w64-headers/crt/xmath.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _XMATH
diff --git a/mingw-w64-headers/crt/ymath.h b/mingw-w64-headers/crt/ymath.h
index 8bfe14d..bd1dab6 100644
--- a/mingw-w64-headers/crt/ymath.h
+++ b/mingw-w64-headers/crt/ymath.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _YMATH
diff --git a/mingw-w64-headers/crt/yvals.h b/mingw-w64-headers/crt/yvals.h
index b984719..168ef99 100644
--- a/mingw-w64-headers/crt/yvals.h
+++ b/mingw-w64-headers/crt/yvals.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _YVALS
diff --git a/mingw-w64-headers/direct-x/include/_mingw_dxhelper.h b/mingw-w64-headers/direct-x/include/_mingw_dxhelper.h
index 0d43b1e..849e291 100644
--- a/mingw-w64-headers/direct-x/include/_mingw_dxhelper.h
+++ b/mingw-w64-headers/direct-x/include/_mingw_dxhelper.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER within this package.
  */
 
diff --git a/mingw-w64-headers/direct-x/include/dvdevcod.h b/mingw-w64-headers/direct-x/include/dvdevcod.h
index 2a5367d..43400ee 100644
--- a/mingw-w64-headers/direct-x/include/dvdevcod.h
+++ b/mingw-w64-headers/direct-x/include/dvdevcod.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _DVDEVCOD_H
diff --git a/mingw-w64-headers/direct-x/include/edevdefs.h b/mingw-w64-headers/direct-x/include/edevdefs.h
index 1dfc974..e0d2f03 100644
--- a/mingw-w64-headers/direct-x/include/edevdefs.h
+++ b/mingw-w64-headers/direct-x/include/edevdefs.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _EDEVDEFS_H
diff --git a/mingw-w64-headers/include/GL/gl.h b/mingw-w64-headers/include/GL/gl.h
index 543f29d..b10d413 100644
--- a/mingw-w64-headers/include/GL/gl.h
+++ b/mingw-w64-headers/include/GL/gl.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __gl_h_
diff --git a/mingw-w64-headers/include/GL/glaux.h b/mingw-w64-headers/include/GL/glaux.h
index 6e0846a..4072e88 100644
--- a/mingw-w64-headers/include/GL/glaux.h
+++ b/mingw-w64-headers/include/GL/glaux.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __GLAUX_H__
diff --git a/mingw-w64-headers/include/GL/glu.h b/mingw-w64-headers/include/GL/glu.h
index 8db2642..d5b277c 100644
--- a/mingw-w64-headers/include/GL/glu.h
+++ b/mingw-w64-headers/include/GL/glu.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __glu_h__
diff --git a/mingw-w64-headers/include/_dbdao.h b/mingw-w64-headers/include/_dbdao.h
index 66a81b9..7b97cb2 100644
--- a/mingw-w64-headers/include/_dbdao.h
+++ b/mingw-w64-headers/include/_dbdao.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __DBDAO_H_
diff --git a/mingw-w64-headers/include/accctrl.h b/mingw-w64-headers/include/accctrl.h
index ac84b90..2262e9a 100644
--- a/mingw-w64-headers/include/accctrl.h
+++ b/mingw-w64-headers/include/accctrl.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __ACCESS_CONTROL__
diff --git a/mingw-w64-headers/include/aclapi.h b/mingw-w64-headers/include/aclapi.h
index d54a786..f95fb71d 100644
--- a/mingw-w64-headers/include/aclapi.h
+++ b/mingw-w64-headers/include/aclapi.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __ACCESS_CONTROL_API__
diff --git a/mingw-w64-headers/include/aclui.h b/mingw-w64-headers/include/aclui.h
index 67a027f..858a05c 100644
--- a/mingw-w64-headers/include/aclui.h
+++ b/mingw-w64-headers/include/aclui.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _ACLUI_H_
diff --git a/mingw-w64-headers/include/activeds.h b/mingw-w64-headers/include/activeds.h
index fb6f2a0..0034f68 100644
--- a/mingw-w64-headers/include/activeds.h
+++ b/mingw-w64-headers/include/activeds.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #include "iads.h"
diff --git a/mingw-w64-headers/include/activscp.h b/mingw-w64-headers/include/activscp.h
index 22411f4..069789e 100644
--- a/mingw-w64-headers/include/activscp.h
+++ b/mingw-w64-headers/include/activscp.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/adc.h b/mingw-w64-headers/include/adc.h
index 9b7931d..66fd6c1 100644
--- a/mingw-w64-headers/include/adc.h
+++ b/mingw-w64-headers/include/adc.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef ADC_INCLUDED
diff --git a/mingw-w64-headers/include/adhoc.h b/mingw-w64-headers/include/adhoc.h
index 7684f77..2612411 100644
--- a/mingw-w64-headers/include/adhoc.h
+++ b/mingw-w64-headers/include/adhoc.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_ADHOC
diff --git a/mingw-w64-headers/include/admex.h b/mingw-w64-headers/include/admex.h
index 51b4d72..29a40b9 100644
--- a/mingw-w64-headers/include/admex.h
+++ b/mingw-w64-headers/include/admex.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/adoctint.h b/mingw-w64-headers/include/adoctint.h
index d88b69b..ee2cd2c 100644
--- a/mingw-w64-headers/include/adoctint.h
+++ b/mingw-w64-headers/include/adoctint.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _ADOCTINT_H_
diff --git a/mingw-w64-headers/include/adodef.h b/mingw-w64-headers/include/adodef.h
index f1b6a23..1adada2 100644
--- a/mingw-w64-headers/include/adodef.h
+++ b/mingw-w64-headers/include/adodef.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _ADODEF_H_
diff --git a/mingw-w64-headers/include/adogpool.h b/mingw-w64-headers/include/adogpool.h
index e652b46..b3163a3 100644
--- a/mingw-w64-headers/include/adogpool.h
+++ b/mingw-w64-headers/include/adogpool.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef INCLUDING_ADOGUIDS
diff --git a/mingw-w64-headers/include/adoguids.h b/mingw-w64-headers/include/adoguids.h
index 2811d5a..e984285 100644
--- a/mingw-w64-headers/include/adoguids.h
+++ b/mingw-w64-headers/include/adoguids.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __ADOGUIDS_H__
diff --git a/mingw-w64-headers/include/adoid.h b/mingw-w64-headers/include/adoid.h
index f4a1a8b..2815608 100644
--- a/mingw-w64-headers/include/adoid.h
+++ b/mingw-w64-headers/include/adoid.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _ADOID_H_
diff --git a/mingw-w64-headers/include/adoint.h b/mingw-w64-headers/include/adoint.h
index 81dae19..a678837 100644
--- a/mingw-w64-headers/include/adoint.h
+++ b/mingw-w64-headers/include/adoint.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _ADOINT_H_
diff --git a/mingw-w64-headers/include/adojet.h b/mingw-w64-headers/include/adojet.h
index 1b0fe37..e18e509 100644
--- a/mingw-w64-headers/include/adojet.h
+++ b/mingw-w64-headers/include/adojet.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/adomd.h b/mingw-w64-headers/include/adomd.h
index 04a51be..c9cc302 100644
--- a/mingw-w64-headers/include/adomd.h
+++ b/mingw-w64-headers/include/adomd.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/adptif.h b/mingw-w64-headers/include/adptif.h
index da5ff4a..1445aca 100644
--- a/mingw-w64-headers/include/adptif.h
+++ b/mingw-w64-headers/include/adptif.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _IPX_ADAPTER_
diff --git a/mingw-w64-headers/include/adsdb.h b/mingw-w64-headers/include/adsdb.h
index 954b496..0fe6ec3 100644
--- a/mingw-w64-headers/include/adsdb.h
+++ b/mingw-w64-headers/include/adsdb.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #define DBPROPFLAGS_ADSISEARCH 0x0000C000
diff --git a/mingw-w64-headers/include/adserr.h b/mingw-w64-headers/include/adserr.h
index 390a8a4..50a57d7 100644
--- a/mingw-w64-headers/include/adserr.h
+++ b/mingw-w64-headers/include/adserr.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifdef RC_INVOKED
diff --git a/mingw-w64-headers/include/adshlp.h b/mingw-w64-headers/include/adshlp.h
index 62e6420..528fe64 100644
--- a/mingw-w64-headers/include/adshlp.h
+++ b/mingw-w64-headers/include/adshlp.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _ADSHLP_
diff --git a/mingw-w64-headers/include/adsiid.h b/mingw-w64-headers/include/adsiid.h
index 7660a4b..41bf1d9 100644
--- a/mingw-w64-headers/include/adsiid.h
+++ b/mingw-w64-headers/include/adsiid.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __ADSIID_H__
diff --git a/mingw-w64-headers/include/adsnms.h b/mingw-w64-headers/include/adsnms.h
index 1fe4054..e0986f8 100644
--- a/mingw-w64-headers/include/adsnms.h
+++ b/mingw-w64-headers/include/adsnms.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifdef __cplusplus
diff --git a/mingw-w64-headers/include/adsprop.h b/mingw-w64-headers/include/adsprop.h
index 7f818f1..92e9f86 100644
--- a/mingw-w64-headers/include/adsprop.h
+++ b/mingw-w64-headers/include/adsprop.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _ADSPROP_H_
diff --git a/mingw-w64-headers/include/adssts.h b/mingw-w64-headers/include/adssts.h
index f20e0bb..8712207 100644
--- a/mingw-w64-headers/include/adssts.h
+++ b/mingw-w64-headers/include/adssts.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifdef __cplusplus
diff --git a/mingw-w64-headers/include/adtgen.h b/mingw-w64-headers/include/adtgen.h
index d08b6fb..13736df 100644
--- a/mingw-w64-headers/include/adtgen.h
+++ b/mingw-w64-headers/include/adtgen.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _ADTGEN_H
diff --git a/mingw-w64-headers/include/advpub.h b/mingw-w64-headers/include/advpub.h
index 1bba83a..6cf260a 100644
--- a/mingw-w64-headers/include/advpub.h
+++ b/mingw-w64-headers/include/advpub.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _ADVPUB_H_
diff --git a/mingw-w64-headers/include/af_irda.h b/mingw-w64-headers/include/af_irda.h
index 52eaa6e..d87583b 100644
--- a/mingw-w64-headers/include/af_irda.h
+++ b/mingw-w64-headers/include/af_irda.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __AFIRDA__
diff --git a/mingw-w64-headers/include/afxres.h b/mingw-w64-headers/include/afxres.h
index fa991c9..f23e2e4 100644
--- a/mingw-w64-headers/include/afxres.h
+++ b/mingw-w64-headers/include/afxres.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _AFXRES_H
diff --git a/mingw-w64-headers/include/agtctl.h b/mingw-w64-headers/include/agtctl.h
index 0c14409..fdd61db 100644
--- a/mingw-w64-headers/include/agtctl.h
+++ b/mingw-w64-headers/include/agtctl.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/agterr.h b/mingw-w64-headers/include/agterr.h
index a620114..dfb3a02 100644
--- a/mingw-w64-headers/include/agterr.h
+++ b/mingw-w64-headers/include/agterr.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _AgentError_h_
diff --git a/mingw-w64-headers/include/agtsvr.h b/mingw-w64-headers/include/agtsvr.h
index 0894006..15c827a 100644
--- a/mingw-w64-headers/include/agtsvr.h
+++ b/mingw-w64-headers/include/agtsvr.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/appmgmt.h b/mingw-w64-headers/include/appmgmt.h
index 49fd4d4..54255ed 100644
--- a/mingw-w64-headers/include/appmgmt.h
+++ b/mingw-w64-headers/include/appmgmt.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _APPMGMT_H_
diff --git a/mingw-w64-headers/include/aqadmtyp.h b/mingw-w64-headers/include/aqadmtyp.h
index e387b66..7f8772b 100644
--- a/mingw-w64-headers/include/aqadmtyp.h
+++ b/mingw-w64-headers/include/aqadmtyp.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __AQADMTYP_H__
diff --git a/mingw-w64-headers/include/asptlb.h b/mingw-w64-headers/include/asptlb.h
index da67003..3b21727 100644
--- a/mingw-w64-headers/include/asptlb.h
+++ b/mingw-w64-headers/include/asptlb.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/atacct.h b/mingw-w64-headers/include/atacct.h
index 56ec4ed..2eed65c 100644
--- a/mingw-w64-headers/include/atacct.h
+++ b/mingw-w64-headers/include/atacct.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_ATACCT
diff --git a/mingw-w64-headers/include/atalkwsh.h b/mingw-w64-headers/include/atalkwsh.h
index da95896..2556b11 100644
--- a/mingw-w64-headers/include/atalkwsh.h
+++ b/mingw-w64-headers/include/atalkwsh.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _ATALKWSH_
diff --git a/mingw-w64-headers/include/audioapotypes.h b/mingw-w64-headers/include/audioapotypes.h
index c91f193..5288204 100644
--- a/mingw-w64-headers/include/audioapotypes.h
+++ b/mingw-w64-headers/include/audioapotypes.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __INC_AUDIOAPOTYPES__
diff --git a/mingw-w64-headers/include/audioengineendpoint.h b/mingw-w64-headers/include/audioengineendpoint.h
index 9fcded2..eb2a227 100644
--- a/mingw-w64-headers/include/audioengineendpoint.h
+++ b/mingw-w64-headers/include/audioengineendpoint.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __INC_AUDIOENGINEENDPOINT__
diff --git a/mingw-w64-headers/include/audiosessiontypes.h b/mingw-w64-headers/include/audiosessiontypes.h
index eff494d..4c0846b 100644
--- a/mingw-w64-headers/include/audiosessiontypes.h
+++ b/mingw-w64-headers/include/audiosessiontypes.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __INC_AUDIOSESSIONTYPES__
diff --git a/mingw-w64-headers/include/authif.h b/mingw-w64-headers/include/authif.h
index b36c859..d51e173 100644
--- a/mingw-w64-headers/include/authif.h
+++ b/mingw-w64-headers/include/authif.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _AUTHIF_H_
diff --git a/mingw-w64-headers/include/authz.h b/mingw-w64-headers/include/authz.h
index d48c908..9c7e81c 100644
--- a/mingw-w64-headers/include/authz.h
+++ b/mingw-w64-headers/include/authz.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __AUTHZ_H__
diff --git a/mingw-w64-headers/include/avifmt.h b/mingw-w64-headers/include/avifmt.h
index 4e27434..7caf65a 100644
--- a/mingw-w64-headers/include/avifmt.h
+++ b/mingw-w64-headers/include/avifmt.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 
diff --git a/mingw-w64-headers/include/avrt.h b/mingw-w64-headers/include/avrt.h
index ea7c966..06dba50 100644
--- a/mingw-w64-headers/include/avrt.h
+++ b/mingw-w64-headers/include/avrt.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_AVRT
diff --git a/mingw-w64-headers/include/azroles.h b/mingw-w64-headers/include/azroles.h
index 54a060a..55116d0 100644
--- a/mingw-w64-headers/include/azroles.h
+++ b/mingw-w64-headers/include/azroles.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/basetsd.h b/mingw-w64-headers/include/basetsd.h
index f63099a..b04561f 100644
--- a/mingw-w64-headers/include/basetsd.h
+++ b/mingw-w64-headers/include/basetsd.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #include <_mingw.h>
diff --git a/mingw-w64-headers/include/basetyps.h b/mingw-w64-headers/include/basetyps.h
index 6c74d76..52f0c0a 100644
--- a/mingw-w64-headers/include/basetyps.h
+++ b/mingw-w64-headers/include/basetyps.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #if !defined(_BASETYPS_H_)
diff --git a/mingw-w64-headers/include/batclass.h b/mingw-w64-headers/include/batclass.h
index 0824991..094df14 100644
--- a/mingw-w64-headers/include/batclass.h
+++ b/mingw-w64-headers/include/batclass.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 DEFINE_GUID(GUID_DEVICE_BATTERY,0x72631e54L,0x78A4,0x11d0,0xbc,0xf7,0x00,0xaa,0x00,0xb7,0xb3,0x2a);
diff --git a/mingw-w64-headers/include/bcrypt.h b/mingw-w64-headers/include/bcrypt.h
index 5b86483..b567b4e 100644
--- a/mingw-w64-headers/include/bcrypt.h
+++ b/mingw-w64-headers/include/bcrypt.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 
diff --git a/mingw-w64-headers/include/bdaiface.h b/mingw-w64-headers/include/bdaiface.h
index 5a8a2ab..ec57204 100644
--- a/mingw-w64-headers/include/bdaiface.h
+++ b/mingw-w64-headers/include/bdaiface.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __INC_BDAIFACE__
diff --git a/mingw-w64-headers/include/bh.h b/mingw-w64-headers/include/bh.h
index 31b6b1e..6c0f03c 100644
--- a/mingw-w64-headers/include/bh.h
+++ b/mingw-w64-headers/include/bh.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #include "netmon.h"
diff --git a/mingw-w64-headers/include/bidispl.h b/mingw-w64-headers/include/bidispl.h
index 7aeabac..9330efa 100644
--- a/mingw-w64-headers/include/bidispl.h
+++ b/mingw-w64-headers/include/bidispl.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/bits.h b/mingw-w64-headers/include/bits.h
index 5dc3e48..6f971ee 100644
--- a/mingw-w64-headers/include/bits.h
+++ b/mingw-w64-headers/include/bits.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/bits1_5.h b/mingw-w64-headers/include/bits1_5.h
index 9b700b7..9824c0f 100644
--- a/mingw-w64-headers/include/bits1_5.h
+++ b/mingw-w64-headers/include/bits1_5.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/bits2_0.h b/mingw-w64-headers/include/bits2_0.h
index 893380e..a9364cf 100644
--- a/mingw-w64-headers/include/bits2_0.h
+++ b/mingw-w64-headers/include/bits2_0.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/bitscfg.h b/mingw-w64-headers/include/bitscfg.h
index 58ed85e..3cf75e8 100644
--- a/mingw-w64-headers/include/bitscfg.h
+++ b/mingw-w64-headers/include/bitscfg.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/bitsmsg.h b/mingw-w64-headers/include/bitsmsg.h
index 5dd730b..4c9e748 100644
--- a/mingw-w64-headers/include/bitsmsg.h
+++ b/mingw-w64-headers/include/bitsmsg.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _BGCPYMSG_
diff --git a/mingw-w64-headers/include/blberr.h b/mingw-w64-headers/include/blberr.h
index 8a680c0..451d346 100644
--- a/mingw-w64-headers/include/blberr.h
+++ b/mingw-w64-headers/include/blberr.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __SDPBLB_ERROR_CODES__
diff --git a/mingw-w64-headers/include/bluetoothapis.h b/mingw-w64-headers/include/bluetoothapis.h
index 82ad4f5..b6a1185 100644
--- a/mingw-w64-headers/include/bluetoothapis.h
+++ b/mingw-w64-headers/include/bluetoothapis.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_BLUETOOTHAPIS
diff --git a/mingw-w64-headers/include/bthdef.h b/mingw-w64-headers/include/bthdef.h
index 7bcb4ac..8213aff 100644
--- a/mingw-w64-headers/include/bthdef.h
+++ b/mingw-w64-headers/include/bthdef.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_BTHDEF
diff --git a/mingw-w64-headers/include/bthsdpdef.h b/mingw-w64-headers/include/bthsdpdef.h
index c3e6f4c..dbd4a85 100644
--- a/mingw-w64-headers/include/bthsdpdef.h
+++ b/mingw-w64-headers/include/bthsdpdef.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_BTHSDPDEF
diff --git a/mingw-w64-headers/include/callobj.h b/mingw-w64-headers/include/callobj.h
index 190fc08..77e966f 100644
--- a/mingw-w64-headers/include/callobj.h
+++ b/mingw-w64-headers/include/callobj.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/cardmod.h b/mingw-w64-headers/include/cardmod.h
index 1f0b27c..9dbd2d8 100644
--- a/mingw-w64-headers/include/cardmod.h
+++ b/mingw-w64-headers/include/cardmod.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 
diff --git a/mingw-w64-headers/include/casetup.h b/mingw-w64-headers/include/casetup.h
index 60d6134..6598b4e 100644
--- a/mingw-w64-headers/include/casetup.h
+++ b/mingw-w64-headers/include/casetup.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_CASETUP
diff --git a/mingw-w64-headers/include/cchannel.h b/mingw-w64-headers/include/cchannel.h
index 7206949..6f6706b 100644
--- a/mingw-w64-headers/include/cchannel.h
+++ b/mingw-w64-headers/include/cchannel.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef H_CCHANNEL
diff --git a/mingw-w64-headers/include/cderr.h b/mingw-w64-headers/include/cderr.h
index 2f66515..8e22bf5 100644
--- a/mingw-w64-headers/include/cderr.h
+++ b/mingw-w64-headers/include/cderr.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_CDERR
diff --git a/mingw-w64-headers/include/cdoex.h b/mingw-w64-headers/include/cdoex.h
index 723f308..b4e5bd7 100644
--- a/mingw-w64-headers/include/cdoex.h
+++ b/mingw-w64-headers/include/cdoex.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/cdoexerr.h b/mingw-w64-headers/include/cdoexerr.h
index 575dc51..1615881 100644
--- a/mingw-w64-headers/include/cdoexerr.h
+++ b/mingw-w64-headers/include/cdoexerr.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #define categoryHeader 0x00000001L
diff --git a/mingw-w64-headers/include/cdoexm.h b/mingw-w64-headers/include/cdoexm.h
index 5f06f40..cf82cb9 100644
--- a/mingw-w64-headers/include/cdoexm.h
+++ b/mingw-w64-headers/include/cdoexm.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/cdoexstr.h b/mingw-w64-headers/include/cdoexstr.h
index 830edee..27c3f78 100644
--- a/mingw-w64-headers/include/cdoexstr.h
+++ b/mingw-w64-headers/include/cdoexstr.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __cdostr_h_
diff --git a/mingw-w64-headers/include/cdonts.h b/mingw-w64-headers/include/cdonts.h
index fc63f81..0a8cf4b 100644
--- a/mingw-w64-headers/include/cdonts.h
+++ b/mingw-w64-headers/include/cdonts.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/cdosys.h b/mingw-w64-headers/include/cdosys.h
index d2e6084..2052138 100644
--- a/mingw-w64-headers/include/cdosys.h
+++ b/mingw-w64-headers/include/cdosys.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/cdosyserr.h b/mingw-w64-headers/include/cdosyserr.h
index b348d67..a426df1 100644
--- a/mingw-w64-headers/include/cdosyserr.h
+++ b/mingw-w64-headers/include/cdosyserr.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #define categoryHeader 0x00000001L
diff --git a/mingw-w64-headers/include/cdosysstr.h b/mingw-w64-headers/include/cdosysstr.h
index 54f9bd2..25b671d 100644
--- a/mingw-w64-headers/include/cdosysstr.h
+++ b/mingw-w64-headers/include/cdosysstr.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __cdostr_h_
diff --git a/mingw-w64-headers/include/celib.h b/mingw-w64-headers/include/celib.h
index f535ab8..7cbbe51 100644
--- a/mingw-w64-headers/include/celib.h
+++ b/mingw-w64-headers/include/celib.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __CELIB_H__
diff --git a/mingw-w64-headers/include/certadm.h b/mingw-w64-headers/include/certadm.h
index d42f3a6..bbdd822 100644
--- a/mingw-w64-headers/include/certadm.h
+++ b/mingw-w64-headers/include/certadm.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/certbase.h b/mingw-w64-headers/include/certbase.h
index dee8c8a..219a579 100644
--- a/mingw-w64-headers/include/certbase.h
+++ b/mingw-w64-headers/include/certbase.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/certbcli.h b/mingw-w64-headers/include/certbcli.h
index 06b5add..fed26d8 100644
--- a/mingw-w64-headers/include/certbcli.h
+++ b/mingw-w64-headers/include/certbcli.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifdef _CERTBCLI_TYPECHECK
diff --git a/mingw-w64-headers/include/certcli.h b/mingw-w64-headers/include/certcli.h
index 1335287..07657e9 100644
--- a/mingw-w64-headers/include/certcli.h
+++ b/mingw-w64-headers/include/certcli.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/certenc.h b/mingw-w64-headers/include/certenc.h
index d6af16f..8f30380 100644
--- a/mingw-w64-headers/include/certenc.h
+++ b/mingw-w64-headers/include/certenc.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/certenroll.h b/mingw-w64-headers/include/certenroll.h
index e3b4b4d..6dbe74e 100644
--- a/mingw-w64-headers/include/certenroll.h
+++ b/mingw-w64-headers/include/certenroll.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_CERTENROLL
diff --git a/mingw-w64-headers/include/certexit.h b/mingw-w64-headers/include/certexit.h
index 1bd7fe8..5bde0b8 100644
--- a/mingw-w64-headers/include/certexit.h
+++ b/mingw-w64-headers/include/certexit.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/certif.h b/mingw-w64-headers/include/certif.h
index 1867df2..2fece84 100644
--- a/mingw-w64-headers/include/certif.h
+++ b/mingw-w64-headers/include/certif.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/certmod.h b/mingw-w64-headers/include/certmod.h
index 59b106a..306bbae 100644
--- a/mingw-w64-headers/include/certmod.h
+++ b/mingw-w64-headers/include/certmod.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/certpol.h b/mingw-w64-headers/include/certpol.h
index c72c90e..725843a 100644
--- a/mingw-w64-headers/include/certpol.h
+++ b/mingw-w64-headers/include/certpol.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/certreqd.h b/mingw-w64-headers/include/certreqd.h
index 6a322fc..f13f59a 100644
--- a/mingw-w64-headers/include/certreqd.h
+++ b/mingw-w64-headers/include/certreqd.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/certsrv.h b/mingw-w64-headers/include/certsrv.h
index 0de367c..e7d6429 100644
--- a/mingw-w64-headers/include/certsrv.h
+++ b/mingw-w64-headers/include/certsrv.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #if !defined(_CERTSRV_H_)
diff --git a/mingw-w64-headers/include/certview.h b/mingw-w64-headers/include/certview.h
index f61a220..fcdd807 100644
--- a/mingw-w64-headers/include/certview.h
+++ b/mingw-w64-headers/include/certview.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/cfg.h b/mingw-w64-headers/include/cfg.h
index 929f335..878849d 100644
--- a/mingw-w64-headers/include/cfg.h
+++ b/mingw-w64-headers/include/cfg.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _CFG_INCLUDED_
diff --git a/mingw-w64-headers/include/cfgmgr32.h b/mingw-w64-headers/include/cfgmgr32.h
index affe6c8..b51a8ad 100644
--- a/mingw-w64-headers/include/cfgmgr32.h
+++ b/mingw-w64-headers/include/cfgmgr32.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _CFGMGR32_H_
diff --git a/mingw-w64-headers/include/cguid.h b/mingw-w64-headers/include/cguid.h
index 6c57eee..99b93b0 100644
--- a/mingw-w64-headers/include/cguid.h
+++ b/mingw-w64-headers/include/cguid.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __CGUID_H__
diff --git a/mingw-w64-headers/include/chanmgr.h b/mingw-w64-headers/include/chanmgr.h
index a4b03bb..2136e07 100644
--- a/mingw-w64-headers/include/chanmgr.h
+++ b/mingw-w64-headers/include/chanmgr.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/cierror.h b/mingw-w64-headers/include/cierror.h
index eecb0c0..cfe348a 100644
--- a/mingw-w64-headers/include/cierror.h
+++ b/mingw-w64-headers/include/cierror.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _CIERROR_H_
diff --git a/mingw-w64-headers/include/clfs.h b/mingw-w64-headers/include/clfs.h
index 404d8f6..6a89195 100644
--- a/mingw-w64-headers/include/clfs.h
+++ b/mingw-w64-headers/include/clfs.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_CLFS
diff --git a/mingw-w64-headers/include/clfsmgmt.h b/mingw-w64-headers/include/clfsmgmt.h
index 8d8965c..a81bc57 100644
--- a/mingw-w64-headers/include/clfsmgmt.h
+++ b/mingw-w64-headers/include/clfsmgmt.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_CLFSMGMT
diff --git a/mingw-w64-headers/include/clfsmgmtw32.h b/mingw-w64-headers/include/clfsmgmtw32.h
index 16ea5f7..81a45ce 100644
--- a/mingw-w64-headers/include/clfsmgmtw32.h
+++ b/mingw-w64-headers/include/clfsmgmtw32.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_CLFSMGMTW32
diff --git a/mingw-w64-headers/include/clfsw32.h b/mingw-w64-headers/include/clfsw32.h
index f9dea58..ca5da69 100644
--- a/mingw-w64-headers/include/clfsw32.h
+++ b/mingw-w64-headers/include/clfsw32.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_CLFSW32
diff --git a/mingw-w64-headers/include/cluadmex.h b/mingw-w64-headers/include/cluadmex.h
index 3e1b92d..0f1da07 100644
--- a/mingw-w64-headers/include/cluadmex.h
+++ b/mingw-w64-headers/include/cluadmex.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/clusapi.h b/mingw-w64-headers/include/clusapi.h
index cf328a2..5feecb1 100644
--- a/mingw-w64-headers/include/clusapi.h
+++ b/mingw-w64-headers/include/clusapi.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _CLUSTER_API_
diff --git a/mingw-w64-headers/include/cluscfgguids.h b/mingw-w64-headers/include/cluscfgguids.h
index c5905f0..0075917 100644
--- a/mingw-w64-headers/include/cluscfgguids.h
+++ b/mingw-w64-headers/include/cluscfgguids.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 DEFINE_GUID(CATID_ClusCfgCapabilities,0x4653eec4,0x2788,0x4ebd,0xa8,0x31,0x7e,0xd,0x9f,0x82,0xd6,0xe7);
diff --git a/mingw-w64-headers/include/cluscfgserver.h b/mingw-w64-headers/include/cluscfgserver.h
index 1708985..7953822 100644
--- a/mingw-w64-headers/include/cluscfgserver.h
+++ b/mingw-w64-headers/include/cluscfgserver.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/cluscfgwizard.h b/mingw-w64-headers/include/cluscfgwizard.h
index 6a35cfa..8c978fd 100644
--- a/mingw-w64-headers/include/cluscfgwizard.h
+++ b/mingw-w64-headers/include/cluscfgwizard.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/cmdtree.h b/mingw-w64-headers/include/cmdtree.h
index 585d985..c2310b8 100644
--- a/mingw-w64-headers/include/cmdtree.h
+++ b/mingw-w64-headers/include/cmdtree.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/cmnquery.h b/mingw-w64-headers/include/cmnquery.h
index 052f59e..ee4fb18 100644
--- a/mingw-w64-headers/include/cmnquery.h
+++ b/mingw-w64-headers/include/cmnquery.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __cmnquery_h
diff --git a/mingw-w64-headers/include/codecapi.h b/mingw-w64-headers/include/codecapi.h
index a79c064..03c70f0 100644
--- a/mingw-w64-headers/include/codecapi.h
+++ b/mingw-w64-headers/include/codecapi.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_CODECAPI
diff --git a/mingw-w64-headers/include/color.dlg b/mingw-w64-headers/include/color.dlg
index 9b3c0f6..157ac09 100644
--- a/mingw-w64-headers/include/color.dlg
+++ b/mingw-w64-headers/include/color.dlg
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #include <colordlg.h>
diff --git a/mingw-w64-headers/include/colordlg.h b/mingw-w64-headers/include/colordlg.h
index afbdd06..4d38517 100644
--- a/mingw-w64-headers/include/colordlg.h
+++ b/mingw-w64-headers/include/colordlg.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #define DLG_COLOR 10
diff --git a/mingw-w64-headers/include/comadmin.h b/mingw-w64-headers/include/comadmin.h
index 52b2fd3..934bee4 100644
--- a/mingw-w64-headers/include/comadmin.h
+++ b/mingw-w64-headers/include/comadmin.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/comcat.idl b/mingw-w64-headers/include/comcat.idl
index a009ef1..ca5e22f 100644
--- a/mingw-w64-headers/include/comcat.idl
+++ b/mingw-w64-headers/include/comcat.idl
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 
diff --git a/mingw-w64-headers/include/comdef.h b/mingw-w64-headers/include/comdef.h
index 54e4113..dccc9b0 100644
--- a/mingw-w64-headers/include/comdef.h
+++ b/mingw-w64-headers/include/comdef.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_COMDEF
diff --git a/mingw-w64-headers/include/comdefsp.h b/mingw-w64-headers/include/comdefsp.h
index 642f158..e171b74 100644
--- a/mingw-w64-headers/include/comdefsp.h
+++ b/mingw-w64-headers/include/comdefsp.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #if !defined(_INC_COMDEFSP)
diff --git a/mingw-w64-headers/include/comip.h b/mingw-w64-headers/include/comip.h
index 0c59edc..628e765 100644
--- a/mingw-w64-headers/include/comip.h
+++ b/mingw-w64-headers/include/comip.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_COMIP
diff --git a/mingw-w64-headers/include/commctrl.h b/mingw-w64-headers/include/commctrl.h
index 42592b2..bbe4e1b 100644
--- a/mingw-w64-headers/include/commctrl.h
+++ b/mingw-w64-headers/include/commctrl.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_COMMCTRL
diff --git a/mingw-w64-headers/include/commctrl.rh b/mingw-w64-headers/include/commctrl.rh
index 1f324d3..e71a922 100644
--- a/mingw-w64-headers/include/commctrl.rh
+++ b/mingw-w64-headers/include/commctrl.rh
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #define HDS_HORZ 0x0
diff --git a/mingw-w64-headers/include/commdlg.h b/mingw-w64-headers/include/commdlg.h
index d9033f0..c8c1feb 100644
--- a/mingw-w64-headers/include/commdlg.h
+++ b/mingw-w64-headers/include/commdlg.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_COMMDLG
diff --git a/mingw-w64-headers/include/common.ver b/mingw-w64-headers/include/common.ver
index bd05407..29acdc2 100644
--- a/mingw-w64-headers/include/common.ver
+++ b/mingw-w64-headers/include/common.ver
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef VER_LEGALCOPYRIGHT_YEARS
diff --git a/mingw-w64-headers/include/commoncontrols.h b/mingw-w64-headers/include/commoncontrols.h
index b65a3e5..d03579c 100644
--- a/mingw-w64-headers/include/commoncontrols.h
+++ b/mingw-w64-headers/include/commoncontrols.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/compobj.h b/mingw-w64-headers/include/compobj.h
index 937928b..343087b 100644
--- a/mingw-w64-headers/include/compobj.h
+++ b/mingw-w64-headers/include/compobj.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef RC_INVOKED
diff --git a/mingw-w64-headers/include/comsvcs.h b/mingw-w64-headers/include/comsvcs.h
index bb0b087..924b5bc 100644
--- a/mingw-w64-headers/include/comsvcs.h
+++ b/mingw-w64-headers/include/comsvcs.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/comutil.h b/mingw-w64-headers/include/comutil.h
index 1f40725..202a35a 100644
--- a/mingw-w64-headers/include/comutil.h
+++ b/mingw-w64-headers/include/comutil.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_COMUTIL
diff --git a/mingw-w64-headers/include/confpriv.h b/mingw-w64-headers/include/confpriv.h
index 145d923..ed9bf11 100644
--- a/mingw-w64-headers/include/confpriv.h
+++ b/mingw-w64-headers/include/confpriv.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/control.h b/mingw-w64-headers/include/control.h
index b012239..27e8236 100644
--- a/mingw-w64-headers/include/control.h
+++ b/mingw-w64-headers/include/control.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/correg.h b/mingw-w64-headers/include/correg.h
index 2648f19..eaad79e 100644
--- a/mingw-w64-headers/include/correg.h
+++ b/mingw-w64-headers/include/correg.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _CORREG_H_
diff --git a/mingw-w64-headers/include/cpl.h b/mingw-w64-headers/include/cpl.h
index 7c95df5..c7d95b3 100644
--- a/mingw-w64-headers/include/cpl.h
+++ b/mingw-w64-headers/include/cpl.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_CPL
diff --git a/mingw-w64-headers/include/cplext.h b/mingw-w64-headers/include/cplext.h
index 1565dc9..4f22dcc 100644
--- a/mingw-w64-headers/include/cplext.h
+++ b/mingw-w64-headers/include/cplext.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_CPLEXT
diff --git a/mingw-w64-headers/include/credssp.h b/mingw-w64-headers/include/credssp.h
index b0605cb..c0ee7f7 100644
--- a/mingw-w64-headers/include/credssp.h
+++ b/mingw-w64-headers/include/credssp.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_CREDSSP
diff --git a/mingw-w64-headers/include/cryptuiapi.h b/mingw-w64-headers/include/cryptuiapi.h
index f7b8c9a..bd5967f 100644
--- a/mingw-w64-headers/include/cryptuiapi.h
+++ b/mingw-w64-headers/include/cryptuiapi.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __CRYPTUIAPI_H__
diff --git a/mingw-w64-headers/include/cryptxml.h b/mingw-w64-headers/include/cryptxml.h
index f47a831..76614cc 100644
--- a/mingw-w64-headers/include/cryptxml.h
+++ b/mingw-w64-headers/include/cryptxml.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 
diff --git a/mingw-w64-headers/include/cscapi.h b/mingw-w64-headers/include/cscapi.h
index 9ae03da..472b128 100644
--- a/mingw-w64-headers/include/cscapi.h
+++ b/mingw-w64-headers/include/cscapi.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_CSCAPI
diff --git a/mingw-w64-headers/include/cscobj.h b/mingw-w64-headers/include/cscobj.h
index 4b6b7da..46b8a82 100644
--- a/mingw-w64-headers/include/cscobj.h
+++ b/mingw-w64-headers/include/cscobj.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_CSCOBJ
diff --git a/mingw-w64-headers/include/ctxtcall.h b/mingw-w64-headers/include/ctxtcall.h
index e056d5e..9fa8ec4 100644
--- a/mingw-w64-headers/include/ctxtcall.h
+++ b/mingw-w64-headers/include/ctxtcall.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/custcntl.h b/mingw-w64-headers/include/custcntl.h
index 6b626ed..2e88b42 100644
--- a/mingw-w64-headers/include/custcntl.h
+++ b/mingw-w64-headers/include/custcntl.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_CUSTCNTL
diff --git a/mingw-w64-headers/include/d2d1.h b/mingw-w64-headers/include/d2d1.h
index 830b811..1749915 100644
--- a/mingw-w64-headers/include/d2d1.h
+++ b/mingw-w64-headers/include/d2d1.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
 
  * d2d1.h - Header file for the Direct2D API
diff --git a/mingw-w64-headers/include/d2d1helper.h b/mingw-w64-headers/include/d2d1helper.h
index 3062e89..70089ae 100644
--- a/mingw-w64-headers/include/d2d1helper.h
+++ b/mingw-w64-headers/include/d2d1helper.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_D2D1HELPER
diff --git a/mingw-w64-headers/include/d2dbasetypes.h b/mingw-w64-headers/include/d2dbasetypes.h
index 7d7e9e5..d1e00cc 100644
--- a/mingw-w64-headers/include/d2dbasetypes.h
+++ b/mingw-w64-headers/include/d2dbasetypes.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
 
  * d2dbasetypes.h - Header file for the Direct2D API
diff --git a/mingw-w64-headers/include/d2derr.h b/mingw-w64-headers/include/d2derr.h
index 4964267..05f0a57 100644
--- a/mingw-w64-headers/include/d2derr.h
+++ b/mingw-w64-headers/include/d2derr.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
 
  * d2derr.h - Header file for the Direct2D API
diff --git a/mingw-w64-headers/include/daogetrw.h b/mingw-w64-headers/include/daogetrw.h
index 1aaa7e8..709688b 100644
--- a/mingw-w64-headers/include/daogetrw.h
+++ b/mingw-w64-headers/include/daogetrw.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #if !defined (_DAOGETRW_H_)
diff --git a/mingw-w64-headers/include/datapath.h b/mingw-w64-headers/include/datapath.h
index eb8a738..6034049 100644
--- a/mingw-w64-headers/include/datapath.h
+++ b/mingw-w64-headers/include/datapath.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #include "rpc.h"
diff --git a/mingw-w64-headers/include/davclnt.h b/mingw-w64-headers/include/davclnt.h
index 81968b1..d06c5f7 100644
--- a/mingw-w64-headers/include/davclnt.h
+++ b/mingw-w64-headers/include/davclnt.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_DAVCLNT
diff --git a/mingw-w64-headers/include/dbdaoerr.h b/mingw-w64-headers/include/dbdaoerr.h
index e33fed4..44631fa 100644
--- a/mingw-w64-headers/include/dbdaoerr.h
+++ b/mingw-w64-headers/include/dbdaoerr.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _DDAOERR_H_
diff --git a/mingw-w64-headers/include/dbdaoid.h b/mingw-w64-headers/include/dbdaoid.h
index c9cbe13..1c5e5b9 100644
--- a/mingw-w64-headers/include/dbdaoid.h
+++ b/mingw-w64-headers/include/dbdaoid.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 DEFINE_OLEGUID(LIBID_CJETSQLHELP,0x00025f01,0,0);
diff --git a/mingw-w64-headers/include/dbdaoint.h b/mingw-w64-headers/include/dbdaoint.h
index d158776..fd39b91 100644
--- a/mingw-w64-headers/include/dbdaoint.h
+++ b/mingw-w64-headers/include/dbdaoint.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _DBDAOINT_H_
diff --git a/mingw-w64-headers/include/dbgautoattach.h b/mingw-w64-headers/include/dbgautoattach.h
index 2e715b3..36268d3 100644
--- a/mingw-w64-headers/include/dbgautoattach.h
+++ b/mingw-w64-headers/include/dbgautoattach.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/dbgeng.h b/mingw-w64-headers/include/dbgeng.h
index ef54635..21fdba7 100644
--- a/mingw-w64-headers/include/dbgeng.h
+++ b/mingw-w64-headers/include/dbgeng.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __DBGENG_H__
diff --git a/mingw-w64-headers/include/dbghelp.h b/mingw-w64-headers/include/dbghelp.h
index 188b4d9..adee3a6 100644
--- a/mingw-w64-headers/include/dbghelp.h
+++ b/mingw-w64-headers/include/dbghelp.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _DBGHELP_
diff --git a/mingw-w64-headers/include/dbgprop.h b/mingw-w64-headers/include/dbgprop.h
index d582305..f1d810e 100644
--- a/mingw-w64-headers/include/dbgprop.h
+++ b/mingw-w64-headers/include/dbgprop.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/dbt.h b/mingw-w64-headers/include/dbt.h
index d0d5653..7d44eaa 100644
--- a/mingw-w64-headers/include/dbt.h
+++ b/mingw-w64-headers/include/dbt.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _DBT_H
diff --git a/mingw-w64-headers/include/dciddi.h b/mingw-w64-headers/include/dciddi.h
index 16514bd..7b8aae0 100644
--- a/mingw-w64-headers/include/dciddi.h
+++ b/mingw-w64-headers/include/dciddi.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_DCIDDI
diff --git a/mingw-w64-headers/include/dciman.h b/mingw-w64-headers/include/dciman.h
index 6280203..0c64c7d 100644
--- a/mingw-w64-headers/include/dciman.h
+++ b/mingw-w64-headers/include/dciman.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_DCIMAN
diff --git a/mingw-w64-headers/include/dcommon.h b/mingw-w64-headers/include/dcommon.h
index 099c9e1..86fabcc 100644
--- a/mingw-w64-headers/include/dcommon.h
+++ b/mingw-w64-headers/include/dcommon.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __INC_DCOMMON__
diff --git a/mingw-w64-headers/include/dde.h b/mingw-w64-headers/include/dde.h
index 1c91daa..eb1d2a6 100644
--- a/mingw-w64-headers/include/dde.h
+++ b/mingw-w64-headers/include/dde.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _DDEHEADER_INCLUDED_
diff --git a/mingw-w64-headers/include/dde.rh b/mingw-w64-headers/include/dde.rh
index 44c55cb..969db26 100644
--- a/mingw-w64-headers/include/dde.rh
+++ b/mingw-w64-headers/include/dde.rh
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #define WM_DDE_FIRST 0x03E0
diff --git a/mingw-w64-headers/include/ddeml.h b/mingw-w64-headers/include/ddeml.h
index 632a254..75c8d1c 100644
--- a/mingw-w64-headers/include/ddeml.h
+++ b/mingw-w64-headers/include/ddeml.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_DDEMLH
diff --git a/mingw-w64-headers/include/ddrawgdi.h b/mingw-w64-headers/include/ddrawgdi.h
index 4f578a7..85d2540 100644
--- a/mingw-w64-headers/include/ddrawgdi.h
+++ b/mingw-w64-headers/include/ddrawgdi.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 
diff --git a/mingw-w64-headers/include/delayimp.h b/mingw-w64-headers/include/delayimp.h
index 7df443d..637b9aa 100644
--- a/mingw-w64-headers/include/delayimp.h
+++ b/mingw-w64-headers/include/delayimp.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #define _DELAY_IMP_VER 2
diff --git a/mingw-w64-headers/include/devenum.idl b/mingw-w64-headers/include/devenum.idl
index 7d396fe..7b66581 100644
--- a/mingw-w64-headers/include/devenum.idl
+++ b/mingw-w64-headers/include/devenum.idl
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 
diff --git a/mingw-w64-headers/include/devguid.h b/mingw-w64-headers/include/devguid.h
index 2e4609d..673844a 100644
--- a/mingw-w64-headers/include/devguid.h
+++ b/mingw-w64-headers/include/devguid.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 DEFINE_GUID(GUID_DEVCLASS_1394,0x6bdd1fc1L,0x810f,0x11d0,0xbe,0xc7,0x08,0x00,0x2b,0xe2,0x09,0x2f);
diff --git a/mingw-w64-headers/include/devicetopology.h b/mingw-w64-headers/include/devicetopology.h
index 7f93aeb..2ce70fd 100644
--- a/mingw-w64-headers/include/devicetopology.h
+++ b/mingw-w64-headers/include/devicetopology.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __INC_DEVICETOPOLOGY__
diff --git a/mingw-w64-headers/include/dhcpcsdk.h b/mingw-w64-headers/include/dhcpcsdk.h
index 9b96fcc..b9e090c 100644
--- a/mingw-w64-headers/include/dhcpcsdk.h
+++ b/mingw-w64-headers/include/dhcpcsdk.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _DHCPCSDK_
diff --git a/mingw-w64-headers/include/dhcpsapi.h b/mingw-w64-headers/include/dhcpsapi.h
index 39935a3..fb97b45 100644
--- a/mingw-w64-headers/include/dhcpsapi.h
+++ b/mingw-w64-headers/include/dhcpsapi.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _DHCPSAPI_
diff --git a/mingw-w64-headers/include/dhcpssdk.h b/mingw-w64-headers/include/dhcpssdk.h
index 0e9c9aa..6a0be92 100644
--- a/mingw-w64-headers/include/dhcpssdk.h
+++ b/mingw-w64-headers/include/dhcpssdk.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _CALLOUT_H_
diff --git a/mingw-w64-headers/include/dhcpv6csdk.h b/mingw-w64-headers/include/dhcpv6csdk.h
index 06f8639..33a876f 100644
--- a/mingw-w64-headers/include/dhcpv6csdk.h
+++ b/mingw-w64-headers/include/dhcpv6csdk.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_DHCPV6CSDK
diff --git a/mingw-w64-headers/include/dhtmldid.h b/mingw-w64-headers/include/dhtmldid.h
index 60ed074..5f3009f 100644
--- a/mingw-w64-headers/include/dhtmldid.h
+++ b/mingw-w64-headers/include/dhtmldid.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __DHTMLDID_H_
diff --git a/mingw-w64-headers/include/dhtmled.h b/mingw-w64-headers/include/dhtmled.h
index 14269fe..a56754d 100644
--- a/mingw-w64-headers/include/dhtmled.h
+++ b/mingw-w64-headers/include/dhtmled.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/dhtmliid.h b/mingw-w64-headers/include/dhtmliid.h
index 34209e9..02c9f84 100644
--- a/mingw-w64-headers/include/dhtmliid.h
+++ b/mingw-w64-headers/include/dhtmliid.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _dhtmliid_h_
diff --git a/mingw-w64-headers/include/digitalv.h b/mingw-w64-headers/include/digitalv.h
index e508c63..1174082 100644
--- a/mingw-w64-headers/include/digitalv.h
+++ b/mingw-w64-headers/include/digitalv.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_DIGITALV
diff --git a/mingw-w64-headers/include/dimm.h b/mingw-w64-headers/include/dimm.h
index 09f953e..da5f19b 100644
--- a/mingw-w64-headers/include/dimm.h
+++ b/mingw-w64-headers/include/dimm.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/diskguid.h b/mingw-w64-headers/include/diskguid.h
index eaf50fb..4fc32c5 100644
--- a/mingw-w64-headers/include/diskguid.h
+++ b/mingw-w64-headers/include/diskguid.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifdef DEFINE_GUID
diff --git a/mingw-w64-headers/include/dispatch.h b/mingw-w64-headers/include/dispatch.h
index 4e67f8c..6903a3e 100644
--- a/mingw-w64-headers/include/dispatch.h
+++ b/mingw-w64-headers/include/dispatch.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef RC_INVOKED
diff --git a/mingw-w64-headers/include/dispdib.h b/mingw-w64-headers/include/dispdib.h
index 7f11a48..4ac5c77 100644
--- a/mingw-w64-headers/include/dispdib.h
+++ b/mingw-w64-headers/include/dispdib.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __DISPDIB_H__
diff --git a/mingw-w64-headers/include/dispex.h b/mingw-w64-headers/include/dispex.h
index 0b0836e..d9a3d7b 100644
--- a/mingw-w64-headers/include/dispex.h
+++ b/mingw-w64-headers/include/dispex.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/dlcapi.h b/mingw-w64-headers/include/dlcapi.h
index bd0f855..4afc104 100644
--- a/mingw-w64-headers/include/dlcapi.h
+++ b/mingw-w64-headers/include/dlcapi.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _DLCAPI_
diff --git a/mingw-w64-headers/include/dlgs.h b/mingw-w64-headers/include/dlgs.h
index 107f85b..1a070ae 100644
--- a/mingw-w64-headers/include/dlgs.h
+++ b/mingw-w64-headers/include/dlgs.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _DLGSH_INCLUDED_
diff --git a/mingw-w64-headers/include/docobj.idl b/mingw-w64-headers/include/docobj.idl
index 25cb19c..a60f157 100644
--- a/mingw-w64-headers/include/docobj.idl
+++ b/mingw-w64-headers/include/docobj.idl
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 
diff --git a/mingw-w64-headers/include/domdid.h b/mingw-w64-headers/include/domdid.h
index 2c546bf..dbfff86 100644
--- a/mingw-w64-headers/include/domdid.h
+++ b/mingw-w64-headers/include/domdid.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __DOMDID_H__
diff --git a/mingw-w64-headers/include/dsadmin.h b/mingw-w64-headers/include/dsadmin.h
index 6df8985..198f41c 100644
--- a/mingw-w64-headers/include/dsadmin.h
+++ b/mingw-w64-headers/include/dsadmin.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 DEFINE_GUID(CLSID_DsAdminCreateObj,0xe301a009,0xf901,0x11d2,0x82,0xb9,0x0,0xc0,0x4f,0x68,0x92,0x8b);
diff --git a/mingw-w64-headers/include/dsclient.h b/mingw-w64-headers/include/dsclient.h
index ffb1f29..24dc57e 100644
--- a/mingw-w64-headers/include/dsclient.h
+++ b/mingw-w64-headers/include/dsclient.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __dsclient_h
diff --git a/mingw-w64-headers/include/dsgetdc.h b/mingw-w64-headers/include/dsgetdc.h
index 20b9120..5bca067 100644
--- a/mingw-w64-headers/include/dsgetdc.h
+++ b/mingw-w64-headers/include/dsgetdc.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _DSGETDC_
diff --git a/mingw-w64-headers/include/dskquota.h b/mingw-w64-headers/include/dskquota.h
index f113d8a..84db218 100644
--- a/mingw-w64-headers/include/dskquota.h
+++ b/mingw-w64-headers/include/dskquota.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __DSKQUOTA_H
diff --git a/mingw-w64-headers/include/dsquery.h b/mingw-w64-headers/include/dsquery.h
index 7c53a17..446aaba 100644
--- a/mingw-w64-headers/include/dsquery.h
+++ b/mingw-w64-headers/include/dsquery.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __dsquery_h
diff --git a/mingw-w64-headers/include/dsrole.h b/mingw-w64-headers/include/dsrole.h
index 189e67b..9dfc709 100644
--- a/mingw-w64-headers/include/dsrole.h
+++ b/mingw-w64-headers/include/dsrole.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __DSROLE_H__
diff --git a/mingw-w64-headers/include/dssec.h b/mingw-w64-headers/include/dssec.h
index 32888d0..e863a08 100644
--- a/mingw-w64-headers/include/dssec.h
+++ b/mingw-w64-headers/include/dssec.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_DSSEC
diff --git a/mingw-w64-headers/include/dtchelp.h b/mingw-w64-headers/include/dtchelp.h
index 0192f77..ca7b2d3 100644
--- a/mingw-w64-headers/include/dtchelp.h
+++ b/mingw-w64-headers/include/dtchelp.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __DTCHELP_H__
diff --git a/mingw-w64-headers/include/dvbsiparser.h b/mingw-w64-headers/include/dvbsiparser.h
index 46a8c27..2d12669 100644
--- a/mingw-w64-headers/include/dvbsiparser.h
+++ b/mingw-w64-headers/include/dvbsiparser.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __DVBSIPARSER_H__
diff --git a/mingw-w64-headers/include/dvobj.h b/mingw-w64-headers/include/dvobj.h
index 2aaeced..5fe17e8 100644
--- a/mingw-w64-headers/include/dvobj.h
+++ b/mingw-w64-headers/include/dvobj.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef RC_INVOKED
diff --git a/mingw-w64-headers/include/dwrite.h b/mingw-w64-headers/include/dwrite.h
index af81a09..fefa79b 100644
--- a/mingw-w64-headers/include/dwrite.h
+++ b/mingw-w64-headers/include/dwrite.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __INC_DWRITE__
diff --git a/mingw-w64-headers/include/dxtmpl.h b/mingw-w64-headers/include/dxtmpl.h
index c7fb717..c0e3d7d 100644
--- a/mingw-w64-headers/include/dxtmpl.h
+++ b/mingw-w64-headers/include/dxtmpl.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef DXTmpl_h
diff --git a/mingw-w64-headers/include/dxva2api.h b/mingw-w64-headers/include/dxva2api.h
index 938ee45..5d6374c 100644
--- a/mingw-w64-headers/include/dxva2api.h
+++ b/mingw-w64-headers/include/dxva2api.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_DXVA2API
diff --git a/mingw-w64-headers/include/dxvahd.h b/mingw-w64-headers/include/dxvahd.h
index edcb00b..4dfe5b7 100644
--- a/mingw-w64-headers/include/dxvahd.h
+++ b/mingw-w64-headers/include/dxvahd.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_DXAVHD
diff --git a/mingw-w64-headers/include/eapauthenticatoractiondefine.h b/mingw-w64-headers/include/eapauthenticatoractiondefine.h
index e88c555..2585af1 100644
--- a/mingw-w64-headers/include/eapauthenticatoractiondefine.h
+++ b/mingw-w64-headers/include/eapauthenticatoractiondefine.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_EAPAUTHENTICATORACTIONDEFINE
diff --git a/mingw-w64-headers/include/eapauthenticatortypes.h b/mingw-w64-headers/include/eapauthenticatortypes.h
index 6434580..ca32cf3 100644
--- a/mingw-w64-headers/include/eapauthenticatortypes.h
+++ b/mingw-w64-headers/include/eapauthenticatortypes.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_EAPAUTHENTICATORTYPES
diff --git a/mingw-w64-headers/include/eaphosterror.h b/mingw-w64-headers/include/eaphosterror.h
index ab14c07..e6b35e0 100644
--- a/mingw-w64-headers/include/eaphosterror.h
+++ b/mingw-w64-headers/include/eaphosterror.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_HOSTERROR
diff --git a/mingw-w64-headers/include/eaphostpeerconfigapis.h b/mingw-w64-headers/include/eaphostpeerconfigapis.h
index 51d969d..ce74a8d 100644
--- a/mingw-w64-headers/include/eaphostpeerconfigapis.h
+++ b/mingw-w64-headers/include/eaphostpeerconfigapis.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_EAPHOSTPEERCONFIGAPIS
diff --git a/mingw-w64-headers/include/eaphostpeertypes.h b/mingw-w64-headers/include/eaphostpeertypes.h
index b30d3b8..39e768a 100644
--- a/mingw-w64-headers/include/eaphostpeertypes.h
+++ b/mingw-w64-headers/include/eaphostpeertypes.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_EAPHOSTPEERTYPES
diff --git a/mingw-w64-headers/include/eapmethodauthenticatorapis.h b/mingw-w64-headers/include/eapmethodauthenticatorapis.h
index a34f964..263cf78 100644
--- a/mingw-w64-headers/include/eapmethodauthenticatorapis.h
+++ b/mingw-w64-headers/include/eapmethodauthenticatorapis.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_EAPMETHODAUTHENTICATORAPIS
diff --git a/mingw-w64-headers/include/eapmethodpeerapis.h b/mingw-w64-headers/include/eapmethodpeerapis.h
index d13f608..b85668c 100644
--- a/mingw-w64-headers/include/eapmethodpeerapis.h
+++ b/mingw-w64-headers/include/eapmethodpeerapis.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_EAPMETHODPEERAPIS
diff --git a/mingw-w64-headers/include/eapmethodtypes.h b/mingw-w64-headers/include/eapmethodtypes.h
index a5548fe..b1856c5 100644
--- a/mingw-w64-headers/include/eapmethodtypes.h
+++ b/mingw-w64-headers/include/eapmethodtypes.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_EAPMETHODTYPES
diff --git a/mingw-w64-headers/include/eappapis.h b/mingw-w64-headers/include/eappapis.h
index 36367fa..c81166d 100644
--- a/mingw-w64-headers/include/eappapis.h
+++ b/mingw-w64-headers/include/eappapis.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_EAPPAPIS
diff --git a/mingw-w64-headers/include/eaptypes.h b/mingw-w64-headers/include/eaptypes.h
index ec4003f..a6d77a1 100644
--- a/mingw-w64-headers/include/eaptypes.h
+++ b/mingw-w64-headers/include/eaptypes.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_EAPTYPES
diff --git a/mingw-w64-headers/include/ehstorapi.h b/mingw-w64-headers/include/ehstorapi.h
index a56e697..f0bc40c 100644
--- a/mingw-w64-headers/include/ehstorapi.h
+++ b/mingw-w64-headers/include/ehstorapi.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_EHSTORAPI
diff --git a/mingw-w64-headers/include/elscore.h b/mingw-w64-headers/include/elscore.h
index 9b88ca4..589fa1e 100644
--- a/mingw-w64-headers/include/elscore.h
+++ b/mingw-w64-headers/include/elscore.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __INC_ELSCORE__
diff --git a/mingw-w64-headers/include/emostore.h b/mingw-w64-headers/include/emostore.h
index 66adbce..adc81c5 100644
--- a/mingw-w64-headers/include/emostore.h
+++ b/mingw-w64-headers/include/emostore.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/emptyvc.h b/mingw-w64-headers/include/emptyvc.h
index b754a09..acf5b05 100644
--- a/mingw-w64-headers/include/emptyvc.h
+++ b/mingw-w64-headers/include/emptyvc.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/endpointvolume.h b/mingw-w64-headers/include/endpointvolume.h
index 66ba478..ebebfcb 100644
--- a/mingw-w64-headers/include/endpointvolume.h
+++ b/mingw-w64-headers/include/endpointvolume.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __INC_ENDPOINTVOLUME__
diff --git a/mingw-w64-headers/include/error.h b/mingw-w64-headers/include/error.h
index ab214e9..cac097a 100644
--- a/mingw-w64-headers/include/error.h
+++ b/mingw-w64-headers/include/error.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #define NO_ERROR 0
diff --git a/mingw-w64-headers/include/errorrep.h b/mingw-w64-headers/include/errorrep.h
index 9e5b929..07dd52b 100644
--- a/mingw-w64-headers/include/errorrep.h
+++ b/mingw-w64-headers/include/errorrep.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __ERRORREP_H__
diff --git a/mingw-w64-headers/include/esent.h b/mingw-w64-headers/include/esent.h
index bed9f69..41784dc 100644
--- a/mingw-w64-headers/include/esent.h
+++ b/mingw-w64-headers/include/esent.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_ESENT
diff --git a/mingw-w64-headers/include/evcoll.h b/mingw-w64-headers/include/evcoll.h
index 217c693..3c336dc 100644
--- a/mingw-w64-headers/include/evcoll.h
+++ b/mingw-w64-headers/include/evcoll.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_EVCOLL
diff --git a/mingw-w64-headers/include/eventsys.h b/mingw-w64-headers/include/eventsys.h
index 1e635b3..eae2bbe 100644
--- a/mingw-w64-headers/include/eventsys.h
+++ b/mingw-w64-headers/include/eventsys.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/evntcons.h b/mingw-w64-headers/include/evntcons.h
index 02fd6d9..918744f 100644
--- a/mingw-w64-headers/include/evntcons.h
+++ b/mingw-w64-headers/include/evntcons.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _EVNTCONS_H_
diff --git a/mingw-w64-headers/include/evntrace.h b/mingw-w64-headers/include/evntrace.h
index 21dfd20..057d359 100644
--- a/mingw-w64-headers/include/evntrace.h
+++ b/mingw-w64-headers/include/evntrace.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _EVNTRACE_
diff --git a/mingw-w64-headers/include/evr.h b/mingw-w64-headers/include/evr.h
index c0d3ddc..67685c5 100644
--- a/mingw-w64-headers/include/evr.h
+++ b/mingw-w64-headers/include/evr.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_EVR
diff --git a/mingw-w64-headers/include/evr9.h b/mingw-w64-headers/include/evr9.h
index 4d9825b..d21366d 100644
--- a/mingw-w64-headers/include/evr9.h
+++ b/mingw-w64-headers/include/evr9.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_EVR9
diff --git a/mingw-w64-headers/include/exchform.h b/mingw-w64-headers/include/exchform.h
index 5d72b19..643d302 100644
--- a/mingw-w64-headers/include/exchform.h
+++ b/mingw-w64-headers/include/exchform.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef EXCHFORM_H
diff --git a/mingw-w64-headers/include/exdisp.h b/mingw-w64-headers/include/exdisp.h
index a9c1f31..291f1fb 100644
--- a/mingw-w64-headers/include/exdisp.h
+++ b/mingw-w64-headers/include/exdisp.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/exdispid.h b/mingw-w64-headers/include/exdispid.h
index 4def639..ad8cffb 100644
--- a/mingw-w64-headers/include/exdispid.h
+++ b/mingw-w64-headers/include/exdispid.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef EXDISPID_H_
diff --git a/mingw-w64-headers/include/fci.h b/mingw-w64-headers/include/fci.h
index 6734f99..13ddd2f 100644
--- a/mingw-w64-headers/include/fci.h
+++ b/mingw-w64-headers/include/fci.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef INCLUDED_TYPES_FCI_FDI
diff --git a/mingw-w64-headers/include/fdi.h b/mingw-w64-headers/include/fdi.h
index 84853d3..f896cef 100644
--- a/mingw-w64-headers/include/fdi.h
+++ b/mingw-w64-headers/include/fdi.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef INCLUDED_TYPES_FCI_FDI
diff --git a/mingw-w64-headers/include/fileextd.h b/mingw-w64-headers/include/fileextd.h
index f2f08a3..6b81eed 100644
--- a/mingw-w64-headers/include/fileextd.h
+++ b/mingw-w64-headers/include/fileextd.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #pragma once
diff --git a/mingw-w64-headers/include/filehc.h b/mingw-w64-headers/include/filehc.h
index f8f7793..988bb44 100644
--- a/mingw-w64-headers/include/filehc.h
+++ b/mingw-w64-headers/include/filehc.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _FILEHC_H_
diff --git a/mingw-w64-headers/include/fileopen.dlg b/mingw-w64-headers/include/fileopen.dlg
index 3fb4d32..e1ac06c 100644
--- a/mingw-w64-headers/include/fileopen.dlg
+++ b/mingw-w64-headers/include/fileopen.dlg
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #include <shlobj.h>
diff --git a/mingw-w64-headers/include/filter.h b/mingw-w64-headers/include/filter.h
index 8412366..45018c7 100644
--- a/mingw-w64-headers/include/filter.h
+++ b/mingw-w64-headers/include/filter.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/filterr.h b/mingw-w64-headers/include/filterr.h
index 2b10ca3..4e123c6 100644
--- a/mingw-w64-headers/include/filterr.h
+++ b/mingw-w64-headers/include/filterr.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _FILTERR_H_
diff --git a/mingw-w64-headers/include/findtext.dlg b/mingw-w64-headers/include/findtext.dlg
index 59acf08..bbf4659 100644
--- a/mingw-w64-headers/include/findtext.dlg
+++ b/mingw-w64-headers/include/findtext.dlg
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 FINDDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 30,73,236,62
diff --git a/mingw-w64-headers/include/fltdefs.h b/mingw-w64-headers/include/fltdefs.h
index 9a3e1d7..2e94261 100644
--- a/mingw-w64-headers/include/fltdefs.h
+++ b/mingw-w64-headers/include/fltdefs.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _FLTDEFS_H
diff --git a/mingw-w64-headers/include/font.dlg b/mingw-w64-headers/include/font.dlg
index 72e0ba5..56b6dcd 100644
--- a/mingw-w64-headers/include/font.dlg
+++ b/mingw-w64-headers/include/font.dlg
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 FORMATDLGORD31 DIALOG 13,54,287,196
diff --git a/mingw-w64-headers/include/fsrm.h b/mingw-w64-headers/include/fsrm.h
index e96a6bd..248010f 100644
--- a/mingw-w64-headers/include/fsrm.h
+++ b/mingw-w64-headers/include/fsrm.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_FSRM
diff --git a/mingw-w64-headers/include/fsrmenums.h b/mingw-w64-headers/include/fsrmenums.h
index c36d081..47fe5cb 100644
--- a/mingw-w64-headers/include/fsrmenums.h
+++ b/mingw-w64-headers/include/fsrmenums.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_FSRMENUMS
diff --git a/mingw-w64-headers/include/fsrmpipeline.h b/mingw-w64-headers/include/fsrmpipeline.h
index b3f8b24..5eb581f 100644
--- a/mingw-w64-headers/include/fsrmpipeline.h
+++ b/mingw-w64-headers/include/fsrmpipeline.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #include <fsrmenums.h>
diff --git a/mingw-w64-headers/include/fsrmquota.h b/mingw-w64-headers/include/fsrmquota.h
index a459781..081fd7b 100644
--- a/mingw-w64-headers/include/fsrmquota.h
+++ b/mingw-w64-headers/include/fsrmquota.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #include <fsrmenums.h>
diff --git a/mingw-w64-headers/include/fsrmreports.h b/mingw-w64-headers/include/fsrmreports.h
index 5e968bb..757de48 100644
--- a/mingw-w64-headers/include/fsrmreports.h
+++ b/mingw-w64-headers/include/fsrmreports.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #include <fsrmenums.h>
diff --git a/mingw-w64-headers/include/fsrmscreen.h b/mingw-w64-headers/include/fsrmscreen.h
index 3f8e51f..fc8d546 100644
--- a/mingw-w64-headers/include/fsrmscreen.h
+++ b/mingw-w64-headers/include/fsrmscreen.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #include <fsrmenums.h>
diff --git a/mingw-w64-headers/include/ftsiface.h b/mingw-w64-headers/include/ftsiface.h
index 7b5496b..dfef131 100644
--- a/mingw-w64-headers/include/ftsiface.h
+++ b/mingw-w64-headers/include/ftsiface.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __FTSIFACE_H__
diff --git a/mingw-w64-headers/include/functiondiscoveryapi.h b/mingw-w64-headers/include/functiondiscoveryapi.h
index cb8f986..ef29f79 100644
--- a/mingw-w64-headers/include/functiondiscoveryapi.h
+++ b/mingw-w64-headers/include/functiondiscoveryapi.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_FUNCTIONDISCOVERYAPI
diff --git a/mingw-w64-headers/include/functiondiscoverycategories.h b/mingw-w64-headers/include/functiondiscoverycategories.h
index 960574a..96b79c1 100644
--- a/mingw-w64-headers/include/functiondiscoverycategories.h
+++ b/mingw-w64-headers/include/functiondiscoverycategories.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_FUNCTIONDISCOVERYCATEGORIES
diff --git a/mingw-w64-headers/include/functiondiscoveryconstraints.h b/mingw-w64-headers/include/functiondiscoveryconstraints.h
index bc65f3c..b3ddac5 100644
--- a/mingw-w64-headers/include/functiondiscoveryconstraints.h
+++ b/mingw-w64-headers/include/functiondiscoveryconstraints.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_FUNCTIONDISCOVERYCONSTRAINTS
diff --git a/mingw-w64-headers/include/functiondiscoverykeys.h b/mingw-w64-headers/include/functiondiscoverykeys.h
index 4ab9964..13a21d3 100644
--- a/mingw-w64-headers/include/functiondiscoverykeys.h
+++ b/mingw-w64-headers/include/functiondiscoverykeys.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_FUNCTIONDISCOVERYKEYS
diff --git a/mingw-w64-headers/include/functiondiscoverynotification.h b/mingw-w64-headers/include/functiondiscoverynotification.h
index 62a26f7..c65dee6 100644
--- a/mingw-w64-headers/include/functiondiscoverynotification.h
+++ b/mingw-w64-headers/include/functiondiscoverynotification.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_FUNCTIONDISCOVERYNOTIFICATION
diff --git a/mingw-w64-headers/include/fwpmtypes.h b/mingw-w64-headers/include/fwpmtypes.h
index a2ec17f..352088c 100644
--- a/mingw-w64-headers/include/fwpmtypes.h
+++ b/mingw-w64-headers/include/fwpmtypes.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_FWPMTYPES
diff --git a/mingw-w64-headers/include/fwpmu.h b/mingw-w64-headers/include/fwpmu.h
index d4976c3..c47b5cb 100644
--- a/mingw-w64-headers/include/fwpmu.h
+++ b/mingw-w64-headers/include/fwpmu.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_FWPMU
diff --git a/mingw-w64-headers/include/fwptypes.h b/mingw-w64-headers/include/fwptypes.h
index 00e7b10..114eb72 100644
--- a/mingw-w64-headers/include/fwptypes.h
+++ b/mingw-w64-headers/include/fwptypes.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_FWTYPES
diff --git a/mingw-w64-headers/include/gb18030.h b/mingw-w64-headers/include/gb18030.h
index 0d25aba..b4be3c2 100644
--- a/mingw-w64-headers/include/gb18030.h
+++ b/mingw-w64-headers/include/gb18030.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _GB18030_H_
diff --git a/mingw-w64-headers/include/gpedit.h b/mingw-w64-headers/include/gpedit.h
index a2ff8fb..6b980f4 100644
--- a/mingw-w64-headers/include/gpedit.h
+++ b/mingw-w64-headers/include/gpedit.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 DEFINE_GUID(CLSID_GPESnapIn,0x8fc0b734,0xa0e1,0x11d1,0xa7,0xd3,0x0,0x0,0xf8,0x75,0x71,0xe3);
diff --git a/mingw-w64-headers/include/gpmgmt.h b/mingw-w64-headers/include/gpmgmt.h
index c1f34c7..0811d38 100644
--- a/mingw-w64-headers/include/gpmgmt.h
+++ b/mingw-w64-headers/include/gpmgmt.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/guiddef.h b/mingw-w64-headers/include/guiddef.h
index efd43ed..6ce480a 100644
--- a/mingw-w64-headers/include/guiddef.h
+++ b/mingw-w64-headers/include/guiddef.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef GUID_DEFINED
diff --git a/mingw-w64-headers/include/h323priv.h b/mingw-w64-headers/include/h323priv.h
index 54ff46b..71c1b7c 100644
--- a/mingw-w64-headers/include/h323priv.h
+++ b/mingw-w64-headers/include/h323priv.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/hlguids.h b/mingw-w64-headers/include/hlguids.h
index 7f62b4e..e28861b 100644
--- a/mingw-w64-headers/include/hlguids.h
+++ b/mingw-w64-headers/include/hlguids.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef HLGUIDS_H
diff --git a/mingw-w64-headers/include/hliface.h b/mingw-w64-headers/include/hliface.h
index 7927264..6ac7516 100644
--- a/mingw-w64-headers/include/hliface.h
+++ b/mingw-w64-headers/include/hliface.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/hlink.h b/mingw-w64-headers/include/hlink.h
index 692c62e..ff47186 100644
--- a/mingw-w64-headers/include/hlink.h
+++ b/mingw-w64-headers/include/hlink.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/hostinfo.h b/mingw-w64-headers/include/hostinfo.h
index f981576..debee3b 100644
--- a/mingw-w64-headers/include/hostinfo.h
+++ b/mingw-w64-headers/include/hostinfo.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef HOST_INFO_H_INCLUDED
diff --git a/mingw-w64-headers/include/htiface.h b/mingw-w64-headers/include/htiface.h
index 10863d0..322f41b 100644
--- a/mingw-w64-headers/include/htiface.h
+++ b/mingw-w64-headers/include/htiface.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/htiframe.h b/mingw-w64-headers/include/htiframe.h
index 927285e..2926ba9 100644
--- a/mingw-w64-headers/include/htiframe.h
+++ b/mingw-w64-headers/include/htiframe.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/htmlguid.h b/mingw-w64-headers/include/htmlguid.h
index c7d7d35..6b4a854 100644
--- a/mingw-w64-headers/include/htmlguid.h
+++ b/mingw-w64-headers/include/htmlguid.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _HTMLGUID_H_
diff --git a/mingw-w64-headers/include/htmlhelp.h b/mingw-w64-headers/include/htmlhelp.h
index ac45870..581a4cd 100644
--- a/mingw-w64-headers/include/htmlhelp.h
+++ b/mingw-w64-headers/include/htmlhelp.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __HTMLHELP_H__
diff --git a/mingw-w64-headers/include/http.h b/mingw-w64-headers/include/http.h
index ea4cd1d..7b6d316 100644
--- a/mingw-w64-headers/include/http.h
+++ b/mingw-w64-headers/include/http.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __HTTP_H__
diff --git a/mingw-w64-headers/include/httpext.h b/mingw-w64-headers/include/httpext.h
index 9f24157..baf3148 100644
--- a/mingw-w64-headers/include/httpext.h
+++ b/mingw-w64-headers/include/httpext.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _HTTPEXT_H_
diff --git a/mingw-w64-headers/include/httpfilt.h b/mingw-w64-headers/include/httpfilt.h
index 20ee335..d3341ea 100644
--- a/mingw-w64-headers/include/httpfilt.h
+++ b/mingw-w64-headers/include/httpfilt.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _HTTPFILT_H_
diff --git a/mingw-w64-headers/include/httprequestid.h b/mingw-w64-headers/include/httprequestid.h
index 5b0f139..c5efc32 100644
--- a/mingw-w64-headers/include/httprequestid.h
+++ b/mingw-w64-headers/include/httprequestid.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __HTTPREQUESTID_H__
diff --git a/mingw-w64-headers/include/i_cryptasn1tls.h b/mingw-w64-headers/include/i_cryptasn1tls.h
index e57fe53..4d7a99c 100644
--- a/mingw-w64-headers/include/i_cryptasn1tls.h
+++ b/mingw-w64-headers/include/i_cryptasn1tls.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __I_CRYPTASN1TLS_H__
diff --git a/mingw-w64-headers/include/ia64reg.h b/mingw-w64-headers/include/ia64reg.h
index 6c3f7e1..e35a44d 100644
--- a/mingw-w64-headers/include/ia64reg.h
+++ b/mingw-w64-headers/include/ia64reg.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _IA64REG_
diff --git a/mingw-w64-headers/include/iaccess.h b/mingw-w64-headers/include/iaccess.h
index 25ac5a0..a520bf4 100644
--- a/mingw-w64-headers/include/iaccess.h
+++ b/mingw-w64-headers/include/iaccess.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/iadmext.h b/mingw-w64-headers/include/iadmext.h
index 2c1eca9..2fccca9 100644
--- a/mingw-w64-headers/include/iadmext.h
+++ b/mingw-w64-headers/include/iadmext.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef COM_NO_WINDOWS_H
diff --git a/mingw-w64-headers/include/iadmw.h b/mingw-w64-headers/include/iadmw.h
index 8b665fb..69b7c10 100644
--- a/mingw-w64-headers/include/iadmw.h
+++ b/mingw-w64-headers/include/iadmw.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/iads.h b/mingw-w64-headers/include/iads.h
index 3ccc2fc..53d88e1 100644
--- a/mingw-w64-headers/include/iads.h
+++ b/mingw-w64-headers/include/iads.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 
diff --git a/mingw-w64-headers/include/icftypes.h b/mingw-w64-headers/include/icftypes.h
index 0ff99ec..82fa507 100644
--- a/mingw-w64-headers/include/icftypes.h
+++ b/mingw-w64-headers/include/icftypes.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_ICFTYPES
diff --git a/mingw-w64-headers/include/icm.h b/mingw-w64-headers/include/icm.h
index f4c9054..06e9ea6 100644
--- a/mingw-w64-headers/include/icm.h
+++ b/mingw-w64-headers/include/icm.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _ICM_H_
diff --git a/mingw-w64-headers/include/icmpapi.h b/mingw-w64-headers/include/icmpapi.h
index 890b5ed..c7cf583 100644
--- a/mingw-w64-headers/include/icmpapi.h
+++ b/mingw-w64-headers/include/icmpapi.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _ICMP_INCLUDED_
diff --git a/mingw-w64-headers/include/icmui.dlg b/mingw-w64-headers/include/icmui.dlg
index 2669185..6f48a7c 100644
--- a/mingw-w64-headers/include/icmui.dlg
+++ b/mingw-w64-headers/include/icmui.dlg
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 COLORMGMTDLGORD DIALOG DISCARDABLE 0,0,350,190
diff --git a/mingw-w64-headers/include/icrsint.h b/mingw-w64-headers/include/icrsint.h
index 0985ad8..b6cb131 100644
--- a/mingw-w64-headers/include/icrsint.h
+++ b/mingw-w64-headers/include/icrsint.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _ICRSINT_H_
diff --git a/mingw-w64-headers/include/identitycommon.h b/mingw-w64-headers/include/identitycommon.h
index 68bf124..f34348f 100644
--- a/mingw-w64-headers/include/identitycommon.h
+++ b/mingw-w64-headers/include/identitycommon.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __IDENTIYCOMMON_H__
diff --git a/mingw-w64-headers/include/identitystore.h b/mingw-w64-headers/include/identitystore.h
index 89fda78..45f643d 100644
--- a/mingw-w64-headers/include/identitystore.h
+++ b/mingw-w64-headers/include/identitystore.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __IDENTITYSTORE_H__
diff --git a/mingw-w64-headers/include/idf.h b/mingw-w64-headers/include/idf.h
index f22ae47..0445b02 100644
--- a/mingw-w64-headers/include/idf.h
+++ b/mingw-w64-headers/include/idf.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __IDF_H__
diff --git a/mingw-w64-headers/include/idispids.h b/mingw-w64-headers/include/idispids.h
index 663770d..08ca53d 100644
--- a/mingw-w64-headers/include/idispids.h
+++ b/mingw-w64-headers/include/idispids.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #define DISPID_READYSTATE (-525)
diff --git a/mingw-w64-headers/include/iedial.h b/mingw-w64-headers/include/iedial.h
index b0cf28e..99851d5 100644
--- a/mingw-w64-headers/include/iedial.h
+++ b/mingw-w64-headers/include/iedial.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/ieverp.h b/mingw-w64-headers/include/ieverp.h
index ddcaffe..d9be1e4 100644
--- a/mingw-w64-headers/include/ieverp.h
+++ b/mingw-w64-headers/include/ieverp.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #define VER_MAJOR_PRODUCTVER 6
diff --git a/mingw-w64-headers/include/ifdef.h b/mingw-w64-headers/include/ifdef.h
index 8377e5c..1f1f9cc 100644
--- a/mingw-w64-headers/include/ifdef.h
+++ b/mingw-w64-headers/include/ifdef.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_IFDEF
diff --git a/mingw-w64-headers/include/iiis.h b/mingw-w64-headers/include/iiis.h
index c1f0943..b61f0c3 100644
--- a/mingw-w64-headers/include/iiis.h
+++ b/mingw-w64-headers/include/iiis.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/iiisext.h b/mingw-w64-headers/include/iiisext.h
index 474485c..bc9323a 100644
--- a/mingw-w64-headers/include/iiisext.h
+++ b/mingw-w64-headers/include/iiisext.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/iimgctx.h b/mingw-w64-headers/include/iimgctx.h
index f04f2a6..82fa4b1 100644
--- a/mingw-w64-headers/include/iimgctx.h
+++ b/mingw-w64-headers/include/iimgctx.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _IImgCtxObjects_H_
diff --git a/mingw-w64-headers/include/iiscnfg.h b/mingw-w64-headers/include/iiscnfg.h
index 16b0664..6ea4fc6 100644
--- a/mingw-w64-headers/include/iiscnfg.h
+++ b/mingw-w64-headers/include/iiscnfg.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _IISCNFG_H_
diff --git a/mingw-w64-headers/include/iisrsta.h b/mingw-w64-headers/include/iisrsta.h
index 22e72d2..0dee071 100644
--- a/mingw-w64-headers/include/iisrsta.h
+++ b/mingw-w64-headers/include/iisrsta.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/iketypes.h b/mingw-w64-headers/include/iketypes.h
index 1ed6d9f..e643c2d 100644
--- a/mingw-w64-headers/include/iketypes.h
+++ b/mingw-w64-headers/include/iketypes.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_IKETYPES
diff --git a/mingw-w64-headers/include/ilogobj.hxx b/mingw-w64-headers/include/ilogobj.hxx
index 97f9de2..f7cb451 100644
--- a/mingw-w64-headers/include/ilogobj.hxx
+++ b/mingw-w64-headers/include/ilogobj.hxx
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _ILOGOBJ_HXX_
diff --git a/mingw-w64-headers/include/imagehlp.h b/mingw-w64-headers/include/imagehlp.h
index dde45a0..bc9dfbc 100644
--- a/mingw-w64-headers/include/imagehlp.h
+++ b/mingw-w64-headers/include/imagehlp.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _IMAGEHLP_
diff --git a/mingw-w64-headers/include/ime.h b/mingw-w64-headers/include/ime.h
index a9288f8..02e9c35 100644
--- a/mingw-w64-headers/include/ime.h
+++ b/mingw-w64-headers/include/ime.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _IME_
diff --git a/mingw-w64-headers/include/imessage.h b/mingw-w64-headers/include/imessage.h
index 08f05af..5a44b1c 100644
--- a/mingw-w64-headers/include/imessage.h
+++ b/mingw-w64-headers/include/imessage.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _IMESSAGE_H_
diff --git a/mingw-w64-headers/include/imm.h b/mingw-w64-headers/include/imm.h
index 8bbb3d6..c6101e9 100644
--- a/mingw-w64-headers/include/imm.h
+++ b/mingw-w64-headers/include/imm.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _IMM_
diff --git a/mingw-w64-headers/include/in6addr.h b/mingw-w64-headers/include/in6addr.h
index 9f20f62..490b2f9 100644
--- a/mingw-w64-headers/include/in6addr.h
+++ b/mingw-w64-headers/include/in6addr.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 
diff --git a/mingw-w64-headers/include/inaddr.h b/mingw-w64-headers/include/inaddr.h
index f7a5492..174004e 100644
--- a/mingw-w64-headers/include/inaddr.h
+++ b/mingw-w64-headers/include/inaddr.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 
diff --git a/mingw-w64-headers/include/indexsrv.h b/mingw-w64-headers/include/indexsrv.h
index 943e322..fc7bf0a 100644
--- a/mingw-w64-headers/include/indexsrv.h
+++ b/mingw-w64-headers/include/indexsrv.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/inetreg.h b/mingw-w64-headers/include/inetreg.h
index f7bfdce..ca3861f 100644
--- a/mingw-w64-headers/include/inetreg.h
+++ b/mingw-w64-headers/include/inetreg.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INETREGSTRS_H_
diff --git a/mingw-w64-headers/include/inetsdk.h b/mingw-w64-headers/include/inetsdk.h
index d88e4bc..04c59df 100644
--- a/mingw-w64-headers/include/inetsdk.h
+++ b/mingw-w64-headers/include/inetsdk.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/initguid.h b/mingw-w64-headers/include/initguid.h
index 1d52095..8361e4f 100644
--- a/mingw-w64-headers/include/initguid.h
+++ b/mingw-w64-headers/include/initguid.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #define INITGUID
diff --git a/mingw-w64-headers/include/initoid.h b/mingw-w64-headers/include/initoid.h
index cad1eac..b9fdd62 100644
--- a/mingw-w64-headers/include/initoid.h
+++ b/mingw-w64-headers/include/initoid.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #define MAPI_PREFIX 0x2A,0x86,0x48,0x86,0xf7,0x14,0x03
diff --git a/mingw-w64-headers/include/inputscope.h b/mingw-w64-headers/include/inputscope.h
index f201379..cebabf7 100644
--- a/mingw-w64-headers/include/inputscope.h
+++ b/mingw-w64-headers/include/inputscope.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/intshcut.h b/mingw-w64-headers/include/intshcut.h
index 5399097..9126d4c 100644
--- a/mingw-w64-headers/include/intshcut.h
+++ b/mingw-w64-headers/include/intshcut.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __INTSHCUT_H__
diff --git a/mingw-w64-headers/include/invkprxy.h b/mingw-w64-headers/include/invkprxy.h
index 25b533b..5f6ac91 100644
--- a/mingw-w64-headers/include/invkprxy.h
+++ b/mingw-w64-headers/include/invkprxy.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_INVKPRXY
diff --git a/mingw-w64-headers/include/ioevent.h b/mingw-w64-headers/include/ioevent.h
index 3f64111..679bdf1 100644
--- a/mingw-w64-headers/include/ioevent.h
+++ b/mingw-w64-headers/include/ioevent.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 DEFINE_GUID(GUID_IO_VOLUME_CHANGE,0x7373654aL,0x812a,0x11d0,0xbe,0xc7,0x08,0x00,0x2b,0xe2,0x09,0x2f);
diff --git a/mingw-w64-headers/include/ipexport.h b/mingw-w64-headers/include/ipexport.h
index 0190de4..fef0fda 100644
--- a/mingw-w64-headers/include/ipexport.h
+++ b/mingw-w64-headers/include/ipexport.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef IP_EXPORT_INCLUDED
diff --git a/mingw-w64-headers/include/iphlpapi.h b/mingw-w64-headers/include/iphlpapi.h
index 5df0210..62a4a48 100644
--- a/mingw-w64-headers/include/iphlpapi.h
+++ b/mingw-w64-headers/include/iphlpapi.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __IPHLPAPI_H__
diff --git a/mingw-w64-headers/include/ipifcons.h b/mingw-w64-headers/include/ipifcons.h
index 3ea19a7..65f678d 100644
--- a/mingw-w64-headers/include/ipifcons.h
+++ b/mingw-w64-headers/include/ipifcons.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __IPIFCONS_H__
diff --git a/mingw-w64-headers/include/ipinfoid.h b/mingw-w64-headers/include/ipinfoid.h
index 80ad783..233cec1 100644
--- a/mingw-w64-headers/include/ipinfoid.h
+++ b/mingw-w64-headers/include/ipinfoid.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __ROUTING_IPINFOID_H__
diff --git a/mingw-w64-headers/include/ipmib.h b/mingw-w64-headers/include/ipmib.h
index c0b45b4..8773dc0 100644
--- a/mingw-w64-headers/include/ipmib.h
+++ b/mingw-w64-headers/include/ipmib.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #include <nldef.h>
diff --git a/mingw-w64-headers/include/ipmsp.h b/mingw-w64-headers/include/ipmsp.h
index 6070bd5..c338601 100644
--- a/mingw-w64-headers/include/ipmsp.h
+++ b/mingw-w64-headers/include/ipmsp.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/iprtrmib.h b/mingw-w64-headers/include/iprtrmib.h
index 560e7d5..f5f826b 100644
--- a/mingw-w64-headers/include/iprtrmib.h
+++ b/mingw-w64-headers/include/iprtrmib.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __ROUTING_IPRTRMIB_H__
diff --git a/mingw-w64-headers/include/ipsectypes.h b/mingw-w64-headers/include/ipsectypes.h
index 124b2a1..e01b47b 100644
--- a/mingw-w64-headers/include/ipsectypes.h
+++ b/mingw-w64-headers/include/ipsectypes.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_IPSECTYPES
diff --git a/mingw-w64-headers/include/iptypes.h b/mingw-w64-headers/include/iptypes.h
index 9b5dea9..745d3f9 100644
--- a/mingw-w64-headers/include/iptypes.h
+++ b/mingw-w64-headers/include/iptypes.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef IP_TYPES_INCLUDED
diff --git a/mingw-w64-headers/include/ipxconst.h b/mingw-w64-headers/include/ipxconst.h
index df9f1a4..77b7892 100644
--- a/mingw-w64-headers/include/ipxconst.h
+++ b/mingw-w64-headers/include/ipxconst.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _IPXCONST_
diff --git a/mingw-w64-headers/include/ipxrip.h b/mingw-w64-headers/include/ipxrip.h
index 85af7a6..4438771 100644
--- a/mingw-w64-headers/include/ipxrip.h
+++ b/mingw-w64-headers/include/ipxrip.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _IPXRIP_
diff --git a/mingw-w64-headers/include/ipxrtdef.h b/mingw-w64-headers/include/ipxrtdef.h
index 84b798c..8aa461e 100644
--- a/mingw-w64-headers/include/ipxrtdef.h
+++ b/mingw-w64-headers/include/ipxrtdef.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _IPXRTDEF_
diff --git a/mingw-w64-headers/include/ipxsap.h b/mingw-w64-headers/include/ipxsap.h
index b0e5f45..4d8eaeb 100644
--- a/mingw-w64-headers/include/ipxsap.h
+++ b/mingw-w64-headers/include/ipxsap.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _IPXSAP_
diff --git a/mingw-w64-headers/include/ipxtfflt.h b/mingw-w64-headers/include/ipxtfflt.h
index 7fca655..3fa6f66 100644
--- a/mingw-w64-headers/include/ipxtfflt.h
+++ b/mingw-w64-headers/include/ipxtfflt.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __ipxfltdf_h
diff --git a/mingw-w64-headers/include/iscsidsc.h b/mingw-w64-headers/include/iscsidsc.h
index 134ead9..a83f355 100644
--- a/mingw-w64-headers/include/iscsidsc.h
+++ b/mingw-w64-headers/include/iscsidsc.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_ISCSIDSC
diff --git a/mingw-w64-headers/include/isguids.h b/mingw-w64-headers/include/isguids.h
index 58bc8a8..fbad423 100644
--- a/mingw-w64-headers/include/isguids.h
+++ b/mingw-w64-headers/include/isguids.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _ISGUIDS_H_
diff --git a/mingw-w64-headers/include/issper16.h b/mingw-w64-headers/include/issper16.h
index b383d40..404c8d7 100644
--- a/mingw-w64-headers/include/issper16.h
+++ b/mingw-w64-headers/include/issper16.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _ISSPERR_H_
diff --git a/mingw-w64-headers/include/issperr.h b/mingw-w64-headers/include/issperr.h
index 9a6bbfe..d505447 100644
--- a/mingw-w64-headers/include/issperr.h
+++ b/mingw-w64-headers/include/issperr.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #warning The header issperr.h is an obsolete file.
diff --git a/mingw-w64-headers/include/isysmon.h b/mingw-w64-headers/include/isysmon.h
index 8ffd031..a0254f1 100644
--- a/mingw-w64-headers/include/isysmon.h
+++ b/mingw-w64-headers/include/isysmon.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_ISYSMON
diff --git a/mingw-w64-headers/include/iwamreg.h b/mingw-w64-headers/include/iwamreg.h
index 3c8fd88..8f60b65 100644
--- a/mingw-w64-headers/include/iwamreg.h
+++ b/mingw-w64-headers/include/iwamreg.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/ks.h b/mingw-w64-headers/include/ks.h
index 4d88035..6420528 100644
--- a/mingw-w64-headers/include/ks.h
+++ b/mingw-w64-headers/include/ks.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _KS_
diff --git a/mingw-w64-headers/include/ksguid.h b/mingw-w64-headers/include/ksguid.h
index f0774d0..eca0269 100644
--- a/mingw-w64-headers/include/ksguid.h
+++ b/mingw-w64-headers/include/ksguid.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #define INITGUID
diff --git a/mingw-w64-headers/include/ksmedia.h b/mingw-w64-headers/include/ksmedia.h
index 6226262..46f0847 100644
--- a/mingw-w64-headers/include/ksmedia.h
+++ b/mingw-w64-headers/include/ksmedia.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 
diff --git a/mingw-w64-headers/include/ksproxy.h b/mingw-w64-headers/include/ksproxy.h
index e6e049d..9f44fe0 100644
--- a/mingw-w64-headers/include/ksproxy.h
+++ b/mingw-w64-headers/include/ksproxy.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __KSPROXY__
diff --git a/mingw-w64-headers/include/ksuuids.h b/mingw-w64-headers/include/ksuuids.h
index 2eba884..5b359dc 100644
--- a/mingw-w64-headers/include/ksuuids.h
+++ b/mingw-w64-headers/include/ksuuids.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 
diff --git a/mingw-w64-headers/include/ktmw32.h b/mingw-w64-headers/include/ktmw32.h
index ca32aeb..2df18e6 100644
--- a/mingw-w64-headers/include/ktmw32.h
+++ b/mingw-w64-headers/include/ktmw32.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_KTMW32
diff --git a/mingw-w64-headers/include/kxia64.h b/mingw-w64-headers/include/kxia64.h
index c166bf7..476c357 100644
--- a/mingw-w64-headers/include/kxia64.h
+++ b/mingw-w64-headers/include/kxia64.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #define SHADOW_IRQL_IMPLEMENTATION 1
diff --git a/mingw-w64-headers/include/lm.h b/mingw-w64-headers/include/lm.h
index a1c78bd..2413af2 100644
--- a/mingw-w64-headers/include/lm.h
+++ b/mingw-w64-headers/include/lm.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _LM_
diff --git a/mingw-w64-headers/include/lmaccess.h b/mingw-w64-headers/include/lmaccess.h
index 59481b3..f8f0b2e 100644
--- a/mingw-w64-headers/include/lmaccess.h
+++ b/mingw-w64-headers/include/lmaccess.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _LMUSER_
diff --git a/mingw-w64-headers/include/lmalert.h b/mingw-w64-headers/include/lmalert.h
index 053c924..5df40d0 100644
--- a/mingw-w64-headers/include/lmalert.h
+++ b/mingw-w64-headers/include/lmalert.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _ALERT_
diff --git a/mingw-w64-headers/include/lmapibuf.h b/mingw-w64-headers/include/lmapibuf.h
index efa614e..7f8a87e 100644
--- a/mingw-w64-headers/include/lmapibuf.h
+++ b/mingw-w64-headers/include/lmapibuf.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _LMAPIBUF_
diff --git a/mingw-w64-headers/include/lmat.h b/mingw-w64-headers/include/lmat.h
index a174c60..16ad29c 100644
--- a/mingw-w64-headers/include/lmat.h
+++ b/mingw-w64-headers/include/lmat.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _LMAT_
diff --git a/mingw-w64-headers/include/lmaudit.h b/mingw-w64-headers/include/lmaudit.h
index 122b10f..879835a 100644
--- a/mingw-w64-headers/include/lmaudit.h
+++ b/mingw-w64-headers/include/lmaudit.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _LMAUDIT_
diff --git a/mingw-w64-headers/include/lmconfig.h b/mingw-w64-headers/include/lmconfig.h
index c6a273b..bf4922e 100644
--- a/mingw-w64-headers/include/lmconfig.h
+++ b/mingw-w64-headers/include/lmconfig.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _LMCONFIG_
diff --git a/mingw-w64-headers/include/lmcons.h b/mingw-w64-headers/include/lmcons.h
index 569a819..1be8b72 100644
--- a/mingw-w64-headers/include/lmcons.h
+++ b/mingw-w64-headers/include/lmcons.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef NETCONS_INCLUDED
diff --git a/mingw-w64-headers/include/lmdfs.h b/mingw-w64-headers/include/lmdfs.h
index 05b8048..678b051 100644
--- a/mingw-w64-headers/include/lmdfs.h
+++ b/mingw-w64-headers/include/lmdfs.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _LMDFS_
diff --git a/mingw-w64-headers/include/lmerr.h b/mingw-w64-headers/include/lmerr.h
index a0879de..52c45d1 100644
--- a/mingw-w64-headers/include/lmerr.h
+++ b/mingw-w64-headers/include/lmerr.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef NETERR_INCLUDED
diff --git a/mingw-w64-headers/include/lmerrlog.h b/mingw-w64-headers/include/lmerrlog.h
index 6b8bb5c..4500dd8 100644
--- a/mingw-w64-headers/include/lmerrlog.h
+++ b/mingw-w64-headers/include/lmerrlog.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _LMERRLOG_
diff --git a/mingw-w64-headers/include/lmjoin.h b/mingw-w64-headers/include/lmjoin.h
index f865f13..928dafc 100644
--- a/mingw-w64-headers/include/lmjoin.h
+++ b/mingw-w64-headers/include/lmjoin.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __LMJOIN_H__
diff --git a/mingw-w64-headers/include/lmmsg.h b/mingw-w64-headers/include/lmmsg.h
index 8229bd5..d6e61cf 100644
--- a/mingw-w64-headers/include/lmmsg.h
+++ b/mingw-w64-headers/include/lmmsg.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _LMMSG_
diff --git a/mingw-w64-headers/include/lmremutl.h b/mingw-w64-headers/include/lmremutl.h
index 26bdf85..8161a1d 100644
--- a/mingw-w64-headers/include/lmremutl.h
+++ b/mingw-w64-headers/include/lmremutl.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _LMREMUTL_
diff --git a/mingw-w64-headers/include/lmrepl.h b/mingw-w64-headers/include/lmrepl.h
index 31ca6ce..b782ec6 100644
--- a/mingw-w64-headers/include/lmrepl.h
+++ b/mingw-w64-headers/include/lmrepl.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _LMREPL_
diff --git a/mingw-w64-headers/include/lmserver.h b/mingw-w64-headers/include/lmserver.h
index 4875389..1f6e738 100644
--- a/mingw-w64-headers/include/lmserver.h
+++ b/mingw-w64-headers/include/lmserver.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _LMSERVER_
diff --git a/mingw-w64-headers/include/lmshare.h b/mingw-w64-headers/include/lmshare.h
index 6c8aec9..44dd80b 100644
--- a/mingw-w64-headers/include/lmshare.h
+++ b/mingw-w64-headers/include/lmshare.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _LMSHARE_
diff --git a/mingw-w64-headers/include/lmsname.h b/mingw-w64-headers/include/lmsname.h
index 202b68a..63d96e8 100644
--- a/mingw-w64-headers/include/lmsname.h
+++ b/mingw-w64-headers/include/lmsname.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _LMSNAME_
diff --git a/mingw-w64-headers/include/lmstats.h b/mingw-w64-headers/include/lmstats.h
index 0d3ebaa..ae54cd8 100644
--- a/mingw-w64-headers/include/lmstats.h
+++ b/mingw-w64-headers/include/lmstats.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _LMSTATS_
diff --git a/mingw-w64-headers/include/lmsvc.h b/mingw-w64-headers/include/lmsvc.h
index 9a8ebd5..09116e2 100644
--- a/mingw-w64-headers/include/lmsvc.h
+++ b/mingw-w64-headers/include/lmsvc.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _LMSVC_
diff --git a/mingw-w64-headers/include/lmuse.h b/mingw-w64-headers/include/lmuse.h
index b621486..acd8356 100644
--- a/mingw-w64-headers/include/lmuse.h
+++ b/mingw-w64-headers/include/lmuse.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _LMUSE_
diff --git a/mingw-w64-headers/include/lmuseflg.h b/mingw-w64-headers/include/lmuseflg.h
index 6888d71..ebbb987 100644
--- a/mingw-w64-headers/include/lmuseflg.h
+++ b/mingw-w64-headers/include/lmuseflg.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _LMUSEFLG_
diff --git a/mingw-w64-headers/include/lmwksta.h b/mingw-w64-headers/include/lmwksta.h
index 7641896..d75be09 100644
--- a/mingw-w64-headers/include/lmwksta.h
+++ b/mingw-w64-headers/include/lmwksta.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _LMWKSTA_
diff --git a/mingw-w64-headers/include/loadperf.h b/mingw-w64-headers/include/loadperf.h
index 3920a76..47ad42a 100644
--- a/mingw-w64-headers/include/loadperf.h
+++ b/mingw-w64-headers/include/loadperf.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _LOADPERF_H_
diff --git a/mingw-w64-headers/include/locationapi.h b/mingw-w64-headers/include/locationapi.h
index 708407b..52619ae 100644
--- a/mingw-w64-headers/include/locationapi.h
+++ b/mingw-w64-headers/include/locationapi.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __INC_LOCATIONAPI__
diff --git a/mingw-w64-headers/include/lpmapi.h b/mingw-w64-headers/include/lpmapi.h
index eb8db29..1c207ae 100644
--- a/mingw-w64-headers/include/lpmapi.h
+++ b/mingw-w64-headers/include/lpmapi.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __LPMAPI_H_
diff --git a/mingw-w64-headers/include/lzexpand.h b/mingw-w64-headers/include/lzexpand.h
index 4b4a7e9..160e3bb 100644
--- a/mingw-w64-headers/include/lzexpand.h
+++ b/mingw-w64-headers/include/lzexpand.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _LZEXPAND_
diff --git a/mingw-w64-headers/include/madcapcl.h b/mingw-w64-headers/include/madcapcl.h
index f373808..1be6063 100644
--- a/mingw-w64-headers/include/madcapcl.h
+++ b/mingw-w64-headers/include/madcapcl.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _MADCAPCL_H_
diff --git a/mingw-w64-headers/include/mailmsgprops.h b/mingw-w64-headers/include/mailmsgprops.h
index a0e4ab8..242b42b 100644
--- a/mingw-w64-headers/include/mailmsgprops.h
+++ b/mingw-w64-headers/include/mailmsgprops.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __MAILMSGPROPS_H__
diff --git a/mingw-w64-headers/include/manipulations.h b/mingw-w64-headers/include/manipulations.h
index 9928a88..2b120f3 100644
--- a/mingw-w64-headers/include/manipulations.h
+++ b/mingw-w64-headers/include/manipulations.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __INC_MANIPULATIONS__
diff --git a/mingw-w64-headers/include/mapi.h b/mingw-w64-headers/include/mapi.h
index 225da1d..e9c6a84 100644
--- a/mingw-w64-headers/include/mapi.h
+++ b/mingw-w64-headers/include/mapi.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef MAPI_H
diff --git a/mingw-w64-headers/include/mapicode.h b/mingw-w64-headers/include/mapicode.h
index b71e593..0b53197 100644
--- a/mingw-w64-headers/include/mapicode.h
+++ b/mingw-w64-headers/include/mapicode.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef MAPICODE_H
diff --git a/mingw-w64-headers/include/mapidbg.h b/mingw-w64-headers/include/mapidbg.h
index 1d39073..20e851e 100644
--- a/mingw-w64-headers/include/mapidbg.h
+++ b/mingw-w64-headers/include/mapidbg.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __MAPIDBG_H_
diff --git a/mingw-w64-headers/include/mapidefs.h b/mingw-w64-headers/include/mapidefs.h
index f497dc7..8186aee 100644
--- a/mingw-w64-headers/include/mapidefs.h
+++ b/mingw-w64-headers/include/mapidefs.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef MAPIDEFS_H
diff --git a/mingw-w64-headers/include/mapiform.h b/mingw-w64-headers/include/mapiform.h
index 575264a..98d0798 100644
--- a/mingw-w64-headers/include/mapiform.h
+++ b/mingw-w64-headers/include/mapiform.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef MAPIFORM_H
diff --git a/mingw-w64-headers/include/mapiguid.h b/mingw-w64-headers/include/mapiguid.h
index e5d5b60..aa67124 100644
--- a/mingw-w64-headers/include/mapiguid.h
+++ b/mingw-w64-headers/include/mapiguid.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef MAPIGUID_H
diff --git a/mingw-w64-headers/include/mapihook.h b/mingw-w64-headers/include/mapihook.h
index f074d73..5229dc6 100644
--- a/mingw-w64-headers/include/mapihook.h
+++ b/mingw-w64-headers/include/mapihook.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef MAPIHOOK_H
diff --git a/mingw-w64-headers/include/mapinls.h b/mingw-w64-headers/include/mapinls.h
index a37aae9..70c6339 100644
--- a/mingw-w64-headers/include/mapinls.h
+++ b/mingw-w64-headers/include/mapinls.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _MAPINLS_H_
diff --git a/mingw-w64-headers/include/mapioid.h b/mingw-w64-headers/include/mapioid.h
index 7fa0eb6..21e1c16 100644
--- a/mingw-w64-headers/include/mapioid.h
+++ b/mingw-w64-headers/include/mapioid.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _MAPIOID_
diff --git a/mingw-w64-headers/include/mapispi.h b/mingw-w64-headers/include/mapispi.h
index b49b48f..9c55659 100644
--- a/mingw-w64-headers/include/mapispi.h
+++ b/mingw-w64-headers/include/mapispi.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef MAPISPI_H
diff --git a/mingw-w64-headers/include/mapitags.h b/mingw-w64-headers/include/mapitags.h
index e13f3f0..a3eac0a 100644
--- a/mingw-w64-headers/include/mapitags.h
+++ b/mingw-w64-headers/include/mapitags.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef MAPITAGS_H
diff --git a/mingw-w64-headers/include/mapiutil.h b/mingw-w64-headers/include/mapiutil.h
index 64abf2f..a1704c6 100644
--- a/mingw-w64-headers/include/mapiutil.h
+++ b/mingw-w64-headers/include/mapiutil.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _MAPIUTIL_H_
diff --git a/mingw-w64-headers/include/mapival.h b/mingw-w64-headers/include/mapival.h
index fd41a6f..1f63d29 100644
--- a/mingw-w64-headers/include/mapival.h
+++ b/mingw-w64-headers/include/mapival.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_VALIDATE
diff --git a/mingw-w64-headers/include/mapiwin.h b/mingw-w64-headers/include/mapiwin.h
index 43f372c..bd39c17 100644
--- a/mingw-w64-headers/include/mapiwin.h
+++ b/mingw-w64-headers/include/mapiwin.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __MAPIWIN_H__
diff --git a/mingw-w64-headers/include/mapiwz.h b/mingw-w64-headers/include/mapiwz.h
index 535907e..98816e9 100644
--- a/mingw-w64-headers/include/mapiwz.h
+++ b/mingw-w64-headers/include/mapiwz.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _MAPIWZ_H
diff --git a/mingw-w64-headers/include/mapix.h b/mingw-w64-headers/include/mapix.h
index d5992a0..34e82a1 100644
--- a/mingw-w64-headers/include/mapix.h
+++ b/mingw-w64-headers/include/mapix.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef MAPIX_H
diff --git a/mingw-w64-headers/include/mciavi.h b/mingw-w64-headers/include/mciavi.h
index 84b4cb8..984368f 100644
--- a/mingw-w64-headers/include/mciavi.h
+++ b/mingw-w64-headers/include/mciavi.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #define MCI_MCIAVI_PLAY_WINDOW 0x01000000L
diff --git a/mingw-w64-headers/include/mcx.h b/mingw-w64-headers/include/mcx.h
index 0a4f756..a6dfb9f 100644
--- a/mingw-w64-headers/include/mcx.h
+++ b/mingw-w64-headers/include/mcx.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _MCX_H_
diff --git a/mingw-w64-headers/include/mdbrole.hxx b/mingw-w64-headers/include/mdbrole.hxx
index 104f811..c143731 100644
--- a/mingw-w64-headers/include/mdbrole.hxx
+++ b/mingw-w64-headers/include/mdbrole.hxx
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _MDBROLE_HXX_
diff --git a/mingw-w64-headers/include/mdcommsg.h b/mingw-w64-headers/include/mdcommsg.h
index 418a3fb..9a188a1 100644
--- a/mingw-w64-headers/include/mdcommsg.h
+++ b/mingw-w64-headers/include/mdcommsg.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _COMMSG_H_
diff --git a/mingw-w64-headers/include/mddefw.h b/mingw-w64-headers/include/mddefw.h
index 46716fb..d20d314 100644
--- a/mingw-w64-headers/include/mddefw.h
+++ b/mingw-w64-headers/include/mddefw.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/mdhcp.h b/mingw-w64-headers/include/mdhcp.h
index 944ae9d..c755555 100644
--- a/mingw-w64-headers/include/mdhcp.h
+++ b/mingw-w64-headers/include/mdhcp.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/mdmsg.h b/mingw-w64-headers/include/mdmsg.h
index 2217ddf..0f0b24c 100644
--- a/mingw-w64-headers/include/mdmsg.h
+++ b/mingw-w64-headers/include/mdmsg.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _MDMSG_H_
diff --git a/mingw-w64-headers/include/mergemod.h b/mingw-w64-headers/include/mergemod.h
index 82b7749..551f0c0 100644
--- a/mingw-w64-headers/include/mergemod.h
+++ b/mingw-w64-headers/include/mergemod.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #include "rpc.h"
diff --git a/mingw-w64-headers/include/mfapi.h b/mingw-w64-headers/include/mfapi.h
index 91b07dc..98399b8 100644
--- a/mingw-w64-headers/include/mfapi.h
+++ b/mingw-w64-headers/include/mfapi.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_MFAPI
diff --git a/mingw-w64-headers/include/mfidl.h b/mingw-w64-headers/include/mfidl.h
index 8c2bbef..e752f15 100644
--- a/mingw-w64-headers/include/mfidl.h
+++ b/mingw-w64-headers/include/mfidl.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_MFIDL
diff --git a/mingw-w64-headers/include/mfmp2dlna.h b/mingw-w64-headers/include/mfmp2dlna.h
index fa67452..898ee6d 100644
--- a/mingw-w64-headers/include/mfmp2dlna.h
+++ b/mingw-w64-headers/include/mfmp2dlna.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_MFMP2DLNA
diff --git a/mingw-w64-headers/include/mfobjects.h b/mingw-w64-headers/include/mfobjects.h
index 435af99..7808951 100644
--- a/mingw-w64-headers/include/mfobjects.h
+++ b/mingw-w64-headers/include/mfobjects.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_MFOBJECTS
diff --git a/mingw-w64-headers/include/mfplay.h b/mingw-w64-headers/include/mfplay.h
index 968899f..0263a5f 100644
--- a/mingw-w64-headers/include/mfplay.h
+++ b/mingw-w64-headers/include/mfplay.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_MFPLAY
diff --git a/mingw-w64-headers/include/mfreadwrite.h b/mingw-w64-headers/include/mfreadwrite.h
index 3a777e0..fc5153a 100644
--- a/mingw-w64-headers/include/mfreadwrite.h
+++ b/mingw-w64-headers/include/mfreadwrite.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_MFREADWRITE
diff --git a/mingw-w64-headers/include/mftransform.h b/mingw-w64-headers/include/mftransform.h
index 77404a2..85f1d81 100644
--- a/mingw-w64-headers/include/mftransform.h
+++ b/mingw-w64-headers/include/mftransform.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_MFTRANSFORM
diff --git a/mingw-w64-headers/include/mgm.h b/mingw-w64-headers/include/mgm.h
index bd7a13b..a50b843 100644
--- a/mingw-w64-headers/include/mgm.h
+++ b/mingw-w64-headers/include/mgm.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _MGM_H_
diff --git a/mingw-w64-headers/include/mgmtapi.h b/mingw-w64-headers/include/mgmtapi.h
index c9b27a9..6ff367c 100644
--- a/mingw-w64-headers/include/mgmtapi.h
+++ b/mingw-w64-headers/include/mgmtapi.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_MGMTAPI
diff --git a/mingw-w64-headers/include/midles.h b/mingw-w64-headers/include/midles.h
index 966a376..d82c19d 100644
--- a/mingw-w64-headers/include/midles.h
+++ b/mingw-w64-headers/include/midles.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __MIDLES_H__
diff --git a/mingw-w64-headers/include/mimedisp.h b/mingw-w64-headers/include/mimedisp.h
index 3ce48d1..e937882 100644
--- a/mingw-w64-headers/include/mimedisp.h
+++ b/mingw-w64-headers/include/mimedisp.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __MIMEDISP_H__
diff --git a/mingw-w64-headers/include/mimeinfo.h b/mingw-w64-headers/include/mimeinfo.h
index b4fb8d0..451d6be 100644
--- a/mingw-w64-headers/include/mimeinfo.h
+++ b/mingw-w64-headers/include/mimeinfo.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/minmax.h b/mingw-w64-headers/include/minmax.h
index d37bc8f..d942c7f 100644
--- a/mingw-w64-headers/include/minmax.h
+++ b/mingw-w64-headers/include/minmax.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_MINMAX
diff --git a/mingw-w64-headers/include/mlang.h b/mingw-w64-headers/include/mlang.h
index 98ddfe0..2391641 100644
--- a/mingw-w64-headers/include/mlang.h
+++ b/mingw-w64-headers/include/mlang.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/mmc.h b/mingw-w64-headers/include/mmc.h
index ce56d39..85dede0 100644
--- a/mingw-w64-headers/include/mmc.h
+++ b/mingw-w64-headers/include/mmc.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/mmcobj.h b/mingw-w64-headers/include/mmcobj.h
index 85e0bd1..ae13ebe 100644
--- a/mingw-w64-headers/include/mmcobj.h
+++ b/mingw-w64-headers/include/mmcobj.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/mmreg.h b/mingw-w64-headers/include/mmreg.h
index 69b908e..253a6bb 100644
--- a/mingw-w64-headers/include/mmreg.h
+++ b/mingw-w64-headers/include/mmreg.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_MMREG
diff --git a/mingw-w64-headers/include/mmsystem.h b/mingw-w64-headers/include/mmsystem.h
index f58a9e5..5011a26 100644
--- a/mingw-w64-headers/include/mmsystem.h
+++ b/mingw-w64-headers/include/mmsystem.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_MMSYSTEM
diff --git a/mingw-w64-headers/include/mobsync.h b/mingw-w64-headers/include/mobsync.h
index c040bc8..a2963e3 100644
--- a/mingw-w64-headers/include/mobsync.h
+++ b/mingw-w64-headers/include/mobsync.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/moniker.h b/mingw-w64-headers/include/moniker.h
index 09e676a..0209956 100644
--- a/mingw-w64-headers/include/moniker.h
+++ b/mingw-w64-headers/include/moniker.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef RC_INVOKED
diff --git a/mingw-w64-headers/include/mpeg2bits.h b/mingw-w64-headers/include/mpeg2bits.h
index b7c44a5..74258bd 100644
--- a/mingw-w64-headers/include/mpeg2bits.h
+++ b/mingw-w64-headers/include/mpeg2bits.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __INC_MPEG2BITS__
diff --git a/mingw-w64-headers/include/mpeg2data.h b/mingw-w64-headers/include/mpeg2data.h
index 03d86a3..caf9856 100644
--- a/mingw-w64-headers/include/mpeg2data.h
+++ b/mingw-w64-headers/include/mpeg2data.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __INC_MPEG2DATA__
diff --git a/mingw-w64-headers/include/mpeg2psiparser.h b/mingw-w64-headers/include/mpeg2psiparser.h
index 28ee258..7c8e1c0 100644
--- a/mingw-w64-headers/include/mpeg2psiparser.h
+++ b/mingw-w64-headers/include/mpeg2psiparser.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 
diff --git a/mingw-w64-headers/include/mpeg2structs.h b/mingw-w64-headers/include/mpeg2structs.h
index 2010ab0..7557b26 100644
--- a/mingw-w64-headers/include/mpeg2structs.h
+++ b/mingw-w64-headers/include/mpeg2structs.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 
diff --git a/mingw-w64-headers/include/mprapi.h b/mingw-w64-headers/include/mprapi.h
index 774ae33..2103c2b 100644
--- a/mingw-w64-headers/include/mprapi.h
+++ b/mingw-w64-headers/include/mprapi.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __ROUTING_MPRADMIN_H__
diff --git a/mingw-w64-headers/include/mprerror.h b/mingw-w64-headers/include/mprerror.h
index 7b34013..3a42f52 100644
--- a/mingw-w64-headers/include/mprerror.h
+++ b/mingw-w64-headers/include/mprerror.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _MPRERROR_H_
diff --git a/mingw-w64-headers/include/mq.h b/mingw-w64-headers/include/mq.h
index e51db2d..f293663 100644
--- a/mingw-w64-headers/include/mq.h
+++ b/mingw-w64-headers/include/mq.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __MQ_H__
diff --git a/mingw-w64-headers/include/mqmail.h b/mingw-w64-headers/include/mqmail.h
index c064d04..8a1e274 100644
--- a/mingw-w64-headers/include/mqmail.h
+++ b/mingw-w64-headers/include/mqmail.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _MQMAIL_H
diff --git a/mingw-w64-headers/include/mqoai.h b/mingw-w64-headers/include/mqoai.h
index 6cfb05a..d568a4c 100644
--- a/mingw-w64-headers/include/mqoai.h
+++ b/mingw-w64-headers/include/mqoai.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/msacm.h b/mingw-w64-headers/include/msacm.h
index 617cbce..3ebbb78 100644
--- a/mingw-w64-headers/include/msacm.h
+++ b/mingw-w64-headers/include/msacm.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_ACM
diff --git a/mingw-w64-headers/include/msacmdlg.dlg b/mingw-w64-headers/include/msacmdlg.dlg
index 06280c5..8225b01 100644
--- a/mingw-w64-headers/include/msacmdlg.dlg
+++ b/mingw-w64-headers/include/msacmdlg.dlg
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 DLG_ACMFORMATCHOOSE_ID DIALOG DISCARDABLE 10,20,225,100
diff --git a/mingw-w64-headers/include/msacmdlg.h b/mingw-w64-headers/include/msacmdlg.h
index c9c0d2d..c52d682 100644
--- a/mingw-w64-headers/include/msacmdlg.h
+++ b/mingw-w64-headers/include/msacmdlg.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #define DLG_ACMFORMATCHOOSE_ID 70
diff --git a/mingw-w64-headers/include/msado15.h b/mingw-w64-headers/include/msado15.h
index 448059e..3e2d369 100644
--- a/mingw-w64-headers/include/msado15.h
+++ b/mingw-w64-headers/include/msado15.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #include "adoint.h"
diff --git a/mingw-w64-headers/include/msasn1.h b/mingw-w64-headers/include/msasn1.h
index c265438..1bbde53 100644
--- a/mingw-w64-headers/include/msasn1.h
+++ b/mingw-w64-headers/include/msasn1.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __MS_ASN1_H__
diff --git a/mingw-w64-headers/include/msber.h b/mingw-w64-headers/include/msber.h
index c5c977e..cc3fe14 100644
--- a/mingw-w64-headers/include/msber.h
+++ b/mingw-w64-headers/include/msber.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __MS_BER_H__
diff --git a/mingw-w64-headers/include/mschapp.h b/mingw-w64-headers/include/mschapp.h
index edba8eb..9fde7dc 100644
--- a/mingw-w64-headers/include/mschapp.h
+++ b/mingw-w64-headers/include/mschapp.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _MSCHAPP_H_
diff --git a/mingw-w64-headers/include/msclus.h b/mingw-w64-headers/include/msclus.h
index c1247ba..c9dc698 100644
--- a/mingw-w64-headers/include/msclus.h
+++ b/mingw-w64-headers/include/msclus.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/msctfmonitorapi.h b/mingw-w64-headers/include/msctfmonitorapi.h
index b222f91..cae9016 100644
--- a/mingw-w64-headers/include/msctfmonitorapi.h
+++ b/mingw-w64-headers/include/msctfmonitorapi.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 
diff --git a/mingw-w64-headers/include/msdadc.h b/mingw-w64-headers/include/msdadc.h
index 65b52e1..bf06ca7 100644
--- a/mingw-w64-headers/include/msdadc.h
+++ b/mingw-w64-headers/include/msdadc.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/msdaguid.h b/mingw-w64-headers/include/msdaguid.h
index a0aa2e9..491d1f5 100644
--- a/mingw-w64-headers/include/msdaguid.h
+++ b/mingw-w64-headers/include/msdaguid.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef MSDAGUID
diff --git a/mingw-w64-headers/include/msdaipp.h b/mingw-w64-headers/include/msdaipp.h
index 3f9a892..9da6c52 100644
--- a/mingw-w64-headers/include/msdaipp.h
+++ b/mingw-w64-headers/include/msdaipp.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/msdaipper.h b/mingw-w64-headers/include/msdaipper.h
index 8a922ce..bf186c3 100644
--- a/mingw-w64-headers/include/msdaipper.h
+++ b/mingw-w64-headers/include/msdaipper.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #define IPP_E_FIRST 0x40048000L
diff --git a/mingw-w64-headers/include/msdaora.h b/mingw-w64-headers/include/msdaora.h
index 3f43fc6..54ddf69 100644
--- a/mingw-w64-headers/include/msdaora.h
+++ b/mingw-w64-headers/include/msdaora.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __MSDAORAGUIDS_DEFINED__
diff --git a/mingw-w64-headers/include/msdaosp.h b/mingw-w64-headers/include/msdaosp.h
index 6cc1c96..2a004ee 100644
--- a/mingw-w64-headers/include/msdaosp.h
+++ b/mingw-w64-headers/include/msdaosp.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/msdasc.h b/mingw-w64-headers/include/msdasc.h
index 78d95fd..f0c6387 100644
--- a/mingw-w64-headers/include/msdasc.h
+++ b/mingw-w64-headers/include/msdasc.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/msdasql.h b/mingw-w64-headers/include/msdasql.h
index 454f795..b9df50b 100644
--- a/mingw-w64-headers/include/msdasql.h
+++ b/mingw-w64-headers/include/msdasql.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _MSDASQL_H_
diff --git a/mingw-w64-headers/include/msdatsrc.h b/mingw-w64-headers/include/msdatsrc.h
index c973521..2177135 100644
--- a/mingw-w64-headers/include/msdatsrc.h
+++ b/mingw-w64-headers/include/msdatsrc.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/msdrm.h b/mingw-w64-headers/include/msdrm.h
index 73da86a..665939d 100644
--- a/mingw-w64-headers/include/msdrm.h
+++ b/mingw-w64-headers/include/msdrm.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_MSDRM
diff --git a/mingw-w64-headers/include/msdrmdefs.h b/mingw-w64-headers/include/msdrmdefs.h
index ad52880..3f19413 100644
--- a/mingw-w64-headers/include/msdrmdefs.h
+++ b/mingw-w64-headers/include/msdrmdefs.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_MSDRMDEFS
diff --git a/mingw-w64-headers/include/msdshape.h b/mingw-w64-headers/include/msdshape.h
index 90a1e18..2c7775e 100644
--- a/mingw-w64-headers/include/msdshape.h
+++ b/mingw-w64-headers/include/msdshape.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef DS_INCLUDED
diff --git a/mingw-w64-headers/include/msfs.h b/mingw-w64-headers/include/msfs.h
index 2102e2c..d0fe760 100644
--- a/mingw-w64-headers/include/msfs.h
+++ b/mingw-w64-headers/include/msfs.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _MSFS_H_
diff --git a/mingw-w64-headers/include/mshtmcid.h b/mingw-w64-headers/include/mshtmcid.h
index 02934a9..fda0972 100644
--- a/mingw-w64-headers/include/mshtmcid.h
+++ b/mingw-w64-headers/include/mshtmcid.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __mshtmcid_h__
diff --git a/mingw-w64-headers/include/mshtmdid.h b/mingw-w64-headers/include/mshtmdid.h
index 94c99cb..7ebdb22 100644
--- a/mingw-w64-headers/include/mshtmdid.h
+++ b/mingw-w64-headers/include/mshtmdid.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __COREDISP_H__
diff --git a/mingw-w64-headers/include/mshtmhst.h b/mingw-w64-headers/include/mshtmhst.h
index d3e2f80..f976c1f 100644
--- a/mingw-w64-headers/include/mshtmhst.h
+++ b/mingw-w64-headers/include/mshtmhst.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/mshtml.h b/mingw-w64-headers/include/mshtml.h
index cec0728..09a9af7 100644
--- a/mingw-w64-headers/include/mshtml.h
+++ b/mingw-w64-headers/include/mshtml.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #if !defined(__cplusplus) || defined(CINTERFACE)
diff --git a/mingw-w64-headers/include/mshtmlc.h b/mingw-w64-headers/include/mshtmlc.h
index e09525a..cf75458 100644
--- a/mingw-w64-headers/include/mshtmlc.h
+++ b/mingw-w64-headers/include/mshtmlc.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/msi.h b/mingw-w64-headers/include/msi.h
index 24b464c..b06a932 100644
--- a/mingw-w64-headers/include/msi.h
+++ b/mingw-w64-headers/include/msi.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _MSI_H_
diff --git a/mingw-w64-headers/include/msidefs.h b/mingw-w64-headers/include/msidefs.h
index 683ab97..d46827a 100644
--- a/mingw-w64-headers/include/msidefs.h
+++ b/mingw-w64-headers/include/msidefs.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __MSIDEFS
diff --git a/mingw-w64-headers/include/msimcntl.h b/mingw-w64-headers/include/msimcntl.h
index 7e58a83..67a5d7e 100644
--- a/mingw-w64-headers/include/msimcntl.h
+++ b/mingw-w64-headers/include/msimcntl.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/msimcsdk.h b/mingw-w64-headers/include/msimcsdk.h
index 2f40ee0..24d0eea 100644
--- a/mingw-w64-headers/include/msimcsdk.h
+++ b/mingw-w64-headers/include/msimcsdk.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/msiquery.h b/mingw-w64-headers/include/msiquery.h
index d40c643..3bbbe7b 100644
--- a/mingw-w64-headers/include/msiquery.h
+++ b/mingw-w64-headers/include/msiquery.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _MSIQUERY_H_
diff --git a/mingw-w64-headers/include/msoav.h b/mingw-w64-headers/include/msoav.h
index 7001428..d9b236e 100644
--- a/mingw-w64-headers/include/msoav.h
+++ b/mingw-w64-headers/include/msoav.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _MSOAV_H
diff --git a/mingw-w64-headers/include/msp.h b/mingw-w64-headers/include/msp.h
index 6d1ca1f..3ff1f34 100644
--- a/mingw-w64-headers/include/msp.h
+++ b/mingw-w64-headers/include/msp.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/mspab.h b/mingw-w64-headers/include/mspab.h
index 50d14c6..e80d84b 100644
--- a/mingw-w64-headers/include/mspab.h
+++ b/mingw-w64-headers/include/mspab.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #define PAB_PROVIDER_ID { 0xB5,0x3b,0xc2,0xc0,0x2c,0x77,0x10,0x1a,0xa1,0xbc,0x08,0x00,0x2b,0x2a,0x56,0xc2 }
diff --git a/mingw-w64-headers/include/mspcall.h b/mingw-w64-headers/include/mspcall.h
index 444f924..79e589f 100644
--- a/mingw-w64-headers/include/mspcall.h
+++ b/mingw-w64-headers/include/mspcall.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __MSPCALL_H_
diff --git a/mingw-w64-headers/include/mspcoll.h b/mingw-w64-headers/include/mspcoll.h
index 5da3da3..da5f7ab 100644
--- a/mingw-w64-headers/include/mspcoll.h
+++ b/mingw-w64-headers/include/mspcoll.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _MSPCOLL_H_
diff --git a/mingw-w64-headers/include/mspenum.h b/mingw-w64-headers/include/mspenum.h
index 8af4697..abfb5cd 100644
--- a/mingw-w64-headers/include/mspenum.h
+++ b/mingw-w64-headers/include/mspenum.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _MSPENUM_H_
diff --git a/mingw-w64-headers/include/msplog.h b/mingw-w64-headers/include/msplog.h
index 5660b13..d422d82 100644
--- a/mingw-w64-headers/include/msplog.h
+++ b/mingw-w64-headers/include/msplog.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _MSPLOG_H_
diff --git a/mingw-w64-headers/include/mspst.h b/mingw-w64-headers/include/mspst.h
index f1b2233..a04f2f3 100644
--- a/mingw-w64-headers/include/mspst.h
+++ b/mingw-w64-headers/include/mspst.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _MSPST_H_
diff --git a/mingw-w64-headers/include/mspstrm.h b/mingw-w64-headers/include/mspstrm.h
index 4002f4b..1bf09d4 100644
--- a/mingw-w64-headers/include/mspstrm.h
+++ b/mingw-w64-headers/include/mspstrm.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _MSPSTRM_H_
diff --git a/mingw-w64-headers/include/mspterm.h b/mingw-w64-headers/include/mspterm.h
index a9ba385..be01fee 100644
--- a/mingw-w64-headers/include/mspterm.h
+++ b/mingw-w64-headers/include/mspterm.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _MSPTERM_H_
diff --git a/mingw-w64-headers/include/mspthrd.h b/mingw-w64-headers/include/mspthrd.h
index 645e3d0..b99b5c8 100644
--- a/mingw-w64-headers/include/mspthrd.h
+++ b/mingw-w64-headers/include/mspthrd.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __MSPTHRD_H
diff --git a/mingw-w64-headers/include/msptrmac.h b/mingw-w64-headers/include/msptrmac.h
index 8743ded..f87716c 100644
--- a/mingw-w64-headers/include/msptrmac.h
+++ b/mingw-w64-headers/include/msptrmac.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _MSPTRMAC_H_
diff --git a/mingw-w64-headers/include/msptrmar.h b/mingw-w64-headers/include/msptrmar.h
index f47b14c..5a968f6 100644
--- a/mingw-w64-headers/include/msptrmar.h
+++ b/mingw-w64-headers/include/msptrmar.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _MSPTRMAR_H_
diff --git a/mingw-w64-headers/include/msptrmvc.h b/mingw-w64-headers/include/msptrmvc.h
index 26d7f15..1978c5e 100644
--- a/mingw-w64-headers/include/msptrmvc.h
+++ b/mingw-w64-headers/include/msptrmvc.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _MSPTRMVC_H_
diff --git a/mingw-w64-headers/include/msputils.h b/mingw-w64-headers/include/msputils.h
index 0a33834..d4db51f 100644
--- a/mingw-w64-headers/include/msputils.h
+++ b/mingw-w64-headers/include/msputils.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __MSPUTILS_H_
diff --git a/mingw-w64-headers/include/msrdc.h b/mingw-w64-headers/include/msrdc.h
index 01f8e9b..36ec15d 100644
--- a/mingw-w64-headers/include/msrdc.h
+++ b/mingw-w64-headers/include/msrdc.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_MSRDC
diff --git a/mingw-w64-headers/include/msremote.h b/mingw-w64-headers/include/msremote.h
index f194298..443bdf0 100644
--- a/mingw-w64-headers/include/msremote.h
+++ b/mingw-w64-headers/include/msremote.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef MSRemote_INCLUDED
diff --git a/mingw-w64-headers/include/mssip.h b/mingw-w64-headers/include/mssip.h
index d02034c..c9a85ab 100644
--- a/mingw-w64-headers/include/mssip.h
+++ b/mingw-w64-headers/include/mssip.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef MSSIP_H
diff --git a/mingw-w64-headers/include/msstkppg.h b/mingw-w64-headers/include/msstkppg.h
index 9fd7bc3..321ef65 100644
--- a/mingw-w64-headers/include/msstkppg.h
+++ b/mingw-w64-headers/include/msstkppg.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _MS_STOCK_PROP_PAGES_H_
diff --git a/mingw-w64-headers/include/mstask.h b/mingw-w64-headers/include/mstask.h
index b3b4dad..c45e08b 100644
--- a/mingw-w64-headers/include/mstask.h
+++ b/mingw-w64-headers/include/mstask.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/mstcpip.h b/mingw-w64-headers/include/mstcpip.h
index 71e3d9f..e5dc081 100644
--- a/mingw-w64-headers/include/mstcpip.h
+++ b/mingw-w64-headers/include/mstcpip.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _MSTCPIP_
diff --git a/mingw-w64-headers/include/msterr.h b/mingw-w64-headers/include/msterr.h
index 00120f3..ffc4c8d 100644
--- a/mingw-w64-headers/include/msterr.h
+++ b/mingw-w64-headers/include/msterr.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _MSTERR_H_
diff --git a/mingw-w64-headers/include/mswsock.h b/mingw-w64-headers/include/mswsock.h
index a723e5a..2efdf14 100644
--- a/mingw-w64-headers/include/mswsock.h
+++ b/mingw-w64-headers/include/mswsock.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 
diff --git a/mingw-w64-headers/include/msxml.idl b/mingw-w64-headers/include/msxml.idl
index ff2b16b..675e37e 100644
--- a/mingw-w64-headers/include/msxml.idl
+++ b/mingw-w64-headers/include/msxml.idl
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 
diff --git a/mingw-w64-headers/include/msxml2.h b/mingw-w64-headers/include/msxml2.h
index ce200ea..b3935cf 100644
--- a/mingw-w64-headers/include/msxml2.h
+++ b/mingw-w64-headers/include/msxml2.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/msxml2did.h b/mingw-w64-headers/include/msxml2did.h
index c0a4040..3677882 100644
--- a/mingw-w64-headers/include/msxml2did.h
+++ b/mingw-w64-headers/include/msxml2did.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __MSXML2DID_H__
diff --git a/mingw-w64-headers/include/msxmldid.h b/mingw-w64-headers/include/msxmldid.h
index aa57f12..1aa89d8 100644
--- a/mingw-w64-headers/include/msxmldid.h
+++ b/mingw-w64-headers/include/msxmldid.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __MSXMLDID_H__
diff --git a/mingw-w64-headers/include/mtsadmin.h b/mingw-w64-headers/include/mtsadmin.h
index 2799bd1..f3a3ca9 100644
--- a/mingw-w64-headers/include/mtsadmin.h
+++ b/mingw-w64-headers/include/mtsadmin.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/mtsevents.h b/mingw-w64-headers/include/mtsevents.h
index abbf2c2..d3e0557 100644
--- a/mingw-w64-headers/include/mtsevents.h
+++ b/mingw-w64-headers/include/mtsevents.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #include "comsvcs.h"
diff --git a/mingw-w64-headers/include/mtsgrp.h b/mingw-w64-headers/include/mtsgrp.h
index abbf2c2..d3e0557 100644
--- a/mingw-w64-headers/include/mtsgrp.h
+++ b/mingw-w64-headers/include/mtsgrp.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #include "comsvcs.h"
diff --git a/mingw-w64-headers/include/mtx.h b/mingw-w64-headers/include/mtx.h
index 9a4d03e..112aaef 100644
--- a/mingw-w64-headers/include/mtx.h
+++ b/mingw-w64-headers/include/mtx.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #define __MTxSpm_LIBRARY_DEFINED__
diff --git a/mingw-w64-headers/include/mtxadmin.h b/mingw-w64-headers/include/mtxadmin.h
index edd53dd..fc5550e 100644
--- a/mingw-w64-headers/include/mtxadmin.h
+++ b/mingw-w64-headers/include/mtxadmin.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #include "rpc.h"
diff --git a/mingw-w64-headers/include/mtxattr.h b/mingw-w64-headers/include/mtxattr.h
index 7986278..0b9ad9f 100644
--- a/mingw-w64-headers/include/mtxattr.h
+++ b/mingw-w64-headers/include/mtxattr.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _MTXATTR_H_
diff --git a/mingw-w64-headers/include/mtxdm.h b/mingw-w64-headers/include/mtxdm.h
index 630905c..b7f28a8 100644
--- a/mingw-w64-headers/include/mtxdm.h
+++ b/mingw-w64-headers/include/mtxdm.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __MTXDM_H__
diff --git a/mingw-w64-headers/include/muiload.h b/mingw-w64-headers/include/muiload.h
index a48daa3..3891953 100644
--- a/mingw-w64-headers/include/muiload.h
+++ b/mingw-w64-headers/include/muiload.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 
diff --git a/mingw-w64-headers/include/multimon.h b/mingw-w64-headers/include/multimon.h
index 466bc46..eb24cf2 100644
--- a/mingw-w64-headers/include/multimon.h
+++ b/mingw-w64-headers/include/multimon.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 
diff --git a/mingw-w64-headers/include/multinfo.h b/mingw-w64-headers/include/multinfo.h
index b86672f..4d7e869 100644
--- a/mingw-w64-headers/include/multinfo.h
+++ b/mingw-w64-headers/include/multinfo.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #include "rpc.h"
diff --git a/mingw-w64-headers/include/mxdc.h b/mingw-w64-headers/include/mxdc.h
index d76dc72..ecf6940 100644
--- a/mingw-w64-headers/include/mxdc.h
+++ b/mingw-w64-headers/include/mxdc.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_MXDC
diff --git a/mingw-w64-headers/include/napenforcementclient.h b/mingw-w64-headers/include/napenforcementclient.h
index 256c40c..9dfbe66 100644
--- a/mingw-w64-headers/include/napenforcementclient.h
+++ b/mingw-w64-headers/include/napenforcementclient.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_NAPENFORCEMENTCLIENT
diff --git a/mingw-w64-headers/include/naperror.h b/mingw-w64-headers/include/naperror.h
index 3f8e838..78c3835 100644
--- a/mingw-w64-headers/include/naperror.h
+++ b/mingw-w64-headers/include/naperror.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_NAPERROR
diff --git a/mingw-w64-headers/include/napmicrosoftvendorids.h b/mingw-w64-headers/include/napmicrosoftvendorids.h
index 92f4bb7..c570c2b 100644
--- a/mingw-w64-headers/include/napmicrosoftvendorids.h
+++ b/mingw-w64-headers/include/napmicrosoftvendorids.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_NAPMICROSOFTVENDORIDS
diff --git a/mingw-w64-headers/include/napprotocol.h b/mingw-w64-headers/include/napprotocol.h
index d0d944f..24f4a83 100644
--- a/mingw-w64-headers/include/napprotocol.h
+++ b/mingw-w64-headers/include/napprotocol.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_NAPTYPES
diff --git a/mingw-w64-headers/include/naptypes.h b/mingw-w64-headers/include/naptypes.h
index 0e9082f..a81924e 100644
--- a/mingw-w64-headers/include/naptypes.h
+++ b/mingw-w64-headers/include/naptypes.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_NAPTYPES
diff --git a/mingw-w64-headers/include/naputil.h b/mingw-w64-headers/include/naputil.h
index 0c19c8f..9c30ef9 100644
--- a/mingw-w64-headers/include/naputil.h
+++ b/mingw-w64-headers/include/naputil.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_NAPUTIL
diff --git a/mingw-w64-headers/include/naputil.w b/mingw-w64-headers/include/naputil.w
index 41f8db9..3a31426 100644
--- a/mingw-w64-headers/include/naputil.w
+++ b/mingw-w64-headers/include/naputil.w
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 
diff --git a/mingw-w64-headers/include/nb30.h b/mingw-w64-headers/include/nb30.h
index a91c019..6312058 100644
--- a/mingw-w64-headers/include/nb30.h
+++ b/mingw-w64-headers/include/nb30.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef NCB_INCLUDED
diff --git a/mingw-w64-headers/include/ncrypt.h b/mingw-w64-headers/include/ncrypt.h
index 0f9a8ca..874634b 100644
--- a/mingw-w64-headers/include/ncrypt.h
+++ b/mingw-w64-headers/include/ncrypt.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_NCRYPT
diff --git a/mingw-w64-headers/include/ndattrib.h b/mingw-w64-headers/include/ndattrib.h
index 8f06006..5ff180c 100644
--- a/mingw-w64-headers/include/ndattrib.h
+++ b/mingw-w64-headers/include/ndattrib.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_NDATTRIB
diff --git a/mingw-w64-headers/include/ndfapi.h b/mingw-w64-headers/include/ndfapi.h
index 8924457..302f435 100644
--- a/mingw-w64-headers/include/ndfapi.h
+++ b/mingw-w64-headers/include/ndfapi.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_NDFAPI
diff --git a/mingw-w64-headers/include/ndhelper.h b/mingw-w64-headers/include/ndhelper.h
index b79f083..4ebd121 100644
--- a/mingw-w64-headers/include/ndhelper.h
+++ b/mingw-w64-headers/include/ndhelper.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_NDHELPER
diff --git a/mingw-w64-headers/include/ndr64types.h b/mingw-w64-headers/include/ndr64types.h
index a926fff..9c1f64e 100644
--- a/mingw-w64-headers/include/ndr64types.h
+++ b/mingw-w64-headers/include/ndr64types.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _NDR64TYPES_H
diff --git a/mingw-w64-headers/include/ndrtypes.h b/mingw-w64-headers/include/ndrtypes.h
index 9645672..8d54d1a 100644
--- a/mingw-w64-headers/include/ndrtypes.h
+++ b/mingw-w64-headers/include/ndrtypes.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __NDRTYPES_H__
diff --git a/mingw-w64-headers/include/netcon.h b/mingw-w64-headers/include/netcon.h
index a2dbdee..3579547 100644
--- a/mingw-w64-headers/include/netcon.h
+++ b/mingw-w64-headers/include/netcon.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/neterr.h b/mingw-w64-headers/include/neterr.h
index 7563437..68d042c 100644
--- a/mingw-w64-headers/include/neterr.h
+++ b/mingw-w64-headers/include/neterr.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _NMNETERR_
diff --git a/mingw-w64-headers/include/netioapi.h b/mingw-w64-headers/include/netioapi.h
index ac0c3b1..ac92a7f 100644
--- a/mingw-w64-headers/include/netioapi.h
+++ b/mingw-w64-headers/include/netioapi.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_NETIOAPI
diff --git a/mingw-w64-headers/include/netlistmgr.h b/mingw-w64-headers/include/netlistmgr.h
index 91a87d1..2f570b0 100644
--- a/mingw-w64-headers/include/netlistmgr.h
+++ b/mingw-w64-headers/include/netlistmgr.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_NETLISTMGR
diff --git a/mingw-w64-headers/include/netmon.h b/mingw-w64-headers/include/netmon.h
index 520fd46..b49d6c3 100644
--- a/mingw-w64-headers/include/netmon.h
+++ b/mingw-w64-headers/include/netmon.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/netprov.h b/mingw-w64-headers/include/netprov.h
index 4df9e97..174c516 100644
--- a/mingw-w64-headers/include/netprov.h
+++ b/mingw-w64-headers/include/netprov.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/newapis.h b/mingw-w64-headers/include/newapis.h
index ae449cc..f240d42 100644
--- a/mingw-w64-headers/include/newapis.h
+++ b/mingw-w64-headers/include/newapis.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 
diff --git a/mingw-w64-headers/include/nldef.h b/mingw-w64-headers/include/nldef.h
index faf1cfe..44519a6 100644
--- a/mingw-w64-headers/include/nldef.h
+++ b/mingw-w64-headers/include/nldef.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_NLDEF
diff --git a/mingw-w64-headers/include/nmsupp.h b/mingw-w64-headers/include/nmsupp.h
index 803cf48..22aee73 100644
--- a/mingw-w64-headers/include/nmsupp.h
+++ b/mingw-w64-headers/include/nmsupp.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _NMSUPP_H
diff --git a/mingw-w64-headers/include/npapi.h b/mingw-w64-headers/include/npapi.h
index 218be2f..bcf565c 100644
--- a/mingw-w64-headers/include/npapi.h
+++ b/mingw-w64-headers/include/npapi.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _NPAPI_INCLUDED
diff --git a/mingw-w64-headers/include/nsemail.h b/mingw-w64-headers/include/nsemail.h
index 31afb53..7ee176d 100644
--- a/mingw-w64-headers/include/nsemail.h
+++ b/mingw-w64-headers/include/nsemail.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 
diff --git a/mingw-w64-headers/include/nspapi.h b/mingw-w64-headers/include/nspapi.h
index b374cb2..13b091f 100644
--- a/mingw-w64-headers/include/nspapi.h
+++ b/mingw-w64-headers/include/nspapi.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _NSPAPI_INCLUDED
diff --git a/mingw-w64-headers/include/ntddndis.h b/mingw-w64-headers/include/ntddndis.h
index 1ea15f2..d6aae79 100644
--- a/mingw-w64-headers/include/ntddndis.h
+++ b/mingw-w64-headers/include/ntddndis.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _NTDDNDIS_
diff --git a/mingw-w64-headers/include/ntddpsch.h b/mingw-w64-headers/include/ntddpsch.h
index 027203b..5f0d5ea 100644
--- a/mingw-w64-headers/include/ntddpsch.h
+++ b/mingw-w64-headers/include/ntddpsch.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _NTDDPSCH_
diff --git a/mingw-w64-headers/include/ntddscsi.h b/mingw-w64-headers/include/ntddscsi.h
index 827db69..24670f9 100644
--- a/mingw-w64-headers/include/ntddscsi.h
+++ b/mingw-w64-headers/include/ntddscsi.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifdef DEFINE_GUID
diff --git a/mingw-w64-headers/include/ntdsapi.h b/mingw-w64-headers/include/ntdsapi.h
index 10dd781..5be1bb5 100644
--- a/mingw-w64-headers/include/ntdsapi.h
+++ b/mingw-w64-headers/include/ntdsapi.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _NTDSAPI_H_
diff --git a/mingw-w64-headers/include/ntdsbcli.h b/mingw-w64-headers/include/ntdsbcli.h
index bb51c0c..9408c83 100644
--- a/mingw-w64-headers/include/ntdsbcli.h
+++ b/mingw-w64-headers/include/ntdsbcli.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _NTDSBCLI_H_
diff --git a/mingw-w64-headers/include/ntdsbmsg.h b/mingw-w64-headers/include/ntdsbmsg.h
index b8a26fb..6efd8c8 100644
--- a/mingw-w64-headers/include/ntdsbmsg.h
+++ b/mingw-w64-headers/include/ntdsbmsg.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _NTDSBMSG_
diff --git a/mingw-w64-headers/include/ntgdi.h b/mingw-w64-headers/include/ntgdi.h
index 67b2592..3ceed7c 100644
--- a/mingw-w64-headers/include/ntgdi.h
+++ b/mingw-w64-headers/include/ntgdi.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef W32KAPI
diff --git a/mingw-w64-headers/include/ntldap.h b/mingw-w64-headers/include/ntldap.h
index 4f9957b..f776b0e 100644
--- a/mingw-w64-headers/include/ntldap.h
+++ b/mingw-w64-headers/include/ntldap.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef NT_LDAP_H
diff --git a/mingw-w64-headers/include/ntmsapi.h b/mingw-w64-headers/include/ntmsapi.h
index 8f624a0..1297b62 100644
--- a/mingw-w64-headers/include/ntmsapi.h
+++ b/mingw-w64-headers/include/ntmsapi.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INCL_NTMSAPI_H_
diff --git a/mingw-w64-headers/include/ntmsmli.h b/mingw-w64-headers/include/ntmsmli.h
index 66985b3..bef11a1 100644
--- a/mingw-w64-headers/include/ntmsmli.h
+++ b/mingw-w64-headers/include/ntmsmli.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INCL_NTMSMLI_H_
diff --git a/mingw-w64-headers/include/ntquery.h b/mingw-w64-headers/include/ntquery.h
index b08677e..d1f336e 100644
--- a/mingw-w64-headers/include/ntquery.h
+++ b/mingw-w64-headers/include/ntquery.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #if !defined(__NTQUERY_H__)
diff --git a/mingw-w64-headers/include/ntsdexts.h b/mingw-w64-headers/include/ntsdexts.h
index 50a8806..dbdb1bf 100644
--- a/mingw-w64-headers/include/ntsdexts.h
+++ b/mingw-w64-headers/include/ntsdexts.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _NTSDEXTNS_
diff --git a/mingw-w64-headers/include/ntsecapi.h b/mingw-w64-headers/include/ntsecapi.h
index a79c45f..5a67da1 100644
--- a/mingw-w64-headers/include/ntsecapi.h
+++ b/mingw-w64-headers/include/ntsecapi.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _NTSECAPI_
diff --git a/mingw-w64-headers/include/ntsecpkg.h b/mingw-w64-headers/include/ntsecpkg.h
index 07f725e..547fcec 100644
--- a/mingw-w64-headers/include/ntsecpkg.h
+++ b/mingw-w64-headers/include/ntsecpkg.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _NTSECPKG_
diff --git a/mingw-w64-headers/include/ntstatus.h b/mingw-w64-headers/include/ntstatus.h
index f315985..28c0307 100644
--- a/mingw-w64-headers/include/ntstatus.h
+++ b/mingw-w64-headers/include/ntstatus.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _NTSTATUS_
diff --git a/mingw-w64-headers/include/ntverp.h b/mingw-w64-headers/include/ntverp.h
index 66efe2a..335358e 100644
--- a/mingw-w64-headers/include/ntverp.h
+++ b/mingw-w64-headers/include/ntverp.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #define VER_PRODUCTBUILD 3790
diff --git a/mingw-w64-headers/include/oaidl.idl b/mingw-w64-headers/include/oaidl.idl
index 44c66c6..8a7e47d 100644
--- a/mingw-w64-headers/include/oaidl.idl
+++ b/mingw-w64-headers/include/oaidl.idl
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 
diff --git a/mingw-w64-headers/include/objbase.h b/mingw-w64-headers/include/objbase.h
index 0378a9d..4f3c9d9 100644
--- a/mingw-w64-headers/include/objbase.h
+++ b/mingw-w64-headers/include/objbase.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #include <rpc.h>
diff --git a/mingw-w64-headers/include/objerror.h b/mingw-w64-headers/include/objerror.h
index 9423406..99dbacc 100644
--- a/mingw-w64-headers/include/objerror.h
+++ b/mingw-w64-headers/include/objerror.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #include <winerror.h>
diff --git a/mingw-w64-headers/include/objidl.idl b/mingw-w64-headers/include/objidl.idl
index 269044b..549453d 100644
--- a/mingw-w64-headers/include/objidl.idl
+++ b/mingw-w64-headers/include/objidl.idl
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 
diff --git a/mingw-w64-headers/include/objsafe.h b/mingw-w64-headers/include/objsafe.h
index 4e41e33..d921183 100644
--- a/mingw-w64-headers/include/objsafe.h
+++ b/mingw-w64-headers/include/objsafe.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/objsel.h b/mingw-w64-headers/include/objsel.h
index 0a52c61..7e8ed1d 100644
--- a/mingw-w64-headers/include/objsel.h
+++ b/mingw-w64-headers/include/objsel.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __OBJSEL_H_
diff --git a/mingw-w64-headers/include/ocidl.idl b/mingw-w64-headers/include/ocidl.idl
index 3d0fb8a..a41e1fd 100644
--- a/mingw-w64-headers/include/ocidl.idl
+++ b/mingw-w64-headers/include/ocidl.idl
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 
diff --git a/mingw-w64-headers/include/ocmm.h b/mingw-w64-headers/include/ocmm.h
index 5679190..2a36441 100644
--- a/mingw-w64-headers/include/ocmm.h
+++ b/mingw-w64-headers/include/ocmm.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/odbcinst.h b/mingw-w64-headers/include/odbcinst.h
index a94665e..9947fe2 100644
--- a/mingw-w64-headers/include/odbcinst.h
+++ b/mingw-w64-headers/include/odbcinst.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __ODBCINST_H
diff --git a/mingw-w64-headers/include/odbcss.h b/mingw-w64-headers/include/odbcss.h
index 122cb06..4744701 100644
--- a/mingw-w64-headers/include/odbcss.h
+++ b/mingw-w64-headers/include/odbcss.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __ODBCSS
diff --git a/mingw-w64-headers/include/ole.h b/mingw-w64-headers/include/ole.h
index 5180e3d..31419db 100644
--- a/mingw-w64-headers/include/ole.h
+++ b/mingw-w64-headers/include/ole.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _OLE_H_
diff --git a/mingw-w64-headers/include/ole2.h b/mingw-w64-headers/include/ole2.h
index 4b7481a..739bf78 100644
--- a/mingw-w64-headers/include/ole2.h
+++ b/mingw-w64-headers/include/ole2.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _OLE2_H_
diff --git a/mingw-w64-headers/include/ole2ver.h b/mingw-w64-headers/include/ole2ver.h
index 38547cf..8967202 100644
--- a/mingw-w64-headers/include/ole2ver.h
+++ b/mingw-w64-headers/include/ole2ver.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _OLE2VER_H_
diff --git a/mingw-w64-headers/include/oleacc.h b/mingw-w64-headers/include/oleacc.h
index 5c225a4..6fb2118 100644
--- a/mingw-w64-headers/include/oleacc.h
+++ b/mingw-w64-headers/include/oleacc.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/oleauto.h b/mingw-w64-headers/include/oleauto.h
index 9bb6269..701bfaa 100644
--- a/mingw-w64-headers/include/oleauto.h
+++ b/mingw-w64-headers/include/oleauto.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #if !defined(_OLEAUTO_H_)
diff --git a/mingw-w64-headers/include/olectl.h b/mingw-w64-headers/include/olectl.h
index c049148..87cda95 100644
--- a/mingw-w64-headers/include/olectl.h
+++ b/mingw-w64-headers/include/olectl.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _OLECTL_H_
diff --git a/mingw-w64-headers/include/olectlid.h b/mingw-w64-headers/include/olectlid.h
index d19a5ee..23a8ca9 100644
--- a/mingw-w64-headers/include/olectlid.h
+++ b/mingw-w64-headers/include/olectlid.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #warning Your code should include olectl.h instead of olectlid.h header file.
diff --git a/mingw-w64-headers/include/oledb.h b/mingw-w64-headers/include/oledb.h
index 4708a62..c009573 100644
--- a/mingw-w64-headers/include/oledb.h
+++ b/mingw-w64-headers/include/oledb.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/oledbdep.h b/mingw-w64-headers/include/oledbdep.h
index a673672..4df5892 100644
--- a/mingw-w64-headers/include/oledbdep.h
+++ b/mingw-w64-headers/include/oledbdep.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/oledberr.h b/mingw-w64-headers/include/oledberr.h
index 0c84bee..b1663a6 100644
--- a/mingw-w64-headers/include/oledberr.h
+++ b/mingw-w64-headers/include/oledberr.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _MSADERR_H_
diff --git a/mingw-w64-headers/include/oledbguid.h b/mingw-w64-headers/include/oledbguid.h
index 364ddc0..e4eb469 100644
--- a/mingw-w64-headers/include/oledbguid.h
+++ b/mingw-w64-headers/include/oledbguid.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __oledbguid_h__
diff --git a/mingw-w64-headers/include/oledlg.dlg b/mingw-w64-headers/include/oledlg.dlg
index fd918fa..fca43a6 100644
--- a/mingw-w64-headers/include/oledlg.dlg
+++ b/mingw-w64-headers/include/oledlg.dlg
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #define IDC_STATIC -1
diff --git a/mingw-w64-headers/include/oledlg.h b/mingw-w64-headers/include/oledlg.h
index 2de0ac7..5e18f1f 100644
--- a/mingw-w64-headers/include/oledlg.h
+++ b/mingw-w64-headers/include/oledlg.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _OLEDLG_H_
diff --git a/mingw-w64-headers/include/oleidl.idl b/mingw-w64-headers/include/oleidl.idl
index d872222..6f69ae5 100644
--- a/mingw-w64-headers/include/oleidl.idl
+++ b/mingw-w64-headers/include/oleidl.idl
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 
diff --git a/mingw-w64-headers/include/oletx2xa.h b/mingw-w64-headers/include/oletx2xa.h
index 8e4cf63..f4e6d14 100644
--- a/mingw-w64-headers/include/oletx2xa.h
+++ b/mingw-w64-headers/include/oletx2xa.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/opmapi.h b/mingw-w64-headers/include/opmapi.h
index 2081357..ed48394 100644
--- a/mingw-w64-headers/include/opmapi.h
+++ b/mingw-w64-headers/include/opmapi.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_OPMAPI
diff --git a/mingw-w64-headers/include/p2p.h b/mingw-w64-headers/include/p2p.h
index d557597..8e1667e 100644
--- a/mingw-w64-headers/include/p2p.h
+++ b/mingw-w64-headers/include/p2p.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_P2P
diff --git a/mingw-w64-headers/include/parser.h b/mingw-w64-headers/include/parser.h
index 1f27493..2f1b976 100644
--- a/mingw-w64-headers/include/parser.h
+++ b/mingw-w64-headers/include/parser.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _PARSER_H
diff --git a/mingw-w64-headers/include/patchapi.h b/mingw-w64-headers/include/patchapi.h
index 075b8de..e91bc5f 100644
--- a/mingw-w64-headers/include/patchapi.h
+++ b/mingw-w64-headers/include/patchapi.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _PATCHAPI_H_
diff --git a/mingw-w64-headers/include/patchwiz.h b/mingw-w64-headers/include/patchwiz.h
index 480ab75..087f4c4 100644
--- a/mingw-w64-headers/include/patchwiz.h
+++ b/mingw-w64-headers/include/patchwiz.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 
diff --git a/mingw-w64-headers/include/pbt.h b/mingw-w64-headers/include/pbt.h
index d93234f..34b5ac1 100644
--- a/mingw-w64-headers/include/pbt.h
+++ b/mingw-w64-headers/include/pbt.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_PBT
diff --git a/mingw-w64-headers/include/pchannel.h b/mingw-w64-headers/include/pchannel.h
index fe6ddc8..021219c 100644
--- a/mingw-w64-headers/include/pchannel.h
+++ b/mingw-w64-headers/include/pchannel.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _H_PCHANNEL
diff --git a/mingw-w64-headers/include/pcrt32.h b/mingw-w64-headers/include/pcrt32.h
index 654bacb..9a5a2b6 100644
--- a/mingw-w64-headers/include/pcrt32.h
+++ b/mingw-w64-headers/include/pcrt32.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #define _ffree free
diff --git a/mingw-w64-headers/include/pdh.h b/mingw-w64-headers/include/pdh.h
index 32491d4..c6af328 100644
--- a/mingw-w64-headers/include/pdh.h
+++ b/mingw-w64-headers/include/pdh.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _PDH_H_
diff --git a/mingw-w64-headers/include/pdhmsg.h b/mingw-w64-headers/include/pdhmsg.h
index fc3b42a..7190cb1 100644
--- a/mingw-w64-headers/include/pdhmsg.h
+++ b/mingw-w64-headers/include/pdhmsg.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _PDH_MSG_H_
diff --git a/mingw-w64-headers/include/penwin.h b/mingw-w64-headers/include/penwin.h
index 00af734..7a5c5d7 100644
--- a/mingw-w64-headers/include/penwin.h
+++ b/mingw-w64-headers/include/penwin.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_PENWIN
diff --git a/mingw-w64-headers/include/perflib.h b/mingw-w64-headers/include/perflib.h
index 5305cdd..1b19762 100644
--- a/mingw-w64-headers/include/perflib.h
+++ b/mingw-w64-headers/include/perflib.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_PERFLIB
diff --git a/mingw-w64-headers/include/perhist.h b/mingw-w64-headers/include/perhist.h
index 14b56f6..3c24b1c 100644
--- a/mingw-w64-headers/include/perhist.h
+++ b/mingw-w64-headers/include/perhist.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/persist.h b/mingw-w64-headers/include/persist.h
index ad94d9e..92c4045 100644
--- a/mingw-w64-headers/include/persist.h
+++ b/mingw-w64-headers/include/persist.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef PERSIST_H
diff --git a/mingw-w64-headers/include/pgobootrun.h b/mingw-w64-headers/include/pgobootrun.h
index 2b9cf9b..c700b16 100644
--- a/mingw-w64-headers/include/pgobootrun.h
+++ b/mingw-w64-headers/include/pgobootrun.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 
diff --git a/mingw-w64-headers/include/pla.h b/mingw-w64-headers/include/pla.h
index 334cb69..2aa94bb 100644
--- a/mingw-w64-headers/include/pla.h
+++ b/mingw-w64-headers/include/pla.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_PLA
diff --git a/mingw-w64-headers/include/polarity.h b/mingw-w64-headers/include/polarity.h
index 6179a6d..001eed3 100644
--- a/mingw-w64-headers/include/polarity.h
+++ b/mingw-w64-headers/include/polarity.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef POLARITY_HEADERFILE_IS_INCLUDED
diff --git a/mingw-w64-headers/include/poppack.h b/mingw-w64-headers/include/poppack.h
index 79ee0e6..163af22 100644
--- a/mingw-w64-headers/include/poppack.h
+++ b/mingw-w64-headers/include/poppack.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #if !(defined(lint) || defined(RC_INVOKED))
diff --git a/mingw-w64-headers/include/portabledeviceconnectapi.h b/mingw-w64-headers/include/portabledeviceconnectapi.h
index 8118853..a890cc8 100644
--- a/mingw-w64-headers/include/portabledeviceconnectapi.h
+++ b/mingw-w64-headers/include/portabledeviceconnectapi.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __INC_PORTABLEDEVICECONNECTAPI__
diff --git a/mingw-w64-headers/include/portabledevicetypes.idl b/mingw-w64-headers/include/portabledevicetypes.idl
index d3e7cd3..3cda4da 100644
--- a/mingw-w64-headers/include/portabledevicetypes.idl
+++ b/mingw-w64-headers/include/portabledevicetypes.idl
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 
diff --git a/mingw-w64-headers/include/powrprof.h b/mingw-w64-headers/include/powrprof.h
index 7807953..9545afe 100644
--- a/mingw-w64-headers/include/powrprof.h
+++ b/mingw-w64-headers/include/powrprof.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifdef __cplusplus
diff --git a/mingw-w64-headers/include/prnasnot.h b/mingw-w64-headers/include/prnasnot.h
index 4f895fb..ae958c0 100644
--- a/mingw-w64-headers/include/prnasnot.h
+++ b/mingw-w64-headers/include/prnasnot.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_PRNASNOT
diff --git a/mingw-w64-headers/include/prnsetup.dlg b/mingw-w64-headers/include/prnsetup.dlg
index 1ff2c31..c8920a8 100644
--- a/mingw-w64-headers/include/prnsetup.dlg
+++ b/mingw-w64-headers/include/prnsetup.dlg
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #include <dlgs.h>
diff --git a/mingw-w64-headers/include/profinfo.h b/mingw-w64-headers/include/profinfo.h
index b405fae..196366a 100644
--- a/mingw-w64-headers/include/profinfo.h
+++ b/mingw-w64-headers/include/profinfo.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_PROFINFO
diff --git a/mingw-w64-headers/include/propidl.idl b/mingw-w64-headers/include/propidl.idl
index 0464709..8d4e9e3 100644
--- a/mingw-w64-headers/include/propidl.idl
+++ b/mingw-w64-headers/include/propidl.idl
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 
diff --git a/mingw-w64-headers/include/prsht.h b/mingw-w64-headers/include/prsht.h
index 356715b..c9fbbe2 100644
--- a/mingw-w64-headers/include/prsht.h
+++ b/mingw-w64-headers/include/prsht.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _PRSHT_H_
diff --git a/mingw-w64-headers/include/psapi.h b/mingw-w64-headers/include/psapi.h
index 03b7788..f3f5220 100644
--- a/mingw-w64-headers/include/psapi.h
+++ b/mingw-w64-headers/include/psapi.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _PSAPI_H_
diff --git a/mingw-w64-headers/include/psdk_inc/_dbg_LOAD_IMAGE.h b/mingw-w64-headers/include/psdk_inc/_dbg_LOAD_IMAGE.h
index 68a2410..ee82522 100644
--- a/mingw-w64-headers/include/psdk_inc/_dbg_LOAD_IMAGE.h
+++ b/mingw-w64-headers/include/psdk_inc/_dbg_LOAD_IMAGE.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #pragma once
diff --git a/mingw-w64-headers/include/psdk_inc/_dbg_common.h b/mingw-w64-headers/include/psdk_inc/_dbg_common.h
index f88a142..bef8789 100644
--- a/mingw-w64-headers/include/psdk_inc/_dbg_common.h
+++ b/mingw-w64-headers/include/psdk_inc/_dbg_common.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #pragma once
diff --git a/mingw-w64-headers/include/psdk_inc/_fd_types.h b/mingw-w64-headers/include/psdk_inc/_fd_types.h
index 7dd796b..ebdb36a 100644
--- a/mingw-w64-headers/include/psdk_inc/_fd_types.h
+++ b/mingw-w64-headers/include/psdk_inc/_fd_types.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 
diff --git a/mingw-w64-headers/include/psdk_inc/_ip_mreq1.h b/mingw-w64-headers/include/psdk_inc/_ip_mreq1.h
index ebdbf41..d259bc9 100644
--- a/mingw-w64-headers/include/psdk_inc/_ip_mreq1.h
+++ b/mingw-w64-headers/include/psdk_inc/_ip_mreq1.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 
diff --git a/mingw-w64-headers/include/psdk_inc/_ip_types.h b/mingw-w64-headers/include/psdk_inc/_ip_types.h
index 0defa74..c528f15 100644
--- a/mingw-w64-headers/include/psdk_inc/_ip_types.h
+++ b/mingw-w64-headers/include/psdk_inc/_ip_types.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 
diff --git a/mingw-w64-headers/include/psdk_inc/_socket_types.h b/mingw-w64-headers/include/psdk_inc/_socket_types.h
index 429d84e..d2bbca5 100644
--- a/mingw-w64-headers/include/psdk_inc/_socket_types.h
+++ b/mingw-w64-headers/include/psdk_inc/_socket_types.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 
diff --git a/mingw-w64-headers/include/psdk_inc/_varenum.h b/mingw-w64-headers/include/psdk_inc/_varenum.h
index 8be5e44..c9b14b8 100644
--- a/mingw-w64-headers/include/psdk_inc/_varenum.h
+++ b/mingw-w64-headers/include/psdk_inc/_varenum.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 
diff --git a/mingw-w64-headers/include/psdk_inc/_ws1_undef.h b/mingw-w64-headers/include/psdk_inc/_ws1_undef.h
index 047ba88..d0db007 100644
--- a/mingw-w64-headers/include/psdk_inc/_ws1_undef.h
+++ b/mingw-w64-headers/include/psdk_inc/_ws1_undef.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 
diff --git a/mingw-w64-headers/include/psdk_inc/_wsa_errnos.h b/mingw-w64-headers/include/psdk_inc/_wsa_errnos.h
index 26f2478..35dc34e 100644
--- a/mingw-w64-headers/include/psdk_inc/_wsa_errnos.h
+++ b/mingw-w64-headers/include/psdk_inc/_wsa_errnos.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 
diff --git a/mingw-w64-headers/include/psdk_inc/_wsadata.h b/mingw-w64-headers/include/psdk_inc/_wsadata.h
index 490698a..1758f56 100644
--- a/mingw-w64-headers/include/psdk_inc/_wsadata.h
+++ b/mingw-w64-headers/include/psdk_inc/_wsadata.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 
diff --git a/mingw-w64-headers/include/psdk_inc/_xmitfile.h b/mingw-w64-headers/include/psdk_inc/_xmitfile.h
index b4690f1..34dd4ee 100644
--- a/mingw-w64-headers/include/psdk_inc/_xmitfile.h
+++ b/mingw-w64-headers/include/psdk_inc/_xmitfile.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 
diff --git a/mingw-w64-headers/include/pshpack1.h b/mingw-w64-headers/include/pshpack1.h
index b26fc6d..88c37a6 100644
--- a/mingw-w64-headers/include/pshpack1.h
+++ b/mingw-w64-headers/include/pshpack1.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #if !(defined(lint) || defined(RC_INVOKED))
diff --git a/mingw-w64-headers/include/pshpack2.h b/mingw-w64-headers/include/pshpack2.h
index 0a56f51..1be4fcd 100644
--- a/mingw-w64-headers/include/pshpack2.h
+++ b/mingw-w64-headers/include/pshpack2.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #if !(defined(lint) || defined(RC_INVOKED))
diff --git a/mingw-w64-headers/include/pshpack4.h b/mingw-w64-headers/include/pshpack4.h
index 69df1f5..59fdbbc 100644
--- a/mingw-w64-headers/include/pshpack4.h
+++ b/mingw-w64-headers/include/pshpack4.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #if !(defined(lint) || defined(RC_INVOKED))
diff --git a/mingw-w64-headers/include/pshpack8.h b/mingw-w64-headers/include/pshpack8.h
index 61f803f..51a331d 100644
--- a/mingw-w64-headers/include/pshpack8.h
+++ b/mingw-w64-headers/include/pshpack8.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #if !(defined(lint) || defined(RC_INVOKED))
diff --git a/mingw-w64-headers/include/pstore.h b/mingw-w64-headers/include/pstore.h
index 2dd924d..fceca57 100644
--- a/mingw-w64-headers/include/pstore.h
+++ b/mingw-w64-headers/include/pstore.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __PSTORE_H__
diff --git a/mingw-w64-headers/include/qmgr.h b/mingw-w64-headers/include/qmgr.h
index a7cf5be..2652b2f 100644
--- a/mingw-w64-headers/include/qmgr.h
+++ b/mingw-w64-headers/include/qmgr.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/qos.h b/mingw-w64-headers/include/qos.h
index 85dd161..488f631 100644
--- a/mingw-w64-headers/include/qos.h
+++ b/mingw-w64-headers/include/qos.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __QOS_H_
diff --git a/mingw-w64-headers/include/qos2.h b/mingw-w64-headers/include/qos2.h
index 2ca6c6c..72e984d 100644
--- a/mingw-w64-headers/include/qos2.h
+++ b/mingw-w64-headers/include/qos2.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_QOS2
diff --git a/mingw-w64-headers/include/qosname.h b/mingw-w64-headers/include/qosname.h
index 1cb5a1f..865d1e8 100644
--- a/mingw-w64-headers/include/qosname.h
+++ b/mingw-w64-headers/include/qosname.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #define QT_1 "G711"
diff --git a/mingw-w64-headers/include/qospol.h b/mingw-w64-headers/include/qospol.h
index 2c4a702..7576832 100644
--- a/mingw-w64-headers/include/qospol.h
+++ b/mingw-w64-headers/include/qospol.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __QOSPOL_H_
diff --git a/mingw-w64-headers/include/qossp.h b/mingw-w64-headers/include/qossp.h
index 198b1cc..4892dac 100644
--- a/mingw-w64-headers/include/qossp.h
+++ b/mingw-w64-headers/include/qossp.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __QOSSP_H_
diff --git a/mingw-w64-headers/include/ras.h b/mingw-w64-headers/include/ras.h
index b2d9128..e47c18c 100644
--- a/mingw-w64-headers/include/ras.h
+++ b/mingw-w64-headers/include/ras.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _RAS_H_
diff --git a/mingw-w64-headers/include/rasdlg.h b/mingw-w64-headers/include/rasdlg.h
index 8cf7362..a0389c9 100644
--- a/mingw-w64-headers/include/rasdlg.h
+++ b/mingw-w64-headers/include/rasdlg.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _RASDLG_H_
diff --git a/mingw-w64-headers/include/raseapif.h b/mingw-w64-headers/include/raseapif.h
index 43e0e79..f1d47d5 100644
--- a/mingw-w64-headers/include/raseapif.h
+++ b/mingw-w64-headers/include/raseapif.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _RASEAPIF_
diff --git a/mingw-w64-headers/include/raserror.h b/mingw-w64-headers/include/raserror.h
index 3e516dc..f94a6ae 100644
--- a/mingw-w64-headers/include/raserror.h
+++ b/mingw-w64-headers/include/raserror.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _RASERROR_H_
diff --git a/mingw-w64-headers/include/rassapi.h b/mingw-w64-headers/include/rassapi.h
index a16bcda..0288d8d 100644
--- a/mingw-w64-headers/include/rassapi.h
+++ b/mingw-w64-headers/include/rassapi.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _RASSAPI_H_
diff --git a/mingw-w64-headers/include/rasshost.h b/mingw-w64-headers/include/rasshost.h
index 9f08fbe..6192c3d 100644
--- a/mingw-w64-headers/include/rasshost.h
+++ b/mingw-w64-headers/include/rasshost.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _RASSHOST_
diff --git a/mingw-w64-headers/include/ratings.h b/mingw-w64-headers/include/ratings.h
index 942a489..861589b 100644
--- a/mingw-w64-headers/include/ratings.h
+++ b/mingw-w64-headers/include/ratings.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _RATINGS_H_
diff --git a/mingw-w64-headers/include/rdpencomapi.h b/mingw-w64-headers/include/rdpencomapi.h
index 922880d..ab91e0c 100644
--- a/mingw-w64-headers/include/rdpencomapi.h
+++ b/mingw-w64-headers/include/rdpencomapi.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_RDPENCOMAPI
diff --git a/mingw-w64-headers/include/reason.h b/mingw-w64-headers/include/reason.h
index d45ece1..a859097 100644
--- a/mingw-w64-headers/include/reason.h
+++ b/mingw-w64-headers/include/reason.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #if !defined SENTINEL_Reason
diff --git a/mingw-w64-headers/include/recguids.h b/mingw-w64-headers/include/recguids.h
index 738b3e9..87664c0 100644
--- a/mingw-w64-headers/include/recguids.h
+++ b/mingw-w64-headers/include/recguids.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 DEFINE_GUID(IID_IReconcileInitiator,0x99180161L,0xDA16,0x101A,0x93,0x5C,0x44,0x45,0x53,0x54,0x00,0x00);
diff --git a/mingw-w64-headers/include/reconcil.h b/mingw-w64-headers/include/reconcil.h
index bc507c9..392a7eb 100644
--- a/mingw-w64-headers/include/reconcil.h
+++ b/mingw-w64-headers/include/reconcil.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __RECONCIL_H__
diff --git a/mingw-w64-headers/include/regstr.h b/mingw-w64-headers/include/regstr.h
index 338ba3c..bb6c043 100644
--- a/mingw-w64-headers/include/regstr.h
+++ b/mingw-w64-headers/include/regstr.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_REGSTR
diff --git a/mingw-w64-headers/include/rend.h b/mingw-w64-headers/include/rend.h
index fe15dcc..ce3112a 100644
--- a/mingw-w64-headers/include/rend.h
+++ b/mingw-w64-headers/include/rend.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/resapi.h b/mingw-w64-headers/include/resapi.h
index fc20ff6..91e4ca6 100644
--- a/mingw-w64-headers/include/resapi.h
+++ b/mingw-w64-headers/include/resapi.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _RESAPI_DEFINES_
diff --git a/mingw-w64-headers/include/restartmanager.h b/mingw-w64-headers/include/restartmanager.h
index 67be89c..23f400b 100644
--- a/mingw-w64-headers/include/restartmanager.h
+++ b/mingw-w64-headers/include/restartmanager.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_RESTARTMANAGER
diff --git a/mingw-w64-headers/include/richedit.h b/mingw-w64-headers/include/richedit.h
index 2d7f60f..98d75a9 100644
--- a/mingw-w64-headers/include/richedit.h
+++ b/mingw-w64-headers/include/richedit.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _RICHEDIT_
diff --git a/mingw-w64-headers/include/richole.h b/mingw-w64-headers/include/richole.h
index 5cf3d62..493eeb4 100644
--- a/mingw-w64-headers/include/richole.h
+++ b/mingw-w64-headers/include/richole.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _RICHOLE_
diff --git a/mingw-w64-headers/include/rkeysvcc.h b/mingw-w64-headers/include/rkeysvcc.h
index 1113291..07aaa12 100644
--- a/mingw-w64-headers/include/rkeysvcc.h
+++ b/mingw-w64-headers/include/rkeysvcc.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __rkeysvcc_h__
diff --git a/mingw-w64-headers/include/rnderr.h b/mingw-w64-headers/include/rnderr.h
index b06db11..c623bcf 100644
--- a/mingw-w64-headers/include/rnderr.h
+++ b/mingw-w64-headers/include/rnderr.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __RND_ERROR_CODES__
diff --git a/mingw-w64-headers/include/routprot.h b/mingw-w64-headers/include/routprot.h
index 670c63b..6124b2e 100644
--- a/mingw-w64-headers/include/routprot.h
+++ b/mingw-w64-headers/include/routprot.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _ROUTPROT_H_
diff --git a/mingw-w64-headers/include/rpc.h b/mingw-w64-headers/include/rpc.h
index d1de6e9..352976e 100644
--- a/mingw-w64-headers/include/rpc.h
+++ b/mingw-w64-headers/include/rpc.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 
diff --git a/mingw-w64-headers/include/rpcasync.h b/mingw-w64-headers/include/rpcasync.h
index 9d026c1..26aa60d 100644
--- a/mingw-w64-headers/include/rpcasync.h
+++ b/mingw-w64-headers/include/rpcasync.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __RPCASYNC_H__
diff --git a/mingw-w64-headers/include/rpcdce.h b/mingw-w64-headers/include/rpcdce.h
index 01aecc1..73cf453 100644
--- a/mingw-w64-headers/include/rpcdce.h
+++ b/mingw-w64-headers/include/rpcdce.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __RPCDCE_H__
diff --git a/mingw-w64-headers/include/rpcdcep.h b/mingw-w64-headers/include/rpcdcep.h
index be714e6..155ab06 100644
--- a/mingw-w64-headers/include/rpcdcep.h
+++ b/mingw-w64-headers/include/rpcdcep.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __RPCDCEP_H__
diff --git a/mingw-w64-headers/include/rpcndr.h b/mingw-w64-headers/include/rpcndr.h
index 6fb979e..822509f 100644
--- a/mingw-w64-headers/include/rpcndr.h
+++ b/mingw-w64-headers/include/rpcndr.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/rpcnsi.h b/mingw-w64-headers/include/rpcnsi.h
index 3ba713c..16e9d33 100644
--- a/mingw-w64-headers/include/rpcnsi.h
+++ b/mingw-w64-headers/include/rpcnsi.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __RPCNSI_H__
diff --git a/mingw-w64-headers/include/rpcnsip.h b/mingw-w64-headers/include/rpcnsip.h
index 52ef4bf..74fad5c 100644
--- a/mingw-w64-headers/include/rpcnsip.h
+++ b/mingw-w64-headers/include/rpcnsip.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __RPCNSIP_H__
diff --git a/mingw-w64-headers/include/rpcnterr.h b/mingw-w64-headers/include/rpcnterr.h
index 7bafaaa..3aecfd4 100644
--- a/mingw-w64-headers/include/rpcnterr.h
+++ b/mingw-w64-headers/include/rpcnterr.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __RPCNTERR_H__
diff --git a/mingw-w64-headers/include/rpcproxy.h b/mingw-w64-headers/include/rpcproxy.h
index fc621eb..17805e8 100644
--- a/mingw-w64-headers/include/rpcproxy.h
+++ b/mingw-w64-headers/include/rpcproxy.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __RPCPROXY_H_VERSION__
diff --git a/mingw-w64-headers/include/rpcssl.h b/mingw-w64-headers/include/rpcssl.h
index 2e87fe4..959b9c5 100644
--- a/mingw-w64-headers/include/rpcssl.h
+++ b/mingw-w64-headers/include/rpcssl.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 
diff --git a/mingw-w64-headers/include/rrascfg.h b/mingw-w64-headers/include/rrascfg.h
index 2ad7e19..5e3de30 100644
--- a/mingw-w64-headers/include/rrascfg.h
+++ b/mingw-w64-headers/include/rrascfg.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/rtcapi.h b/mingw-w64-headers/include/rtcapi.h
index 32bc205..90b41bd 100644
--- a/mingw-w64-headers/include/rtcapi.h
+++ b/mingw-w64-headers/include/rtcapi.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_RTCAPI
diff --git a/mingw-w64-headers/include/rtccore.h b/mingw-w64-headers/include/rtccore.h
index e43b248..795121d 100644
--- a/mingw-w64-headers/include/rtccore.h
+++ b/mingw-w64-headers/include/rtccore.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/rtcerr.h b/mingw-w64-headers/include/rtcerr.h
index a9cc7e1..81caa65 100644
--- a/mingw-w64-headers/include/rtcerr.h
+++ b/mingw-w64-headers/include/rtcerr.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #define FACILITY_SIP_STATUS_CODE 0xEF
diff --git a/mingw-w64-headers/include/rtinfo.h b/mingw-w64-headers/include/rtinfo.h
index dc2eda5..212d1ce 100644
--- a/mingw-w64-headers/include/rtinfo.h
+++ b/mingw-w64-headers/include/rtinfo.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __ROUTING_RTINFO_H__
diff --git a/mingw-w64-headers/include/rtm.h b/mingw-w64-headers/include/rtm.h
index 076ae5e..cf098d6 100644
--- a/mingw-w64-headers/include/rtm.h
+++ b/mingw-w64-headers/include/rtm.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __ROUTING_RTM_H__
diff --git a/mingw-w64-headers/include/rtmv2.h b/mingw-w64-headers/include/rtmv2.h
index a18382d..8c1e52a 100644
--- a/mingw-w64-headers/include/rtmv2.h
+++ b/mingw-w64-headers/include/rtmv2.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __ROUTING_RTMv2_H__
diff --git a/mingw-w64-headers/include/rtutils.h b/mingw-w64-headers/include/rtutils.h
index 4c1ceb3..8de48e8 100644
--- a/mingw-w64-headers/include/rtutils.h
+++ b/mingw-w64-headers/include/rtutils.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __ROUTING_RTUTILS_H__
diff --git a/mingw-w64-headers/include/sal.h b/mingw-w64-headers/include/sal.h
index 3175cb4..113445d 100644
--- a/mingw-w64-headers/include/sal.h
+++ b/mingw-w64-headers/include/sal.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 
diff --git a/mingw-w64-headers/include/sbe.h b/mingw-w64-headers/include/sbe.h
index fcf6613..f8fc991 100644
--- a/mingw-w64-headers/include/sbe.h
+++ b/mingw-w64-headers/include/sbe.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __INC_SBE__
diff --git a/mingw-w64-headers/include/scarddat.h b/mingw-w64-headers/include/scarddat.h
index 12c6c9d..92d52ae 100644
--- a/mingw-w64-headers/include/scarddat.h
+++ b/mingw-w64-headers/include/scarddat.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #include "scardssp.h"
diff --git a/mingw-w64-headers/include/scarderr.h b/mingw-w64-headers/include/scarderr.h
index 7c799c7..e6d4497 100644
--- a/mingw-w64-headers/include/scarderr.h
+++ b/mingw-w64-headers/include/scarderr.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef SCARD_S_SUCCESS
diff --git a/mingw-w64-headers/include/scardmgr.h b/mingw-w64-headers/include/scardmgr.h
index 12c6c9d..92d52ae 100644
--- a/mingw-w64-headers/include/scardmgr.h
+++ b/mingw-w64-headers/include/scardmgr.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #include "scardssp.h"
diff --git a/mingw-w64-headers/include/scardsrv.h b/mingw-w64-headers/include/scardsrv.h
index 12c6c9d..92d52ae 100644
--- a/mingw-w64-headers/include/scardsrv.h
+++ b/mingw-w64-headers/include/scardsrv.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #include "scardssp.h"
diff --git a/mingw-w64-headers/include/scardssp.h b/mingw-w64-headers/include/scardssp.h
index 54aaa80..2ce0068 100644
--- a/mingw-w64-headers/include/scardssp.h
+++ b/mingw-w64-headers/include/scardssp.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/scesvc.h b/mingw-w64-headers/include/scesvc.h
index de9247b..8c29e09 100644
--- a/mingw-w64-headers/include/scesvc.h
+++ b/mingw-w64-headers/include/scesvc.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 DEFINE_GUID(cNodetypeSceTemplateServices,0x24a7f717,0x1f0c,0x11d1,0xaf,0xfb,0x0,0xc0,0x4f,0xb9,0x84,0xf9);
diff --git a/mingw-w64-headers/include/schannel.h b/mingw-w64-headers/include/schannel.h
index f7e27a1..d260fa0 100644
--- a/mingw-w64-headers/include/schannel.h
+++ b/mingw-w64-headers/include/schannel.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __SCHANNEL_H__
diff --git a/mingw-w64-headers/include/schedule.h b/mingw-w64-headers/include/schedule.h
index b371afa..98350a9 100644
--- a/mingw-w64-headers/include/schedule.h
+++ b/mingw-w64-headers/include/schedule.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _SCHEDULE_H_
diff --git a/mingw-w64-headers/include/schemadef.h b/mingw-w64-headers/include/schemadef.h
index 781a52d..1c447a5 100644
--- a/mingw-w64-headers/include/schemadef.h
+++ b/mingw-w64-headers/include/schemadef.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef SCHEMA_STRINGS
diff --git a/mingw-w64-headers/include/schnlsp.h b/mingw-w64-headers/include/schnlsp.h
index 3c8f3ea..6335707 100644
--- a/mingw-w64-headers/include/schnlsp.h
+++ b/mingw-w64-headers/include/schnlsp.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __SCHNLSP_H__
diff --git a/mingw-w64-headers/include/scode.h b/mingw-w64-headers/include/scode.h
index e1378c6..dd5af87 100644
--- a/mingw-w64-headers/include/scode.h
+++ b/mingw-w64-headers/include/scode.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _WINERROR_
diff --git a/mingw-w64-headers/include/scrnsave.h b/mingw-w64-headers/include/scrnsave.h
index a550eea..f65009d 100644
--- a/mingw-w64-headers/include/scrnsave.h
+++ b/mingw-w64-headers/include/scrnsave.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_SCRNSAVE
diff --git a/mingw-w64-headers/include/scrptids.h b/mingw-w64-headers/include/scrptids.h
index 83c4c3c..505924c 100644
--- a/mingw-w64-headers/include/scrptids.h
+++ b/mingw-w64-headers/include/scrptids.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #define DISPID_LOAD 1
diff --git a/mingw-w64-headers/include/sddl.h b/mingw-w64-headers/include/sddl.h
index 1913cab..0bf19ba 100644
--- a/mingw-w64-headers/include/sddl.h
+++ b/mingw-w64-headers/include/sddl.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __SDDL_H__
diff --git a/mingw-w64-headers/include/sdkddkver.h b/mingw-w64-headers/include/sdkddkver.h
index 71bb0b7..0e8dc8a 100644
--- a/mingw-w64-headers/include/sdkddkver.h
+++ b/mingw-w64-headers/include/sdkddkver.h
@@ -3,7 +3,7 @@
  * from ReactOS PSDK/DDK, this file is in the public domain:
  *
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 
diff --git a/mingw-w64-headers/include/sdoias.h b/mingw-w64-headers/include/sdoias.h
index 7f8f4bc..10ee36e 100644
--- a/mingw-w64-headers/include/sdoias.h
+++ b/mingw-w64-headers/include/sdoias.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/sdpblb.h b/mingw-w64-headers/include/sdpblb.h
index cc62189..62616b1 100644
--- a/mingw-w64-headers/include/sdpblb.h
+++ b/mingw-w64-headers/include/sdpblb.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/sdperr.h b/mingw-w64-headers/include/sdperr.h
index 0a81e46..6a80fa2 100644
--- a/mingw-w64-headers/include/sdperr.h
+++ b/mingw-w64-headers/include/sdperr.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __SDP_ERROR_CODES__
diff --git a/mingw-w64-headers/include/secext.h b/mingw-w64-headers/include/secext.h
index 9900662..306c4ef 100644
--- a/mingw-w64-headers/include/secext.h
+++ b/mingw-w64-headers/include/secext.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __SECEXT_H__
diff --git a/mingw-w64-headers/include/security.h b/mingw-w64-headers/include/security.h
index 98e54c1..5790dd9 100644
--- a/mingw-w64-headers/include/security.h
+++ b/mingw-w64-headers/include/security.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 
diff --git a/mingw-w64-headers/include/sens.h b/mingw-w64-headers/include/sens.h
index 85ceeef..753ec3e 100644
--- a/mingw-w64-headers/include/sens.h
+++ b/mingw-w64-headers/include/sens.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __SENS_H__
diff --git a/mingw-w64-headers/include/sensapi.h b/mingw-w64-headers/include/sensapi.h
index 75537b5..576573b 100644
--- a/mingw-w64-headers/include/sensapi.h
+++ b/mingw-w64-headers/include/sensapi.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __SENSAPI_H__
diff --git a/mingw-w64-headers/include/sensevts.h b/mingw-w64-headers/include/sensevts.h
index f57896c..fe04224 100644
--- a/mingw-w64-headers/include/sensevts.h
+++ b/mingw-w64-headers/include/sensevts.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/sensors.h b/mingw-w64-headers/include/sensors.h
index 41dd25f..e3e553c 100644
--- a/mingw-w64-headers/include/sensors.h
+++ b/mingw-w64-headers/include/sensors.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 
diff --git a/mingw-w64-headers/include/sensorsapi.idl b/mingw-w64-headers/include/sensorsapi.idl
index 08479a5..35cf01d 100644
--- a/mingw-w64-headers/include/sensorsapi.idl
+++ b/mingw-w64-headers/include/sensorsapi.idl
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 
diff --git a/mingw-w64-headers/include/servprov.h b/mingw-w64-headers/include/servprov.h
index 4b59c05..029d1f6 100644
--- a/mingw-w64-headers/include/servprov.h
+++ b/mingw-w64-headers/include/servprov.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/setupapi.h b/mingw-w64-headers/include/setupapi.h
index 28aa7df..1681d6d 100644
--- a/mingw-w64-headers/include/setupapi.h
+++ b/mingw-w64-headers/include/setupapi.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_SETUPAPI
diff --git a/mingw-w64-headers/include/sfc.h b/mingw-w64-headers/include/sfc.h
index 477e87b..eb9213f 100644
--- a/mingw-w64-headers/include/sfc.h
+++ b/mingw-w64-headers/include/sfc.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _SFC_
diff --git a/mingw-w64-headers/include/shappmgr.h b/mingw-w64-headers/include/shappmgr.h
index 229c50b..7214c6f 100644
--- a/mingw-w64-headers/include/shappmgr.h
+++ b/mingw-w64-headers/include/shappmgr.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/shdeprecated.h b/mingw-w64-headers/include/shdeprecated.h
index cda94d7..9e822e0 100644
--- a/mingw-w64-headers/include/shdeprecated.h
+++ b/mingw-w64-headers/include/shdeprecated.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/shdispid.h b/mingw-w64-headers/include/shdispid.h
index 4b120fb..41ca856 100644
--- a/mingw-w64-headers/include/shdispid.h
+++ b/mingw-w64-headers/include/shdispid.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _SHDISPID_H_
diff --git a/mingw-w64-headers/include/shellapi.h b/mingw-w64-headers/include/shellapi.h
index 7f967f3..9145f06 100644
--- a/mingw-w64-headers/include/shellapi.h
+++ b/mingw-w64-headers/include/shellapi.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_SHELLAPI
diff --git a/mingw-w64-headers/include/shfolder.h b/mingw-w64-headers/include/shfolder.h
index 0c68809..125b5de 100644
--- a/mingw-w64-headers/include/shfolder.h
+++ b/mingw-w64-headers/include/shfolder.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _SHFOLDER_H_
diff --git a/mingw-w64-headers/include/shldisp.h b/mingw-w64-headers/include/shldisp.h
index 16e21db..b34e2c2 100644
--- a/mingw-w64-headers/include/shldisp.h
+++ b/mingw-w64-headers/include/shldisp.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/shlguid.h b/mingw-w64-headers/include/shlguid.h
index 50e3676..3282835 100644
--- a/mingw-w64-headers/include/shlguid.h
+++ b/mingw-w64-headers/include/shlguid.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _SHLGUID_H_
diff --git a/mingw-w64-headers/include/shlobj.h b/mingw-w64-headers/include/shlobj.h
index f6416d5..44d24df 100644
--- a/mingw-w64-headers/include/shlobj.h
+++ b/mingw-w64-headers/include/shlobj.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _SHLOBJ_H_
diff --git a/mingw-w64-headers/include/shlwapi.h b/mingw-w64-headers/include/shlwapi.h
index a041d54..94a54f8 100644
--- a/mingw-w64-headers/include/shlwapi.h
+++ b/mingw-w64-headers/include/shlwapi.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_SHLWAPI
diff --git a/mingw-w64-headers/include/shobjidl.idl b/mingw-w64-headers/include/shobjidl.idl
index 20c5f32..9ddc358 100644
--- a/mingw-w64-headers/include/shobjidl.idl
+++ b/mingw-w64-headers/include/shobjidl.idl
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 
diff --git a/mingw-w64-headers/include/shtypes.idl b/mingw-w64-headers/include/shtypes.idl
index d983928..66e557f 100644
--- a/mingw-w64-headers/include/shtypes.idl
+++ b/mingw-w64-headers/include/shtypes.idl
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 
diff --git a/mingw-w64-headers/include/simpdata.h b/mingw-w64-headers/include/simpdata.h
index 8f51465..112cc35 100644
--- a/mingw-w64-headers/include/simpdata.h
+++ b/mingw-w64-headers/include/simpdata.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/simpdc.h b/mingw-w64-headers/include/simpdc.h
index 9bd7bac..25aa739 100644
--- a/mingw-w64-headers/include/simpdc.h
+++ b/mingw-w64-headers/include/simpdc.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef I_SIMPDC_H_
diff --git a/mingw-w64-headers/include/sipbase.h b/mingw-w64-headers/include/sipbase.h
index 456c35c..c83f960 100644
--- a/mingw-w64-headers/include/sipbase.h
+++ b/mingw-w64-headers/include/sipbase.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef SIPBASE_H
diff --git a/mingw-w64-headers/include/sisbkup.h b/mingw-w64-headers/include/sisbkup.h
index 4b00fab..b572930 100644
--- a/mingw-w64-headers/include/sisbkup.h
+++ b/mingw-w64-headers/include/sisbkup.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __SISBKUP_H__
diff --git a/mingw-w64-headers/include/slerror.h b/mingw-w64-headers/include/slerror.h
index 54607ba..ee6d957 100644
--- a/mingw-w64-headers/include/slerror.h
+++ b/mingw-w64-headers/include/slerror.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_SLERROR
diff --git a/mingw-w64-headers/include/slpublic.h b/mingw-w64-headers/include/slpublic.h
index dfca086..de022b1 100644
--- a/mingw-w64-headers/include/slpublic.h
+++ b/mingw-w64-headers/include/slpublic.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_SLPUBLIC
diff --git a/mingw-w64-headers/include/smpab.h b/mingw-w64-headers/include/smpab.h
index fb2c713..7717195 100644
--- a/mingw-w64-headers/include/smpab.h
+++ b/mingw-w64-headers/include/smpab.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #define PR_SAB_FILE PROP_TAG(PT_STRING8,0x6604)
diff --git a/mingw-w64-headers/include/smpms.h b/mingw-w64-headers/include/smpms.h
index 53cb624..b66731c 100644
--- a/mingw-w64-headers/include/smpms.h
+++ b/mingw-w64-headers/include/smpms.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _SMPMS_H_
diff --git a/mingw-w64-headers/include/smpxp.h b/mingw-w64-headers/include/smpxp.h
index 1cbc820..1622bb6 100644
--- a/mingw-w64-headers/include/smpxp.h
+++ b/mingw-w64-headers/include/smpxp.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #define BASE_ID 0x6600
diff --git a/mingw-w64-headers/include/smtpguid.h b/mingw-w64-headers/include/smtpguid.h
index dce2993..9b04cdc 100644
--- a/mingw-w64-headers/include/smtpguid.h
+++ b/mingw-w64-headers/include/smtpguid.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __SMTPGUID_H__
diff --git a/mingw-w64-headers/include/smx.h b/mingw-w64-headers/include/smx.h
index 6d31fcd..50eaba1 100644
--- a/mingw-w64-headers/include/smx.h
+++ b/mingw-w64-headers/include/smx.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _SMX_H_
diff --git a/mingw-w64-headers/include/snmp.h b/mingw-w64-headers/include/snmp.h
index 82e9388..6c265c8 100644
--- a/mingw-w64-headers/include/snmp.h
+++ b/mingw-w64-headers/include/snmp.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_SNMP
diff --git a/mingw-w64-headers/include/softpub.h b/mingw-w64-headers/include/softpub.h
index 21365cd..a0d6915 100644
--- a/mingw-w64-headers/include/softpub.h
+++ b/mingw-w64-headers/include/softpub.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef SOFTPUB_H
diff --git a/mingw-w64-headers/include/specstrings.h b/mingw-w64-headers/include/specstrings.h
index b46d430..ed0275f 100644
--- a/mingw-w64-headers/include/specstrings.h
+++ b/mingw-w64-headers/include/specstrings.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #define __specstrings
diff --git a/mingw-w64-headers/include/sporder.h b/mingw-w64-headers/include/sporder.h
index 20d8dba..39de5b3 100644
--- a/mingw-w64-headers/include/sporder.h
+++ b/mingw-w64-headers/include/sporder.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __SPORDER_H__
diff --git a/mingw-w64-headers/include/sql.h b/mingw-w64-headers/include/sql.h
index 369cb78..5d4f28a 100644
--- a/mingw-w64-headers/include/sql.h
+++ b/mingw-w64-headers/include/sql.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __SQL
diff --git a/mingw-w64-headers/include/sql_1.h b/mingw-w64-headers/include/sql_1.h
index 720443c..9126a3d 100644
--- a/mingw-w64-headers/include/sql_1.h
+++ b/mingw-w64-headers/include/sql_1.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _SQL_1_H_
diff --git a/mingw-w64-headers/include/sqlext.h b/mingw-w64-headers/include/sqlext.h
index eb7a793..7a1c258 100644
--- a/mingw-w64-headers/include/sqlext.h
+++ b/mingw-w64-headers/include/sqlext.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __SQLEXT
diff --git a/mingw-w64-headers/include/sqloledb.h b/mingw-w64-headers/include/sqloledb.h
index aa594e0..9f62160 100644
--- a/mingw-w64-headers/include/sqloledb.h
+++ b/mingw-w64-headers/include/sqloledb.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _SQLOLEDB_H_
diff --git a/mingw-w64-headers/include/sqltypes.h b/mingw-w64-headers/include/sqltypes.h
index 21a4c85..5ac1e8d 100644
--- a/mingw-w64-headers/include/sqltypes.h
+++ b/mingw-w64-headers/include/sqltypes.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __SQLTYPES
diff --git a/mingw-w64-headers/include/sqlucode.h b/mingw-w64-headers/include/sqlucode.h
index 9c40d49..3fc46e8 100644
--- a/mingw-w64-headers/include/sqlucode.h
+++ b/mingw-w64-headers/include/sqlucode.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __SQLUCODE
diff --git a/mingw-w64-headers/include/srrestoreptapi.h b/mingw-w64-headers/include/srrestoreptapi.h
index 088cebe..fd8a555 100644
--- a/mingw-w64-headers/include/srrestoreptapi.h
+++ b/mingw-w64-headers/include/srrestoreptapi.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #if !defined(_SRRESTOREPTAPI_H)
diff --git a/mingw-w64-headers/include/srv.h b/mingw-w64-headers/include/srv.h
index 9a83788..c5ebd1e 100644
--- a/mingw-w64-headers/include/srv.h
+++ b/mingw-w64-headers/include/srv.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _ODS_SRV_H_
diff --git a/mingw-w64-headers/include/sspguid.h b/mingw-w64-headers/include/sspguid.h
index 9d22fc4..5644b02 100644
--- a/mingw-w64-headers/include/sspguid.h
+++ b/mingw-w64-headers/include/sspguid.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _SSPGUID_H_
diff --git a/mingw-w64-headers/include/sspi.h b/mingw-w64-headers/include/sspi.h
index 125f385..8facc3b 100644
--- a/mingw-w64-headers/include/sspi.h
+++ b/mingw-w64-headers/include/sspi.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __SSPI_H__
diff --git a/mingw-w64-headers/include/sspserr.h b/mingw-w64-headers/include/sspserr.h
index e2b4268..f6e1d68 100644
--- a/mingw-w64-headers/include/sspserr.h
+++ b/mingw-w64-headers/include/sspserr.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __SSPSERR_H__
diff --git a/mingw-w64-headers/include/sspsidl.h b/mingw-w64-headers/include/sspsidl.h
index 12c6c9d..92d52ae 100644
--- a/mingw-w64-headers/include/sspsidl.h
+++ b/mingw-w64-headers/include/sspsidl.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #include "scardssp.h"
diff --git a/mingw-w64-headers/include/sti.h b/mingw-w64-headers/include/sti.h
index a8f9955..8f7985c 100644
--- a/mingw-w64-headers/include/sti.h
+++ b/mingw-w64-headers/include/sti.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _STICOM_
diff --git a/mingw-w64-headers/include/stierr.h b/mingw-w64-headers/include/stierr.h
index 0659cd6..a749632 100644
--- a/mingw-w64-headers/include/stierr.h
+++ b/mingw-w64-headers/include/stierr.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _STIERR_
diff --git a/mingw-w64-headers/include/stireg.h b/mingw-w64-headers/include/stireg.h
index af9e7dd..94ad91f 100644
--- a/mingw-w64-headers/include/stireg.h
+++ b/mingw-w64-headers/include/stireg.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _STIREG_
diff --git a/mingw-w64-headers/include/stllock.h b/mingw-w64-headers/include/stllock.h
index c4923c3..0990126 100644
--- a/mingw-w64-headers/include/stllock.h
+++ b/mingw-w64-headers/include/stllock.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _STLLOCK_H_
diff --git a/mingw-w64-headers/include/stm.h b/mingw-w64-headers/include/stm.h
index 4b7511d..62a7081 100644
--- a/mingw-w64-headers/include/stm.h
+++ b/mingw-w64-headers/include/stm.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __ROUTING_STM_H__
diff --git a/mingw-w64-headers/include/storage.h b/mingw-w64-headers/include/storage.h
index 3b6bd76..f8a7b6b 100644
--- a/mingw-w64-headers/include/storage.h
+++ b/mingw-w64-headers/include/storage.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef RC_INVOKED
diff --git a/mingw-w64-headers/include/storduid.h b/mingw-w64-headers/include/storduid.h
index 230dc37..a10fcf1 100644
--- a/mingw-w64-headers/include/storduid.h
+++ b/mingw-w64-headers/include/storduid.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_STORDUID
diff --git a/mingw-w64-headers/include/storprop.h b/mingw-w64-headers/include/storprop.h
index 750c3ae..cb51caf 100644
--- a/mingw-w64-headers/include/storprop.h
+++ b/mingw-w64-headers/include/storprop.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __STORPROP_H__
diff --git a/mingw-w64-headers/include/stralign.h b/mingw-w64-headers/include/stralign.h
index c3dfeb7..7ff9cdc 100644
--- a/mingw-w64-headers/include/stralign.h
+++ b/mingw-w64-headers/include/stralign.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __STRALIGN_H_
diff --git a/mingw-w64-headers/include/strmif.idl b/mingw-w64-headers/include/strmif.idl
index d9a445e..586c44c 100644
--- a/mingw-w64-headers/include/strmif.idl
+++ b/mingw-w64-headers/include/strmif.idl
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 
diff --git a/mingw-w64-headers/include/strsafe.h b/mingw-w64-headers/include/strsafe.h
index 5544286..916b47e 100644
--- a/mingw-w64-headers/include/strsafe.h
+++ b/mingw-w64-headers/include/strsafe.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _STRSAFE_H_INCLUDED_
diff --git a/mingw-w64-headers/include/subauth.h b/mingw-w64-headers/include/subauth.h
index 52a2423..1d30158 100644
--- a/mingw-w64-headers/include/subauth.h
+++ b/mingw-w64-headers/include/subauth.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _NTSUBAUTH_
diff --git a/mingw-w64-headers/include/subsmgr.h b/mingw-w64-headers/include/subsmgr.h
index a681db1..eabd4ea 100644
--- a/mingw-w64-headers/include/subsmgr.h
+++ b/mingw-w64-headers/include/subsmgr.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/svcguid.h b/mingw-w64-headers/include/svcguid.h
index 51ebfbf..f29ac2f 100644
--- a/mingw-w64-headers/include/svcguid.h
+++ b/mingw-w64-headers/include/svcguid.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _SVCGUID_
diff --git a/mingw-w64-headers/include/svrapi.h b/mingw-w64-headers/include/svrapi.h
index 2579b85..700f8ae 100644
--- a/mingw-w64-headers/include/svrapi.h
+++ b/mingw-w64-headers/include/svrapi.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef SVRAPI_INCLUDED
diff --git a/mingw-w64-headers/include/tabflicks.h b/mingw-w64-headers/include/tabflicks.h
index 3e11c3e..f41b7f8 100644
--- a/mingw-w64-headers/include/tabflicks.h
+++ b/mingw-w64-headers/include/tabflicks.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_TABFLICKS
diff --git a/mingw-w64-headers/include/tapi.h b/mingw-w64-headers/include/tapi.h
index bac7828..e2d0c95 100644
--- a/mingw-w64-headers/include/tapi.h
+++ b/mingw-w64-headers/include/tapi.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef TAPI_H
diff --git a/mingw-w64-headers/include/tapi3.h b/mingw-w64-headers/include/tapi3.h
index bd5c00e..1f2b1ee 100644
--- a/mingw-w64-headers/include/tapi3.h
+++ b/mingw-w64-headers/include/tapi3.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/tapi3cc.h b/mingw-w64-headers/include/tapi3cc.h
index 811f127..1bd07a6 100644
--- a/mingw-w64-headers/include/tapi3cc.h
+++ b/mingw-w64-headers/include/tapi3cc.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/tapi3ds.h b/mingw-w64-headers/include/tapi3ds.h
index 93657da..9eb1035 100644
--- a/mingw-w64-headers/include/tapi3ds.h
+++ b/mingw-w64-headers/include/tapi3ds.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/tapi3err.h b/mingw-w64-headers/include/tapi3err.h
index bbc3ce2..cab63ff 100644
--- a/mingw-w64-headers/include/tapi3err.h
+++ b/mingw-w64-headers/include/tapi3err.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __TAPI3ERR_H__
diff --git a/mingw-w64-headers/include/tapi3if.h b/mingw-w64-headers/include/tapi3if.h
index 4ad977b..8a09978 100644
--- a/mingw-w64-headers/include/tapi3if.h
+++ b/mingw-w64-headers/include/tapi3if.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/taskschd.h b/mingw-w64-headers/include/taskschd.h
index 18db870..dbd2c42 100644
--- a/mingw-w64-headers/include/taskschd.h
+++ b/mingw-w64-headers/include/taskschd.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_TASKSCHD
diff --git a/mingw-w64-headers/include/tbs.h b/mingw-w64-headers/include/tbs.h
index 9ec1dbe..8f885da 100644
--- a/mingw-w64-headers/include/tbs.h
+++ b/mingw-w64-headers/include/tbs.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 
diff --git a/mingw-w64-headers/include/tcerror.h b/mingw-w64-headers/include/tcerror.h
index be0fcf5..205ba5d 100644
--- a/mingw-w64-headers/include/tcerror.h
+++ b/mingw-w64-headers/include/tcerror.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _TCERROR_H_
diff --git a/mingw-w64-headers/include/tcguid.h b/mingw-w64-headers/include/tcguid.h
index a425452..dbc9b73 100644
--- a/mingw-w64-headers/include/tcguid.h
+++ b/mingw-w64-headers/include/tcguid.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifdef __cplusplus
diff --git a/mingw-w64-headers/include/tcpestats.h b/mingw-w64-headers/include/tcpestats.h
index 36a1ce8..b68f64f 100644
--- a/mingw-w64-headers/include/tcpestats.h
+++ b/mingw-w64-headers/include/tcpestats.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_TCPESTATS
diff --git a/mingw-w64-headers/include/tcpmib.h b/mingw-w64-headers/include/tcpmib.h
index a726d06..e73ccfe 100644
--- a/mingw-w64-headers/include/tcpmib.h
+++ b/mingw-w64-headers/include/tcpmib.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_TCPMIB
diff --git a/mingw-w64-headers/include/tdh.h b/mingw-w64-headers/include/tdh.h
index 32e2b60..a76a7e4 100644
--- a/mingw-w64-headers/include/tdh.h
+++ b/mingw-w64-headers/include/tdh.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_TDH
diff --git a/mingw-w64-headers/include/termmgr.h b/mingw-w64-headers/include/termmgr.h
index 9aa882c..eac3c21 100644
--- a/mingw-w64-headers/include/termmgr.h
+++ b/mingw-w64-headers/include/termmgr.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/textserv.h b/mingw-w64-headers/include/textserv.h
index e01f6f1..fbde94d 100644
--- a/mingw-w64-headers/include/textserv.h
+++ b/mingw-w64-headers/include/textserv.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _TEXTSERV_H
diff --git a/mingw-w64-headers/include/timeprov.h b/mingw-w64-headers/include/timeprov.h
index d168de2..3e969db 100644
--- a/mingw-w64-headers/include/timeprov.h
+++ b/mingw-w64-headers/include/timeprov.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef TIMEPROV_H
diff --git a/mingw-w64-headers/include/tlhelp32.h b/mingw-w64-headers/include/tlhelp32.h
index c82c14a..9009fe6 100644
--- a/mingw-w64-headers/include/tlhelp32.h
+++ b/mingw-w64-headers/include/tlhelp32.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_TOOLHELP32
diff --git a/mingw-w64-headers/include/tlogstg.h b/mingw-w64-headers/include/tlogstg.h
index 64d2e68..46eacdd 100644
--- a/mingw-w64-headers/include/tlogstg.h
+++ b/mingw-w64-headers/include/tlogstg.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/tmschema.h b/mingw-w64-headers/include/tmschema.h
index 3030943..5d0c609 100644
--- a/mingw-w64-headers/include/tmschema.h
+++ b/mingw-w64-headers/include/tmschema.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #if (defined(SCHEMA_STRINGS)) || (! defined(TMSCHEMA_H))
diff --git a/mingw-w64-headers/include/tnef.h b/mingw-w64-headers/include/tnef.h
index 6263a8c..56ff22e 100644
--- a/mingw-w64-headers/include/tnef.h
+++ b/mingw-w64-headers/include/tnef.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef TNEF_H
diff --git a/mingw-w64-headers/include/tom.h b/mingw-w64-headers/include/tom.h
index 0b01f5b..766e340 100644
--- a/mingw-w64-headers/include/tom.h
+++ b/mingw-w64-headers/include/tom.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/tpcshrd.idl b/mingw-w64-headers/include/tpcshrd.idl
index d446a1f..cc74801 100644
--- a/mingw-w64-headers/include/tpcshrd.idl
+++ b/mingw-w64-headers/include/tpcshrd.idl
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 
diff --git a/mingw-w64-headers/include/traffic.h b/mingw-w64-headers/include/traffic.h
index ec0aff9..5d11124 100644
--- a/mingw-w64-headers/include/traffic.h
+++ b/mingw-w64-headers/include/traffic.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __TRAFFIC_H
diff --git a/mingw-w64-headers/include/transact.h b/mingw-w64-headers/include/transact.h
index 7111ef2..722c119 100644
--- a/mingw-w64-headers/include/transact.h
+++ b/mingw-w64-headers/include/transact.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/triedcid.h b/mingw-w64-headers/include/triedcid.h
index 8a3daa8..458f265 100644
--- a/mingw-w64-headers/include/triedcid.h
+++ b/mingw-w64-headers/include/triedcid.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __TRIEDCID_H__
diff --git a/mingw-w64-headers/include/triediid.h b/mingw-w64-headers/include/triediid.h
index 8510665..2b10068 100644
--- a/mingw-w64-headers/include/triediid.h
+++ b/mingw-w64-headers/include/triediid.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _triediid_h_
diff --git a/mingw-w64-headers/include/triedit.h b/mingw-w64-headers/include/triedit.h
index 0021cde..ee162de 100644
--- a/mingw-w64-headers/include/triedit.h
+++ b/mingw-w64-headers/include/triedit.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/tspi.h b/mingw-w64-headers/include/tspi.h
index 9c89cf6..fe6b108 100644
--- a/mingw-w64-headers/include/tspi.h
+++ b/mingw-w64-headers/include/tspi.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef TSPI_H
diff --git a/mingw-w64-headers/include/tssbx.h b/mingw-w64-headers/include/tssbx.h
index 2439809..f303893 100644
--- a/mingw-w64-headers/include/tssbx.h
+++ b/mingw-w64-headers/include/tssbx.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_TSSBX
diff --git a/mingw-w64-headers/include/tsuserex.h b/mingw-w64-headers/include/tsuserex.h
index 5520a3b..a85cef7 100644
--- a/mingw-w64-headers/include/tsuserex.h
+++ b/mingw-w64-headers/include/tsuserex.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/tuner.h b/mingw-w64-headers/include/tuner.h
index 03dece0..d4848ba 100644
--- a/mingw-w64-headers/include/tuner.h
+++ b/mingw-w64-headers/include/tuner.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __INC_TUNER__
diff --git a/mingw-w64-headers/include/tvout.h b/mingw-w64-headers/include/tvout.h
index 4bf11c7..fb5c2ea 100644
--- a/mingw-w64-headers/include/tvout.h
+++ b/mingw-w64-headers/include/tvout.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __TVOUT__
diff --git a/mingw-w64-headers/include/txcoord.h b/mingw-w64-headers/include/txcoord.h
index e263d6c..fee18fe 100644
--- a/mingw-w64-headers/include/txcoord.h
+++ b/mingw-w64-headers/include/txcoord.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/txctx.h b/mingw-w64-headers/include/txctx.h
index abbf2c2..d3e0557 100644
--- a/mingw-w64-headers/include/txctx.h
+++ b/mingw-w64-headers/include/txctx.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #include "comsvcs.h"
diff --git a/mingw-w64-headers/include/txdtc.h b/mingw-w64-headers/include/txdtc.h
index a257b95..b1a7a83 100644
--- a/mingw-w64-headers/include/txdtc.h
+++ b/mingw-w64-headers/include/txdtc.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/txfw32.h b/mingw-w64-headers/include/txfw32.h
index 875d5ec..11620c5 100644
--- a/mingw-w64-headers/include/txfw32.h
+++ b/mingw-w64-headers/include/txfw32.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_TXFW32
diff --git a/mingw-w64-headers/include/typeinfo.h b/mingw-w64-headers/include/typeinfo.h
index c1eb1c3..0c86fce 100644
--- a/mingw-w64-headers/include/typeinfo.h
+++ b/mingw-w64-headers/include/typeinfo.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #include <_mingw.h>
diff --git a/mingw-w64-headers/include/uastrfnc.h b/mingw-w64-headers/include/uastrfnc.h
index 79d2472..4bea6ac 100644
--- a/mingw-w64-headers/include/uastrfnc.h
+++ b/mingw-w64-headers/include/uastrfnc.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _UASTRFNC_H_
diff --git a/mingw-w64-headers/include/udpmib.h b/mingw-w64-headers/include/udpmib.h
index 9ab5dbc..e94f54b 100644
--- a/mingw-w64-headers/include/udpmib.h
+++ b/mingw-w64-headers/include/udpmib.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_UDPMIB
diff --git a/mingw-w64-headers/include/umx.h b/mingw-w64-headers/include/umx.h
index 9f0b57b..5b05dbd 100644
--- a/mingw-w64-headers/include/umx.h
+++ b/mingw-w64-headers/include/umx.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _UMX_H_
diff --git a/mingw-w64-headers/include/unknwn.idl b/mingw-w64-headers/include/unknwn.idl
index a798519..26bf6db 100644
--- a/mingw-w64-headers/include/unknwn.idl
+++ b/mingw-w64-headers/include/unknwn.idl
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 
diff --git a/mingw-w64-headers/include/urlmon.idl b/mingw-w64-headers/include/urlmon.idl
index d5ce5dd..72e55de 100644
--- a/mingw-w64-headers/include/urlmon.idl
+++ b/mingw-w64-headers/include/urlmon.idl
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 
diff --git a/mingw-w64-headers/include/userenv.h b/mingw-w64-headers/include/userenv.h
index 7c6c008..b43df62 100644
--- a/mingw-w64-headers/include/userenv.h
+++ b/mingw-w64-headers/include/userenv.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _USERENV_H_
diff --git a/mingw-w64-headers/include/usp10.h b/mingw-w64-headers/include/usp10.h
index 9fc1837..11f941e 100644
--- a/mingw-w64-headers/include/usp10.h
+++ b/mingw-w64-headers/include/usp10.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __usp10__
diff --git a/mingw-w64-headers/include/uuids.h b/mingw-w64-headers/include/uuids.h
index 0b566c3..2308b46 100644
--- a/mingw-w64-headers/include/uuids.h
+++ b/mingw-w64-headers/include/uuids.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef OUR_GUID_ENTRY
diff --git a/mingw-w64-headers/include/uxtheme.h b/mingw-w64-headers/include/uxtheme.h
index 9202998..f57e547 100644
--- a/mingw-w64-headers/include/uxtheme.h
+++ b/mingw-w64-headers/include/uxtheme.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _UXTHEME_H_
diff --git a/mingw-w64-headers/include/vcr.h b/mingw-w64-headers/include/vcr.h
index 8688923..5c857fc 100644
--- a/mingw-w64-headers/include/vcr.h
+++ b/mingw-w64-headers/include/vcr.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __VCR_H__
diff --git a/mingw-w64-headers/include/vdmdbg.h b/mingw-w64-headers/include/vdmdbg.h
index a0656a1..3cbb712 100644
--- a/mingw-w64-headers/include/vdmdbg.h
+++ b/mingw-w64-headers/include/vdmdbg.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _VDMDBG_
diff --git a/mingw-w64-headers/include/vds.h b/mingw-w64-headers/include/vds.h
index b288f44..d1b3d5b 100644
--- a/mingw-w64-headers/include/vds.h
+++ b/mingw-w64-headers/include/vds.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_VDS
diff --git a/mingw-w64-headers/include/vdslun.h b/mingw-w64-headers/include/vdslun.h
index 877eb9c..2206b68 100644
--- a/mingw-w64-headers/include/vdslun.h
+++ b/mingw-w64-headers/include/vdslun.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_VDSLUN
diff --git a/mingw-w64-headers/include/verinfo.ver b/mingw-w64-headers/include/verinfo.ver
index 25e38fb..b7a6712 100644
--- a/mingw-w64-headers/include/verinfo.ver
+++ b/mingw-w64-headers/include/verinfo.ver
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 VS_VERSION_INFO VERSIONINFO
diff --git a/mingw-w64-headers/include/vfw.h b/mingw-w64-headers/include/vfw.h
index f27228c..80cbffa 100644
--- a/mingw-w64-headers/include/vfw.h
+++ b/mingw-w64-headers/include/vfw.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_VFW
diff --git a/mingw-w64-headers/include/virtdisk.h b/mingw-w64-headers/include/virtdisk.h
index e4e44a6..cc6b002 100644
--- a/mingw-w64-headers/include/virtdisk.h
+++ b/mingw-w64-headers/include/virtdisk.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_VIRTDISK
diff --git a/mingw-w64-headers/include/vsadmin.h b/mingw-w64-headers/include/vsadmin.h
index d7e51d4..2f9c478 100644
--- a/mingw-w64-headers/include/vsadmin.h
+++ b/mingw-w64-headers/include/vsadmin.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_VSADMIN
diff --git a/mingw-w64-headers/include/vsbackup.h b/mingw-w64-headers/include/vsbackup.h
index 6806c37..9ff4894 100644
--- a/mingw-w64-headers/include/vsbackup.h
+++ b/mingw-w64-headers/include/vsbackup.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_VSBACKUP
diff --git a/mingw-w64-headers/include/vsmgmt.h b/mingw-w64-headers/include/vsmgmt.h
index 446c7f8..7a11d28 100644
--- a/mingw-w64-headers/include/vsmgmt.h
+++ b/mingw-w64-headers/include/vsmgmt.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_VSMGT
diff --git a/mingw-w64-headers/include/vsprov.h b/mingw-w64-headers/include/vsprov.h
index b58848a..9bee9ac 100644
--- a/mingw-w64-headers/include/vsprov.h
+++ b/mingw-w64-headers/include/vsprov.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_VSPROV
diff --git a/mingw-w64-headers/include/vss.h b/mingw-w64-headers/include/vss.h
index 44ebaed..1837f6d 100644
--- a/mingw-w64-headers/include/vss.h
+++ b/mingw-w64-headers/include/vss.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_VSS
diff --git a/mingw-w64-headers/include/vswriter.h b/mingw-w64-headers/include/vswriter.h
index 18158cf..f9e5c54 100644
--- a/mingw-w64-headers/include/vswriter.h
+++ b/mingw-w64-headers/include/vswriter.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_VSWRITER
diff --git a/mingw-w64-headers/include/w32api.h b/mingw-w64-headers/include/w32api.h
index c6157b6..6725a9f 100644
--- a/mingw-w64-headers/include/w32api.h
+++ b/mingw-w64-headers/include/w32api.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _W32API_H
diff --git a/mingw-w64-headers/include/wab.h b/mingw-w64-headers/include/wab.h
index 8c47f9d..a0472fa 100644
--- a/mingw-w64-headers/include/wab.h
+++ b/mingw-w64-headers/include/wab.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #include <wabdefs.h>
diff --git a/mingw-w64-headers/include/wabapi.h b/mingw-w64-headers/include/wabapi.h
index 6d81f27..6703cd2 100644
--- a/mingw-w64-headers/include/wabapi.h
+++ b/mingw-w64-headers/include/wabapi.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _WABAPI_H_
diff --git a/mingw-w64-headers/include/wabcode.h b/mingw-w64-headers/include/wabcode.h
index d594cc6..1529c1f 100644
--- a/mingw-w64-headers/include/wabcode.h
+++ b/mingw-w64-headers/include/wabcode.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #if !defined(MAPICODE_H) && !defined(WABCODE_H)
diff --git a/mingw-w64-headers/include/wabdefs.h b/mingw-w64-headers/include/wabdefs.h
index 9075b95..251688d 100644
--- a/mingw-w64-headers/include/wabdefs.h
+++ b/mingw-w64-headers/include/wabdefs.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #if !defined(MAPIDEFS_H) && !defined(WABDEFS_H)
diff --git a/mingw-w64-headers/include/wabiab.h b/mingw-w64-headers/include/wabiab.h
index 9470868..9fababe 100644
--- a/mingw-w64-headers/include/wabiab.h
+++ b/mingw-w64-headers/include/wabiab.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef WABIAB_H
diff --git a/mingw-w64-headers/include/wabmem.h b/mingw-w64-headers/include/wabmem.h
index 971aec9..89f2bcb 100644
--- a/mingw-w64-headers/include/wabmem.h
+++ b/mingw-w64-headers/include/wabmem.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #if !defined(WABMEM_H)
diff --git a/mingw-w64-headers/include/wabnot.h b/mingw-w64-headers/include/wabnot.h
index 03b5fa3..6de4d9b 100644
--- a/mingw-w64-headers/include/wabnot.h
+++ b/mingw-w64-headers/include/wabnot.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #if !defined(MAPISPI_H) && !defined(WABSPI_H)
diff --git a/mingw-w64-headers/include/wabtags.h b/mingw-w64-headers/include/wabtags.h
index 3510171..871c0f9 100644
--- a/mingw-w64-headers/include/wabtags.h
+++ b/mingw-w64-headers/include/wabtags.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #if !defined(MAPITAGS_H) && !defined(WABTAGS_H)
diff --git a/mingw-w64-headers/include/wabutil.h b/mingw-w64-headers/include/wabutil.h
index ba1fcc8..5abb745 100644
--- a/mingw-w64-headers/include/wabutil.h
+++ b/mingw-w64-headers/include/wabutil.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #if !defined(_MAPIUTIL_H) && !defined(_WABUTIL_H)
diff --git a/mingw-w64-headers/include/wbemads.h b/mingw-w64-headers/include/wbemads.h
index 7e7c981..333c699 100644
--- a/mingw-w64-headers/include/wbemads.h
+++ b/mingw-w64-headers/include/wbemads.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/wbemcli.h b/mingw-w64-headers/include/wbemcli.h
index add825d..8926ea1 100644
--- a/mingw-w64-headers/include/wbemcli.h
+++ b/mingw-w64-headers/include/wbemcli.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/wbemdisp.h b/mingw-w64-headers/include/wbemdisp.h
index e57e661..381bee7 100644
--- a/mingw-w64-headers/include/wbemdisp.h
+++ b/mingw-w64-headers/include/wbemdisp.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/wbemidl.h b/mingw-w64-headers/include/wbemidl.h
index d650daf..923a72d 100644
--- a/mingw-w64-headers/include/wbemidl.h
+++ b/mingw-w64-headers/include/wbemidl.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __WBEMIDL_H_
diff --git a/mingw-w64-headers/include/wbemprov.h b/mingw-w64-headers/include/wbemprov.h
index 51a6821..b683d55 100644
--- a/mingw-w64-headers/include/wbemprov.h
+++ b/mingw-w64-headers/include/wbemprov.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/wbemtran.h b/mingw-w64-headers/include/wbemtran.h
index 004ff2a..6c3ab72 100644
--- a/mingw-w64-headers/include/wbemtran.h
+++ b/mingw-w64-headers/include/wbemtran.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/wcmconfig.h b/mingw-w64-headers/include/wcmconfig.h
index 83a462d..4348fa9 100644
--- a/mingw-w64-headers/include/wcmconfig.h
+++ b/mingw-w64-headers/include/wcmconfig.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_WCMCONFIG
diff --git a/mingw-w64-headers/include/wcsplugin.h b/mingw-w64-headers/include/wcsplugin.h
index a8b0d43..043aaf7 100644
--- a/mingw-w64-headers/include/wcsplugin.h
+++ b/mingw-w64-headers/include/wcsplugin.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_WCSPLUGIN
diff --git a/mingw-w64-headers/include/wct.h b/mingw-w64-headers/include/wct.h
index 4ff3e83..0bd3696 100644
--- a/mingw-w64-headers/include/wct.h
+++ b/mingw-w64-headers/include/wct.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_WCT
diff --git a/mingw-w64-headers/include/wdsbp.h b/mingw-w64-headers/include/wdsbp.h
index 2c86345..abe7814 100644
--- a/mingw-w64-headers/include/wdsbp.h
+++ b/mingw-w64-headers/include/wdsbp.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_WDSBP
diff --git a/mingw-w64-headers/include/wdsclientapi.h b/mingw-w64-headers/include/wdsclientapi.h
index 73c30ba..61dfce7 100644
--- a/mingw-w64-headers/include/wdsclientapi.h
+++ b/mingw-w64-headers/include/wdsclientapi.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_WDSCLIENTAPI
diff --git a/mingw-w64-headers/include/wdspxe.h b/mingw-w64-headers/include/wdspxe.h
index 2858321..71028bd 100644
--- a/mingw-w64-headers/include/wdspxe.h
+++ b/mingw-w64-headers/include/wdspxe.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_WDSPXE
diff --git a/mingw-w64-headers/include/wdstci.h b/mingw-w64-headers/include/wdstci.h
index 693fccb..fbef8c4 100644
--- a/mingw-w64-headers/include/wdstci.h
+++ b/mingw-w64-headers/include/wdstci.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_WDSCLIENTAPI
diff --git a/mingw-w64-headers/include/wdstpdi.h b/mingw-w64-headers/include/wdstpdi.h
index 6c97d9d..2031aa7 100644
--- a/mingw-w64-headers/include/wdstpdi.h
+++ b/mingw-w64-headers/include/wdstpdi.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 
diff --git a/mingw-w64-headers/include/wdstptmgmt.h b/mingw-w64-headers/include/wdstptmgmt.h
index 3e1a803..65eadf1 100644
--- a/mingw-w64-headers/include/wdstptmgmt.h
+++ b/mingw-w64-headers/include/wdstptmgmt.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 
diff --git a/mingw-w64-headers/include/werapi.h b/mingw-w64-headers/include/werapi.h
index 57af63f..8b96eb6 100644
--- a/mingw-w64-headers/include/werapi.h
+++ b/mingw-w64-headers/include/werapi.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_WERAPI
diff --git a/mingw-w64-headers/include/wfext.h b/mingw-w64-headers/include/wfext.h
index c40a581..fa8d4e5 100644
--- a/mingw-w64-headers/include/wfext.h
+++ b/mingw-w64-headers/include/wfext.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_WFEXT
diff --git a/mingw-w64-headers/include/wia.h b/mingw-w64-headers/include/wia.h
index 0b5a53b..764280f 100644
--- a/mingw-w64-headers/include/wia.h
+++ b/mingw-w64-headers/include/wia.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/wiadef.h b/mingw-w64-headers/include/wiadef.h
index 63b6404..63fcee7 100644
--- a/mingw-w64-headers/include/wiadef.h
+++ b/mingw-w64-headers/include/wiadef.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _WIADEF_H_
diff --git a/mingw-w64-headers/include/wiadevd.h b/mingw-w64-headers/include/wiadevd.h
index c1a6b56..a700532 100644
--- a/mingw-w64-headers/include/wiadevd.h
+++ b/mingw-w64-headers/include/wiadevd.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _WIADEVD_H_INCLUDED
diff --git a/mingw-w64-headers/include/wiavideo.h b/mingw-w64-headers/include/wiavideo.h
index cadfb69..ced9021 100644
--- a/mingw-w64-headers/include/wiavideo.h
+++ b/mingw-w64-headers/include/wiavideo.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/winable.h b/mingw-w64-headers/include/winable.h
index c31a393..b4493a2 100644
--- a/mingw-w64-headers/include/winable.h
+++ b/mingw-w64-headers/include/winable.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _WINABLE_
diff --git a/mingw-w64-headers/include/winbase.h b/mingw-w64-headers/include/winbase.h
index b7aa8f5..ceba6ad 100644
--- a/mingw-w64-headers/include/winbase.h
+++ b/mingw-w64-headers/include/winbase.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _WINBASE_
diff --git a/mingw-w64-headers/include/winber.h b/mingw-w64-headers/include/winber.h
index 84db098..32dc0b2 100644
--- a/mingw-w64-headers/include/winber.h
+++ b/mingw-w64-headers/include/winber.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _WINBER_DEFINED_
diff --git a/mingw-w64-headers/include/wincon.h b/mingw-w64-headers/include/wincon.h
index a39b51d..d673819 100644
--- a/mingw-w64-headers/include/wincon.h
+++ b/mingw-w64-headers/include/wincon.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _WINCON_
diff --git a/mingw-w64-headers/include/wincred.h b/mingw-w64-headers/include/wincred.h
index 4b8433c..cd8c4ec 100644
--- a/mingw-w64-headers/include/wincred.h
+++ b/mingw-w64-headers/include/wincred.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _WINCRED_H_
diff --git a/mingw-w64-headers/include/wincrypt.h b/mingw-w64-headers/include/wincrypt.h
index 810e062..b9dc3ce 100644
--- a/mingw-w64-headers/include/wincrypt.h
+++ b/mingw-w64-headers/include/wincrypt.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __WINCRYPT_H__
diff --git a/mingw-w64-headers/include/windef.h b/mingw-w64-headers/include/windef.h
index 217b9be..7ed8252 100644
--- a/mingw-w64-headers/include/windef.h
+++ b/mingw-w64-headers/include/windef.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _WINDEF_
diff --git a/mingw-w64-headers/include/windns.h b/mingw-w64-headers/include/windns.h
index 0ffb813..89af6b5 100644
--- a/mingw-w64-headers/include/windns.h
+++ b/mingw-w64-headers/include/windns.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _WINDNS_INCLUDED_
diff --git a/mingw-w64-headers/include/windot11.h b/mingw-w64-headers/include/windot11.h
index c83ebba..48839af 100644
--- a/mingw-w64-headers/include/windot11.h
+++ b/mingw-w64-headers/include/windot11.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_WINDOT11
diff --git a/mingw-w64-headers/include/windows.h b/mingw-w64-headers/include/windows.h
index d70efc9..50ff81c 100644
--- a/mingw-w64-headers/include/windows.h
+++ b/mingw-w64-headers/include/windows.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _WINDOWS_
diff --git a/mingw-w64-headers/include/windowsx.h b/mingw-w64-headers/include/windowsx.h
index f249dd4..e4440f9 100644
--- a/mingw-w64-headers/include/windowsx.h
+++ b/mingw-w64-headers/include/windowsx.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_WINDOWSX
diff --git a/mingw-w64-headers/include/windowsx.h16 b/mingw-w64-headers/include/windowsx.h16
index bbf6ba8..0470d65 100644
--- a/mingw-w64-headers/include/windowsx.h16
+++ b/mingw-w64-headers/include/windowsx.h16
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_WINDOWSX
diff --git a/mingw-w64-headers/include/winefs.h b/mingw-w64-headers/include/winefs.h
index a9373f3..0ebc524 100644
--- a/mingw-w64-headers/include/winefs.h
+++ b/mingw-w64-headers/include/winefs.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __WINEFS_H__
diff --git a/mingw-w64-headers/include/winerror.h b/mingw-w64-headers/include/winerror.h
index 451ab46..72117d6 100644
--- a/mingw-w64-headers/include/winerror.h
+++ b/mingw-w64-headers/include/winerror.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _WINERROR_
diff --git a/mingw-w64-headers/include/winevt.h b/mingw-w64-headers/include/winevt.h
index e0c119b..90be0cd 100644
--- a/mingw-w64-headers/include/winevt.h
+++ b/mingw-w64-headers/include/winevt.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_WINEVT
diff --git a/mingw-w64-headers/include/wingdi.h b/mingw-w64-headers/include/wingdi.h
index 02dddc0..fa91d5a 100644
--- a/mingw-w64-headers/include/wingdi.h
+++ b/mingw-w64-headers/include/wingdi.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _WINGDI_
diff --git a/mingw-w64-headers/include/wininet.h b/mingw-w64-headers/include/wininet.h
index 7894cde..661dc44 100644
--- a/mingw-w64-headers/include/wininet.h
+++ b/mingw-w64-headers/include/wininet.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _WININET_
diff --git a/mingw-w64-headers/include/winioctl.h b/mingw-w64-headers/include/winioctl.h
index 1e7a670..127b3fe 100644
--- a/mingw-w64-headers/include/winioctl.h
+++ b/mingw-w64-headers/include/winioctl.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifdef DEFINE_GUID
diff --git a/mingw-w64-headers/include/winldap.h b/mingw-w64-headers/include/winldap.h
index 9bbdd22..8bb82f5 100644
--- a/mingw-w64-headers/include/winldap.h
+++ b/mingw-w64-headers/include/winldap.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef LDAP_CLIENT_DEFINED
diff --git a/mingw-w64-headers/include/winnetwk.h b/mingw-w64-headers/include/winnetwk.h
index d2eee13..fca0e87 100644
--- a/mingw-w64-headers/include/winnetwk.h
+++ b/mingw-w64-headers/include/winnetwk.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _WINNETWK_
diff --git a/mingw-w64-headers/include/winnls.h b/mingw-w64-headers/include/winnls.h
index 37597ed..a95f568 100644
--- a/mingw-w64-headers/include/winnls.h
+++ b/mingw-w64-headers/include/winnls.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _WINNLS_
diff --git a/mingw-w64-headers/include/winnls32.h b/mingw-w64-headers/include/winnls32.h
index a87abc1..dd966e2 100644
--- a/mingw-w64-headers/include/winnls32.h
+++ b/mingw-w64-headers/include/winnls32.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _WINNLS32_
diff --git a/mingw-w64-headers/include/winnt.h b/mingw-w64-headers/include/winnt.h
index 3b355d1..7988743 100644
--- a/mingw-w64-headers/include/winnt.h
+++ b/mingw-w64-headers/include/winnt.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _WINNT_
diff --git a/mingw-w64-headers/include/winnt.rh b/mingw-w64-headers/include/winnt.rh
index 8e76a46..050e62d 100644
--- a/mingw-w64-headers/include/winnt.rh
+++ b/mingw-w64-headers/include/winnt.rh
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #if defined(UNICODE)
diff --git a/mingw-w64-headers/include/winperf.h b/mingw-w64-headers/include/winperf.h
index e5dd86d..b73ad72 100644
--- a/mingw-w64-headers/include/winperf.h
+++ b/mingw-w64-headers/include/winperf.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _WINPERF_
diff --git a/mingw-w64-headers/include/winreg.h b/mingw-w64-headers/include/winreg.h
index 1718ad9..9119765 100644
--- a/mingw-w64-headers/include/winreg.h
+++ b/mingw-w64-headers/include/winreg.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _WINREG_
diff --git a/mingw-w64-headers/include/winresrc.h b/mingw-w64-headers/include/winresrc.h
index e63a65c..3e6dda7 100644
--- a/mingw-w64-headers/include/winresrc.h
+++ b/mingw-w64-headers/include/winresrc.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _WINRESRC_
diff --git a/mingw-w64-headers/include/winsafer.h b/mingw-w64-headers/include/winsafer.h
index 554f0b9..2b8b885 100644
--- a/mingw-w64-headers/include/winsafer.h
+++ b/mingw-w64-headers/include/winsafer.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _WINSAFER_H
diff --git a/mingw-w64-headers/include/winsatcominterfacei.h b/mingw-w64-headers/include/winsatcominterfacei.h
index efcafaa..e256244 100644
--- a/mingw-w64-headers/include/winsatcominterfacei.h
+++ b/mingw-w64-headers/include/winsatcominterfacei.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 
diff --git a/mingw-w64-headers/include/winscard.h b/mingw-w64-headers/include/winscard.h
index 815f204..7373d19 100644
--- a/mingw-w64-headers/include/winscard.h
+++ b/mingw-w64-headers/include/winscard.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _WINSCARD_H_
diff --git a/mingw-w64-headers/include/winsmcrd.h b/mingw-w64-headers/include/winsmcrd.h
index cda4815..ea48994 100644
--- a/mingw-w64-headers/include/winsmcrd.h
+++ b/mingw-w64-headers/include/winsmcrd.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _NTDDSCRD_H2_
diff --git a/mingw-w64-headers/include/winsnmp.h b/mingw-w64-headers/include/winsnmp.h
index 43818fc..c0cf732 100644
--- a/mingw-w64-headers/include/winsnmp.h
+++ b/mingw-w64-headers/include/winsnmp.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_WINSNMP
diff --git a/mingw-w64-headers/include/winsock.h b/mingw-w64-headers/include/winsock.h
index 02270c1..905a448 100644
--- a/mingw-w64-headers/include/winsock.h
+++ b/mingw-w64-headers/include/winsock.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _WINSOCKAPI_
diff --git a/mingw-w64-headers/include/winsock2.h b/mingw-w64-headers/include/winsock2.h
index 310b3a3..cc435ba 100644
--- a/mingw-w64-headers/include/winsock2.h
+++ b/mingw-w64-headers/include/winsock2.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 
diff --git a/mingw-w64-headers/include/winspool.h b/mingw-w64-headers/include/winspool.h
index bd14cb1..0116d18 100644
--- a/mingw-w64-headers/include/winspool.h
+++ b/mingw-w64-headers/include/winspool.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _WINSPOOL_
diff --git a/mingw-w64-headers/include/winsvc.h b/mingw-w64-headers/include/winsvc.h
index 55108fa..8b4b3de 100644
--- a/mingw-w64-headers/include/winsvc.h
+++ b/mingw-w64-headers/include/winsvc.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _WINSVC_
diff --git a/mingw-w64-headers/include/winsxs.h b/mingw-w64-headers/include/winsxs.h
index c8eea72..28ade9e 100644
--- a/mingw-w64-headers/include/winsxs.h
+++ b/mingw-w64-headers/include/winsxs.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_WINSXS
diff --git a/mingw-w64-headers/include/winsync.h b/mingw-w64-headers/include/winsync.h
index c15ed16..30d5e5d 100644
--- a/mingw-w64-headers/include/winsync.h
+++ b/mingw-w64-headers/include/winsync.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __WINSYNC_H__
diff --git a/mingw-w64-headers/include/winternl.h b/mingw-w64-headers/include/winternl.h
index 9dbaa59..c552162 100644
--- a/mingw-w64-headers/include/winternl.h
+++ b/mingw-w64-headers/include/winternl.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _WINTERNL_
diff --git a/mingw-w64-headers/include/wintrust.h b/mingw-w64-headers/include/wintrust.h
index 1655ec5..9dc4522 100644
--- a/mingw-w64-headers/include/wintrust.h
+++ b/mingw-w64-headers/include/wintrust.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef WINTRUST_H
diff --git a/mingw-w64-headers/include/winuser.h b/mingw-w64-headers/include/winuser.h
index 72db690..d7ac780 100644
--- a/mingw-w64-headers/include/winuser.h
+++ b/mingw-w64-headers/include/winuser.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _WINUSER_
diff --git a/mingw-w64-headers/include/winuser.rh b/mingw-w64-headers/include/winuser.rh
index 5e18c4c..28e680e 100644
--- a/mingw-w64-headers/include/winuser.rh
+++ b/mingw-w64-headers/include/winuser.rh
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #define RT_MANIFEST 24
diff --git a/mingw-w64-headers/include/winver.h b/mingw-w64-headers/include/winver.h
index 008258c..5d056b8 100644
--- a/mingw-w64-headers/include/winver.h
+++ b/mingw-w64-headers/include/winver.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef VER_H
diff --git a/mingw-w64-headers/include/winwlx.h b/mingw-w64-headers/include/winwlx.h
index 3ac0ac2..cd0276c 100644
--- a/mingw-w64-headers/include/winwlx.h
+++ b/mingw-w64-headers/include/winwlx.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _WINWLX_
diff --git a/mingw-w64-headers/include/wlanapi.h b/mingw-w64-headers/include/wlanapi.h
index 4197fbe..598b991 100644
--- a/mingw-w64-headers/include/wlanapi.h
+++ b/mingw-w64-headers/include/wlanapi.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_WLANAPI
diff --git a/mingw-w64-headers/include/wlantypes.h b/mingw-w64-headers/include/wlantypes.h
index 5b7aa3e..47ed6f1 100644
--- a/mingw-w64-headers/include/wlantypes.h
+++ b/mingw-w64-headers/include/wlantypes.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_WLANTYPES
diff --git a/mingw-w64-headers/include/wmcontainer.h b/mingw-w64-headers/include/wmcontainer.h
index e5f930b..82fa388 100644
--- a/mingw-w64-headers/include/wmcontainer.h
+++ b/mingw-w64-headers/include/wmcontainer.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_WMCONTAINER
diff --git a/mingw-w64-headers/include/wmiatlprov.h b/mingw-w64-headers/include/wmiatlprov.h
index d155a40..5ef9e51 100644
--- a/mingw-w64-headers/include/wmiatlprov.h
+++ b/mingw-w64-headers/include/wmiatlprov.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __ATLWMIPROV_H__
diff --git a/mingw-w64-headers/include/wmistr.h b/mingw-w64-headers/include/wmistr.h
index 6b8a5e9..6a3e174 100644
--- a/mingw-w64-headers/include/wmistr.h
+++ b/mingw-w64-headers/include/wmistr.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _WMISTR_
diff --git a/mingw-w64-headers/include/wmiutils.h b/mingw-w64-headers/include/wmiutils.h
index 3328541..6686637 100644
--- a/mingw-w64-headers/include/wmiutils.h
+++ b/mingw-w64-headers/include/wmiutils.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/wownt16.h b/mingw-w64-headers/include/wownt16.h
index eefc73b..46d41bc 100644
--- a/mingw-w64-headers/include/wownt16.h
+++ b/mingw-w64-headers/include/wownt16.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _WOWNT16_
diff --git a/mingw-w64-headers/include/wownt32.h b/mingw-w64-headers/include/wownt32.h
index 9b26306..27ad439 100644
--- a/mingw-w64-headers/include/wownt32.h
+++ b/mingw-w64-headers/include/wownt32.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _WOWNT32_
diff --git a/mingw-w64-headers/include/wpapi.h b/mingw-w64-headers/include/wpapi.h
index 3524f9f..c349d54 100644
--- a/mingw-w64-headers/include/wpapi.h
+++ b/mingw-w64-headers/include/wpapi.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __WP15API_H__
diff --git a/mingw-w64-headers/include/wpapimsg.h b/mingw-w64-headers/include/wpapimsg.h
index a598041..2f9e2fb 100644
--- a/mingw-w64-headers/include/wpapimsg.h
+++ b/mingw-w64-headers/include/wpapimsg.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #define WEBPOST_ERROR_FIRST 0x40042100L
diff --git a/mingw-w64-headers/include/wpcevent.h b/mingw-w64-headers/include/wpcevent.h
index bac8590..5716ece 100644
--- a/mingw-w64-headers/include/wpcevent.h
+++ b/mingw-w64-headers/include/wpcevent.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 
diff --git a/mingw-w64-headers/include/wpcrsmsg.h b/mingw-w64-headers/include/wpcrsmsg.h
index 10e84dd..0daf6c8 100644
--- a/mingw-w64-headers/include/wpcrsmsg.h
+++ b/mingw-w64-headers/include/wpcrsmsg.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #define CRSWPP_ERROR_FIRST 0x40042200L
diff --git a/mingw-w64-headers/include/wpftpmsg.h b/mingw-w64-headers/include/wpftpmsg.h
index 28e0276..cab957d 100644
--- a/mingw-w64-headers/include/wpftpmsg.h
+++ b/mingw-w64-headers/include/wpftpmsg.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #define FTPWPP_ERROR_FIRST 0x40042300L
diff --git a/mingw-w64-headers/include/wppstmsg.h b/mingw-w64-headers/include/wppstmsg.h
index 9b231e7..d97ab70 100644
--- a/mingw-w64-headers/include/wppstmsg.h
+++ b/mingw-w64-headers/include/wppstmsg.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #define WPP_ERROR_FIRST 0x40042380L
diff --git a/mingw-w64-headers/include/wpspihlp.h b/mingw-w64-headers/include/wpspihlp.h
index a555207..e5b4151 100644
--- a/mingw-w64-headers/include/wpspihlp.h
+++ b/mingw-w64-headers/include/wpspihlp.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __WPSPIHLP_H__
diff --git a/mingw-w64-headers/include/wptypes.h b/mingw-w64-headers/include/wptypes.h
index 87c557c..f1e6f85 100644
--- a/mingw-w64-headers/include/wptypes.h
+++ b/mingw-w64-headers/include/wptypes.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __WPTYPES_H__
diff --git a/mingw-w64-headers/include/wpwizmsg.h b/mingw-w64-headers/include/wpwizmsg.h
index 8dc8b55..6ba863e 100644
--- a/mingw-w64-headers/include/wpwizmsg.h
+++ b/mingw-w64-headers/include/wpwizmsg.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #define WPWIZ_ERROR_FIRST 0x40042000L
diff --git a/mingw-w64-headers/include/ws2atm.h b/mingw-w64-headers/include/ws2atm.h
index 12c4c97..af1e408 100644
--- a/mingw-w64-headers/include/ws2atm.h
+++ b/mingw-w64-headers/include/ws2atm.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _WS2ATM_H_
diff --git a/mingw-w64-headers/include/ws2bth.h b/mingw-w64-headers/include/ws2bth.h
index 28bd1b0..63f9441 100644
--- a/mingw-w64-headers/include/ws2bth.h
+++ b/mingw-w64-headers/include/ws2bth.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_WS2BTH
diff --git a/mingw-w64-headers/include/ws2def.h b/mingw-w64-headers/include/ws2def.h
index 4b0e2da..67380cf 100644
--- a/mingw-w64-headers/include/ws2def.h
+++ b/mingw-w64-headers/include/ws2def.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 
diff --git a/mingw-w64-headers/include/ws2dnet.h b/mingw-w64-headers/include/ws2dnet.h
index 51d5fbf..7229486 100644
--- a/mingw-w64-headers/include/ws2dnet.h
+++ b/mingw-w64-headers/include/ws2dnet.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef WS2DNET_H
diff --git a/mingw-w64-headers/include/ws2ipdef.h b/mingw-w64-headers/include/ws2ipdef.h
index cb503bd..6e7ee32 100644
--- a/mingw-w64-headers/include/ws2ipdef.h
+++ b/mingw-w64-headers/include/ws2ipdef.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_WS2IPDEF
diff --git a/mingw-w64-headers/include/ws2spi.h b/mingw-w64-headers/include/ws2spi.h
index b4d03b7..d8f55d2 100644
--- a/mingw-w64-headers/include/ws2spi.h
+++ b/mingw-w64-headers/include/ws2spi.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _WINSOCK2SPI_
diff --git a/mingw-w64-headers/include/ws2tcpip.h b/mingw-w64-headers/include/ws2tcpip.h
index a8ee073..35948b0 100644
--- a/mingw-w64-headers/include/ws2tcpip.h
+++ b/mingw-w64-headers/include/ws2tcpip.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _WS2TCPIP_H_
diff --git a/mingw-w64-headers/include/wsdapi.h b/mingw-w64-headers/include/wsdapi.h
index 20c4a67..31c96c5 100644
--- a/mingw-w64-headers/include/wsdapi.h
+++ b/mingw-w64-headers/include/wsdapi.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_WSDAPI
diff --git a/mingw-w64-headers/include/wsdattachment.h b/mingw-w64-headers/include/wsdattachment.h
index dd0a58b..fef83e4 100644
--- a/mingw-w64-headers/include/wsdattachment.h
+++ b/mingw-w64-headers/include/wsdattachment.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_WSDATTACHMENT
diff --git a/mingw-w64-headers/include/wsdbase.h b/mingw-w64-headers/include/wsdbase.h
index 76cddf7..d77d807 100644
--- a/mingw-w64-headers/include/wsdbase.h
+++ b/mingw-w64-headers/include/wsdbase.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_WSDBASE
diff --git a/mingw-w64-headers/include/wsdclient.h b/mingw-w64-headers/include/wsdclient.h
index 906762a..d437ebc 100644
--- a/mingw-w64-headers/include/wsdclient.h
+++ b/mingw-w64-headers/include/wsdclient.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_WSDCLIENT
diff --git a/mingw-w64-headers/include/wsddisco.h b/mingw-w64-headers/include/wsddisco.h
index b46b54c..41fa428 100644
--- a/mingw-w64-headers/include/wsddisco.h
+++ b/mingw-w64-headers/include/wsddisco.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_WSDDISCO
diff --git a/mingw-w64-headers/include/wsdhost.h b/mingw-w64-headers/include/wsdhost.h
index 04926de..230defc 100644
--- a/mingw-w64-headers/include/wsdhost.h
+++ b/mingw-w64-headers/include/wsdhost.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_WSDHOST
diff --git a/mingw-w64-headers/include/wsdtypes.h b/mingw-w64-headers/include/wsdtypes.h
index 1cf367d..e2543ea 100644
--- a/mingw-w64-headers/include/wsdtypes.h
+++ b/mingw-w64-headers/include/wsdtypes.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_WSDTYPES
diff --git a/mingw-w64-headers/include/wsdutil.h b/mingw-w64-headers/include/wsdutil.h
index 982c53a..4911d8f 100644
--- a/mingw-w64-headers/include/wsdutil.h
+++ b/mingw-w64-headers/include/wsdutil.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_WSDUTIL
diff --git a/mingw-w64-headers/include/wsdxml.h b/mingw-w64-headers/include/wsdxml.h
index 9073ede..c4a6d30 100644
--- a/mingw-w64-headers/include/wsdxml.h
+++ b/mingw-w64-headers/include/wsdxml.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_WSDXML
diff --git a/mingw-w64-headers/include/wsdxmldom.h b/mingw-w64-headers/include/wsdxmldom.h
index c2ac83e..6a46c12 100644
--- a/mingw-w64-headers/include/wsdxmldom.h
+++ b/mingw-w64-headers/include/wsdxmldom.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_WSDXMLDOM
diff --git a/mingw-w64-headers/include/wshisotp.h b/mingw-w64-headers/include/wshisotp.h
index ab600a7..8c2c73a 100644
--- a/mingw-w64-headers/include/wshisotp.h
+++ b/mingw-w64-headers/include/wshisotp.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _WSHISOTP_
diff --git a/mingw-w64-headers/include/wsipv6ok.h b/mingw-w64-headers/include/wsipv6ok.h
index e49cf2f..1450fe6 100644
--- a/mingw-w64-headers/include/wsipv6ok.h
+++ b/mingw-w64-headers/include/wsipv6ok.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _WSIPV6OK_
diff --git a/mingw-w64-headers/include/wsipx.h b/mingw-w64-headers/include/wsipx.h
index 8d81586..a0b1fca 100644
--- a/mingw-w64-headers/include/wsipx.h
+++ b/mingw-w64-headers/include/wsipx.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _WSIPX_
diff --git a/mingw-w64-headers/include/wsnetbs.h b/mingw-w64-headers/include/wsnetbs.h
index 0db3c29..9ad948b 100644
--- a/mingw-w64-headers/include/wsnetbs.h
+++ b/mingw-w64-headers/include/wsnetbs.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _WSNETBS_
diff --git a/mingw-w64-headers/include/wsnwlink.h b/mingw-w64-headers/include/wsnwlink.h
index cc5e14f..4393d10 100644
--- a/mingw-w64-headers/include/wsnwlink.h
+++ b/mingw-w64-headers/include/wsnwlink.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _WSNWLINK_
diff --git a/mingw-w64-headers/include/wspiapi.h b/mingw-w64-headers/include/wspiapi.h
index 2967c66..3328955 100644
--- a/mingw-w64-headers/include/wspiapi.h
+++ b/mingw-w64-headers/include/wspiapi.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _WSPIAPI_H_
diff --git a/mingw-w64-headers/include/wsrm.h b/mingw-w64-headers/include/wsrm.h
index e5560e9..d738f47 100644
--- a/mingw-w64-headers/include/wsrm.h
+++ b/mingw-w64-headers/include/wsrm.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _WSRM_H_
diff --git a/mingw-w64-headers/include/wsvns.h b/mingw-w64-headers/include/wsvns.h
index 9e6c1c1..a294138 100644
--- a/mingw-w64-headers/include/wsvns.h
+++ b/mingw-w64-headers/include/wsvns.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _WSVNS_
diff --git a/mingw-w64-headers/include/wtsapi32.h b/mingw-w64-headers/include/wtsapi32.h
index d9ca1eb..fd0afba 100644
--- a/mingw-w64-headers/include/wtsapi32.h
+++ b/mingw-w64-headers/include/wtsapi32.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _INC_WTSAPI
diff --git a/mingw-w64-headers/include/wtypes.idl b/mingw-w64-headers/include/wtypes.idl
index 4ffe87e..e681a82 100644
--- a/mingw-w64-headers/include/wtypes.idl
+++ b/mingw-w64-headers/include/wtypes.idl
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 
diff --git a/mingw-w64-headers/include/xa.h b/mingw-w64-headers/include/xa.h
index 07e05e4..d60cc3a 100644
--- a/mingw-w64-headers/include/xa.h
+++ b/mingw-w64-headers/include/xa.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef XA_H
diff --git a/mingw-w64-headers/include/xcmc.h b/mingw-w64-headers/include/xcmc.h
index e5ceeb9..1fa6e84 100644
--- a/mingw-w64-headers/include/xcmc.h
+++ b/mingw-w64-headers/include/xcmc.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _XCMC_H
diff --git a/mingw-w64-headers/include/xcmcext.h b/mingw-w64-headers/include/xcmcext.h
index 8c6a6e4..fa0b0d4 100644
--- a/mingw-w64-headers/include/xcmcext.h
+++ b/mingw-w64-headers/include/xcmcext.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _XCMCEXT_H
diff --git a/mingw-w64-headers/include/xcmcmsx2.h b/mingw-w64-headers/include/xcmcmsx2.h
index 7ff15b7..c40f4c9 100644
--- a/mingw-w64-headers/include/xcmcmsx2.h
+++ b/mingw-w64-headers/include/xcmcmsx2.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef _XCMCMSX2_H
diff --git a/mingw-w64-headers/include/xcmcmsxt.h b/mingw-w64-headers/include/xcmcmsxt.h
index ebefe0c..abb4503 100644
--- a/mingw-w64-headers/include/xcmcmsxt.h
+++ b/mingw-w64-headers/include/xcmcmsxt.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef XCMCMSXT_H
diff --git a/mingw-w64-headers/include/xenroll.h b/mingw-w64-headers/include/xenroll.h
index 13d0355..9aae128 100644
--- a/mingw-w64-headers/include/xenroll.h
+++ b/mingw-w64-headers/include/xenroll.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/xmldomdid.h b/mingw-w64-headers/include/xmldomdid.h
index 1d152cf..240a276 100644
--- a/mingw-w64-headers/include/xmldomdid.h
+++ b/mingw-w64-headers/include/xmldomdid.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __XMLDOMDID_H__
diff --git a/mingw-w64-headers/include/xmldsodid.h b/mingw-w64-headers/include/xmldsodid.h
index 2c78d24..6624a50 100644
--- a/mingw-w64-headers/include/xmldsodid.h
+++ b/mingw-w64-headers/include/xmldsodid.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __XMLDSODID_H__
diff --git a/mingw-w64-headers/include/xmltrnsf.h b/mingw-w64-headers/include/xmltrnsf.h
index 9b2e78f..69c51d5 100644
--- a/mingw-w64-headers/include/xmltrnsf.h
+++ b/mingw-w64-headers/include/xmltrnsf.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
diff --git a/mingw-w64-headers/include/xolehlp.h b/mingw-w64-headers/include/xolehlp.h
index c14c9e4..3b5ebbf 100644
--- a/mingw-w64-headers/include/xolehlp.h
+++ b/mingw-w64-headers/include/xolehlp.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */
 #ifndef __XOLEHLP__H__
diff --git a/mingw-w64-headers/include/zmouse.h b/mingw-w64-headers/include/zmouse.h
index dd73a41..472e2a0 100644
--- a/mingw-w64-headers/include/zmouse.h
+++ b/mingw-w64-headers/include/zmouse.h
@@ -1,6 +1,6 @@
 /**
  * This file has no copyright assigned and is placed in the Public Domain.
- * This file is part of the w64 mingw-runtime package.
+ * This file is part of the mingw-w64 runtime package.
  * No warranty is given; refer to the file DISCLAIMER.PD within this package.
  */