diff --git a/include/clang/Driver/Job.h b/include/clang/Driver/Job.h
index bc7e3ecaf06f31ebfdd913ffab6a1f2e0df15e90..dda3ab5864dd9ceecd363dea87ab3cd6d22248d8 100644
--- a/include/clang/Driver/Job.h
+++ b/include/clang/Driver/Job.h
@@ -49,7 +49,7 @@ private:
   JobClass Kind;
 
 protected:
-  Job(JobClass _Kind) : Kind(_Kind) {}
+  Job(JobClass Kind) : Kind(Kind) {}
 public:
   virtual ~Job();
 
@@ -106,8 +106,8 @@ class Command : public Job {
   void writeResponseFile(raw_ostream &OS) const;
 
 public:
-  Command(const Action &_Source, const Tool &_Creator, const char *_Executable,
-          const llvm::opt::ArgStringList &_Arguments);
+  Command(const Action &Source, const Tool &Creator, const char *Executable,
+          const llvm::opt::ArgStringList &Arguments);
 
   void Print(llvm::raw_ostream &OS, const char *Terminator, bool Quote,
              CrashReportInfo *CrashInfo = nullptr) const override;
diff --git a/lib/Driver/Job.cpp b/lib/Driver/Job.cpp
index 6d18a41cad0879d8f7daed5871e5d77081c240fa..4b5b839e524d4c60c1511047231e142f9b68a401 100644
--- a/lib/Driver/Job.cpp
+++ b/lib/Driver/Job.cpp
@@ -27,12 +27,10 @@ using llvm::ArrayRef;
 
 Job::~Job() {}
 
-Command::Command(const Action &_Source, const Tool &_Creator,
-                 const char *_Executable,
-                 const ArgStringList &_Arguments)
-    : Job(CommandClass), Source(_Source), Creator(_Creator),
-      Executable(_Executable), Arguments(_Arguments),
-      ResponseFile(nullptr) {}
+Command::Command(const Action &Source, const Tool &Creator,
+                 const char *Executable, const ArgStringList &Arguments)
+    : Job(CommandClass), Source(Source), Creator(Creator),
+      Executable(Executable), Arguments(Arguments), ResponseFile(nullptr) {}
 
 static int skipArgs(const char *Flag, bool HaveCrashVFS) {
   // These flags are all of the form -Flag <Arg> and are treated as two