diff --git a/include/llvm/CodeGen/MachineModuleInfo.h b/include/llvm/CodeGen/MachineModuleInfo.h
index 96f82599161..071c649a3ad 100644
--- a/include/llvm/CodeGen/MachineModuleInfo.h
+++ b/include/llvm/CodeGen/MachineModuleInfo.h
@@ -111,9 +111,9 @@ class MachineModuleInfo : public ImmutablePass {
   // frame maps by debug and exception handling consumers.
   std::vector<MachineMove> FrameMoves;
 
-  // CompactEncoding - If the target supports it, this is the compact unwind
-  // encoding. It replaces a function's CIE and FDE.
-  uint32_t CompactEncoding;
+  // CompactUnwindEncoding - If the target supports it, this is the compact
+  // unwind encoding. It replaces a function's CIE and FDE.
+  uint32_t CompactUnwindEncoding;
 
   // LandingPads - List of LandingPadInfo describing the landing pad information
   // in the current function.
@@ -234,10 +234,10 @@ public:
   /// handling comsumers.
   std::vector<MachineMove> &getFrameMoves() { return FrameMoves; }
 
-  /// getCompactEncoding - Returns the compact unwind encoding for a function if
-  /// the target supports the encoding. This encoding replaces a function's CIE
-  /// and FDE.
-  uint32_t getCompactEncoding() const { return CompactEncoding; }
+  /// getCompactUnwindEncoding - Returns the compact unwind encoding for a
+  /// function if the target supports the encoding. This encoding replaces a
+  /// function's CIE and FDE.
+  uint32_t getCompactUnwindEncoding() const { return CompactUnwindEncoding; }
 
   /// getAddrLabelSymbol - Return the symbol to be used for the specified basic
   /// block when its address is taken.  This cannot be its normal LBB label
diff --git a/lib/CodeGen/MachineModuleInfo.cpp b/lib/CodeGen/MachineModuleInfo.cpp
index 652d2078ce2..33a3c6ec3ff 100644
--- a/lib/CodeGen/MachineModuleInfo.cpp
+++ b/lib/CodeGen/MachineModuleInfo.cpp
@@ -257,7 +257,7 @@ MachineModuleInfo::MachineModuleInfo(const MCAsmInfo &MAI,
                                      const MCRegisterInfo &MRI,
                                      const TargetAsmInfo *TAI)
   : ImmutablePass(ID), Context(MAI, MRI, TAI),
-    ObjFileMMI(0), CompactEncoding(0), CurCallSite(0), CallsEHReturn(0),
+    ObjFileMMI(0), CompactUnwindEncoding(0), CurCallSite(0), CallsEHReturn(0),
     CallsUnwindInit(0), DbgInfoAvailable(false),
     CallsExternalVAFunctionWithFloatingPointArguments(false) {
   initializeMachineModuleInfoPass(*PassRegistry::getPassRegistry());
@@ -312,7 +312,7 @@ void MachineModuleInfo::EndFunction() {
   FilterEnds.clear();
   CallsEHReturn = 0;
   CallsUnwindInit = 0;
-  CompactEncoding = 0;
+  CompactUnwindEncoding = 0;
   VariableDbgInfo.clear();
 }