diff --git a/include/llvm/Bitcode/Serialize.h b/include/llvm/Bitcode/Serialize.h
index 74637f5d87f..f31493f3419 100644
--- a/include/llvm/Bitcode/Serialize.h
+++ b/include/llvm/Bitcode/Serialize.h
@@ -54,7 +54,7 @@ public:
     if (ptr) SerializeTrait<T>::Emit(*this,*ptr);
   }
 
-  void Flush() { if (inRecord()) EmitRecord(); }
+  void FlushRecord() { if (inRecord()) EmitRecord(); }
   
   void EnterBlock(unsigned BlockID = 8, unsigned CodeLen = 3);
   void ExitBlock();    
diff --git a/lib/Bitcode/Writer/Serialize.cpp b/lib/Bitcode/Writer/Serialize.cpp
index f25a1542d37..8e3bb1b1aad 100644
--- a/lib/Bitcode/Writer/Serialize.cpp
+++ b/lib/Bitcode/Writer/Serialize.cpp
@@ -29,7 +29,7 @@ Serializer::~Serializer() {
 
   while (BlockLevel > 0)
     Stream.ExitBlock();
-  
+   
   Stream.FlushToWord();
 }
 
@@ -40,7 +40,7 @@ void Serializer::EmitRecord() {
 }
 
 void Serializer::EnterBlock(unsigned BlockID,unsigned CodeLen) {
-  Flush();
+  FlushRecord();
   Stream.EnterSubblock(BlockID,CodeLen);
   ++BlockLevel;
 }
@@ -48,7 +48,7 @@ void Serializer::EnterBlock(unsigned BlockID,unsigned CodeLen) {
 void Serializer::ExitBlock() {
   assert (BlockLevel > 0);
   --BlockLevel;
-  Flush();
+  FlushRecord();
   Stream.ExitBlock();
 }