diff --git a/lldb/packages/Python/lldbsuite/test/lang/objc/modules-cache/TestClangModulesCache.py b/lldb/packages/Python/lldbsuite/test/lang/objc/modules-cache/TestClangModulesCache.py
index 3a5725ad79a1..0cff6916e7f1 100644
--- a/lldb/packages/Python/lldbsuite/test/lang/objc/modules-cache/TestClangModulesCache.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/modules-cache/TestClangModulesCache.py
@@ -32,7 +32,7 @@ class ObjCModulesTestCase(TestBase):
           shutil.rmtree(mod_cache)
         self.assertFalse(os.path.isdir(mod_cache),
                          "module cache should not exist")
-        self.runCmd('settings set clang.modules-cache-path "%s"' % mod_cache)
+        self.runCmd('settings set symbols.clang-modules-cache-path "%s"' % mod_cache)
         self.runCmd('settings set target.clang-module-search-paths "%s"'
                     % self.getSourceDir())
         (target, process, thread, bkpt) = lldbutil.run_to_source_breakpoint(
diff --git a/lldb/packages/Python/lldbsuite/test/lldbtest.py b/lldb/packages/Python/lldbsuite/test/lldbtest.py
index 1bae7aaa476b..925cddd38f17 100644
--- a/lldb/packages/Python/lldbsuite/test/lldbtest.py
+++ b/lldb/packages/Python/lldbsuite/test/lldbtest.py
@@ -1921,7 +1921,7 @@ class TestBase(Base):
         if self.child:
             assert(self.getDebugInfo() == 'default')
             mod_cache = os.path.join(self.getBuildDir(), "module-cache")
-            self.runCmd('settings set clang.modules-cache-path "%s"'
+            self.runCmd('settings set symbols.clang-modules-cache-path "%s"'
                         % mod_cache)
 
 
diff --git a/lldb/source/Core/Debugger.cpp b/lldb/source/Core/Debugger.cpp
index 49414cbdfa19..172cd487bec0 100644
--- a/lldb/source/Core/Debugger.cpp
+++ b/lldb/source/Core/Debugger.cpp
@@ -776,8 +776,8 @@ Debugger::Debugger(lldb::LogOutputCallback log_callback, void *baton)
       ConstString("platform"), ConstString("Platform settings."), true,
       Platform::GetGlobalPlatformProperties()->GetValueProperties());
   m_collection_sp->AppendProperty(
-      ConstString("clang"), ConstString("Settings specific to Clang."), true,
-      ModuleList::GetGlobalModuleListProperties().GetValueProperties());
+      ConstString("symbols"), ConstString("Symbol lookup and cache settings."),
+      true, ModuleList::GetGlobalModuleListProperties().GetValueProperties());
   if (m_command_interpreter_ap) {
     m_collection_sp->AppendProperty(
         ConstString("interpreter"),
diff --git a/lldb/source/Core/ModuleList.cpp b/lldb/source/Core/ModuleList.cpp
index d89d7cbca6f2..605fe2f29a85 100644
--- a/lldb/source/Core/ModuleList.cpp
+++ b/lldb/source/Core/ModuleList.cpp
@@ -67,7 +67,7 @@ using namespace lldb_private;
 namespace {
 
 PropertyDefinition g_properties[] = {
-    {"modules-cache-path", OptionValue::eTypeFileSpec, true, 0, nullptr,
+    {"clang-modules-cache-path", OptionValue::eTypeFileSpec, true, 0, nullptr,
      nullptr,
      "The path to the clang modules cache directory (-fmodules-cache-path)."},
     {nullptr, OptionValue::eTypeInvalid, false, 0, nullptr, nullptr, nullptr}};
@@ -77,7 +77,7 @@ enum { ePropertyClangModulesCachePath };
 } // namespace
 
 ModuleListProperties::ModuleListProperties() {
-  m_collection_sp.reset(new OptionValueProperties(ConstString("clang")));
+  m_collection_sp.reset(new OptionValueProperties(ConstString("symbols")));
   m_collection_sp->Initialize(g_properties);
 
   llvm::SmallString<128> path;