Index: llvm/trunk/lib/Fuzzer/FuzzerCorpus.h
===================================================================
--- llvm/trunk/lib/Fuzzer/FuzzerCorpus.h
+++ llvm/trunk/lib/Fuzzer/FuzzerCorpus.h
@@ -119,7 +119,7 @@
   void DeleteInput(size_t Idx) {
     InputInfo &II = *Inputs[Idx];
     if (!OutputCorpus.empty() && II.MayDeleteFile)
-      DeleteFile(DirPlusFile(OutputCorpus, Sha1ToString(II.Sha1)));
+      RemoveFile(DirPlusFile(OutputCorpus, Sha1ToString(II.Sha1)));
     Unit().swap(II.U);
     if (FeatureDebug)
       Printf("EVICTED %zd\n", Idx);
Index: llvm/trunk/lib/Fuzzer/FuzzerIO.h
===================================================================
--- llvm/trunk/lib/Fuzzer/FuzzerIO.h
+++ llvm/trunk/lib/Fuzzer/FuzzerIO.h
@@ -57,7 +57,7 @@
 
 int DuplicateFile(int Fd);
 
-void DeleteFile(const std::string &Path);
+void RemoveFile(const std::string &Path);
 
 }  // namespace fuzzer
 
Index: llvm/trunk/lib/Fuzzer/FuzzerIOPosix.cpp
===================================================================
--- llvm/trunk/lib/Fuzzer/FuzzerIOPosix.cpp
+++ llvm/trunk/lib/Fuzzer/FuzzerIOPosix.cpp
@@ -71,7 +71,7 @@
   return dup(Fd);
 }
 
-void DeleteFile(const std::string &Path) {
+void RemoveFile(const std::string &Path) {
   unlink(Path.c_str());
 }
 
Index: llvm/trunk/lib/Fuzzer/FuzzerIOWindows.cpp
===================================================================
--- llvm/trunk/lib/Fuzzer/FuzzerIOWindows.cpp
+++ llvm/trunk/lib/Fuzzer/FuzzerIOWindows.cpp
@@ -135,7 +135,7 @@
   return _dup(Fd);
 }
 
-void DeleteFile(const std::string &Path) {
+void RemoveFile(const std::string &Path) {
   _unlink(Path.c_str());
 }
 
Index: llvm/trunk/lib/Fuzzer/FuzzerMerge.cpp
===================================================================
--- llvm/trunk/lib/Fuzzer/FuzzerMerge.cpp
+++ llvm/trunk/lib/Fuzzer/FuzzerMerge.cpp
@@ -221,7 +221,7 @@
   std::string CFPath =
       "libFuzzerTemp." + std::to_string(GetPid()) + ".txt";
   // Write the control file.
-  DeleteFile(CFPath);
+  RemoveFile(CFPath);
   std::ofstream ControlFile(CFPath);
   ControlFile << AllFiles.size() << "\n";
   ControlFile << NumFilesInFirstCorpus << "\n";
@@ -253,7 +253,7 @@
   for (auto &F: NewFiles)
     WriteToOutputCorpus(FileToVector(F));
   // We are done, delete the control file.
-  DeleteFile(CFPath);
+  RemoveFile(CFPath);
 }
 
 } // namespace fuzzer