diff --git a/fmt/format.h b/fmt/format.h
index 62796d11..6c688b18 100644
--- a/fmt/format.h
+++ b/fmt/format.h
@@ -1234,7 +1234,7 @@ constexpr Type type() { return gettype<typename std::decay<T>::type>(); }
 template <typename Formatter>
 class MakeValue : public Arg {
  public:
-  typedef typename Formatter::Char Char;
+  typedef typename Formatter::char_type Char;
 
  private:
   // The following two methods are private to disallow formatting of
@@ -2194,12 +2194,12 @@ class ArgFormatter : public BasicArgFormatter<ArgFormatter<Char>, Char> {
 };
 
 /** This template formats data and writes the output to a writer. */
-template <typename CharType, typename ArgFormatter>
+template <typename Char, typename ArgFormatter>
 class basic_formatter :
-  private internal::FormatterBase<basic_formatter<CharType, ArgFormatter>> {
+  private internal::FormatterBase<basic_formatter<Char, ArgFormatter>> {
  public:
   /** The character type for the output. */
-  typedef CharType Char;
+  typedef Char char_type;
 
  private:
   BasicWriter<Char> &writer_;
diff --git a/fmt/printf.h b/fmt/printf.h
index a0d2b8d3..d75eef1f 100644
--- a/fmt/printf.h
+++ b/fmt/printf.h
@@ -281,13 +281,13 @@ class PrintfArgFormatter
 };
 
 /** This template formats data and writes the output to a writer. */
-template <typename CharType,
-          typename ArgFormatter = PrintfArgFormatter<CharType> >
+template <typename Char,
+          typename ArgFormatter = PrintfArgFormatter<Char> >
 class PrintfFormatter :
-  private internal::FormatterBase<PrintfFormatter<CharType, ArgFormatter>> {
+  private internal::FormatterBase<PrintfFormatter<Char, ArgFormatter>> {
  public:
   /** The character type for the output. */
-  typedef CharType Char;
+  typedef Char char_type;
 
  private:
   BasicWriter<Char> &writer_;
diff --git a/test/util-test.cc b/test/util-test.cc
index 5e836d49..502f463e 100644
--- a/test/util-test.cc
+++ b/test/util-test.cc
@@ -578,7 +578,7 @@ TEST(UtilTest, FormatArgs) {
 }
 
 struct CustomFormatter {
-  typedef char Char;
+  typedef char char_type;
 };
 
 void format_value(CustomFormatter &, const char *&s, const Test &) {