diff --git a/src/cli/cli.c b/src/cli/cli.c
index 351d3da37..2f2cf6263 100644
--- a/src/cli/cli.c
+++ b/src/cli/cli.c
@@ -2751,9 +2751,9 @@ const cbm_config_entry_t CBM_CONFIG_REGISTRY[] = {
     {"tool_mode", "streamlined", "CBM_TOOL_MODE", "Tools",
      "Which tool surface the MCP server lists by default",
      "streamlined|classic",
-     "'streamlined' (default): lists 5 core tools plus _hidden_tools discovery: "
+     "'streamlined' (default): lists core tools plus _hidden_tools discovery: "
      "search_graph, query_graph, search_code, trace_path, get_code. "
-     "'classic': exposes all 15 individual tools including index_repository, get_code_snippet, get_architecture, "
+     "'classic': exposes all individual tools including index_repository, get_code_snippet, get_architecture, "
      "list_projects, detect_changes, manage_adr, etc. "
      "You can also enable individual classic tools without switching modes: "
      "config set tool_index_repository true"},
diff --git a/src/mcp/mcp.c b/src/mcp/mcp.c
index a56df52b7..a8de48fc5 100644
--- a/src/mcp/mcp.c
+++ b/src/mcp/mcp.c
@@ -1057,12 +1057,12 @@ char *cbm_mcp_tools_list(cbm_mcp_server_t *srv) {
 
         /* Progressive disclosure: list advanced tools so AI knows they exist.
          * Added as a special tool entry with description explaining how to enable.
-         * The 5 default-surface tools (search_graph, query_graph, search_code,
+         * Default-surface tools (search_graph, query_graph, search_code,
          * trace_path, get_code) are NOT listed here. */
         yyjson_mut_val *hint_tool = yyjson_mut_obj(doc);
         yyjson_mut_obj_add_str(doc, hint_tool, "name", "_hidden_tools");
         yyjson_mut_obj_add_str(doc, hint_tool, "description",
-            "11 advanced tools are normally hidden in streamlined mode. "
+            "Advanced tools are normally hidden in streamlined mode. "
             "Advanced tools: index_repository, get_code_snippet, "
             "get_graph_schema, get_architecture, list_projects, "
             "delete_project, index_status, detect_changes, manage_adr, "
diff --git a/tests/test_tool_consolidation.c b/tests/test_tool_consolidation.c
index 82de55e44..2eb699c5a 100644
--- a/tests/test_tool_consolidation.c
+++ b/tests/test_tool_consolidation.c
@@ -149,7 +149,7 @@ TEST(streamlined_mode_shows_5_default_tools) {
      * trace_path, get_code. The search_code_graph mega-tool is gone. */
     char *json = cbm_mcp_tools_list(NULL);
     ASSERT_NOT_NULL(json);
-    /* The 5 default-surface tools must be present */
+    /* Default-surface tools must be present by name. */
     ASSERT_NOT_NULL(strstr(json, "search_graph"));
     ASSERT_NOT_NULL(strstr(json, "query_graph"));
     ASSERT_NOT_NULL(strstr(json, "search_code"));