Index: lldb/source/API/SystemInitializerFull.cpp
===================================================================
--- lldb/source/API/SystemInitializerFull.cpp
+++ lldb/source/API/SystemInitializerFull.cpp
@@ -49,11 +49,11 @@
 #include "Plugins/DynamicLoader/POSIX-DYLD/DynamicLoaderPOSIXDYLD.h"
 #include "Plugins/DynamicLoader/Static/DynamicLoaderStatic.h"
 #include "Plugins/DynamicLoader/Windows-DYLD/DynamicLoaderWindowsDYLD.h"
-#include "Plugins/Instruction/ARM/EmulateInstructionARM.h"
-#include "Plugins/Instruction/ARM64/EmulateInstructionARM64.h"
-#include "Plugins/Instruction/MIPS/EmulateInstructionMIPS.h"
-#include "Plugins/Instruction/MIPS64/EmulateInstructionMIPS64.h"
-#include "Plugins/Instruction/PPC64/EmulateInstructionPPC64.h"
+#include "Plugins/EmulateInstruction/ARM/EmulateInstructionARM.h"
+#include "Plugins/EmulateInstruction/ARM64/EmulateInstructionARM64.h"
+#include "Plugins/EmulateInstruction/MIPS/EmulateInstructionMIPS.h"
+#include "Plugins/EmulateInstruction/MIPS64/EmulateInstructionMIPS64.h"
+#include "Plugins/EmulateInstruction/PPC64/EmulateInstructionPPC64.h"
 #include "Plugins/InstrumentationRuntime/ASan/InstrumentationRuntimeASan.h"
 #include "Plugins/InstrumentationRuntime/MainThreadChecker/InstrumentationRuntimeMainThreadChecker.h"
 #include "Plugins/InstrumentationRuntime/TSan/InstrumentationRuntimeTSan.h"
@@ -83,7 +83,7 @@
 #include "Plugins/Platform/NetBSD/PlatformNetBSD.h"
 #include "Plugins/Platform/OpenBSD/PlatformOpenBSD.h"
 #include "Plugins/Platform/Windows/PlatformWindows.h"
-#include "Plugins/Platform/gdb-server/PlatformRemoteGDBServer.h"
+#include "Plugins/Platform/RemoteGDBServer/PlatformRemoteGDBServer.h"
 #include "Plugins/Process/elf-core/ProcessElfCore.h"
 #include "Plugins/Process/gdb-remote/ProcessGDBRemote.h"
 #include "Plugins/Process/mach-core/ProcessMachCore.h"
@@ -102,7 +102,7 @@
 
 #if defined(__APPLE__)
 #include "Plugins/DynamicLoader/Darwin-Kernel/DynamicLoaderDarwinKernel.h"
-#include "Plugins/Process/MacOSX-Kernel/ProcessKDP.h"
+#include "Plugins/Process/KDP/ProcessKDP.h"
 #include "Plugins/SymbolVendor/MacOSX/SymbolVendorMacOSX.h"
 #endif
 #include "Plugins/StructuredData/DarwinLog/StructuredDataDarwinLog.h"
Index: lldb/source/Plugins/CMakeLists.txt
===================================================================
--- lldb/source/Plugins/CMakeLists.txt
+++ lldb/source/Plugins/CMakeLists.txt
@@ -3,7 +3,7 @@
 add_subdirectory(Disassembler)
 add_subdirectory(DynamicLoader)
 add_subdirectory(ExpressionParser)
-add_subdirectory(Instruction)
+add_subdirectory(EmulateInstruction)
 add_subdirectory(InstrumentationRuntime)
 add_subdirectory(JITLoader)
 add_subdirectory(Language)
Index: lldb/source/Plugins/DynamicLoader/POSIX-DYLD/CMakeLists.txt
===================================================================
--- lldb/source/Plugins/DynamicLoader/POSIX-DYLD/CMakeLists.txt
+++ lldb/source/Plugins/DynamicLoader/POSIX-DYLD/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_lldb_library(lldbPluginDynamicLoaderPosixDYLD PLUGIN
+add_lldb_library(lldbPluginDynamicLoaderPOSIXDYLD PLUGIN
   DYLDRendezvous.cpp
   DynamicLoaderPOSIXDYLD.cpp
 
Index: lldb/source/Plugins/EmulateInstruction/ARM/CMakeLists.txt
===================================================================
--- lldb/source/Plugins/EmulateInstruction/ARM/CMakeLists.txt
+++ lldb/source/Plugins/EmulateInstruction/ARM/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_lldb_library(lldbPluginInstructionARM PLUGIN
+add_lldb_library(lldbPluginEmulateInstructionARM PLUGIN
   EmulateInstructionARM.cpp
   EmulationStateARM.cpp
 
Index: lldb/source/Plugins/EmulateInstruction/ARM64/CMakeLists.txt
===================================================================
--- lldb/source/Plugins/EmulateInstruction/ARM64/CMakeLists.txt
+++ lldb/source/Plugins/EmulateInstruction/ARM64/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_lldb_library(lldbPluginInstructionARM64 PLUGIN
+add_lldb_library(lldbPluginEmulateInstructionARM64 PLUGIN
   EmulateInstructionARM64.cpp
 
   LINK_LIBS
Index: lldb/source/Plugins/EmulateInstruction/MIPS/CMakeLists.txt
===================================================================
--- lldb/source/Plugins/EmulateInstruction/MIPS/CMakeLists.txt
+++ lldb/source/Plugins/EmulateInstruction/MIPS/CMakeLists.txt
@@ -2,7 +2,7 @@
   set(mips_target Mips)
 endif()
 
-add_lldb_library(lldbPluginInstructionMIPS PLUGIN
+add_lldb_library(lldbPluginEmulateInstructionMIPS PLUGIN
   EmulateInstructionMIPS.cpp
 
   LINK_LIBS
Index: lldb/source/Plugins/EmulateInstruction/MIPS64/CMakeLists.txt
===================================================================
--- lldb/source/Plugins/EmulateInstruction/MIPS64/CMakeLists.txt
+++ lldb/source/Plugins/EmulateInstruction/MIPS64/CMakeLists.txt
@@ -2,7 +2,7 @@
   set(mips_target Mips)
 endif()
 
-add_lldb_library(lldbPluginInstructionMIPS64 PLUGIN
+add_lldb_library(lldbPluginEmulateInstructionMIPS64 PLUGIN
   EmulateInstructionMIPS64.cpp
 
   LINK_LIBS
Index: lldb/source/Plugins/EmulateInstruction/PPC64/CMakeLists.txt
===================================================================
--- lldb/source/Plugins/EmulateInstruction/PPC64/CMakeLists.txt
+++ lldb/source/Plugins/EmulateInstruction/PPC64/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_lldb_library(lldbPluginInstructionPPC64 PLUGIN
+add_lldb_library(lldbPluginEmulateInstructionPPC64 PLUGIN
   EmulateInstructionPPC64.cpp
 
   LINK_LIBS
Index: lldb/source/Plugins/ExpressionParser/Clang/CMakeLists.txt
===================================================================
--- lldb/source/Plugins/ExpressionParser/Clang/CMakeLists.txt
+++ lldb/source/Plugins/ExpressionParser/Clang/CMakeLists.txt
@@ -2,7 +2,7 @@
   set(tablegen_deps intrinsics_gen)
 endif()
 
-add_lldb_library(lldbPluginExpressionParserClang PLUGIN
+add_lldb_library(lldbPluginClangASTContext PLUGIN
   ASTResultSynthesizer.cpp
   ASTStructExtractor.cpp
   ASTUtils.cpp
@@ -34,7 +34,7 @@
     lldbTarget
     lldbUtility
     lldbPluginCPlusPlusLanguage
-    lldbPluginCPPRuntime
+    lldbPluginCPPLanguageRuntime
   CLANG_LIBS
     clangAST
     clangCodeGen
Index: lldb/source/Plugins/Language/CPlusPlus/CMakeLists.txt
===================================================================
--- lldb/source/Plugins/Language/CPlusPlus/CMakeLists.txt
+++ lldb/source/Plugins/Language/CPlusPlus/CMakeLists.txt
@@ -28,7 +28,7 @@
     lldbTarget
     lldbUtility
     lldbPluginClangCommon
-    lldbPluginCPPRuntime
+    lldbPluginCPPLanguageRuntime
 
   LINK_COMPONENTS
     Support
Index: lldb/source/Plugins/LanguageRuntime/CPlusPlus/CMakeLists.txt
===================================================================
--- lldb/source/Plugins/LanguageRuntime/CPlusPlus/CMakeLists.txt
+++ lldb/source/Plugins/LanguageRuntime/CPlusPlus/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_lldb_library(lldbPluginCPPRuntime PLUGIN
+add_lldb_library(lldbPluginCPPLanguageRuntime PLUGIN
   CPPLanguageRuntime.cpp
 
   LINK_LIBS
Index: lldb/source/Plugins/LanguageRuntime/CPlusPlus/ItaniumABI/CMakeLists.txt
===================================================================
--- lldb/source/Plugins/LanguageRuntime/CPlusPlus/ItaniumABI/CMakeLists.txt
+++ lldb/source/Plugins/LanguageRuntime/CPlusPlus/ItaniumABI/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_lldb_library(lldbPluginCXXItaniumABI PLUGIN
+add_lldb_library(lldbPluginItaniumABILanguageRuntime PLUGIN
   ItaniumABILanguageRuntime.cpp
 
   LINK_LIBS
@@ -7,5 +7,5 @@
     lldbInterpreter
     lldbSymbol
     lldbTarget
-    lldbPluginCPPRuntime
+    lldbPluginCPPLanguageRuntime
   )
Index: lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/CMakeLists.txt
===================================================================
--- lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/CMakeLists.txt
+++ lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/CMakeLists.txt
@@ -17,8 +17,8 @@
     lldbSymbol
     lldbTarget
     lldbUtility
-    lldbPluginExpressionParserClang
-    lldbPluginCPPRuntime
+    lldbPluginClangASTContext
+    lldbPluginCPPLanguageRuntime
   CLANG_LIBS
     clangAST
   LINK_COMPONENTS
Index: lldb/source/Plugins/LanguageRuntime/ObjC/CMakeLists.txt
===================================================================
--- lldb/source/Plugins/LanguageRuntime/ObjC/CMakeLists.txt
+++ lldb/source/Plugins/LanguageRuntime/ObjC/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_lldb_library(lldbPluginObjCRuntime PLUGIN
+add_lldb_library(lldbPluginObjCLanguageRuntime PLUGIN
   ObjCLanguageRuntime.cpp
 
   LINK_LIBS
Index: lldb/source/Plugins/ObjectContainer/Universal-Mach-O/CMakeLists.txt
===================================================================
--- lldb/source/Plugins/ObjectContainer/Universal-Mach-O/CMakeLists.txt
+++ lldb/source/Plugins/ObjectContainer/Universal-Mach-O/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_lldb_library(lldbPluginObjectContainerMachOArchive PLUGIN
+add_lldb_library(lldbPluginObjectContainerUniversalMachO PLUGIN
   ObjectContainerUniversalMachO.cpp
 
   LINK_LIBS
Index: lldb/source/Plugins/OperatingSystem/Python/CMakeLists.txt
===================================================================
--- lldb/source/Plugins/OperatingSystem/Python/CMakeLists.txt
+++ lldb/source/Plugins/OperatingSystem/Python/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_lldb_library(lldbPluginOSPython PLUGIN
+add_lldb_library(lldbPluginOperatingSystemPython PLUGIN
   OperatingSystemPython.cpp
 
   LINK_LIBS
Index: lldb/source/Plugins/Platform/Android/CMakeLists.txt
===================================================================
--- lldb/source/Plugins/Platform/Android/CMakeLists.txt
+++ lldb/source/Plugins/Platform/Android/CMakeLists.txt
@@ -7,7 +7,7 @@
     lldbCore
     lldbHost
     lldbPluginPlatformLinux
-    lldbPluginPlatformGDB
+    lldbPluginPlatformRemoteGDBServer
   LINK_COMPONENTS
     Support
   )
Index: lldb/source/Plugins/Platform/Android/PlatformAndroidRemoteGDBServer.h
===================================================================
--- lldb/source/Plugins/Platform/Android/PlatformAndroidRemoteGDBServer.h
+++ lldb/source/Plugins/Platform/Android/PlatformAndroidRemoteGDBServer.h
@@ -12,7 +12,7 @@
 #include <map>
 #include <utility>
 
-#include "Plugins/Platform/gdb-server/PlatformRemoteGDBServer.h"
+#include "Plugins/Platform/RemoteGDBServer/PlatformRemoteGDBServer.h"
 
 #include "llvm/ADT/Optional.h"
 
Index: lldb/source/Plugins/Platform/CMakeLists.txt
===================================================================
--- lldb/source/Plugins/Platform/CMakeLists.txt
+++ lldb/source/Plugins/Platform/CMakeLists.txt
@@ -13,5 +13,5 @@
 #endif()
 
 add_subdirectory(POSIX)
-add_subdirectory(gdb-server)
+add_subdirectory(RemoteGDBServer)
 add_subdirectory(Android)
Index: lldb/source/Plugins/Platform/RemoteGDBServer/CMakeLists.txt
===================================================================
--- lldb/source/Plugins/Platform/RemoteGDBServer/CMakeLists.txt
+++ lldb/source/Plugins/Platform/RemoteGDBServer/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_lldb_library(lldbPluginPlatformGDB PLUGIN
+add_lldb_library(lldbPluginPlatformRemoteGDBServer PLUGIN
   PlatformRemoteGDBServer.cpp
 
    LINK_LIBS
Index: lldb/source/Plugins/Process/CMakeLists.txt
===================================================================
--- lldb/source/Plugins/Process/CMakeLists.txt
+++ lldb/source/Plugins/Process/CMakeLists.txt
@@ -10,7 +10,7 @@
 elseif (CMAKE_SYSTEM_NAME MATCHES "Windows")
   add_subdirectory(Windows/Common)
 elseif (CMAKE_SYSTEM_NAME MATCHES "Darwin")
-  add_subdirectory(MacOSX-Kernel)
+  add_subdirectory(KDP)
 endif()
 add_subdirectory(gdb-remote)
 add_subdirectory(Utility)
Index: lldb/source/Plugins/Process/KDP/CMakeLists.txt
===================================================================
--- lldb/source/Plugins/Process/KDP/CMakeLists.txt
+++ lldb/source/Plugins/Process/KDP/CMakeLists.txt
@@ -6,7 +6,7 @@
   SOURCE ProcessKDPProperties.td
   TARGET LLDBPluginProcessMacOSXKernelPropertiesEnumGen)
 
-add_lldb_library(lldbPluginProcessMacOSXKernel PLUGIN
+add_lldb_library(lldbPluginProcessKDP PLUGIN
   CommunicationKDP.cpp
   ProcessKDP.cpp
   ProcessKDPLog.cpp
@@ -29,6 +29,6 @@
     lldbPluginProcessUtility
   )
 
-add_dependencies(lldbPluginProcessMacOSXKernel
+add_dependencies(lldbPluginProcessKDP
   LLDBPluginProcessMacOSXKernelPropertiesGen
   LLDBPluginProcessMacOSXKernelPropertiesEnumGen)
Index: lldb/source/Plugins/Process/elf-core/CMakeLists.txt
===================================================================
--- lldb/source/Plugins/Process/elf-core/CMakeLists.txt
+++ lldb/source/Plugins/Process/elf-core/CMakeLists.txt
@@ -13,7 +13,7 @@
   LINK_LIBS
     lldbCore
     lldbTarget
-    lldbPluginDynamicLoaderPosixDYLD
+    lldbPluginDynamicLoaderPOSIXDYLD
     lldbPluginObjectFileELF
     lldbPluginProcessUtility
   LINK_COMPONENTS
Index: lldb/source/Plugins/SymbolFile/DWARF/CMakeLists.txt
===================================================================
--- lldb/source/Plugins/SymbolFile/DWARF/CMakeLists.txt
+++ lldb/source/Plugins/SymbolFile/DWARF/CMakeLists.txt
@@ -52,7 +52,7 @@
     lldbUtility
     lldbPluginObjCLanguage
     lldbPluginCPlusPlusLanguage
-    lldbPluginExpressionParserClang
+    lldbPluginClangASTContext
   CLANG_LIBS
     clangAST
     clangBasic
Index: lldb/source/Plugins/UnwindAssembly/x86/CMakeLists.txt
===================================================================
--- lldb/source/Plugins/UnwindAssembly/x86/CMakeLists.txt
+++ lldb/source/Plugins/UnwindAssembly/x86/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_lldb_library(lldbPluginUnwindAssemblyX86 PLUGIN
+add_lldb_library(lldbPluginUnwindAssembly_x86 PLUGIN
   UnwindAssembly-x86.cpp
   x86AssemblyInspectionEngine.cpp
 
Index: lldb/source/Symbol/CMakeLists.txt
===================================================================
--- lldb/source/Symbol/CMakeLists.txt
+++ lldb/source/Symbol/CMakeLists.txt
@@ -51,11 +51,11 @@
     lldbHost
     lldbTarget
     lldbUtility
-    lldbPluginExpressionParserClang
+    lldbPluginClangASTContext
     lldbPluginSymbolFileDWARF
     lldbPluginSymbolFilePDB
     lldbPluginObjCLanguage
-    lldbPluginObjCRuntime
+    lldbPluginObjCLanguageRuntime
 
   CLANG_LIBS
     clangAST
Index: lldb/source/Target/CMakeLists.txt
===================================================================
--- lldb/source/Target/CMakeLists.txt
+++ lldb/source/Target/CMakeLists.txt
@@ -73,7 +73,7 @@
     lldbInterpreter
     lldbSymbol
     lldbUtility
-    lldbPluginExpressionParserClang
+    lldbPluginClangASTContext
     lldbPluginProcessUtility
 
   LINK_COMPONENTS
Index: lldb/tools/lldb-server/CMakeLists.txt
===================================================================
--- lldb/tools/lldb-server/CMakeLists.txt
+++ lldb/tools/lldb-server/CMakeLists.txt
@@ -41,9 +41,9 @@
       lldbHost
       lldbInitialization
       ${LLDB_PLUGINS}
-      lldbPluginInstructionARM
-      lldbPluginInstructionMIPS
-      lldbPluginInstructionMIPS64
+      lldbPluginEmulateInstructionARM
+      lldbPluginEmulateInstructionMIPS
+      lldbPluginEmulateInstructionMIPS64
       ${LLDB_SYSTEM_LIBS}
 
     LINK_COMPONENTS
Index: lldb/tools/lldb-server/SystemInitializerLLGS.cpp
===================================================================
--- lldb/tools/lldb-server/SystemInitializerLLGS.cpp
+++ lldb/tools/lldb-server/SystemInitializerLLGS.cpp
@@ -26,19 +26,19 @@
 #if defined(__arm__) || defined(__arm) || defined(_ARM) || defined(_M_ARM) ||  \
     defined(LLDB_TARGET_ARM64)
 #define LLDB_TARGET_ARM
-#include "Plugins/Instruction/ARM/EmulateInstructionARM.h"
+#include "Plugins/EmulateInstruction/ARM/EmulateInstructionARM.h"
 #endif
 
 #if defined(__mips64__) || defined(mips64) || defined(__mips64) ||             \
     defined(__MIPS64__) || defined(_M_MIPS64)
 #define LLDB_TARGET_MIPS64
-#include "Plugins/Instruction/MIPS64/EmulateInstructionMIPS64.h"
+#include "Plugins/EmulateInstruction/MIPS64/EmulateInstructionMIPS64.h"
 #endif
 
 #if defined(__mips__) || defined(mips) || defined(__mips) ||                   \
     defined(__MIPS__) || defined(_M_MIPS) || defined(LLDB_TARGET_MIPS64)
 #define LLDB_TARGET_MIPS
-#include "Plugins/Instruction/MIPS/EmulateInstructionMIPS.h"
+#include "Plugins/EmulateInstruction/MIPS/EmulateInstructionMIPS.h"
 #endif
 
 using namespace lldb_private;
Index: lldb/tools/lldb-test/SystemInitializerTest.cpp
===================================================================
--- lldb/tools/lldb-test/SystemInitializerTest.cpp
+++ lldb/tools/lldb-test/SystemInitializerTest.cpp
@@ -39,11 +39,11 @@
 #include "Plugins/DynamicLoader/POSIX-DYLD/DynamicLoaderPOSIXDYLD.h"
 #include "Plugins/DynamicLoader/Static/DynamicLoaderStatic.h"
 #include "Plugins/DynamicLoader/Windows-DYLD/DynamicLoaderWindowsDYLD.h"
-#include "Plugins/Instruction/ARM/EmulateInstructionARM.h"
-#include "Plugins/Instruction/ARM64/EmulateInstructionARM64.h"
-#include "Plugins/Instruction/MIPS/EmulateInstructionMIPS.h"
-#include "Plugins/Instruction/MIPS64/EmulateInstructionMIPS64.h"
-#include "Plugins/Instruction/PPC64/EmulateInstructionPPC64.h"
+#include "Plugins/EmulateInstruction/ARM/EmulateInstructionARM.h"
+#include "Plugins/EmulateInstruction/ARM64/EmulateInstructionARM64.h"
+#include "Plugins/EmulateInstruction/MIPS/EmulateInstructionMIPS.h"
+#include "Plugins/EmulateInstruction/MIPS64/EmulateInstructionMIPS64.h"
+#include "Plugins/EmulateInstruction/PPC64/EmulateInstructionPPC64.h"
 #include "Plugins/InstrumentationRuntime/ASan/InstrumentationRuntimeASan.h"
 #include "Plugins/InstrumentationRuntime/MainThreadChecker/InstrumentationRuntimeMainThreadChecker.h"
 #include "Plugins/InstrumentationRuntime/TSan/InstrumentationRuntimeTSan.h"
@@ -72,7 +72,7 @@
 #include "Plugins/Platform/NetBSD/PlatformNetBSD.h"
 #include "Plugins/Platform/OpenBSD/PlatformOpenBSD.h"
 #include "Plugins/Platform/Windows/PlatformWindows.h"
-#include "Plugins/Platform/gdb-server/PlatformRemoteGDBServer.h"
+#include "Plugins/Platform/RemoteGDBServer/PlatformRemoteGDBServer.h"
 #include "Plugins/Process/elf-core/ProcessElfCore.h"
 #include "Plugins/Process/gdb-remote/ProcessGDBRemote.h"
 #include "Plugins/Process/mach-core/ProcessMachCore.h"
@@ -91,7 +91,7 @@
 
 #if defined(__APPLE__)
 #include "Plugins/DynamicLoader/Darwin-Kernel/DynamicLoaderDarwinKernel.h"
-#include "Plugins/Process/MacOSX-Kernel/ProcessKDP.h"
+#include "Plugins/Process/KDP/ProcessKDP.h"
 #include "Plugins/SymbolVendor/MacOSX/SymbolVendorMacOSX.h"
 #endif
 #include "Plugins/StructuredData/DarwinLog/StructuredDataDarwinLog.h"
Index: lldb/unittests/Disassembler/CMakeLists.txt
===================================================================
--- lldb/unittests/Disassembler/CMakeLists.txt
+++ lldb/unittests/Disassembler/CMakeLists.txt
@@ -6,7 +6,7 @@
       lldbCore
       lldbSymbol
       lldbTarget
-      lldbPluginDisassemblerLLVM
+      lldbPluginDisassemblerLLVMC
       lldbPluginProcessUtility
     LINK_COMPONENTS
       Support
Index: lldb/unittests/Expression/CMakeLists.txt
===================================================================
--- lldb/unittests/Expression/CMakeLists.txt
+++ lldb/unittests/Expression/CMakeLists.txt
@@ -7,7 +7,7 @@
 
   LINK_LIBS
     lldbCore
-    lldbPluginExpressionParserClang
+    lldbPluginClangASTContext
     lldbUtility
     lldbUtilityHelpers
     LLVMTestingSupport
Index: lldb/unittests/UnwindAssembly/ARM64/CMakeLists.txt
===================================================================
--- lldb/unittests/UnwindAssembly/ARM64/CMakeLists.txt
+++ lldb/unittests/UnwindAssembly/ARM64/CMakeLists.txt
@@ -5,8 +5,8 @@
     lldbSymbol
     lldbTarget
     lldbPluginUnwindAssemblyInstEmulation
-    lldbPluginDisassemblerLLVM
-    lldbPluginInstructionARM64
+    lldbPluginDisassemblerLLVMC
+    lldbPluginEmulateInstructionARM64
     lldbPluginProcessUtility
   LINK_COMPONENTS
     Support
Index: lldb/unittests/UnwindAssembly/ARM64/TestArm64InstEmulation.cpp
===================================================================
--- lldb/unittests/UnwindAssembly/ARM64/TestArm64InstEmulation.cpp
+++ lldb/unittests/UnwindAssembly/ARM64/TestArm64InstEmulation.cpp
@@ -21,7 +21,7 @@
 #include "lldb/Utility/ArchSpec.h"
 
 #include "Plugins/Disassembler/LLVMC/DisassemblerLLVMC.h"
-#include "Plugins/Instruction/ARM64/EmulateInstructionARM64.h"
+#include "Plugins/EmulateInstruction/ARM64/EmulateInstructionARM64.h"
 #include "Plugins/Process/Utility/lldb-arm64-register-enums.h"
 #include "llvm/Support/TargetSelect.h"
 
Index: lldb/unittests/UnwindAssembly/PPC64/CMakeLists.txt
===================================================================
--- lldb/unittests/UnwindAssembly/PPC64/CMakeLists.txt
+++ lldb/unittests/UnwindAssembly/PPC64/CMakeLists.txt
@@ -5,8 +5,8 @@
     lldbSymbol
     lldbTarget
     lldbPluginUnwindAssemblyInstEmulation
-    lldbPluginDisassemblerLLVM
-    lldbPluginInstructionPPC64
+    lldbPluginDisassemblerLLVMC
+    lldbPluginEmulateInstructionPPC64
     lldbPluginProcessUtility
   LINK_COMPONENTS
     Support
Index: lldb/unittests/UnwindAssembly/PPC64/TestPPC64InstEmulation.cpp
===================================================================
--- lldb/unittests/UnwindAssembly/PPC64/TestPPC64InstEmulation.cpp
+++ lldb/unittests/UnwindAssembly/PPC64/TestPPC64InstEmulation.cpp
@@ -19,7 +19,7 @@
 #include "lldb/Utility/ArchSpec.h"
 
 #include "Plugins/Disassembler/LLVMC/DisassemblerLLVMC.h"
-#include "Plugins/Instruction/PPC64/EmulateInstructionPPC64.h"
+#include "Plugins/EmulateInstruction/PPC64/EmulateInstructionPPC64.h"
 #include "Plugins/Process/Utility/lldb-ppc64le-register-enums.h"
 #include "llvm/Support/TargetSelect.h"
 
Index: lldb/unittests/UnwindAssembly/x86/CMakeLists.txt
===================================================================
--- lldb/unittests/UnwindAssembly/x86/CMakeLists.txt
+++ lldb/unittests/UnwindAssembly/x86/CMakeLists.txt
@@ -3,7 +3,7 @@
     LINK_LIBS
       lldbCore
       lldbSymbol
-      lldbPluginUnwindAssemblyX86
+      lldbPluginUnwindAssembly_x86
     LINK_COMPONENTS
       Support
       ${LLVM_TARGETS_TO_BUILD}