diff --git a/lldb/source/API/SystemInitializerFull.cpp b/lldb/source/API/SystemInitializerFull.cpp
--- a/lldb/source/API/SystemInitializerFull.cpp
+++ b/lldb/source/API/SystemInitializerFull.cpp
@@ -24,21 +24,21 @@
 #include "lldb/Interpreter/CommandInterpreter.h"
 #include "lldb/Utility/Timer.h"
 
-#include "Plugins/ABI/MacOSX-arm/ABIMacOSX_arm.h"
-#include "Plugins/ABI/MacOSX-arm64/ABIMacOSX_arm64.h"
-#include "Plugins/ABI/MacOSX-i386/ABIMacOSX_i386.h"
-#include "Plugins/ABI/SysV-arc/ABISysV_arc.h"
-#include "Plugins/ABI/SysV-arm/ABISysV_arm.h"
-#include "Plugins/ABI/SysV-arm64/ABISysV_arm64.h"
-#include "Plugins/ABI/SysV-hexagon/ABISysV_hexagon.h"
-#include "Plugins/ABI/SysV-i386/ABISysV_i386.h"
-#include "Plugins/ABI/SysV-mips/ABISysV_mips.h"
-#include "Plugins/ABI/SysV-mips64/ABISysV_mips64.h"
-#include "Plugins/ABI/SysV-ppc/ABISysV_ppc.h"
-#include "Plugins/ABI/SysV-ppc64/ABISysV_ppc64.h"
-#include "Plugins/ABI/SysV-s390x/ABISysV_s390x.h"
-#include "Plugins/ABI/SysV-x86_64/ABISysV_x86_64.h"
-#include "Plugins/ABI/Windows-x86_64/ABIWindows_x86_64.h"
+#include "Plugins/ABI/AArch64/ABIMacOSX_arm64.h"
+#include "Plugins/ABI/AArch64/ABISysV_arm64.h"
+#include "Plugins/ABI/ARC/ABISysV_arc.h"
+#include "Plugins/ABI/ARM/ABIMacOSX_arm.h"
+#include "Plugins/ABI/ARM/ABISysV_arm.h"
+#include "Plugins/ABI/Hexagon/ABISysV_hexagon.h"
+#include "Plugins/ABI/Mips/ABISysV_mips.h"
+#include "Plugins/ABI/Mips/ABISysV_mips64.h"
+#include "Plugins/ABI/PowerPC/ABISysV_ppc.h"
+#include "Plugins/ABI/PowerPC/ABISysV_ppc64.h"
+#include "Plugins/ABI/SystemZ/ABISysV_s390x.h"
+#include "Plugins/ABI/X86/ABIMacOSX_i386.h"
+#include "Plugins/ABI/X86/ABISysV_i386.h"
+#include "Plugins/ABI/X86/ABISysV_x86_64.h"
+#include "Plugins/ABI/X86/ABIWindows_x86_64.h"
 #include "Plugins/Architecture/Arm/ArchitectureArm.h"
 #include "Plugins/Architecture/Mips/ArchitectureMips.h"
 #include "Plugins/Architecture/PPC64/ArchitecturePPC64.h"
diff --git a/lldb/source/Plugins/ABI/MacOSX-arm64/ABIMacOSX_arm64.h b/lldb/source/Plugins/ABI/AArch64/ABIMacOSX_arm64.h
rename from lldb/source/Plugins/ABI/MacOSX-arm64/ABIMacOSX_arm64.h
rename to lldb/source/Plugins/ABI/AArch64/ABIMacOSX_arm64.h
diff --git a/lldb/source/Plugins/ABI/MacOSX-arm64/ABIMacOSX_arm64.cpp b/lldb/source/Plugins/ABI/AArch64/ABIMacOSX_arm64.cpp
rename from lldb/source/Plugins/ABI/MacOSX-arm64/ABIMacOSX_arm64.cpp
rename to lldb/source/Plugins/ABI/AArch64/ABIMacOSX_arm64.cpp
diff --git a/lldb/source/Plugins/ABI/SysV-arm64/ABISysV_arm64.h b/lldb/source/Plugins/ABI/AArch64/ABISysV_arm64.h
rename from lldb/source/Plugins/ABI/SysV-arm64/ABISysV_arm64.h
rename to lldb/source/Plugins/ABI/AArch64/ABISysV_arm64.h
diff --git a/lldb/source/Plugins/ABI/SysV-arm64/ABISysV_arm64.cpp b/lldb/source/Plugins/ABI/AArch64/ABISysV_arm64.cpp
rename from lldb/source/Plugins/ABI/SysV-arm64/ABISysV_arm64.cpp
rename to lldb/source/Plugins/ABI/AArch64/ABISysV_arm64.cpp
diff --git a/lldb/source/Plugins/ABI/MacOSX-arm64/CMakeLists.txt b/lldb/source/Plugins/ABI/AArch64/CMakeLists.txt
rename from lldb/source/Plugins/ABI/MacOSX-arm64/CMakeLists.txt
rename to lldb/source/Plugins/ABI/AArch64/CMakeLists.txt
--- a/lldb/source/Plugins/ABI/MacOSX-arm64/CMakeLists.txt
+++ b/lldb/source/Plugins/ABI/AArch64/CMakeLists.txt
@@ -1,6 +1,7 @@
-add_lldb_library(lldbPluginABIMacOSX_arm64 PLUGIN
+add_lldb_library(lldbPluginABIAArch64 PLUGIN
   ABIMacOSX_arm64.cpp
-  
+  ABISysV_arm64.cpp
+
   LINK_LIBS
     lldbCore
     lldbSymbol
diff --git a/lldb/source/Plugins/ABI/SysV-arc/ABISysV_arc.h b/lldb/source/Plugins/ABI/ARC/ABISysV_arc.h
rename from lldb/source/Plugins/ABI/SysV-arc/ABISysV_arc.h
rename to lldb/source/Plugins/ABI/ARC/ABISysV_arc.h
diff --git a/lldb/source/Plugins/ABI/SysV-arc/ABISysV_arc.cpp b/lldb/source/Plugins/ABI/ARC/ABISysV_arc.cpp
rename from lldb/source/Plugins/ABI/SysV-arc/ABISysV_arc.cpp
rename to lldb/source/Plugins/ABI/ARC/ABISysV_arc.cpp
diff --git a/lldb/source/Plugins/ABI/SysV-arc/CMakeLists.txt b/lldb/source/Plugins/ABI/ARC/CMakeLists.txt
rename from lldb/source/Plugins/ABI/SysV-arc/CMakeLists.txt
rename to lldb/source/Plugins/ABI/ARC/CMakeLists.txt
--- a/lldb/source/Plugins/ABI/SysV-arc/CMakeLists.txt
+++ b/lldb/source/Plugins/ABI/ARC/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_lldb_library(lldbPluginABISysV_arc PLUGIN
+add_lldb_library(lldbPluginABIARC PLUGIN
   ABISysV_arc.cpp
 
   LINK_LIBS
diff --git a/lldb/source/Plugins/ABI/MacOSX-arm/ABIMacOSX_arm.h b/lldb/source/Plugins/ABI/ARM/ABIMacOSX_arm.h
rename from lldb/source/Plugins/ABI/MacOSX-arm/ABIMacOSX_arm.h
rename to lldb/source/Plugins/ABI/ARM/ABIMacOSX_arm.h
diff --git a/lldb/source/Plugins/ABI/MacOSX-arm/ABIMacOSX_arm.cpp b/lldb/source/Plugins/ABI/ARM/ABIMacOSX_arm.cpp
rename from lldb/source/Plugins/ABI/MacOSX-arm/ABIMacOSX_arm.cpp
rename to lldb/source/Plugins/ABI/ARM/ABIMacOSX_arm.cpp
diff --git a/lldb/source/Plugins/ABI/SysV-arm/ABISysV_arm.h b/lldb/source/Plugins/ABI/ARM/ABISysV_arm.h
rename from lldb/source/Plugins/ABI/SysV-arm/ABISysV_arm.h
rename to lldb/source/Plugins/ABI/ARM/ABISysV_arm.h
diff --git a/lldb/source/Plugins/ABI/SysV-arm/ABISysV_arm.cpp b/lldb/source/Plugins/ABI/ARM/ABISysV_arm.cpp
rename from lldb/source/Plugins/ABI/SysV-arm/ABISysV_arm.cpp
rename to lldb/source/Plugins/ABI/ARM/ABISysV_arm.cpp
diff --git a/lldb/source/Plugins/ABI/MacOSX-arm/CMakeLists.txt b/lldb/source/Plugins/ABI/ARM/CMakeLists.txt
rename from lldb/source/Plugins/ABI/MacOSX-arm/CMakeLists.txt
rename to lldb/source/Plugins/ABI/ARM/CMakeLists.txt
--- a/lldb/source/Plugins/ABI/MacOSX-arm/CMakeLists.txt
+++ b/lldb/source/Plugins/ABI/ARM/CMakeLists.txt
@@ -1,5 +1,6 @@
-add_lldb_library(lldbPluginABIMacOSX_arm PLUGIN
+add_lldb_library(lldbPluginABIARM PLUGIN
   ABIMacOSX_arm.cpp
+  ABISysV_arm.cpp
 
   LINK_LIBS
     lldbCore
diff --git a/lldb/source/Plugins/ABI/CMakeLists.txt b/lldb/source/Plugins/ABI/CMakeLists.txt
--- a/lldb/source/Plugins/ABI/CMakeLists.txt
+++ b/lldb/source/Plugins/ABI/CMakeLists.txt
@@ -1,31 +1,5 @@
-if ("AArch64" IN_LIST LLVM_TARGETS_TO_BUILD)
-  add_subdirectory(MacOSX-arm64)
-  add_subdirectory(SysV-arm64)
-endif()
-if ("ARM" IN_LIST LLVM_TARGETS_TO_BUILD)
-  add_subdirectory(MacOSX-arm)
-  add_subdirectory(SysV-arm)
-endif()
-if ("ARC" IN_LIST LLVM_TARGETS_TO_BUILD)
-  add_subdirectory(SysV-arc)
-endif()
-if ("Hexagon" IN_LIST LLVM_TARGETS_TO_BUILD)
-  add_subdirectory(SysV-hexagon)
-endif()
-if ("Mips" IN_LIST LLVM_TARGETS_TO_BUILD)
-  add_subdirectory(SysV-mips)
-  add_subdirectory(SysV-mips64)
-endif()
-if ("PowerPC" IN_LIST LLVM_TARGETS_TO_BUILD)
-  add_subdirectory(SysV-ppc)
-  add_subdirectory(SysV-ppc64)
-endif()
-if ("SystemZ" IN_LIST LLVM_TARGETS_TO_BUILD)
-  add_subdirectory(SysV-s390x)
-endif()
-if ("X86" IN_LIST LLVM_TARGETS_TO_BUILD)
-  add_subdirectory(SysV-i386)
-  add_subdirectory(SysV-x86_64)
-  add_subdirectory(MacOSX-i386)
-  add_subdirectory(Windows-x86_64)
-endif()
+foreach(target AArch64 ARM ARC Hexagon Mips PowerPC SystemZ X86)
+  if (${target} IN_LIST LLVM_TARGETS_TO_BUILD)
+    add_subdirectory(${target})
+  endif()
+endforeach()
diff --git a/lldb/source/Plugins/ABI/SysV-hexagon/ABISysV_hexagon.h b/lldb/source/Plugins/ABI/Hexagon/ABISysV_hexagon.h
rename from lldb/source/Plugins/ABI/SysV-hexagon/ABISysV_hexagon.h
rename to lldb/source/Plugins/ABI/Hexagon/ABISysV_hexagon.h
diff --git a/lldb/source/Plugins/ABI/SysV-hexagon/ABISysV_hexagon.cpp b/lldb/source/Plugins/ABI/Hexagon/ABISysV_hexagon.cpp
rename from lldb/source/Plugins/ABI/SysV-hexagon/ABISysV_hexagon.cpp
rename to lldb/source/Plugins/ABI/Hexagon/ABISysV_hexagon.cpp
diff --git a/lldb/source/Plugins/ABI/SysV-hexagon/CMakeLists.txt b/lldb/source/Plugins/ABI/Hexagon/CMakeLists.txt
rename from lldb/source/Plugins/ABI/SysV-hexagon/CMakeLists.txt
rename to lldb/source/Plugins/ABI/Hexagon/CMakeLists.txt
--- a/lldb/source/Plugins/ABI/SysV-hexagon/CMakeLists.txt
+++ b/lldb/source/Plugins/ABI/Hexagon/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_lldb_library(lldbPluginABISysV_hexagon PLUGIN
+add_lldb_library(lldbPluginABIHexagon PLUGIN
   ABISysV_hexagon.cpp
 
   LINK_LIBS
diff --git a/lldb/source/Plugins/ABI/MacOSX-i386/CMakeLists.txt b/lldb/source/Plugins/ABI/MacOSX-i386/CMakeLists.txt
deleted file mode 100644
--- a/lldb/source/Plugins/ABI/MacOSX-i386/CMakeLists.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-add_lldb_library(lldbPluginABIMacOSX_i386 PLUGIN
-  ABIMacOSX_i386.cpp
-
-  LINK_LIBS
-    lldbCore
-    lldbSymbol
-    lldbTarget
-  LINK_COMPONENTS
-    Support
-  )
diff --git a/lldb/source/Plugins/ABI/SysV-mips/ABISysV_mips.h b/lldb/source/Plugins/ABI/Mips/ABISysV_mips.h
rename from lldb/source/Plugins/ABI/SysV-mips/ABISysV_mips.h
rename to lldb/source/Plugins/ABI/Mips/ABISysV_mips.h
diff --git a/lldb/source/Plugins/ABI/SysV-mips/ABISysV_mips.cpp b/lldb/source/Plugins/ABI/Mips/ABISysV_mips.cpp
rename from lldb/source/Plugins/ABI/SysV-mips/ABISysV_mips.cpp
rename to lldb/source/Plugins/ABI/Mips/ABISysV_mips.cpp
diff --git a/lldb/source/Plugins/ABI/SysV-mips64/ABISysV_mips64.h b/lldb/source/Plugins/ABI/Mips/ABISysV_mips64.h
rename from lldb/source/Plugins/ABI/SysV-mips64/ABISysV_mips64.h
rename to lldb/source/Plugins/ABI/Mips/ABISysV_mips64.h
diff --git a/lldb/source/Plugins/ABI/SysV-mips64/ABISysV_mips64.cpp b/lldb/source/Plugins/ABI/Mips/ABISysV_mips64.cpp
rename from lldb/source/Plugins/ABI/SysV-mips64/ABISysV_mips64.cpp
rename to lldb/source/Plugins/ABI/Mips/ABISysV_mips64.cpp
diff --git a/lldb/source/Plugins/ABI/SysV-mips64/CMakeLists.txt b/lldb/source/Plugins/ABI/Mips/CMakeLists.txt
rename from lldb/source/Plugins/ABI/SysV-mips64/CMakeLists.txt
rename to lldb/source/Plugins/ABI/Mips/CMakeLists.txt
--- a/lldb/source/Plugins/ABI/SysV-mips64/CMakeLists.txt
+++ b/lldb/source/Plugins/ABI/Mips/CMakeLists.txt
@@ -1,4 +1,5 @@
-add_lldb_library(lldbPluginABISysV_mips64 PLUGIN
+add_lldb_library(lldbPluginABIMips PLUGIN
+  ABISysV_mips.cpp
   ABISysV_mips64.cpp
 
   LINK_LIBS
diff --git a/lldb/source/Plugins/ABI/SysV-ppc/ABISysV_ppc.h b/lldb/source/Plugins/ABI/PowerPC/ABISysV_ppc.h
rename from lldb/source/Plugins/ABI/SysV-ppc/ABISysV_ppc.h
rename to lldb/source/Plugins/ABI/PowerPC/ABISysV_ppc.h
diff --git a/lldb/source/Plugins/ABI/SysV-ppc/ABISysV_ppc.cpp b/lldb/source/Plugins/ABI/PowerPC/ABISysV_ppc.cpp
rename from lldb/source/Plugins/ABI/SysV-ppc/ABISysV_ppc.cpp
rename to lldb/source/Plugins/ABI/PowerPC/ABISysV_ppc.cpp
diff --git a/lldb/source/Plugins/ABI/SysV-ppc64/ABISysV_ppc64.h b/lldb/source/Plugins/ABI/PowerPC/ABISysV_ppc64.h
rename from lldb/source/Plugins/ABI/SysV-ppc64/ABISysV_ppc64.h
rename to lldb/source/Plugins/ABI/PowerPC/ABISysV_ppc64.h
diff --git a/lldb/source/Plugins/ABI/SysV-ppc64/ABISysV_ppc64.cpp b/lldb/source/Plugins/ABI/PowerPC/ABISysV_ppc64.cpp
rename from lldb/source/Plugins/ABI/SysV-ppc64/ABISysV_ppc64.cpp
rename to lldb/source/Plugins/ABI/PowerPC/ABISysV_ppc64.cpp
diff --git a/lldb/source/Plugins/ABI/SysV-ppc64/CMakeLists.txt b/lldb/source/Plugins/ABI/PowerPC/CMakeLists.txt
rename from lldb/source/Plugins/ABI/SysV-ppc64/CMakeLists.txt
rename to lldb/source/Plugins/ABI/PowerPC/CMakeLists.txt
--- a/lldb/source/Plugins/ABI/SysV-ppc64/CMakeLists.txt
+++ b/lldb/source/Plugins/ABI/PowerPC/CMakeLists.txt
@@ -1,4 +1,5 @@
-add_lldb_library(lldbPluginABISysV_ppc64 PLUGIN
+add_lldb_library(lldbPluginABIPowerPC PLUGIN
+  ABISysV_ppc.cpp
   ABISysV_ppc64.cpp
 
   LINK_LIBS
diff --git a/lldb/source/Plugins/ABI/SysV-arm/CMakeLists.txt b/lldb/source/Plugins/ABI/SysV-arm/CMakeLists.txt
deleted file mode 100644
--- a/lldb/source/Plugins/ABI/SysV-arm/CMakeLists.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-add_lldb_library(lldbPluginABISysV_arm PLUGIN
-  ABISysV_arm.cpp
-
-  LINK_LIBS
-    lldbCore
-    lldbSymbol
-    lldbTarget
-    lldbPluginProcessUtility
-  LINK_COMPONENTS
-    Support
-  )
diff --git a/lldb/source/Plugins/ABI/SysV-arm64/CMakeLists.txt b/lldb/source/Plugins/ABI/SysV-arm64/CMakeLists.txt
deleted file mode 100644
--- a/lldb/source/Plugins/ABI/SysV-arm64/CMakeLists.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-add_lldb_library(lldbPluginABISysV_arm64 PLUGIN
-  ABISysV_arm64.cpp
-
-  LINK_LIBS
-    lldbCore
-    lldbSymbol
-    lldbTarget
-  LINK_COMPONENTS
-    Support
-  )
diff --git a/lldb/source/Plugins/ABI/SysV-i386/CMakeLists.txt b/lldb/source/Plugins/ABI/SysV-i386/CMakeLists.txt
deleted file mode 100644
--- a/lldb/source/Plugins/ABI/SysV-i386/CMakeLists.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-add_lldb_library(lldbPluginABISysV_i386 PLUGIN
-  ABISysV_i386.cpp
-
-  LINK_LIBS
-    lldbCore
-    lldbSymbol
-    lldbTarget
-  LINK_COMPONENTS
-    Support
-  )
diff --git a/lldb/source/Plugins/ABI/SysV-mips/CMakeLists.txt b/lldb/source/Plugins/ABI/SysV-mips/CMakeLists.txt
deleted file mode 100644
--- a/lldb/source/Plugins/ABI/SysV-mips/CMakeLists.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-add_lldb_library(lldbPluginABISysV_mips PLUGIN
-  ABISysV_mips.cpp
-
-  LINK_LIBS
-    lldbCore
-    lldbSymbol
-    lldbTarget
-  LINK_COMPONENTS
-    Support
-  )
diff --git a/lldb/source/Plugins/ABI/SysV-ppc/CMakeLists.txt b/lldb/source/Plugins/ABI/SysV-ppc/CMakeLists.txt
deleted file mode 100644
--- a/lldb/source/Plugins/ABI/SysV-ppc/CMakeLists.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-add_lldb_library(lldbPluginABISysV_ppc PLUGIN
-  ABISysV_ppc.cpp
-
-  LINK_LIBS
-    lldbCore
-    lldbSymbol
-    lldbTarget
-  LINK_COMPONENTS
-    Support
-  )
diff --git a/lldb/source/Plugins/ABI/SysV-x86_64/CMakeLists.txt b/lldb/source/Plugins/ABI/SysV-x86_64/CMakeLists.txt
deleted file mode 100644
--- a/lldb/source/Plugins/ABI/SysV-x86_64/CMakeLists.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-add_lldb_library(lldbPluginABISysV_x86_64 PLUGIN
-  ABISysV_x86_64.cpp
-
-  LINK_LIBS
-    lldbCore
-    lldbSymbol
-    lldbTarget
-  LINK_COMPONENTS
-    Support
-  )
diff --git a/lldb/source/Plugins/ABI/SysV-s390x/ABISysV_s390x.h b/lldb/source/Plugins/ABI/SystemZ/ABISysV_s390x.h
rename from lldb/source/Plugins/ABI/SysV-s390x/ABISysV_s390x.h
rename to lldb/source/Plugins/ABI/SystemZ/ABISysV_s390x.h
diff --git a/lldb/source/Plugins/ABI/SysV-s390x/ABISysV_s390x.cpp b/lldb/source/Plugins/ABI/SystemZ/ABISysV_s390x.cpp
rename from lldb/source/Plugins/ABI/SysV-s390x/ABISysV_s390x.cpp
rename to lldb/source/Plugins/ABI/SystemZ/ABISysV_s390x.cpp
diff --git a/lldb/source/Plugins/ABI/SysV-s390x/CMakeLists.txt b/lldb/source/Plugins/ABI/SystemZ/CMakeLists.txt
rename from lldb/source/Plugins/ABI/SysV-s390x/CMakeLists.txt
rename to lldb/source/Plugins/ABI/SystemZ/CMakeLists.txt
--- a/lldb/source/Plugins/ABI/SysV-s390x/CMakeLists.txt
+++ b/lldb/source/Plugins/ABI/SystemZ/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_lldb_library(lldbPluginABISysV_s390x PLUGIN
+add_lldb_library(lldbPluginABISystemZ PLUGIN
   ABISysV_s390x.cpp
 
   LINK_LIBS
diff --git a/lldb/source/Plugins/ABI/MacOSX-i386/ABIMacOSX_i386.h b/lldb/source/Plugins/ABI/X86/ABIMacOSX_i386.h
rename from lldb/source/Plugins/ABI/MacOSX-i386/ABIMacOSX_i386.h
rename to lldb/source/Plugins/ABI/X86/ABIMacOSX_i386.h
diff --git a/lldb/source/Plugins/ABI/MacOSX-i386/ABIMacOSX_i386.cpp b/lldb/source/Plugins/ABI/X86/ABIMacOSX_i386.cpp
rename from lldb/source/Plugins/ABI/MacOSX-i386/ABIMacOSX_i386.cpp
rename to lldb/source/Plugins/ABI/X86/ABIMacOSX_i386.cpp
diff --git a/lldb/source/Plugins/ABI/SysV-i386/ABISysV_i386.h b/lldb/source/Plugins/ABI/X86/ABISysV_i386.h
rename from lldb/source/Plugins/ABI/SysV-i386/ABISysV_i386.h
rename to lldb/source/Plugins/ABI/X86/ABISysV_i386.h
diff --git a/lldb/source/Plugins/ABI/SysV-i386/ABISysV_i386.cpp b/lldb/source/Plugins/ABI/X86/ABISysV_i386.cpp
rename from lldb/source/Plugins/ABI/SysV-i386/ABISysV_i386.cpp
rename to lldb/source/Plugins/ABI/X86/ABISysV_i386.cpp
diff --git a/lldb/source/Plugins/ABI/SysV-x86_64/ABISysV_x86_64.h b/lldb/source/Plugins/ABI/X86/ABISysV_x86_64.h
rename from lldb/source/Plugins/ABI/SysV-x86_64/ABISysV_x86_64.h
rename to lldb/source/Plugins/ABI/X86/ABISysV_x86_64.h
diff --git a/lldb/source/Plugins/ABI/SysV-x86_64/ABISysV_x86_64.cpp b/lldb/source/Plugins/ABI/X86/ABISysV_x86_64.cpp
rename from lldb/source/Plugins/ABI/SysV-x86_64/ABISysV_x86_64.cpp
rename to lldb/source/Plugins/ABI/X86/ABISysV_x86_64.cpp
diff --git a/lldb/source/Plugins/ABI/Windows-x86_64/ABIWindows_x86_64.h b/lldb/source/Plugins/ABI/X86/ABIWindows_x86_64.h
rename from lldb/source/Plugins/ABI/Windows-x86_64/ABIWindows_x86_64.h
rename to lldb/source/Plugins/ABI/X86/ABIWindows_x86_64.h
diff --git a/lldb/source/Plugins/ABI/Windows-x86_64/ABIWindows_x86_64.cpp b/lldb/source/Plugins/ABI/X86/ABIWindows_x86_64.cpp
rename from lldb/source/Plugins/ABI/Windows-x86_64/ABIWindows_x86_64.cpp
rename to lldb/source/Plugins/ABI/X86/ABIWindows_x86_64.cpp
diff --git a/lldb/source/Plugins/ABI/Windows-x86_64/CMakeLists.txt b/lldb/source/Plugins/ABI/X86/CMakeLists.txt
rename from lldb/source/Plugins/ABI/Windows-x86_64/CMakeLists.txt
rename to lldb/source/Plugins/ABI/X86/CMakeLists.txt
--- a/lldb/source/Plugins/ABI/Windows-x86_64/CMakeLists.txt
+++ b/lldb/source/Plugins/ABI/X86/CMakeLists.txt
@@ -1,4 +1,7 @@
-add_lldb_library(lldbPluginABIWindows_x86_64 PLUGIN
+add_lldb_library(lldbPluginABIX86 PLUGIN
+  ABIMacOSX_i386.cpp
+  ABISysV_i386.cpp
+  ABISysV_x86_64.cpp
   ABIWindows_x86_64.cpp
 
   LINK_LIBS
diff --git a/lldb/tools/lldb-test/SystemInitializerTest.cpp b/lldb/tools/lldb-test/SystemInitializerTest.cpp
--- a/lldb/tools/lldb-test/SystemInitializerTest.cpp
+++ b/lldb/tools/lldb-test/SystemInitializerTest.cpp
@@ -14,21 +14,21 @@
 #include "lldb/Interpreter/CommandInterpreter.h"
 #include "lldb/Utility/Timer.h"
 
-#include "Plugins/ABI/MacOSX-arm/ABIMacOSX_arm.h"
-#include "Plugins/ABI/MacOSX-arm64/ABIMacOSX_arm64.h"
-#include "Plugins/ABI/MacOSX-i386/ABIMacOSX_i386.h"
-#include "Plugins/ABI/SysV-arc/ABISysV_arc.h"
-#include "Plugins/ABI/SysV-arm/ABISysV_arm.h"
-#include "Plugins/ABI/SysV-arm64/ABISysV_arm64.h"
-#include "Plugins/ABI/SysV-hexagon/ABISysV_hexagon.h"
-#include "Plugins/ABI/SysV-i386/ABISysV_i386.h"
-#include "Plugins/ABI/SysV-mips/ABISysV_mips.h"
-#include "Plugins/ABI/SysV-mips64/ABISysV_mips64.h"
-#include "Plugins/ABI/SysV-ppc/ABISysV_ppc.h"
-#include "Plugins/ABI/SysV-ppc64/ABISysV_ppc64.h"
-#include "Plugins/ABI/SysV-s390x/ABISysV_s390x.h"
-#include "Plugins/ABI/SysV-x86_64/ABISysV_x86_64.h"
-#include "Plugins/ABI/Windows-x86_64/ABIWindows_x86_64.h"
+#include "Plugins/ABI/AArch64/ABIMacOSX_arm64.h"
+#include "Plugins/ABI/AArch64/ABISysV_arm64.h"
+#include "Plugins/ABI/ARC/ABISysV_arc.h"
+#include "Plugins/ABI/ARM/ABIMacOSX_arm.h"
+#include "Plugins/ABI/ARM/ABISysV_arm.h"
+#include "Plugins/ABI/Hexagon/ABISysV_hexagon.h"
+#include "Plugins/ABI/Mips/ABISysV_mips.h"
+#include "Plugins/ABI/Mips/ABISysV_mips64.h"
+#include "Plugins/ABI/PowerPC/ABISysV_ppc.h"
+#include "Plugins/ABI/PowerPC/ABISysV_ppc64.h"
+#include "Plugins/ABI/SystemZ/ABISysV_s390x.h"
+#include "Plugins/ABI/X86/ABIMacOSX_i386.h"
+#include "Plugins/ABI/X86/ABISysV_i386.h"
+#include "Plugins/ABI/X86/ABISysV_x86_64.h"
+#include "Plugins/ABI/X86/ABIWindows_x86_64.h"
 #include "Plugins/Architecture/Arm/ArchitectureArm.h"
 #include "Plugins/Architecture/Mips/ArchitectureMips.h"
 #include "Plugins/Architecture/PPC64/ArchitecturePPC64.h"