diff --git a/tools/llvmc2/Makefile b/tools/llvmc2/Makefile
index 772e9ec33a9..648ba079198 100644
--- a/tools/llvmc2/Makefile
+++ b/tools/llvmc2/Makefile
@@ -20,7 +20,7 @@ TOOLS_SOURCE=Example.td Tools.td Common.td
 # The degree of horrorshowness in that file is too much for me atm.
 $(ObjDir)/AutoGenerated.inc.tmp: $(TOOLS_SOURCE) $(ObjDir)/.dir
 	$(Echo) "Building LLVMCC configuration library with tblgen"
-	$(Verb) $(TableGen) -gen-llvmcc -o $(call SYSPATH, $@) $<
+	$(Verb) $(TableGen) -gen-llvmc -o $(call SYSPATH, $@) $<
 
 AutoGenerated.inc : $(ObjDir)/AutoGenerated.inc.tmp
 	$(Verb) $(CMP) -s $@ $< || $(CP) $< $@
diff --git a/utils/TableGen/LLVMCConfigurationEmitter.cpp b/utils/TableGen/LLVMCConfigurationEmitter.cpp
index 73390af9d64..aaa10992d99 100644
--- a/utils/TableGen/LLVMCConfigurationEmitter.cpp
+++ b/utils/TableGen/LLVMCConfigurationEmitter.cpp
@@ -27,7 +27,7 @@
 
 using namespace llvm;
 
-//namespace {
+namespace {
 
 //===----------------------------------------------------------------------===//
 /// Typedefs
@@ -1080,10 +1080,10 @@ void EmitPopulateCompilationGraph (Record* CompilationGraph,
 
 
 // End of anonymous namespace
-//}
+}
 
 // Back-end entry point
-void LLVMCCConfigurationEmitter::run (std::ostream &O) {
+void LLVMCConfigurationEmitter::run (std::ostream &O) {
   // Emit file header
   EmitSourceFileHeader("LLVMC Configuration Library", O);
 
diff --git a/utils/TableGen/LLVMCConfigurationEmitter.h b/utils/TableGen/LLVMCConfigurationEmitter.h
index 849f0540132..cb2d0646278 100644
--- a/utils/TableGen/LLVMCConfigurationEmitter.h
+++ b/utils/TableGen/LLVMCConfigurationEmitter.h
@@ -11,20 +11,20 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVMCCCONF_EMITTER_H
-#define LLVMCCCONF_EMITTER_H
+#ifndef LLVM_UTILS_TABLEGEN_LLVMCCONF_EMITTER_H
+#define LLVM_UTILS_TABLEGEN_LLVMCCONF_EMITTER_H
 
 #include "TableGenBackend.h"
 
 namespace llvm {
-  class LLVMCCConfigurationEmitter : public TableGenBackend {
+  class LLVMCConfigurationEmitter : public TableGenBackend {
     RecordKeeper &Records;
   public:
-    explicit LLVMCCConfigurationEmitter(RecordKeeper &R) : Records(R) {}
+    explicit LLVMCConfigurationEmitter(RecordKeeper &R) : Records(R) {}
 
     // run - Output the asmwriter, returning true on failure.
     void run(std::ostream &o);
   };
 }
 
-#endif //LLVMCCCONF_EMITTER_H
+#endif //LLVM_UTILS_TABLEGEN_LLVMCCONF_EMITTER_H
diff --git a/utils/TableGen/TableGen.cpp b/utils/TableGen/TableGen.cpp
index 1bc2790f093..64b2f97dc30 100644
--- a/utils/TableGen/TableGen.cpp
+++ b/utils/TableGen/TableGen.cpp
@@ -47,7 +47,7 @@ enum ActionType {
   GenDAGISel,
   GenSubtarget,
   GenIntrinsic,
-  GenLLVMCCConf,
+  GenLLVMCConf,
   PrintEnums
 };
 
@@ -78,8 +78,8 @@ namespace {
                                "Generate subtarget enumerations"),
                     clEnumValN(GenIntrinsic, "gen-intrinsic",
                                "Generate intrinsic information"),
-                    clEnumValN(GenLLVMCCConf, "gen-llvmcc",
-                               "Generate LLVMCC configuration library"),
+                    clEnumValN(GenLLVMCConf, "gen-llvmc",
+                               "Generate LLVMC configuration library"),
                     clEnumValN(PrintEnums, "print-enums",
                                "Print enum values for a class"),
                     clEnumValEnd));
@@ -183,8 +183,8 @@ int main(int argc, char **argv) {
     case GenIntrinsic:
       IntrinsicEmitter(Records).run(*Out);
       break;
-    case GenLLVMCCConf:
-      LLVMCCConfigurationEmitter(Records).run(*Out);
+    case GenLLVMCConf:
+      LLVMCConfigurationEmitter(Records).run(*Out);
       break;
     case PrintEnums:
     {