diff --git a/llvm/lib/Target/MSP430/AsmPrinter/CMakeLists.txt b/llvm/lib/Target/MSP430/InstPrinter/CMakeLists.txt
similarity index 100%
rename from llvm/lib/Target/MSP430/AsmPrinter/CMakeLists.txt
rename to llvm/lib/Target/MSP430/InstPrinter/CMakeLists.txt
diff --git a/llvm/lib/Target/MSP430/AsmPrinter/MSP430InstPrinter.cpp b/llvm/lib/Target/MSP430/InstPrinter/MSP430InstPrinter.cpp
similarity index 100%
rename from llvm/lib/Target/MSP430/AsmPrinter/MSP430InstPrinter.cpp
rename to llvm/lib/Target/MSP430/InstPrinter/MSP430InstPrinter.cpp
diff --git a/llvm/lib/Target/MSP430/AsmPrinter/MSP430InstPrinter.h b/llvm/lib/Target/MSP430/InstPrinter/MSP430InstPrinter.h
similarity index 100%
rename from llvm/lib/Target/MSP430/AsmPrinter/MSP430InstPrinter.h
rename to llvm/lib/Target/MSP430/InstPrinter/MSP430InstPrinter.h
diff --git a/llvm/lib/Target/MSP430/AsmPrinter/Makefile b/llvm/lib/Target/MSP430/InstPrinter/Makefile
similarity index 100%
rename from llvm/lib/Target/MSP430/AsmPrinter/Makefile
rename to llvm/lib/Target/MSP430/InstPrinter/Makefile
diff --git a/llvm/lib/Target/MSP430/MSP430AsmPrinter.cpp b/llvm/lib/Target/MSP430/MSP430AsmPrinter.cpp
index 4cd96698c2f0..cc2cf673331d 100644
--- a/llvm/lib/Target/MSP430/MSP430AsmPrinter.cpp
+++ b/llvm/lib/Target/MSP430/MSP430AsmPrinter.cpp
@@ -15,7 +15,7 @@
 #define DEBUG_TYPE "asm-printer"
 #include "MSP430.h"
 #include "MSP430InstrInfo.h"
-#include "AsmPrinter/MSP430InstPrinter.h"
+#include "InstPrinter/MSP430InstPrinter.h"
 #include "MSP430MCAsmInfo.h"
 #include "MSP430MCInstLower.h"
 #include "MSP430TargetMachine.h"
diff --git a/llvm/lib/Target/MSP430/Makefile b/llvm/lib/Target/MSP430/Makefile
index b1f33d6d0c11..fa4e80b0ff37 100644
--- a/llvm/lib/Target/MSP430/Makefile
+++ b/llvm/lib/Target/MSP430/Makefile
@@ -18,7 +18,7 @@ BUILT_SOURCES = MSP430GenRegisterInfo.h.inc MSP430GenRegisterNames.inc \
 		MSP430GenDAGISel.inc MSP430GenCallingConv.inc \
 		MSP430GenSubtarget.inc
 
-DIRS = AsmPrinter TargetInfo
+DIRS = InstPrinter TargetInfo
 
 include $(LEVEL)/Makefile.common