diff --git a/claude-plugins/.claude-plugin/marketplace.json b/claude-plugins/.claude-plugin/marketplace.json
index af3d093c..1cc8a964 100644
--- a/claude-plugins/.claude-plugin/marketplace.json
+++ b/claude-plugins/.claude-plugin/marketplace.json
@@ -7,9 +7,9 @@
   },
   "plugins": [
     {
-      "name": "notes-hygiene",
+      "name": "state-hygiene",
       "description": "Read-before-write discipline and dated-archive convention for durable agent notes/state files - use before archiving, overwriting, or pruning any notes/state file.",
-      "source": "./plugins/notes-hygiene",
+      "source": "./plugins/state-hygiene",
       "category": "productivity"
     }
   ]
diff --git a/claude-plugins/plugins/notes-hygiene/.claude-plugin/plugin.json b/claude-plugins/plugins/state-hygiene/.claude-plugin/plugin.json
similarity index 85%
rename from claude-plugins/plugins/notes-hygiene/.claude-plugin/plugin.json
rename to claude-plugins/plugins/state-hygiene/.claude-plugin/plugin.json
index f0918a04..44486683 100644
--- a/claude-plugins/plugins/notes-hygiene/.claude-plugin/plugin.json
+++ b/claude-plugins/plugins/state-hygiene/.claude-plugin/plugin.json
@@ -1,5 +1,5 @@
 {
-  "name": "notes-hygiene",
+  "name": "state-hygiene",
   "description": "Read-before-write discipline and dated-archive convention for durable agent notes/state files.",
   "author": {
     "name": "hyperhive"
diff --git a/claude-plugins/plugins/notes-hygiene/skills/notes-hygiene/SKILL.md b/claude-plugins/plugins/state-hygiene/skills/state-hygiene/SKILL.md
similarity index 98%
rename from claude-plugins/plugins/notes-hygiene/skills/notes-hygiene/SKILL.md
rename to claude-plugins/plugins/state-hygiene/skills/state-hygiene/SKILL.md
index d78e643a..2cf6d351 100644
--- a/claude-plugins/plugins/notes-hygiene/skills/notes-hygiene/SKILL.md
+++ b/claude-plugins/plugins/state-hygiene/skills/state-hygiene/SKILL.md
@@ -1,9 +1,9 @@
 ---
-name: notes-hygiene
+name: state-hygiene
 description: Enforces safe handling of an agent's own durable state/notes files (e.g. state/notes.md, state/TODO.md, or anything else under state/ meant to survive a container restart) - read the file before archiving, overwriting, or pruning it, split resolved work into small dated archive files instead of growing one giant live file, and never shell-pipe-append (>>) into a notes file. Use this whenever you are about to write to a durable notes/state file, especially right before a context-compaction checkpoint, when told to "flush state" or "write down anything relevant", or when a live notes file has grown large and needs an archive pass.
 ---
 
-# Notes Hygiene
+# State Hygiene
 
 Durable notes/state files (your `CLAUDE.md`, `state/notes.md`, `state/TODO.md`,
 and anything else under `state/`) are your memory across container resets and
diff --git a/nix/agent-modules/claude-settings.nix b/nix/agent-modules/claude-settings.nix
index 5aac9f8b..5fecee08 100644
--- a/nix/agent-modules/claude-settings.nix
+++ b/nix/agent-modules/claude-settings.nix
@@ -261,7 +261,7 @@ in
     type = lib.types.listOf lib.types.str;
     default = [
       "skill-creator@claude-plugins-official"
-      "notes-hygiene@hyperhive"
+      "state-hygiene@hyperhive"
     ];
     example = [
       "formatter@my-marketplace"
@@ -279,7 +279,7 @@ in
 
       Defaults to Anthropic's `skill-creator` (teaches an agent to
       write, refine, and evaluate its own skills) plus hyperhive's own
-      `notes-hygiene` skill (read-before-write + dated-archive
+      `state-hygiene` skill (read-before-write + dated-archive
       discipline for durable notes/state files) — agents get both out
       of the box, matching the default marketplaces above.
 
@@ -288,7 +288,7 @@ in
       `claudeMarketplaces`). An agent that wants extra plugins AND the
       defaults should list both
       `skill-creator@claude-plugins-official` and
-      `notes-hygiene@hyperhive` alongside them.
+      `state-hygiene@hyperhive` alongside them.
     '';
   };