4 files changed, 11 insertions, 11 deletions
diff --git a/lib/Support/CMakeLists.txt b/lib/Support/CMakeLists.txt
index 7d27a29139..5823836585 100644
--- a/lib/Support/CMakeLists.txt
+++ b/lib/Support/CMakeLists.txt
@@ -73,7 +73,7 @@ add_llvm_library(LLVMSupport
   IncludeFile.cpp
   Memory.cpp
   Mutex.cpp
-  PathV2.cpp
+  Path.cpp
   Process.cpp
   Program.cpp
   RWMutex.cpp
@@ -89,7 +89,7 @@ add_llvm_library(LLVMSupport
   Unix/Host.inc
   Unix/Memory.inc
   Unix/Mutex.inc
-  Unix/PathV2.inc
+  Unix/Path.inc
   Unix/Process.inc
   Unix/Program.inc
   Unix/RWMutex.inc
@@ -102,7 +102,7 @@ add_llvm_library(LLVMSupport
   Windows/Host.inc
   Windows/Memory.inc
   Windows/Mutex.inc
-  Windows/PathV2.inc
+  Windows/Path.inc
   Windows/Process.inc
   Windows/Program.inc
   Windows/RWMutex.inc
diff --git a/lib/Support/PathV2.cpp b/lib/Support/Path.cpp
index c0be6f4ea1..8b9e60a2d9 100644
--- a/lib/Support/PathV2.cpp
+++ b/lib/Support/Path.cpp
@@ -1,4 +1,4 @@
-//===-- PathV2.cpp - Implement OS Path Concept ------------------*- C++ -*-===//
+//===-- Path.cpp - Implement OS Path Concept ------------------------------===//
 //
 //                     The LLVM Compiler Infrastructure
 //
@@ -7,7 +7,7 @@
 //
 //===----------------------------------------------------------------------===//
 //
-//  This file implements the operating system PathV2 API.
+//  This file implements the operating system Path API.
 //
 //===----------------------------------------------------------------------===//
 
@@ -962,8 +962,8 @@ error_code directory_entry::status(file_status &result) const {
 
 // Include the truly platform-specific parts.
 #if defined(LLVM_ON_UNIX)
-#include "Unix/PathV2.inc"
+#include "Unix/Path.inc"
 #endif
 #if defined(LLVM_ON_WIN32)
-#include "Windows/PathV2.inc"
+#include "Windows/Path.inc"
 #endif
diff --git a/lib/Support/Unix/PathV2.inc b/lib/Support/Unix/Path.inc
index 91efcd8023..94f872077a 100644
--- a/lib/Support/Unix/PathV2.inc
+++ b/lib/Support/Unix/Path.inc
@@ -1,4 +1,4 @@
-//===- llvm/Support/Unix/PathV2.cpp - Unix Path Implementation --*- C++ -*-===//
+//===- llvm/Support/Unix/Path.inc - Unix Path Implementation ----*- C++ -*-===//
 //
 //                     The LLVM Compiler Infrastructure
 //
@@ -7,7 +7,7 @@
 //
 //===----------------------------------------------------------------------===//
 //
-// This file implements the Unix specific implementation of the PathV2 API.
+// This file implements the Unix specific implementation of the Path API.
 //
 //===----------------------------------------------------------------------===//
 
diff --git a/lib/Support/Windows/PathV2.inc b/lib/Support/Windows/Path.inc
index 6987e5fc9d..2b24c5487f 100644
--- a/lib/Support/Windows/PathV2.inc
+++ b/lib/Support/Windows/Path.inc
@@ -1,4 +1,4 @@
-//===- llvm/Support/Windows/PathV2.inc - Windows Path Impl ------*- C++ -*-===//
+//===- llvm/Support/Windows/Path.inc - Windows Path Impl --------*- C++ -*-===//
 //
 //                     The LLVM Compiler Infrastructure
 //
@@ -7,7 +7,7 @@
 //
 //===----------------------------------------------------------------------===//
 //
-// This file implements the Windows specific implementation of the PathV2 API.
+// This file implements the Windows specific implementation of the Path API.
 //
 //===----------------------------------------------------------------------===//