diff --git a/util/hb-ot-shape-closure.cc b/util/hb-ot-shape-closure.cc
index 7321f93b6..b1758b691 100644
--- a/util/hb-ot-shape-closure.cc
+++ b/util/hb-ot-shape-closure.cc
@@ -59,8 +59,8 @@ struct shape_closure_consumer_t
     failed = false;
     buffer = hb_buffer_create ();
   }
-  template <typename text_options_t>
-  bool consume_line (text_options_t &text_opts)
+  template <typename text_options_type>
+  bool consume_line (text_options_type &text_opts)
   {
     unsigned int text_len;
     const char *text;
diff --git a/util/helper-cairo.hh b/util/helper-cairo.hh
index d1357c135..5fbaf9e41 100644
--- a/util/helper-cairo.hh
+++ b/util/helper-cairo.hh
@@ -377,11 +377,11 @@ static const char *helper_cairo_supported_formats[] =
 };
 
 template <typename view_options_t,
-	 typename output_options_t>
+	 typename output_options_type>
 static inline cairo_t *
 helper_cairo_create_context (double w, double h,
 			     view_options_t *view_opts,
-			     output_options_t *out_opts,
+			     output_options_type *out_opts,
 			     cairo_content_t content)
 {
   cairo_surface_t *(*constructor) (cairo_write_func_t write_func,
diff --git a/util/main-font-text.hh b/util/main-font-text.hh
index dabbd3285..ca39c5a47 100644
--- a/util/main-font-text.hh
+++ b/util/main-font-text.hh
@@ -31,8 +31,14 @@
 
 /* main() body for utilities taking font and processing text.*/
 
-template <typename consumer_t, typename font_options_t, typename text_options_t>
-struct main_font_text_t : option_parser_t, font_options_t, text_options_t, consumer_t
+template <typename consumer_t,
+	  typename font_options_type,
+	  typename text_options_type>
+struct main_font_text_t :
+       option_parser_t,
+       font_options_type,
+       text_options_type,
+       consumer_t
 {
   int operator () (int argc, char **argv)
   {
@@ -53,8 +59,8 @@ struct main_font_text_t : option_parser_t, font_options_t, text_options_t, consu
 
   void add_options ()
   {
-    font_options_t::add_options (this);
-    text_options_t::add_options (this);
+    font_options_type::add_options (this);
+    text_options_type::add_options (this);
     consumer_t::add_options (this);
 
     GOptionEntry entries[] =