diff --git a/lldb/source/Core/CMakeLists.txt b/lldb/source/Core/CMakeLists.txt
index d89abd577430..476e92878e05 100644
--- a/lldb/source/Core/CMakeLists.txt
+++ b/lldb/source/Core/CMakeLists.txt
@@ -1,9 +1,9 @@
-lldb_tablegen(Properties.inc -gen-lldb-property-defs
-  SOURCE Properties.td
+lldb_tablegen(CoreProperties.inc -gen-lldb-property-defs
+  SOURCE CoreProperties.td
   TARGET LLDBCorePropertiesGen)
 
-lldb_tablegen(PropertiesEnum.inc -gen-lldb-property-enum-defs
-  SOURCE Properties.td
+lldb_tablegen(CorePropertiesEnum.inc -gen-lldb-property-enum-defs
+  SOURCE CoreProperties.td
   TARGET LLDBCorePropertiesEnumGen)
 
 set(LLDB_CURSES_LIBS)
diff --git a/lldb/source/Core/Properties.td b/lldb/source/Core/CoreProperties.td
similarity index 100%
rename from lldb/source/Core/Properties.td
rename to lldb/source/Core/CoreProperties.td
diff --git a/lldb/source/Core/Debugger.cpp b/lldb/source/Core/Debugger.cpp
index 82f4dda8277d..ca19ad66bb74 100644
--- a/lldb/source/Core/Debugger.cpp
+++ b/lldb/source/Core/Debugger.cpp
@@ -203,11 +203,11 @@ static constexpr OptionEnumValueElement s_stop_show_column_values[] = {
     {eStopShowColumnNone, "none", "Do not highlight the stop column."}};
 
 #define LLDB_PROPERTIES_debugger
-#include "Properties.inc"
+#include "CoreProperties.inc"
 
 enum {
 #define LLDB_PROPERTIES_debugger
-#include "PropertiesEnum.inc"
+#include "CorePropertiesEnum.inc"
 };
 
 LoadPluginCallbackType Debugger::g_load_plugin_callback = nullptr;
diff --git a/lldb/source/Core/ModuleList.cpp b/lldb/source/Core/ModuleList.cpp
index 66bd0ac2c546..999ed6b74d7b 100644
--- a/lldb/source/Core/ModuleList.cpp
+++ b/lldb/source/Core/ModuleList.cpp
@@ -66,11 +66,11 @@ using namespace lldb_private;
 namespace {
 
 #define LLDB_PROPERTIES_modulelist
-#include "Properties.inc"
+#include "CoreProperties.inc"
 
 enum {
 #define LLDB_PROPERTIES_modulelist
-#include "PropertiesEnum.inc"
+#include "CorePropertiesEnum.inc"
 };
 
 } // namespace
diff --git a/lldb/source/Interpreter/CMakeLists.txt b/lldb/source/Interpreter/CMakeLists.txt
index ece88b14d67d..5f7229240b42 100644
--- a/lldb/source/Interpreter/CMakeLists.txt
+++ b/lldb/source/Interpreter/CMakeLists.txt
@@ -1,9 +1,9 @@
-lldb_tablegen(Properties.inc -gen-lldb-property-defs
-  SOURCE Properties.td
+lldb_tablegen(InterpreterProperties.inc -gen-lldb-property-defs
+  SOURCE InterpreterProperties.td
   TARGET LLDBInterpreterPropertiesGen)
 
-lldb_tablegen(PropertiesEnum.inc -gen-lldb-property-enum-defs
-  SOURCE Properties.td
+lldb_tablegen(InterpreterPropertiesEnum.inc -gen-lldb-property-enum-defs
+  SOURCE InterpreterProperties.td
   TARGET LLDBInterpreterPropertiesEnumGen)
 
 add_lldb_library(lldbInterpreter
@@ -70,4 +70,4 @@ add_dependencies(lldbInterpreter
 
 if (NOT LLDB_DISABLE_LIBEDIT)
   target_include_directories(lldbInterpreter PRIVATE ${libedit_INCLUDE_DIRS})
-endif()
\ No newline at end of file
+endif()
diff --git a/lldb/source/Interpreter/CommandInterpreter.cpp b/lldb/source/Interpreter/CommandInterpreter.cpp
index 3a4cd7b9bd5a..379251b02761 100644
--- a/lldb/source/Interpreter/CommandInterpreter.cpp
+++ b/lldb/source/Interpreter/CommandInterpreter.cpp
@@ -90,11 +90,11 @@ static constexpr const char *InitFileWarning =
     "accept the security risk.";
 
 #define LLDB_PROPERTIES_interpreter
-#include "Properties.inc"
+#include "InterpreterProperties.inc"
 
 enum {
 #define LLDB_PROPERTIES_interpreter
-#include "PropertiesEnum.inc"
+#include "InterpreterPropertiesEnum.inc"
 };
 
 ConstString &CommandInterpreter::GetStaticBroadcasterClass() {
diff --git a/lldb/source/Interpreter/Properties.td b/lldb/source/Interpreter/InterpreterProperties.td
similarity index 100%
rename from lldb/source/Interpreter/Properties.td
rename to lldb/source/Interpreter/InterpreterProperties.td
diff --git a/lldb/source/Plugins/DynamicLoader/Darwin-Kernel/CMakeLists.txt b/lldb/source/Plugins/DynamicLoader/Darwin-Kernel/CMakeLists.txt
index b4ba84a7fdef..e29ddca343f9 100644
--- a/lldb/source/Plugins/DynamicLoader/Darwin-Kernel/CMakeLists.txt
+++ b/lldb/source/Plugins/DynamicLoader/Darwin-Kernel/CMakeLists.txt
@@ -1,9 +1,9 @@
-lldb_tablegen(Properties.inc -gen-lldb-property-defs
-  SOURCE Properties.td
+lldb_tablegen(DynamicLoaderDarwinKernelProperties.inc -gen-lldb-property-defs
+  SOURCE DynamicLoaderDarwinKernelProperties.td
   TARGET LLDBPluginDynamicLoaderDarwinKernelPropertiesGen)
 
-lldb_tablegen(PropertiesEnum.inc -gen-lldb-property-enum-defs
-  SOURCE Properties.td
+lldb_tablegen(DynamicLoaderDarwinKernelPropertiesEnum.inc -gen-lldb-property-enum-defs
+  SOURCE DynamicLoaderDarwinKernelProperties.td
   TARGET LLDBPluginDynamicLoaderDarwinKernelPropertiesEnumGen)
 
 add_lldb_library(lldbPluginDynamicLoaderDarwinKernel PLUGIN
diff --git a/lldb/source/Plugins/DynamicLoader/Darwin-Kernel/DynamicLoaderDarwinKernel.cpp b/lldb/source/Plugins/DynamicLoader/Darwin-Kernel/DynamicLoaderDarwinKernel.cpp
index b6a98bcc5cd7..51f128f97061 100644
--- a/lldb/source/Plugins/DynamicLoader/Darwin-Kernel/DynamicLoaderDarwinKernel.cpp
+++ b/lldb/source/Plugins/DynamicLoader/Darwin-Kernel/DynamicLoaderDarwinKernel.cpp
@@ -73,11 +73,11 @@ static constexpr OptionEnumValueElement g_kaslr_kernel_scan_enum_values[] = {
      "on 32-bit targets)."}};
 
 #define LLDB_PROPERTIES_dynamicloaderdarwinkernel
-#include "Properties.inc"
+#include "DynamicLoaderDarwinKernelProperties.inc"
 
 enum {
 #define LLDB_PROPERTIES_dynamicloaderdarwinkernel
-#include "PropertiesEnum.inc"
+#include "DynamicLoaderDarwinKernelPropertiesEnum.inc"
 };
 
 class DynamicLoaderDarwinKernelProperties : public Properties {
diff --git a/lldb/source/Plugins/DynamicLoader/Darwin-Kernel/Properties.td b/lldb/source/Plugins/DynamicLoader/Darwin-Kernel/DynamicLoaderDarwinKernelProperties.td
similarity index 100%
rename from lldb/source/Plugins/DynamicLoader/Darwin-Kernel/Properties.td
rename to lldb/source/Plugins/DynamicLoader/Darwin-Kernel/DynamicLoaderDarwinKernelProperties.td
diff --git a/lldb/source/Plugins/JITLoader/GDB/CMakeLists.txt b/lldb/source/Plugins/JITLoader/GDB/CMakeLists.txt
index 88e8fce4a6d8..774d85b16a28 100644
--- a/lldb/source/Plugins/JITLoader/GDB/CMakeLists.txt
+++ b/lldb/source/Plugins/JITLoader/GDB/CMakeLists.txt
@@ -1,9 +1,9 @@
-lldb_tablegen(Properties.inc -gen-lldb-property-defs
-  SOURCE Properties.td
+lldb_tablegen(JITLoaderGDBProperties.inc -gen-lldb-property-defs
+  SOURCE JITLoaderGDBProperties.td
   TARGET LLDBPluginJITLoaderGDBPropertiesGen)
 
-lldb_tablegen(PropertiesEnum.inc -gen-lldb-property-enum-defs
-  SOURCE Properties.td
+lldb_tablegen(JITLoaderGDBPropertiesEnum.inc -gen-lldb-property-enum-defs
+  SOURCE JITLoaderGDBProperties.td
   TARGET LLDBPluginJITLoaderGDBPropertiesEnumGen)
 
 add_lldb_library(lldbPluginJITLoaderGDB PLUGIN
diff --git a/lldb/source/Plugins/JITLoader/GDB/JITLoaderGDB.cpp b/lldb/source/Plugins/JITLoader/GDB/JITLoaderGDB.cpp
index 08c134c984b8..0593af4caad9 100644
--- a/lldb/source/Plugins/JITLoader/GDB/JITLoaderGDB.cpp
+++ b/lldb/source/Plugins/JITLoader/GDB/JITLoaderGDB.cpp
@@ -67,11 +67,11 @@ static constexpr OptionEnumValueElement g_enable_jit_loader_gdb_enumerators[] =
  };
 
 #define LLDB_PROPERTIES_jitloadergdb
-#include "Properties.inc"
+#include "JITLoaderGDBProperties.inc"
 
 enum {
 #define LLDB_PROPERTIES_jitloadergdb
-#include "PropertiesEnum.inc"
+#include "JITLoaderGDBPropertiesEnum.inc"
   ePropertyEnableJITBreakpoint
 };
 
diff --git a/lldb/source/Plugins/JITLoader/GDB/Properties.td b/lldb/source/Plugins/JITLoader/GDB/JITLoaderGDBProperties.td
similarity index 100%
rename from lldb/source/Plugins/JITLoader/GDB/Properties.td
rename to lldb/source/Plugins/JITLoader/GDB/JITLoaderGDBProperties.td
diff --git a/lldb/source/Plugins/Platform/MacOSX/CMakeLists.txt b/lldb/source/Plugins/Platform/MacOSX/CMakeLists.txt
index d8fd2aafe719..49084dc6d4a9 100644
--- a/lldb/source/Plugins/Platform/MacOSX/CMakeLists.txt
+++ b/lldb/source/Plugins/Platform/MacOSX/CMakeLists.txt
@@ -1,9 +1,9 @@
-lldb_tablegen(Properties.inc -gen-lldb-property-defs
-  SOURCE Properties.td
+lldb_tablegen(PlatformMacOSXProperties.inc -gen-lldb-property-defs
+  SOURCE PlatformMacOSXProperties.td
   TARGET LLDBPluginPlatformMacOSXPropertiesGen)
 
-lldb_tablegen(PropertiesEnum.inc -gen-lldb-property-enum-defs
-  SOURCE Properties.td
+lldb_tablegen(PlatformMacOSXPropertiesEnum.inc -gen-lldb-property-enum-defs
+  SOURCE PlatformMacOSXProperties.td
   TARGET LLDBPluginPlatformMacOSXPropertiesEnumGen)
 
 list(APPEND PLUGIN_PLATFORM_MACOSX_SOURCES
diff --git a/lldb/source/Plugins/Platform/MacOSX/PlatformDarwinKernel.cpp b/lldb/source/Plugins/Platform/MacOSX/PlatformDarwinKernel.cpp
index a196a5fabf4a..7ca5397595c9 100644
--- a/lldb/source/Plugins/Platform/MacOSX/PlatformDarwinKernel.cpp
+++ b/lldb/source/Plugins/Platform/MacOSX/PlatformDarwinKernel.cpp
@@ -178,11 +178,11 @@ const char *PlatformDarwinKernel::GetDescriptionStatic() {
 /// Code to handle the PlatformDarwinKernel settings
 
 #define LLDB_PROPERTIES_platformdarwinkernel
-#include "Properties.inc"
+#include "PlatformMacOSXProperties.inc"
 
 enum {
 #define LLDB_PROPERTIES_platformdarwinkernel
-#include "PropertiesEnum.inc"
+#include "PlatformMacOSXPropertiesEnum.inc"
 };
 
 class PlatformDarwinKernelProperties : public Properties {
diff --git a/lldb/source/Plugins/Platform/MacOSX/Properties.td b/lldb/source/Plugins/Platform/MacOSX/PlatformMacOSXProperties.td
similarity index 100%
rename from lldb/source/Plugins/Platform/MacOSX/Properties.td
rename to lldb/source/Plugins/Platform/MacOSX/PlatformMacOSXProperties.td
diff --git a/lldb/source/Plugins/Process/MacOSX-Kernel/CMakeLists.txt b/lldb/source/Plugins/Process/MacOSX-Kernel/CMakeLists.txt
index 56720083631a..ddce25c62046 100644
--- a/lldb/source/Plugins/Process/MacOSX-Kernel/CMakeLists.txt
+++ b/lldb/source/Plugins/Process/MacOSX-Kernel/CMakeLists.txt
@@ -1,9 +1,9 @@
-lldb_tablegen(Properties.inc -gen-lldb-property-defs
-  SOURCE Properties.td
+lldb_tablegen(ProcessKDPProperties.inc -gen-lldb-property-defs
+  SOURCE ProcessKDPProperties.td
   TARGET LLDBPluginProcessMacOSXKernelPropertiesGen)
 
-lldb_tablegen(PropertiesEnum.inc -gen-lldb-property-enum-defs
-  SOURCE Properties.td
+lldb_tablegen(ProcessKDPPropertiesEnum.inc -gen-lldb-property-enum-defs
+  SOURCE ProcessKDPProperties.td
   TARGET LLDBPluginProcessMacOSXKernelPropertiesEnumGen)
 
 add_lldb_library(lldbPluginProcessMacOSXKernel PLUGIN
diff --git a/lldb/source/Plugins/Process/MacOSX-Kernel/ProcessKDP.cpp b/lldb/source/Plugins/Process/MacOSX-Kernel/ProcessKDP.cpp
index 1782661edbef..491c0b012b01 100644
--- a/lldb/source/Plugins/Process/MacOSX-Kernel/ProcessKDP.cpp
+++ b/lldb/source/Plugins/Process/MacOSX-Kernel/ProcessKDP.cpp
@@ -53,11 +53,11 @@ using namespace lldb_private;
 namespace {
 
 #define LLDB_PROPERTIES_processkdp
-#include "Properties.inc"
+#include "ProcessKDPProperties.inc"
 
 enum {
 #define LLDB_PROPERTIES_processkdp
-#include "PropertiesEnum.inc"
+#include "ProcessKDPPropertiesEnum.inc"
 };
 
 class PluginProperties : public Properties {
diff --git a/lldb/source/Plugins/Process/MacOSX-Kernel/Properties.td b/lldb/source/Plugins/Process/MacOSX-Kernel/ProcessKDPProperties.td
similarity index 100%
rename from lldb/source/Plugins/Process/MacOSX-Kernel/Properties.td
rename to lldb/source/Plugins/Process/MacOSX-Kernel/ProcessKDPProperties.td
diff --git a/lldb/source/Plugins/Process/gdb-remote/CMakeLists.txt b/lldb/source/Plugins/Process/gdb-remote/CMakeLists.txt
index 2e0b4a8041c8..477f224b940d 100644
--- a/lldb/source/Plugins/Process/gdb-remote/CMakeLists.txt
+++ b/lldb/source/Plugins/Process/gdb-remote/CMakeLists.txt
@@ -1,9 +1,9 @@
-lldb_tablegen(Properties.inc -gen-lldb-property-defs
-  SOURCE Properties.td
+lldb_tablegen(ProcessGDBRemoteProperties.inc -gen-lldb-property-defs
+  SOURCE ProcessGDBRemoteProperties.td
   TARGET LLDBPluginProcessGDBRemotePropertiesGen)
 
-lldb_tablegen(PropertiesEnum.inc -gen-lldb-property-enum-defs
-  SOURCE Properties.td
+lldb_tablegen(ProcessGDBRemotePropertiesEnum.inc -gen-lldb-property-enum-defs
+  SOURCE ProcessGDBRemoteProperties.td
   TARGET LLDBPluginProcessGDBRemotePropertiesEnumGen)
 
 if (CMAKE_SYSTEM_NAME MATCHES "Darwin")
diff --git a/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp b/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp
index 51670adc2a61..cd59fc1179b2 100644
--- a/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp
+++ b/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp
@@ -111,11 +111,11 @@ void DumpProcessGDBRemotePacketHistory(void *p, const char *path) {
 namespace {
 
 #define LLDB_PROPERTIES_processgdbremote
-#include "Properties.inc"
+#include "ProcessGDBRemoteProperties.inc"
 
 enum {
 #define LLDB_PROPERTIES_processgdbremote
-#include "PropertiesEnum.inc"
+#include "ProcessGDBRemotePropertiesEnum.inc"
 };
 
 class PluginProperties : public Properties {
diff --git a/lldb/source/Plugins/Process/gdb-remote/Properties.td b/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemoteProperties.td
similarity index 100%
rename from lldb/source/Plugins/Process/gdb-remote/Properties.td
rename to lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemoteProperties.td
diff --git a/lldb/source/Plugins/StructuredData/DarwinLog/CMakeLists.txt b/lldb/source/Plugins/StructuredData/DarwinLog/CMakeLists.txt
index 0b921851aa11..7d1d03fe908f 100644
--- a/lldb/source/Plugins/StructuredData/DarwinLog/CMakeLists.txt
+++ b/lldb/source/Plugins/StructuredData/DarwinLog/CMakeLists.txt
@@ -1,9 +1,9 @@
-lldb_tablegen(Properties.inc -gen-lldb-property-defs
-  SOURCE Properties.td
+lldb_tablegen(StructuredDataDarwinLogProperties.inc -gen-lldb-property-defs
+  SOURCE StructuredDataDarwinLogProperties.td
   TARGET LLDBPluginStructuredDataDarwinLogPropertiesGen)
 
-lldb_tablegen(PropertiesEnum.inc -gen-lldb-property-enum-defs
-  SOURCE Properties.td
+lldb_tablegen(StructuredDataDarwinLogPropertiesEnum.inc -gen-lldb-property-enum-defs
+  SOURCE StructuredDataDarwinLogProperties.td
   TARGET LLDBPluginStructuredDataDarwinLogPropertiesEnumGen)
 
 add_lldb_library(lldbPluginStructuredDataDarwinLog PLUGIN
diff --git a/lldb/source/Plugins/StructuredData/DarwinLog/StructuredDataDarwinLog.cpp b/lldb/source/Plugins/StructuredData/DarwinLog/StructuredDataDarwinLog.cpp
index b05c389931ea..3fa3f68227b7 100644
--- a/lldb/source/Plugins/StructuredData/DarwinLog/StructuredDataDarwinLog.cpp
+++ b/lldb/source/Plugins/StructuredData/DarwinLog/StructuredDataDarwinLog.cpp
@@ -105,11 +105,11 @@ void SetGlobalEnableOptions(const DebuggerSP &debugger_sp,
 /// Code to handle the StructuredDataDarwinLog settings
 
 #define LLDB_PROPERTIES_darwinlog
-#include "Properties.inc"
+#include "StructuredDataDarwinLogProperties.inc"
 
 enum {
 #define LLDB_PROPERTIES_darwinlog
-#include "PropertiesEnum.inc"
+#include "StructuredDataDarwinLogPropertiesEnum.inc"
 };
 
 class StructuredDataDarwinLogProperties : public Properties {
diff --git a/lldb/source/Plugins/StructuredData/DarwinLog/Properties.td b/lldb/source/Plugins/StructuredData/DarwinLog/StructuredDataDarwinLogProperties.td
similarity index 100%
rename from lldb/source/Plugins/StructuredData/DarwinLog/Properties.td
rename to lldb/source/Plugins/StructuredData/DarwinLog/StructuredDataDarwinLogProperties.td
diff --git a/lldb/source/Plugins/SymbolFile/DWARF/CMakeLists.txt b/lldb/source/Plugins/SymbolFile/DWARF/CMakeLists.txt
index 1ca4be3ebea5..c9db96b4f986 100644
--- a/lldb/source/Plugins/SymbolFile/DWARF/CMakeLists.txt
+++ b/lldb/source/Plugins/SymbolFile/DWARF/CMakeLists.txt
@@ -1,9 +1,9 @@
-lldb_tablegen(Properties.inc -gen-lldb-property-defs
-  SOURCE Properties.td
+lldb_tablegen(SymbolFileDWARFProperties.inc -gen-lldb-property-defs
+  SOURCE SymbolFileDWARFProperties.td
   TARGET LLDBPluginSymbolFileDWARFPropertiesGen)
 
-lldb_tablegen(PropertiesEnum.inc -gen-lldb-property-enum-defs
-  SOURCE Properties.td
+lldb_tablegen(SymbolFileDWARFPropertiesEnum.inc -gen-lldb-property-enum-defs
+  SOURCE SymbolFileDWARFProperties.td
   TARGET LLDBPluginSymbolFileDWARFPropertiesEnumGen)
 
 add_lldb_library(lldbPluginSymbolFileDWARF PLUGIN
diff --git a/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp b/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp
index f24e403985a1..f8ce14426989 100644
--- a/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp
+++ b/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp
@@ -114,11 +114,11 @@ using namespace lldb_private;
 namespace {
 
 #define LLDB_PROPERTIES_symbolfiledwarf
-#include "Properties.inc"
+#include "SymbolFileDWARFProperties.inc"
 
 enum {
 #define LLDB_PROPERTIES_symbolfiledwarf
-#include "PropertiesEnum.inc"
+#include "SymbolFileDWARFPropertiesEnum.inc"
 };
 
 class PluginProperties : public Properties {
diff --git a/lldb/source/Plugins/SymbolFile/DWARF/Properties.td b/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARFProperties.td
similarity index 100%
rename from lldb/source/Plugins/SymbolFile/DWARF/Properties.td
rename to lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARFProperties.td
diff --git a/lldb/source/Target/CMakeLists.txt b/lldb/source/Target/CMakeLists.txt
index 1e9f1cab2e61..bb74ff19e732 100644
--- a/lldb/source/Target/CMakeLists.txt
+++ b/lldb/source/Target/CMakeLists.txt
@@ -1,9 +1,9 @@
-lldb_tablegen(Properties.inc -gen-lldb-property-defs
-  SOURCE Properties.td
+lldb_tablegen(TargetProperties.inc -gen-lldb-property-defs
+  SOURCE TargetProperties.td
   TARGET LLDBTargetPropertiesGen)
 
-lldb_tablegen(PropertiesEnum.inc -gen-lldb-property-enum-defs
-  SOURCE Properties.td
+lldb_tablegen(TargetPropertiesEnum.inc -gen-lldb-property-enum-defs
+  SOURCE TargetProperties.td
   TARGET LLDBTargetPropertiesEnumGen)
 
 add_lldb_library(lldbTarget
diff --git a/lldb/source/Target/Platform.cpp b/lldb/source/Target/Platform.cpp
index 92e8526189b0..c4089625ce09 100644
--- a/lldb/source/Target/Platform.cpp
+++ b/lldb/source/Target/Platform.cpp
@@ -64,11 +64,11 @@ const char *Platform::GetHostPlatformName() { return "host"; }
 namespace {
 
 #define LLDB_PROPERTIES_platform
-#include "Properties.inc"
+#include "TargetProperties.inc"
 
 enum {
 #define LLDB_PROPERTIES_platform
-#include "PropertiesEnum.inc"
+#include "TargetPropertiesEnum.inc"
 };
 
 } // namespace
diff --git a/lldb/source/Target/Process.cpp b/lldb/source/Target/Process.cpp
index f0cab63bf74f..e781926b6c0b 100644
--- a/lldb/source/Target/Process.cpp
+++ b/lldb/source/Target/Process.cpp
@@ -113,11 +113,11 @@ public:
 };
 
 #define LLDB_PROPERTIES_process
-#include "Properties.inc"
+#include "TargetProperties.inc"
 
 enum {
 #define LLDB_PROPERTIES_process
-#include "PropertiesEnum.inc"
+#include "TargetPropertiesEnum.inc"
 };
 
 ProcessProperties::ProcessProperties(lldb_private::Process *process)
diff --git a/lldb/source/Target/Target.cpp b/lldb/source/Target/Target.cpp
index abf9a08b09ad..7b0960aafa64 100644
--- a/lldb/source/Target/Target.cpp
+++ b/lldb/source/Target/Target.cpp
@@ -3274,11 +3274,11 @@ static constexpr OptionEnumValueElement g_memory_module_load_level_values[] = {
      "this setting loads sections and all symbols."} };
 
 #define LLDB_PROPERTIES_target
-#include "Properties.inc"
+#include "TargetProperties.inc"
 
 enum {
 #define LLDB_PROPERTIES_target
-#include "PropertiesEnum.inc"
+#include "TargetPropertiesEnum.inc"
   ePropertyExperimental,
 };
 
@@ -3355,11 +3355,11 @@ protected:
 
 // TargetProperties
 #define LLDB_PROPERTIES_experimental
-#include "Properties.inc"
+#include "TargetProperties.inc"
 
 enum {
 #define LLDB_PROPERTIES_experimental
-#include "PropertiesEnum.inc"
+#include "TargetPropertiesEnum.inc"
 };
 
 class TargetExperimentalOptionValueProperties : public OptionValueProperties {
diff --git a/lldb/source/Target/Properties.td b/lldb/source/Target/TargetProperties.td
similarity index 100%
rename from lldb/source/Target/Properties.td
rename to lldb/source/Target/TargetProperties.td
diff --git a/lldb/source/Target/Thread.cpp b/lldb/source/Target/Thread.cpp
index 78cddfe914fc..7147fedefdcb 100644
--- a/lldb/source/Target/Thread.cpp
+++ b/lldb/source/Target/Thread.cpp
@@ -64,11 +64,11 @@ const ThreadPropertiesSP &Thread::GetGlobalProperties() {
 }
 
 #define LLDB_PROPERTIES_thread
-#include "Properties.inc"
+#include "TargetProperties.inc"
 
 enum {
 #define LLDB_PROPERTIES_thread
-#include "PropertiesEnum.inc"
+#include "TargetPropertiesEnum.inc"
 };
 
 class ThreadOptionValueProperties : public OptionValueProperties {