diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 3c93751aeecbd..888ac8c317434 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -925,8 +925,8 @@ x-pack/solutions/observability/packages/kbn-custom-integrations @elastic/obs-ux-
 x-pack/solutions/observability/packages/kbn-investigation-shared @elastic/obs-ux-management-team
 x-pack/solutions/observability/packages/kbn-scout-oblt @elastic/appex-qa
 x-pack/solutions/observability/packages/kbn-streams-schema @elastic/streams-program-team
-x-pack/solutions/observability/packages/observability_ai/observability_ai_common @elastic/obs-ai-assistant
-x-pack/solutions/observability/packages/observability_ai/observability_ai_server @elastic/obs-ai-assistant
+x-pack/solutions/observability/packages/observability-ai/observability-ai-common @elastic/obs-ai-assistant
+x-pack/solutions/observability/packages/observability-ai/observability-ai-server @elastic/obs-ai-assistant
 x-pack/solutions/observability/packages/synthetics_test_data @elastic/obs-ux-management-team
 x-pack/solutions/observability/packages/utils-browser @elastic/observability-ui
 x-pack/solutions/observability/packages/utils-common @elastic/observability-ui
diff --git a/package.json b/package.json
index e1a3291218ea9..26cc26b9fd0de 100644
--- a/package.json
+++ b/package.json
@@ -699,8 +699,8 @@
     "@kbn/observability-ai-assistant-app-plugin": "link:x-pack/solutions/observability/plugins/observability_ai_assistant_app",
     "@kbn/observability-ai-assistant-management-plugin": "link:x-pack/solutions/observability/plugins/observability_ai_assistant_management",
     "@kbn/observability-ai-assistant-plugin": "link:x-pack/platform/plugins/shared/observability_ai_assistant",
-    "@kbn/observability-ai-common": "link:x-pack/solutions/observability/packages/observability_ai/observability_ai_common",
-    "@kbn/observability-ai-server": "link:x-pack/solutions/observability/packages/observability_ai/observability_ai_server",
+    "@kbn/observability-ai-common": "link:x-pack/solutions/observability/packages/observability-ai/observability-ai-common",
+    "@kbn/observability-ai-server": "link:x-pack/solutions/observability/packages/observability-ai/observability-ai-server",
     "@kbn/observability-alert-details": "link:x-pack/solutions/observability/packages/alert_details",
     "@kbn/observability-alerting-test-data": "link:x-pack/solutions/observability/packages/alerting_test_data",
     "@kbn/observability-fixtures-plugin": "link:x-pack/test/cases_api_integration/common/plugins/observability",
diff --git a/tsconfig.base.json b/tsconfig.base.json
index d5005c960cd70..e1bd83b5fad14 100644
--- a/tsconfig.base.json
+++ b/tsconfig.base.json
@@ -1340,10 +1340,10 @@
       "@kbn/observability-ai-assistant-management-plugin/*": ["x-pack/solutions/observability/plugins/observability_ai_assistant_management/*"],
       "@kbn/observability-ai-assistant-plugin": ["x-pack/platform/plugins/shared/observability_ai_assistant"],
       "@kbn/observability-ai-assistant-plugin/*": ["x-pack/platform/plugins/shared/observability_ai_assistant/*"],
-      "@kbn/observability-ai-common": ["x-pack/solutions/observability/packages/observability_ai/observability_ai_common"],
-      "@kbn/observability-ai-common/*": ["x-pack/solutions/observability/packages/observability_ai/observability_ai_common/*"],
-      "@kbn/observability-ai-server": ["x-pack/solutions/observability/packages/observability_ai/observability_ai_server"],
-      "@kbn/observability-ai-server/*": ["x-pack/solutions/observability/packages/observability_ai/observability_ai_server/*"],
+      "@kbn/observability-ai-common": ["x-pack/solutions/observability/packages/observability-ai/observability-ai-common"],
+      "@kbn/observability-ai-common/*": ["x-pack/solutions/observability/packages/observability-ai/observability-ai-common/*"],
+      "@kbn/observability-ai-server": ["x-pack/solutions/observability/packages/observability-ai/observability-ai-server"],
+      "@kbn/observability-ai-server/*": ["x-pack/solutions/observability/packages/observability-ai/observability-ai-server/*"],
       "@kbn/observability-alert-details": ["x-pack/solutions/observability/packages/alert_details"],
       "@kbn/observability-alert-details/*": ["x-pack/solutions/observability/packages/alert_details/*"],
       "@kbn/observability-alerting-test-data": ["x-pack/solutions/observability/packages/alerting_test_data"],
diff --git a/x-pack/solutions/observability/packages/observability_ai/observability_ai_common/jest.config.js b/x-pack/solutions/observability/packages/observability-ai/observability-ai-common/jest.config.js
similarity index 87%
rename from x-pack/solutions/observability/packages/observability_ai/observability_ai_common/jest.config.js
rename to x-pack/solutions/observability/packages/observability-ai/observability-ai-common/jest.config.js
index 3620ef5a1c254..fda41606e56b1 100644
--- a/x-pack/solutions/observability/packages/observability_ai/observability_ai_common/jest.config.js
+++ b/x-pack/solutions/observability/packages/observability-ai/observability-ai-common/jest.config.js
@@ -9,7 +9,7 @@ module.exports = {
   preset: '@kbn/test',
   rootDir: '../../../../../..',
   roots: [
-    '<rootDir>/x-pack/solutions/observability/packages/observability_ai/observability_ai_common',
-    '<rootDir>/x-pack/solutions/observability/packages/observability_ai/observability_ai_server',
+    '<rootDir>/x-pack/solutions/observability/packages/observability-ai/observability-ai-common',
+    '<rootDir>/x-pack/solutions/observability/packages/observability-ai/observability-ai-server',
   ],
 };
diff --git a/x-pack/solutions/observability/packages/observability_ai/observability_ai_common/kibana.jsonc b/x-pack/solutions/observability/packages/observability-ai/observability-ai-common/kibana.jsonc
similarity index 100%
rename from x-pack/solutions/observability/packages/observability_ai/observability_ai_common/kibana.jsonc
rename to x-pack/solutions/observability/packages/observability-ai/observability-ai-common/kibana.jsonc
diff --git a/x-pack/solutions/observability/packages/observability_ai/observability_ai_common/package.json b/x-pack/solutions/observability/packages/observability-ai/observability-ai-common/package.json
similarity index 100%
rename from x-pack/solutions/observability/packages/observability_ai/observability_ai_common/package.json
rename to x-pack/solutions/observability/packages/observability-ai/observability-ai-common/package.json
diff --git a/x-pack/solutions/observability/packages/observability_ai/observability_ai_common/root_cause_analysis/index.ts b/x-pack/solutions/observability/packages/observability-ai/observability-ai-common/root_cause_analysis/index.ts
similarity index 100%
rename from x-pack/solutions/observability/packages/observability_ai/observability_ai_common/root_cause_analysis/index.ts
rename to x-pack/solutions/observability/packages/observability-ai/observability-ai-common/root_cause_analysis/index.ts
diff --git a/x-pack/solutions/observability/packages/observability_ai/observability_ai_common/root_cause_analysis/tool_names.ts b/x-pack/solutions/observability/packages/observability-ai/observability-ai-common/root_cause_analysis/tool_names.ts
similarity index 100%
rename from x-pack/solutions/observability/packages/observability_ai/observability_ai_common/root_cause_analysis/tool_names.ts
rename to x-pack/solutions/observability/packages/observability-ai/observability-ai-common/root_cause_analysis/tool_names.ts
diff --git a/x-pack/solutions/observability/packages/observability_ai/observability_ai_common/tsconfig.json b/x-pack/solutions/observability/packages/observability-ai/observability-ai-common/tsconfig.json
similarity index 100%
rename from x-pack/solutions/observability/packages/observability_ai/observability_ai_common/tsconfig.json
rename to x-pack/solutions/observability/packages/observability-ai/observability-ai-common/tsconfig.json
diff --git a/x-pack/solutions/observability/packages/observability_ai/observability_ai_server/jest.config.js b/x-pack/solutions/observability/packages/observability-ai/observability-ai-server/jest.config.js
similarity index 92%
rename from x-pack/solutions/observability/packages/observability_ai/observability_ai_server/jest.config.js
rename to x-pack/solutions/observability/packages/observability-ai/observability-ai-server/jest.config.js
index 8aa1c2d673222..fff212e040dcc 100644
--- a/x-pack/solutions/observability/packages/observability_ai/observability_ai_server/jest.config.js
+++ b/x-pack/solutions/observability/packages/observability-ai/observability-ai-server/jest.config.js
@@ -9,6 +9,6 @@ module.exports = {
   preset: '@kbn/test',
   rootDir: '../../../../../..',
   roots: [
-    '<rootDir>/x-pack/solutions/observability/packages/observability_ai/observability_ai_server',
+    '<rootDir>/x-pack/solutions/observability/packages/observability-ai/observability-ai-server',
   ],
 };
diff --git a/x-pack/solutions/observability/packages/observability_ai/observability_ai_server/kibana.jsonc b/x-pack/solutions/observability/packages/observability-ai/observability-ai-server/kibana.jsonc
similarity index 100%
rename from x-pack/solutions/observability/packages/observability_ai/observability_ai_server/kibana.jsonc
rename to x-pack/solutions/observability/packages/observability-ai/observability-ai-server/kibana.jsonc
diff --git a/x-pack/solutions/observability/packages/observability_ai/observability_ai_server/package.json b/x-pack/solutions/observability/packages/observability-ai/observability-ai-server/package.json
similarity index 100%
rename from x-pack/solutions/observability/packages/observability_ai/observability_ai_server/package.json
rename to x-pack/solutions/observability/packages/observability-ai/observability-ai-server/package.json
diff --git a/x-pack/solutions/observability/packages/observability_ai/observability_ai_server/root_cause_analysis/call_end_rca_process_tool.ts b/x-pack/solutions/observability/packages/observability-ai/observability-ai-server/root_cause_analysis/call_end_rca_process_tool.ts
similarity index 100%
rename from x-pack/solutions/observability/packages/observability_ai/observability_ai_server/root_cause_analysis/call_end_rca_process_tool.ts
rename to x-pack/solutions/observability/packages/observability-ai/observability-ai-server/root_cause_analysis/call_end_rca_process_tool.ts
diff --git a/x-pack/solutions/observability/packages/observability_ai/observability_ai_server/root_cause_analysis/call_investigate_entity_tool.ts b/x-pack/solutions/observability/packages/observability-ai/observability-ai-server/root_cause_analysis/call_investigate_entity_tool.ts
similarity index 100%
rename from x-pack/solutions/observability/packages/observability_ai/observability_ai_server/root_cause_analysis/call_investigate_entity_tool.ts
rename to x-pack/solutions/observability/packages/observability-ai/observability-ai-server/root_cause_analysis/call_investigate_entity_tool.ts
diff --git a/x-pack/solutions/observability/packages/observability_ai/observability_ai_server/root_cause_analysis/call_observe_tool.ts b/x-pack/solutions/observability/packages/observability-ai/observability-ai-server/root_cause_analysis/call_observe_tool.ts
similarity index 100%
rename from x-pack/solutions/observability/packages/observability_ai/observability_ai_server/root_cause_analysis/call_observe_tool.ts
rename to x-pack/solutions/observability/packages/observability-ai/observability-ai-server/root_cause_analysis/call_observe_tool.ts
diff --git a/x-pack/solutions/observability/packages/observability_ai/observability_ai_server/root_cause_analysis/empty_assistant_message.ts b/x-pack/solutions/observability/packages/observability-ai/observability-ai-server/root_cause_analysis/empty_assistant_message.ts
similarity index 100%
rename from x-pack/solutions/observability/packages/observability_ai/observability_ai_server/root_cause_analysis/empty_assistant_message.ts
rename to x-pack/solutions/observability/packages/observability-ai/observability-ai-server/root_cause_analysis/empty_assistant_message.ts
diff --git a/x-pack/solutions/observability/packages/observability_ai/observability_ai_server/root_cause_analysis/index.ts b/x-pack/solutions/observability/packages/observability-ai/observability-ai-server/root_cause_analysis/index.ts
similarity index 100%
rename from x-pack/solutions/observability/packages/observability_ai/observability_ai_server/root_cause_analysis/index.ts
rename to x-pack/solutions/observability/packages/observability-ai/observability-ai-server/root_cause_analysis/index.ts
diff --git a/x-pack/solutions/observability/packages/observability_ai/observability_ai_server/root_cause_analysis/prompts/index.ts b/x-pack/solutions/observability/packages/observability-ai/observability-ai-server/root_cause_analysis/prompts/index.ts
similarity index 100%
rename from x-pack/solutions/observability/packages/observability_ai/observability_ai_server/root_cause_analysis/prompts/index.ts
rename to x-pack/solutions/observability/packages/observability-ai/observability-ai-server/root_cause_analysis/prompts/index.ts
diff --git a/x-pack/solutions/observability/packages/observability_ai/observability_ai_server/root_cause_analysis/run_root_cause_analysis.ts b/x-pack/solutions/observability/packages/observability-ai/observability-ai-server/root_cause_analysis/run_root_cause_analysis.ts
similarity index 100%
rename from x-pack/solutions/observability/packages/observability_ai/observability_ai_server/root_cause_analysis/run_root_cause_analysis.ts
rename to x-pack/solutions/observability/packages/observability-ai/observability-ai-server/root_cause_analysis/run_root_cause_analysis.ts
diff --git a/x-pack/solutions/observability/packages/observability_ai/observability_ai_server/root_cause_analysis/tasks/analyze_log_patterns/index.ts b/x-pack/solutions/observability/packages/observability-ai/observability-ai-server/root_cause_analysis/tasks/analyze_log_patterns/index.ts
similarity index 100%
rename from x-pack/solutions/observability/packages/observability_ai/observability_ai_server/root_cause_analysis/tasks/analyze_log_patterns/index.ts
rename to x-pack/solutions/observability/packages/observability-ai/observability-ai-server/root_cause_analysis/tasks/analyze_log_patterns/index.ts
diff --git a/x-pack/solutions/observability/packages/observability_ai/observability_ai_server/root_cause_analysis/tasks/describe_entity/index.ts b/x-pack/solutions/observability/packages/observability-ai/observability-ai-server/root_cause_analysis/tasks/describe_entity/index.ts
similarity index 100%
rename from x-pack/solutions/observability/packages/observability_ai/observability_ai_server/root_cause_analysis/tasks/describe_entity/index.ts
rename to x-pack/solutions/observability/packages/observability-ai/observability-ai-server/root_cause_analysis/tasks/describe_entity/index.ts
diff --git a/x-pack/solutions/observability/packages/observability_ai/observability_ai_server/root_cause_analysis/tasks/describe_log_patterns/index.ts b/x-pack/solutions/observability/packages/observability-ai/observability-ai-server/root_cause_analysis/tasks/describe_log_patterns/index.ts
similarity index 100%
rename from x-pack/solutions/observability/packages/observability_ai/observability_ai_server/root_cause_analysis/tasks/describe_log_patterns/index.ts
rename to x-pack/solutions/observability/packages/observability-ai/observability-ai-server/root_cause_analysis/tasks/describe_log_patterns/index.ts
diff --git a/x-pack/solutions/observability/packages/observability_ai/observability_ai_server/root_cause_analysis/tasks/find_related_entities/analyze_fetched_related_entities.ts b/x-pack/solutions/observability/packages/observability-ai/observability-ai-server/root_cause_analysis/tasks/find_related_entities/analyze_fetched_related_entities.ts
similarity index 100%
rename from x-pack/solutions/observability/packages/observability_ai/observability_ai_server/root_cause_analysis/tasks/find_related_entities/analyze_fetched_related_entities.ts
rename to x-pack/solutions/observability/packages/observability-ai/observability-ai-server/root_cause_analysis/tasks/find_related_entities/analyze_fetched_related_entities.ts
diff --git a/x-pack/solutions/observability/packages/observability_ai/observability_ai_server/root_cause_analysis/tasks/find_related_entities/extract_related_entities.ts b/x-pack/solutions/observability/packages/observability-ai/observability-ai-server/root_cause_analysis/tasks/find_related_entities/extract_related_entities.ts
similarity index 100%
rename from x-pack/solutions/observability/packages/observability_ai/observability_ai_server/root_cause_analysis/tasks/find_related_entities/extract_related_entities.ts
rename to x-pack/solutions/observability/packages/observability-ai/observability-ai-server/root_cause_analysis/tasks/find_related_entities/extract_related_entities.ts
diff --git a/x-pack/solutions/observability/packages/observability_ai/observability_ai_server/root_cause_analysis/tasks/find_related_entities/index.ts b/x-pack/solutions/observability/packages/observability-ai/observability-ai-server/root_cause_analysis/tasks/find_related_entities/index.ts
similarity index 100%
rename from x-pack/solutions/observability/packages/observability_ai/observability_ai_server/root_cause_analysis/tasks/find_related_entities/index.ts
rename to x-pack/solutions/observability/packages/observability-ai/observability-ai-server/root_cause_analysis/tasks/find_related_entities/index.ts
diff --git a/x-pack/solutions/observability/packages/observability_ai/observability_ai_server/root_cause_analysis/tasks/find_related_entities/write_keyword_searches_for_related_entities.ts b/x-pack/solutions/observability/packages/observability-ai/observability-ai-server/root_cause_analysis/tasks/find_related_entities/write_keyword_searches_for_related_entities.ts
similarity index 100%
rename from x-pack/solutions/observability/packages/observability_ai/observability_ai_server/root_cause_analysis/tasks/find_related_entities/write_keyword_searches_for_related_entities.ts
rename to x-pack/solutions/observability/packages/observability-ai/observability-ai-server/root_cause_analysis/tasks/find_related_entities/write_keyword_searches_for_related_entities.ts
diff --git a/x-pack/solutions/observability/packages/observability_ai/observability_ai_server/root_cause_analysis/tasks/generate_timeline/index.ts b/x-pack/solutions/observability/packages/observability-ai/observability-ai-server/root_cause_analysis/tasks/generate_timeline/index.ts
similarity index 100%
rename from x-pack/solutions/observability/packages/observability_ai/observability_ai_server/root_cause_analysis/tasks/generate_timeline/index.ts
rename to x-pack/solutions/observability/packages/observability-ai/observability-ai-server/root_cause_analysis/tasks/generate_timeline/index.ts
diff --git a/x-pack/solutions/observability/packages/observability_ai/observability_ai_server/root_cause_analysis/tasks/get_knowledge_base_entries/index.ts b/x-pack/solutions/observability/packages/observability-ai/observability-ai-server/root_cause_analysis/tasks/get_knowledge_base_entries/index.ts
similarity index 100%
rename from x-pack/solutions/observability/packages/observability_ai/observability_ai_server/root_cause_analysis/tasks/get_knowledge_base_entries/index.ts
rename to x-pack/solutions/observability/packages/observability-ai/observability-ai-server/root_cause_analysis/tasks/get_knowledge_base_entries/index.ts
diff --git a/x-pack/solutions/observability/packages/observability_ai/observability_ai_server/root_cause_analysis/tasks/investigate_entity/index.ts b/x-pack/solutions/observability/packages/observability-ai/observability-ai-server/root_cause_analysis/tasks/investigate_entity/index.ts
similarity index 100%
rename from x-pack/solutions/observability/packages/observability_ai/observability_ai_server/root_cause_analysis/tasks/investigate_entity/index.ts
rename to x-pack/solutions/observability/packages/observability-ai/observability-ai-server/root_cause_analysis/tasks/investigate_entity/index.ts
diff --git a/x-pack/solutions/observability/packages/observability_ai/observability_ai_server/root_cause_analysis/tasks/investigate_entity/prompts.ts b/x-pack/solutions/observability/packages/observability-ai/observability-ai-server/root_cause_analysis/tasks/investigate_entity/prompts.ts
similarity index 100%
rename from x-pack/solutions/observability/packages/observability_ai/observability_ai_server/root_cause_analysis/tasks/investigate_entity/prompts.ts
rename to x-pack/solutions/observability/packages/observability-ai/observability-ai-server/root_cause_analysis/tasks/investigate_entity/prompts.ts
diff --git a/x-pack/solutions/observability/packages/observability_ai/observability_ai_server/root_cause_analysis/tasks/investigate_entity/types.ts b/x-pack/solutions/observability/packages/observability-ai/observability-ai-server/root_cause_analysis/tasks/investigate_entity/types.ts
similarity index 100%
rename from x-pack/solutions/observability/packages/observability_ai/observability_ai_server/root_cause_analysis/tasks/investigate_entity/types.ts
rename to x-pack/solutions/observability/packages/observability-ai/observability-ai-server/root_cause_analysis/tasks/investigate_entity/types.ts
diff --git a/x-pack/solutions/observability/packages/observability_ai/observability_ai_server/root_cause_analysis/tasks/observe_investigation_results/index.ts b/x-pack/solutions/observability/packages/observability-ai/observability-ai-server/root_cause_analysis/tasks/observe_investigation_results/index.ts
similarity index 100%
rename from x-pack/solutions/observability/packages/observability_ai/observability_ai_server/root_cause_analysis/tasks/observe_investigation_results/index.ts
rename to x-pack/solutions/observability/packages/observability-ai/observability-ai-server/root_cause_analysis/tasks/observe_investigation_results/index.ts
diff --git a/x-pack/solutions/observability/packages/observability_ai/observability_ai_server/root_cause_analysis/tasks/write_entity_investigation_report/index.ts b/x-pack/solutions/observability/packages/observability-ai/observability-ai-server/root_cause_analysis/tasks/write_entity_investigation_report/index.ts
similarity index 100%
rename from x-pack/solutions/observability/packages/observability_ai/observability_ai_server/root_cause_analysis/tasks/write_entity_investigation_report/index.ts
rename to x-pack/solutions/observability/packages/observability-ai/observability-ai-server/root_cause_analysis/tasks/write_entity_investigation_report/index.ts
diff --git a/x-pack/solutions/observability/packages/observability_ai/observability_ai_server/root_cause_analysis/tasks/write_final_report/index.ts b/x-pack/solutions/observability/packages/observability-ai/observability-ai-server/root_cause_analysis/tasks/write_final_report/index.ts
similarity index 100%
rename from x-pack/solutions/observability/packages/observability_ai/observability_ai_server/root_cause_analysis/tasks/write_final_report/index.ts
rename to x-pack/solutions/observability/packages/observability-ai/observability-ai-server/root_cause_analysis/tasks/write_final_report/index.ts
diff --git a/x-pack/solutions/observability/packages/observability_ai/observability_ai_server/root_cause_analysis/tools.ts b/x-pack/solutions/observability/packages/observability-ai/observability-ai-server/root_cause_analysis/tools.ts
similarity index 100%
rename from x-pack/solutions/observability/packages/observability_ai/observability_ai_server/root_cause_analysis/tools.ts
rename to x-pack/solutions/observability/packages/observability-ai/observability-ai-server/root_cause_analysis/tools.ts
diff --git a/x-pack/solutions/observability/packages/observability_ai/observability_ai_server/root_cause_analysis/types.ts b/x-pack/solutions/observability/packages/observability-ai/observability-ai-server/root_cause_analysis/types.ts
similarity index 100%
rename from x-pack/solutions/observability/packages/observability_ai/observability_ai_server/root_cause_analysis/types.ts
rename to x-pack/solutions/observability/packages/observability-ai/observability-ai-server/root_cause_analysis/types.ts
diff --git a/x-pack/solutions/observability/packages/observability_ai/observability_ai_server/root_cause_analysis/util/call_tools.ts b/x-pack/solutions/observability/packages/observability-ai/observability-ai-server/root_cause_analysis/util/call_tools.ts
similarity index 100%
rename from x-pack/solutions/observability/packages/observability_ai/observability_ai_server/root_cause_analysis/util/call_tools.ts
rename to x-pack/solutions/observability/packages/observability-ai/observability-ai-server/root_cause_analysis/util/call_tools.ts
diff --git a/x-pack/solutions/observability/packages/observability_ai/observability_ai_server/root_cause_analysis/util/chunk_output_calls.ts b/x-pack/solutions/observability/packages/observability-ai/observability-ai-server/root_cause_analysis/util/chunk_output_calls.ts
similarity index 100%
rename from x-pack/solutions/observability/packages/observability_ai/observability_ai_server/root_cause_analysis/util/chunk_output_calls.ts
rename to x-pack/solutions/observability/packages/observability-ai/observability-ai-server/root_cause_analysis/util/chunk_output_calls.ts
diff --git a/x-pack/solutions/observability/packages/observability_ai/observability_ai_server/root_cause_analysis/util/format_entity.ts b/x-pack/solutions/observability/packages/observability-ai/observability-ai-server/root_cause_analysis/util/format_entity.ts
similarity index 100%
rename from x-pack/solutions/observability/packages/observability_ai/observability_ai_server/root_cause_analysis/util/format_entity.ts
rename to x-pack/solutions/observability/packages/observability-ai/observability-ai-server/root_cause_analysis/util/format_entity.ts
diff --git a/x-pack/solutions/observability/packages/observability_ai/observability_ai_server/root_cause_analysis/util/get_previously_investigated_entities.ts b/x-pack/solutions/observability/packages/observability-ai/observability-ai-server/root_cause_analysis/util/get_previously_investigated_entities.ts
similarity index 100%
rename from x-pack/solutions/observability/packages/observability_ai/observability_ai_server/root_cause_analysis/util/get_previously_investigated_entities.ts
rename to x-pack/solutions/observability/packages/observability-ai/observability-ai-server/root_cause_analysis/util/get_previously_investigated_entities.ts
diff --git a/x-pack/solutions/observability/packages/observability_ai/observability_ai_server/root_cause_analysis/util/serialize_knowledge_base_entries.ts b/x-pack/solutions/observability/packages/observability-ai/observability-ai-server/root_cause_analysis/util/serialize_knowledge_base_entries.ts
similarity index 100%
rename from x-pack/solutions/observability/packages/observability_ai/observability_ai_server/root_cause_analysis/util/serialize_knowledge_base_entries.ts
rename to x-pack/solutions/observability/packages/observability-ai/observability-ai-server/root_cause_analysis/util/serialize_knowledge_base_entries.ts
diff --git a/x-pack/solutions/observability/packages/observability_ai/observability_ai_server/root_cause_analysis/util/stringify_summaries.ts b/x-pack/solutions/observability/packages/observability-ai/observability-ai-server/root_cause_analysis/util/stringify_summaries.ts
similarity index 100%
rename from x-pack/solutions/observability/packages/observability_ai/observability_ai_server/root_cause_analysis/util/stringify_summaries.ts
rename to x-pack/solutions/observability/packages/observability-ai/observability-ai-server/root_cause_analysis/util/stringify_summaries.ts
diff --git a/x-pack/solutions/observability/packages/observability_ai/observability_ai_server/root_cause_analysis/util/to_blockquote.ts b/x-pack/solutions/observability/packages/observability-ai/observability-ai-server/root_cause_analysis/util/to_blockquote.ts
similarity index 100%
rename from x-pack/solutions/observability/packages/observability_ai/observability_ai_server/root_cause_analysis/util/to_blockquote.ts
rename to x-pack/solutions/observability/packages/observability-ai/observability-ai-server/root_cause_analysis/util/to_blockquote.ts
diff --git a/x-pack/solutions/observability/packages/observability_ai/observability_ai_server/root_cause_analysis/util/validate_investigate_entity_tool_call.ts b/x-pack/solutions/observability/packages/observability-ai/observability-ai-server/root_cause_analysis/util/validate_investigate_entity_tool_call.ts
similarity index 100%
rename from x-pack/solutions/observability/packages/observability_ai/observability_ai_server/root_cause_analysis/util/validate_investigate_entity_tool_call.ts
rename to x-pack/solutions/observability/packages/observability-ai/observability-ai-server/root_cause_analysis/util/validate_investigate_entity_tool_call.ts
diff --git a/x-pack/solutions/observability/packages/observability_ai/observability_ai_server/tsconfig.json b/x-pack/solutions/observability/packages/observability-ai/observability-ai-server/tsconfig.json
similarity index 100%
rename from x-pack/solutions/observability/packages/observability_ai/observability_ai_server/tsconfig.json
rename to x-pack/solutions/observability/packages/observability-ai/observability-ai-server/tsconfig.json
diff --git a/yarn.lock b/yarn.lock
index 441eeb4ebceac..75cb2fce29ed5 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6549,11 +6549,11 @@
   version "0.0.0"
   uid ""
 
-"@kbn/observability-ai-common@link:x-pack/solutions/observability/packages/observability_ai/observability_ai_common":
+"@kbn/observability-ai-common@link:x-pack/solutions/observability/packages/observability-ai/observability-ai-common":
   version "0.0.0"
   uid ""
 
-"@kbn/observability-ai-server@link:x-pack/solutions/observability/packages/observability_ai/observability_ai_server":
+"@kbn/observability-ai-server@link:x-pack/solutions/observability/packages/observability-ai/observability-ai-server":
   version "0.0.0"
   uid ""