diff --git a/src/autofit/aflatin.c b/src/autofit/aflatin.c
index 4362bb7fe..bb002c182 100644
--- a/src/autofit/aflatin.c
+++ b/src/autofit/aflatin.c
@@ -90,7 +90,7 @@
 
 
       /* XXX: Extend this with a list of possible standard characters: */
-      /*      Especially in non-default coverages, a singe standard    */
+      /*      Especially in non-default coverages, a single standard   */
       /*      character may not be available.                          */
       af_get_char_index( &metrics->root,
                          script_class->standard_char,
diff --git a/src/autofit/aftypes.h b/src/autofit/aftypes.h
index 76512a93f..0f599f7cb 100644
--- a/src/autofit/aftypes.h
+++ b/src/autofit/aftypes.h
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    Auto-fitter types (specification only).                              */
 /*                                                                         */
-/*  Copyright 2003-2009, 2011-2013 by                                      */
+/*  Copyright 2003-2009, 2011-2014 by                                      */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -233,9 +233,9 @@ extern void*  _af_debug_hints;
   /*************************************************************************/
 
   /*
-   *  In FreeType, a writing system consists of multiple scripts that can
-   *  be handled similarly *in a typographical way*; the relationship is not
-   *  based on history.  For example, both the Greek and the unrelated
+   *  For the auto-hinter, a writing system consists of multiple scripts that
+   *  can be handled similarly *in a typographical way*; the relationship is
+   *  not based on history.  For example, both the Greek and the unrelated
    *  Armenian scripts share the same features like ascender, descender,
    *  x-height, etc.  Essentially, a writing system is covered by a
    *  submodule of the auto-fitter; it contains
diff --git a/src/autofit/hbshim.c b/src/autofit/hbshim.c
index 88c9e48e5..5e6ebd205 100644
--- a/src/autofit/hbshim.c
+++ b/src/autofit/hbshim.c
@@ -289,9 +289,9 @@
     /*
      * Various OpenType features might use the same glyphs at different
      * vertical positions; for example, superscript and subscript glyphs
-     * could be the same.  However, FreeType's auto-hinting is completely
+     * could be the same.  However, the auto-hinter is completely
      * agnostic of OpenType features after the feature analysis has been
-     * completed: FreeType then simply receives a glyph index and returns a
+     * completed: The engine then simply receives a glyph index and returns a
      * hinted and usually rendered glyph.
      *
      * Consider the superscript feature of font `pala.ttf': Some of the
@@ -485,7 +485,7 @@
   }
 
 
-#else /* !FT_CONFIG_OPTION_USE_HARDBUZZ */
+#else /* !FT_CONFIG_OPTION_USE_HARFBUZZ */
 
 
   FT_Error