diff --git a/lib/Frontend/CompilerInvocation.cpp b/lib/Frontend/CompilerInvocation.cpp
index 18b247c..caeb416 100644
--- a/lib/Frontend/CompilerInvocation.cpp
+++ b/lib/Frontend/CompilerInvocation.cpp
@@ -1615,7 +1615,7 @@
   const LangStandard &Std = LangStandard::getLangStandardForKind(LangStd);
   Opts.BCPLComment = Std.hasBCPLComments();
   Opts.C99 = Std.isC99();
-  Opts.C1X = Std.isC1X();
+  Opts.C11 = Std.isC11();
   Opts.CPlusPlus = Std.isCPlusPlus();
   Opts.CPlusPlus0x = Std.isCPlusPlus0x();
   Opts.Digraphs = Std.hasDigraphs();
diff --git a/lib/Frontend/InitPreprocessor.cpp b/lib/Frontend/InitPreprocessor.cpp
index 61d1748..ad12e3d 100644
--- a/lib/Frontend/InitPreprocessor.cpp
+++ b/lib/Frontend/InitPreprocessor.cpp
@@ -270,7 +270,7 @@
     // FIXME: C1x doesn't have a defined version number yet, so pick something
     // that is the minimum possible according to their placeholder scheme
     // 201ymmL.
-    if (LangOpts.C1X)
+    if (LangOpts.C11)
       Builder.defineMacro("__STDC_VERSION__", "201001L");
     else if (LangOpts.C99)
       Builder.defineMacro("__STDC_VERSION__", "199901L");