4 files changed, 10 insertions, 10 deletions
diff --git a/tools/llvm-mc/CMakeLists.txt b/tools/llvm-mc/CMakeLists.txt
index ffb7bc9..46c5c6b 100644
--- a/tools/llvm-mc/CMakeLists.txt
+++ b/tools/llvm-mc/CMakeLists.txt
@@ -4,5 +4,5 @@ add_llvm_tool(llvm-mc
   llvm-mc.cpp
   AsmLexer.cpp
   AsmParser.cpp
-  HexDisassembler.cpp
+  Disassembler.cpp
   )
diff --git a/tools/llvm-mc/HexDisassembler.cpp b/tools/llvm-mc/Disassembler.cpp
index 530520b..5fde712 100644
--- a/tools/llvm-mc/HexDisassembler.cpp
+++ b/tools/llvm-mc/Disassembler.cpp
@@ -1,4 +1,4 @@
-//===- HexDisassembler.cpp - Disassembler for hex strings -----------------===//
+//===- Disassembler.cpp - Disassembler for hex strings --------------------===//
 //
 //                     The LLVM Compiler Infrastructure
 //
@@ -12,7 +12,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "HexDisassembler.h"
+#include "Disassembler.h"
 
 #include "llvm/ADT/OwningPtr.h"
 #include "llvm/MC/MCAsmInfo.h"
@@ -78,7 +78,7 @@ static bool PrintInst(const llvm::MCDisassembler &DisAsm,
   return false;
 }
 
-int HexDisassembler::disassemble(const Target &T, const std::string &Triple,
+int Disassembler::disassemble(const Target &T, const std::string &Triple,
                                  MemoryBuffer &Buffer) {
   // Set up disassembler.
   llvm::OwningPtr<const llvm::MCAsmInfo> AsmInfo(T.createAsmInfo(Triple));
diff --git a/tools/llvm-mc/HexDisassembler.h b/tools/llvm-mc/Disassembler.h
index d197aea..78c2f85 100644
--- a/tools/llvm-mc/HexDisassembler.h
+++ b/tools/llvm-mc/Disassembler.h
@@ -1,4 +1,4 @@
-//===- HexDisassembler.h - Disassembler for hex strings -------------------===//
+//===- Disassembler.h - Text File Disassembler ----------------------------===//
 //
 //                     The LLVM Compiler Infrastructure
 //
@@ -12,8 +12,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef HEXDISASSEMBLER_H
-#define HEXDISASSEMBLER_H
+#ifndef DISASSEMBLER_H
+#define DISASSEMBLER_H
 
 #include <string>
 
@@ -22,7 +22,7 @@ namespace llvm {
 class Target;
 class MemoryBuffer;
 
-class HexDisassembler {
+class Disassembler {
 public:
   static int disassemble(const Target &target, 
                          const std::string &tripleString,
diff --git a/tools/llvm-mc/llvm-mc.cpp b/tools/llvm-mc/llvm-mc.cpp
index 75cb2b8..30cdfba 100644
--- a/tools/llvm-mc/llvm-mc.cpp
+++ b/tools/llvm-mc/llvm-mc.cpp
@@ -32,7 +32,7 @@
 #include "llvm/Target/TargetMachine.h"  // FIXME.
 #include "llvm/Target/TargetSelect.h"
 #include "AsmParser.h"
-#include "HexDisassembler.h"
+#include "Disassembler.h"
 using namespace llvm;
 
 static cl::opt<std::string>
@@ -310,7 +310,7 @@ static int DisassembleInput(const char *ProgName) {
     return 1;
   }
   
-  return HexDisassembler::disassemble(*TheTarget, TripleName, *Buffer);
+  return Disassembler::disassemble(*TheTarget, TripleName, *Buffer);
 }