diff --git a/lib/CodeGen/MachineCodeForInstruction.cpp b/lib/CodeGen/MachineCodeForInstruction.cpp
index 98871a7e85b..f21e01651be 100644
--- a/lib/CodeGen/MachineCodeForInstruction.cpp
+++ b/lib/CodeGen/MachineCodeForInstruction.cpp
@@ -29,11 +29,11 @@ static Annotation *CreateMCFI(AnnotationID AID, const Annotable *, void *) {
 }
 
 // Register the annotation with the annotation factory
-static struct Initializer {
-  Initializer() {
+static struct MCFIInitializer {
+  MCFIInitializer() {
     AnnotationManager::registerAnnotationFactory(MCFI_AID, &CreateMCFI);
   }
-} RegisterAID;
+} RegisterCreateMCFI;
 
 
 MachineCodeForInstruction&