diff --git a/DEVELOPERS-HINTS b/DEVELOPERS-HINTS
index 937c30651b9e0412ccd024149fa0606873e998b7..c3795576def66206d6799b66ae7122e28da00d8c 100644
--- a/DEVELOPERS-HINTS
+++ b/DEVELOPERS-HINTS
@@ -437,7 +437,7 @@ NAMING CONVENTIONS FOR NON-API FUNCTIONS AND TYPES
 ==================================================
 
 Functions and data which are internal to your code (or at least shouldn't be
-visible to any WineLib or Windows program) should be preceded by
+visible to any Winelib or Windows program) should be preceded by
 an identifier to the module:
 
 Examples:
diff --git a/include/dplay.h b/include/dplay.h
index 966c0e117bde40a033ffc0d856457f76370bec0d..86b98daf9ee5c804a4176b5f27cdd537f03ca5c4 100644
--- a/include/dplay.h
+++ b/include/dplay.h
@@ -1,8 +1,10 @@
 #ifndef __WINE_DPLAY_H
 #define __WINE_DPLAY_H
 
-/* FIXME: GCC doesn't yet support annon structures so some of the structures defined here don't match the sdk exactly.
- * I've tried to come up with suitably terse names, but this file won't cut it for inclusion into a WineLib app.
+/* FIXME: GCC doesn't yet support annon structures so some of the structures 
+ * defined here don't match the sdk exactly. I've tried to come up with 
+ * suitably terse names, but this file won't cut it for inclusion into a 
+ * Winelib app.
  */
 
 #include "wine/obj_base.h"
diff --git a/include/dplobby.h b/include/dplobby.h
index dfb2b0963388b7599aec6ab06507cf4ba63971df..85615b7efaaf604e4f45b42e769b1efe2804145f 100644
--- a/include/dplobby.h
+++ b/include/dplobby.h
@@ -1,8 +1,10 @@
 #ifndef __WINE_DPLOBBY_H
 #define __WINE_DPLOBBY_H
 
-/* FIXME: GCC doesn't yet support annon structures so some of the structures defined here don't match the sdk exactly. 
- * I've tried to come up with suitably terse names, but this file won't cut it for inclusion into a WineLib app.
+/* FIXME: GCC doesn't yet support annon structures so some of the structures 
+ * defined here don't match the sdk exactly. I've tried to come up with 
+ * suitably terse names, but this file won't cut it for inclusion into a 
+ * Winelib app.
  */
 
 #include "dplay.h"
diff --git a/include/prsht.h b/include/prsht.h
index aceaa720decd1e6be6b40d7d4cf893b6c3ca4a32..cf8d2090d4f54c5e4194331e7f97ef1547ee46db 100644
--- a/include/prsht.h
+++ b/include/prsht.h
@@ -178,7 +178,7 @@ HPROPSHEETPAGE WINAPI CreatePropertySheetPageW(LPCPROPSHEETPAGEW);
 BOOL WINAPI DestroyPropertySheetPage(HPROPSHEETPAGE hPropPage);
 
 /*
- * Property sheet support (UNICODE-WineLib)
+ * Property sheet support (UNICODE-Winelib)
  */
 
 DECL_WINELIB_TYPE_AW(PROPSHEETPAGE) 
diff --git a/include/wine/obj_base.h b/include/wine/obj_base.h
index ac915ce455e1c7e5429e5863446e5ff65806ca49..8c915737d108887a5a3a339519612511f2c80ac4 100644
--- a/include/wine/obj_base.h
+++ b/include/wine/obj_base.h
@@ -17,12 +17,12 @@
  * define the ICOM_USE_COM_INTERFACE_ATTRIBUTE macro below. This may also
  * require the addition of the -vtable-thunks option for g++.
  *
- * If you aren't interested in WineLib C++ compatability at all, leave both
+ * If you aren't interested in Winelib C++ compatibility at all, leave both
  * options off.
  *
  * The preferable method for using ICOM_USE_COM_INTERFACE_ATTRIBUTE macro
- * would be to define it only for your WineLib application. This allows you
- * to have both binary and WineLib compatibility for C and C++ at the same 
+ * would be to define it only for your Winelib application. This allows you
+ * to have both binary and Winelib compatibility for C and C++ at the same 
  * time :)
  */
 /* #define ICOM_MSVTABLE_COMPAT 1 */
diff --git a/include/winnls.h b/include/winnls.h
index 5736528f35fff0c6ac62926c62d2281b84350197..b4307c7b607f6de46566376464b7216ebb16e052 100644
--- a/include/winnls.h
+++ b/include/winnls.h
@@ -185,7 +185,7 @@ extern "C" {
 /* internal flags for GetDateFormat system */
 #define DATE_DATEVARSONLY      0x00000100  /* only date stuff: yMdg */
 #define TIME_TIMEVARSONLY      0x00000200  /* only time stuff: hHmst */
-/* use this in a WineLib program if you really want all types */
+/* use this in a Winelib program if you really want all types */
 #define LOCALE_TIMEDATEBOTH    0x00000300  /* full set */
 
 /* Tests that we currently implement */