diff --git a/ChangeLog b/ChangeLog
index 0e40b1698..5d8c415bd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2018-09-03  Werner Lemberg  <wl@gnu.org>
+
+	*/*: s/PSNames/psnames/.
+
+	Only tracing messages are affected.
+
 2018-09-03  Werner Lemberg  <wl@gnu.org>
 
 	[sfnt] Fix heap buffer overflow in CPAL handling.
diff --git a/include/freetype/config/ftoption.h b/include/freetype/config/ftoption.h
index 6b745719a..dc6424c9c 100644
--- a/include/freetype/config/ftoption.h
+++ b/include/freetype/config/ftoption.h
@@ -321,14 +321,14 @@ FT_BEGIN_HEADER
    *
    * Postscript Names to Unicode Values support
    *
-   *   By default, FreeType 2 is built with the 'PSNames' module compiled in.
+   *   By default, FreeType 2 is built with the 'psnames' module compiled in.
    *   Among other things, the module is used to convert a glyph name into a
    *   Unicode value.  This is especially useful in order to synthesize on
    *   the fly a Unicode charmap from the CFF/Type 1 driver through a big
    *   table named the 'Adobe Glyph List' (AGL).
    *
    *   Undefine this macro if you do not want the Adobe Glyph List compiled
-   *   in your 'PSNames' module.  The Type 1 driver will not be able to
+   *   in your 'psnames' module.  The Type 1 driver will not be able to
    *   synthesize a Unicode charmap out of the glyphs found in the fonts.
    */
 #define FT_CONFIG_OPTION_ADOBE_GLYPH_LIST
@@ -538,11 +538,11 @@ FT_BEGIN_HEADER
    * Define TT_CONFIG_OPTION_POSTSCRIPT_NAMES if you want to be able to load
    * and enumerate the glyph Postscript names in a TrueType or OpenType file.
    *
-   * Note that when you do not compile the 'PSNames' module by undefining the
+   * Note that when you do not compile the 'psnames' module by undefining the
    * above FT_CONFIG_OPTION_POSTSCRIPT_NAMES, the 'sfnt' module will contain
    * additional code used to read the PS Names table from a font.
    *
-   * (By default, the module uses 'PSNames' to extract glyph names.)
+   * (By default, the module uses 'psnames' to extract glyph names.)
    */
 #define TT_CONFIG_OPTION_POSTSCRIPT_NAMES
 
diff --git a/src/cff/cffdrivr.c b/src/cff/cffdrivr.c
index 2789d20bf..3e43bed0b 100644
--- a/src/cff/cffdrivr.c
+++ b/src/cff/cffdrivr.c
@@ -348,7 +348,7 @@
         FT_ERROR(( "cff_get_glyph_name:"
                    " cannot get glyph name from a CFF2 font\n"
                    "                   "
-                   " without the `PSNames' module\n" ));
+                   " without the `psnames' module\n" ));
         error = FT_THROW( Missing_Module );
         goto Exit;
       }
@@ -359,7 +359,7 @@
       FT_ERROR(( "cff_get_glyph_name:"
                  " cannot get glyph name from CFF & CEF fonts\n"
                  "                   "
-                 " without the `PSNames' module\n" ));
+                 " without the `psnames' module\n" ));
       error = FT_THROW( Missing_Module );
       goto Exit;
     }
@@ -415,7 +415,7 @@
         FT_ERROR(( "cff_get_name_index:"
                    " cannot get glyph index from a CFF2 font\n"
                    "                   "
-                   " without the `PSNames' module\n" ));
+                   " without the `psnames' module\n" ));
         return 0;
       }
     }
diff --git a/src/cff/cffobjs.c b/src/cff/cffobjs.c
index 391d18869..9c27b5238 100644
--- a/src/cff/cffobjs.c
+++ b/src/cff/cffobjs.c
@@ -644,14 +644,14 @@
 
       dict = &cff->top_font.font_dict;
 
-      /* we need the `PSNames' module for CFF and CEF formats */
+      /* we need the `psnames' module for CFF and CEF formats */
       /* which aren't CID-keyed                               */
       if ( dict->cid_registry == 0xFFFFU && !psnames )
       {
         FT_ERROR(( "cff_face_init:"
                    " cannot open CFF & CEF fonts\n"
                    "              "
-                   " without the `PSNames' module\n" ));
+                   " without the `psnames' module\n" ));
         error = FT_THROW( Missing_Module );
         goto Exit;
       }
diff --git a/src/psaux/t1decode.c b/src/psaux/t1decode.c
index f611cf91d..a182cf0c6 100644
--- a/src/psaux/t1decode.c
+++ b/src/psaux/t1decode.c
@@ -1957,7 +1957,7 @@
   {
     FT_ZERO( decoder );
 
-    /* retrieve PSNames interface from list of current modules */
+    /* retrieve `psnames' interface from list of current modules */
     {
       FT_Service_PsCMaps  psnames;
 
diff --git a/src/psnames/psmodule.c b/src/psnames/psmodule.c
index 719e94d8f..895cfe934 100644
--- a/src/psnames/psmodule.c
+++ b/src/psnames/psmodule.c
@@ -2,7 +2,7 @@
  *
  * psmodule.c
  *
- *   PSNames module implementation (body).
+ *   psnames module implementation (body).
  *
  * Copyright 1996-2018 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
diff --git a/src/psnames/psmodule.h b/src/psnames/psmodule.h
index 8b026ee96..c6ca5cc57 100644
--- a/src/psnames/psmodule.h
+++ b/src/psnames/psmodule.h
@@ -2,7 +2,7 @@
  *
  * psmodule.h
  *
- *   High-level PSNames module interface (specification).
+ *   High-level psnames module interface (specification).
  *
  * Copyright 1996-2018 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
diff --git a/src/psnames/psnames.c b/src/psnames/psnames.c
index bfa5b858a..8b69435a1 100644
--- a/src/psnames/psnames.c
+++ b/src/psnames/psnames.c
@@ -2,7 +2,7 @@
  *
  * psnames.c
  *
- *   FreeType PSNames module component (body only).
+ *   FreeType psnames module component (body only).
  *
  * Copyright 1996-2018 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
diff --git a/src/psnames/rules.mk b/src/psnames/rules.mk
index 46ec5df81..c38b30d3b 100644
--- a/src/psnames/rules.mk
+++ b/src/psnames/rules.mk
@@ -1,5 +1,5 @@
 #
-# FreeType 2 PSNames driver configuration rules
+# FreeType 2 psnames driver configuration rules
 #
 
 
@@ -13,7 +13,7 @@
 # fully.
 
 
-# PSNames driver directory
+# psnames driver directory
 #
 PSNAMES_DIR := $(SRC_DIR)/psnames
 
@@ -26,19 +26,19 @@ PSNAMES_COMPILE := $(CC) $(ANSIFLAGS)                                \
                          $(FT_CFLAGS)
 
 
-# PSNames driver sources (i.e., C files)
+# psnames driver sources (i.e., C files)
 #
 PSNAMES_DRV_SRC := $(PSNAMES_DIR)/psmodule.c
 
 
-# PSNames driver headers
+# psnames driver headers
 #
 PSNAMES_DRV_H := $(PSNAMES_DRV_SRC:%.c=%.h) \
                  $(PSNAMES_DIR)/psnamerr.h  \
                  $(PSNAMES_DIR)/pstables.h
 
 
-# PSNames driver object(s)
+# psnames driver object(s)
 #
 #   PSNAMES_DRV_OBJ_M is used during `multi' builds
 #   PSNAMES_DRV_OBJ_S is used during `single' builds
@@ -46,19 +46,19 @@ PSNAMES_DRV_H := $(PSNAMES_DRV_SRC:%.c=%.h) \
 PSNAMES_DRV_OBJ_M := $(PSNAMES_DRV_SRC:$(PSNAMES_DIR)/%.c=$(OBJ_DIR)/%.$O)
 PSNAMES_DRV_OBJ_S := $(OBJ_DIR)/psnames.$O
 
-# PSNames driver source file for single build
+# psnames driver source file for single build
 #
 PSNAMES_DRV_SRC_S := $(PSNAMES_DIR)/psnames.c
 
 
-# PSNames driver - single object
+# psnames driver - single object
 #
 $(PSNAMES_DRV_OBJ_S): $(PSNAMES_DRV_SRC_S) $(PSNAMES_DRV_SRC) \
                       $(FREETYPE_H) $(PSNAMES_DRV_H)
 	$(PSNAMES_COMPILE) $T$(subst /,$(COMPILER_SEP),$@ $(PSNAMES_DRV_SRC_S))
 
 
-# PSNames driver - multiple objects
+# psnames driver - multiple objects
 #
 $(OBJ_DIR)/%.$O: $(PSNAMES_DIR)/%.c $(FREETYPE_H) $(PSNAMES_DRV_H)
 	$(PSNAMES_COMPILE) $T$(subst /,$(COMPILER_SEP),$@ $<)
diff --git a/src/sfnt/ttpost.c b/src/sfnt/ttpost.c
index 7d64a7816..b4eb8a70b 100644
--- a/src/sfnt/ttpost.c
+++ b/src/sfnt/ttpost.c
@@ -48,7 +48,7 @@
 #define FT_COMPONENT  ttpost
 
 
-  /* If this configuration macro is defined, we rely on the `PSNames' */
+  /* If this configuration macro is defined, we rely on the `psnames' */
   /* module to grab the glyph names.                                  */
 
 #ifdef FT_CONFIG_OPTION_POSTSCRIPT_NAMES
@@ -62,9 +62,9 @@
 #else /* FT_CONFIG_OPTION_POSTSCRIPT_NAMES */
 
 
-   /* Otherwise, we ignore the `PSNames' module, and provide our own  */
+   /* Otherwise, we ignore the `psnames' module, and provide our own  */
    /* table of Mac names.  Thus, it is possible to build a version of */
-   /* FreeType without the Type 1 driver & PSNames module.            */
+   /* FreeType without the Type 1 driver & psnames module.            */
 
 #define MAC_NAME( x )  (FT_String*)tt_post_default_names[x]
 
diff --git a/vms_make.com b/vms_make.com
index 7b8a49b3b..ef64726d8 100644
--- a/vms_make.com
+++ b/vms_make.com
@@ -756,7 +756,7 @@ $ open/append out [.src.psnames]descrip.mms
 $ copy sys$input: out
 $ deck
 #
-# FreeType 2 PSNames driver compilation rules for VMS
+# FreeType 2 psnames driver compilation rules for VMS
 #