diff --git a/llvm/tools/llvmc2/Action.cpp b/llvm/tools/llvmc2/Action.cpp
index 80531c0806a7..183dd813b411 100644
--- a/llvm/tools/llvmc2/Action.cpp
+++ b/llvm/tools/llvmc2/Action.cpp
@@ -1,4 +1,4 @@
-//===--- Tools.h - The LLVM Compiler Driver ---------------------*- C++ -*-===//
+//===--- Action.cpp - The LLVM Compiler Driver ------------------*- C++ -*-===//
 //
 //                     The LLVM Compiler Infrastructure
 //
@@ -26,7 +26,7 @@ extern cl::opt<bool> VerboseMode;
 
 namespace {
   int ExecuteProgram(const std::string& name,
-                     const StringVector& args) {
+                     const StrVector& args) {
     sys::Path prog = sys::Program::FindProgramByName(name);
 
     if (prog.isEmpty())
@@ -42,7 +42,7 @@ namespace {
     argv.reserve((args.size()+2));
     argv.push_back(name.c_str());
 
-    for (StringVector::const_iterator B = args.begin(), E = args.end();
+    for (StrVector::const_iterator B = args.begin(), E = args.end();
          B!=E; ++B) {
       if (*B == ">") {
         ++B;
diff --git a/llvm/tools/llvmc2/Action.h b/llvm/tools/llvmc2/Action.h
index 0f3f0bd26b6d..c3b31d4e5589 100644
--- a/llvm/tools/llvmc2/Action.h
+++ b/llvm/tools/llvmc2/Action.h
@@ -1,4 +1,4 @@
-//===--- Tools.h - The LLVM Compiler Driver ---------------------*- C++ -*-===//
+//===--- Action.h - The LLVM Compiler Driver --------------------*- C++ -*-===//
 //
 //                     The LLVM Compiler Infrastructure
 //
@@ -19,7 +19,7 @@
 
 namespace llvmc {
 
-  typedef std::vector<std::string> StringVector;
+  typedef std::vector<std::string> StrVector;
 
   /// Action - A class that encapsulates a single shell command.
   class Action {
@@ -29,8 +29,7 @@ namespace llvmc {
     std::vector<std::string> Args_;
   public:
     Action() {}
-    Action (const std::string& C,
-            const StringVector& A)
+    Action (const std::string& C, const StrVector& A)
       : Command_(C), Args_(A)
     {}