diff --git a/TODO.md b/TODO.md
index ef705fa..5dd810c 100644
--- a/TODO.md
+++ b/TODO.md
@@ -252,6 +252,10 @@ Current status:
 - Optional build-time detection/linking for Netatalk/libatalk exists as a first
   local metadata backend hook. It is deliberately not an AFP protocol
   implementation yet.
+- Existing mars_nwe private xattr payloads use the `org.mars-nwe.*`
+  namespace (`org.mars-nwe.archive` and `org.mars-nwe.fileinfo`) rather than
+  the unreleased test-only `user.mars_nwe.*` names.  There is no legacy read
+  fallback because the old names never shipped outside local test systems.
 - NetWare AFP calls are NCP entry points for Mac namespace semantics on a
   NetWare volume, not transport-level AFP proxy calls to `afpd`.
 
@@ -267,6 +271,9 @@ Follow-up:
   data/resource fork and Finder Info semantics.
 - Replace the temporary stat-derived AFP entry-id fallback with a persistent
   CNID/directory-id mapping once the libatalk/CNID backend is integrated.
+- Put future mars_nwe-owned AFP metadata under `org.mars-nwe.afp.*` (or a
+  compact `org.mars-nwe.afp.metadata` record) and keep Netatalk-owned metadata
+  under Netatalk's own `org.netatalk.*` keys.
 - Extend the Linux AFP smoke tests once additional AFP subfunctions are
   implemented, especially Finder Info updates, fork open/read/write paths,
   resource-fork handling, and broader directory-scan edge cases.
diff --git a/src/nwarchive.c b/src/nwarchive.c
index 7d8a394..727bbc1 100644
--- a/src/nwarchive.c
+++ b/src/nwarchive.c
@@ -8,7 +8,7 @@
 #include <sys/xattr.h>
 #endif
 
-#define MARS_NWE_ARCHIVE_XATTR "user.mars_nwe.archive"
+#define MARS_NWE_ARCHIVE_XATTR "org.mars-nwe.archive"
 #define MARS_NWE_ARCHIVE_VERSION 1
 
 typedef struct {
@@ -148,7 +148,7 @@ int mars_nwe_set_archive_info(char *unixname,
 }
 
 
-#define MARS_NWE_FILEINFO_XATTR "user.mars_nwe.fileinfo"
+#define MARS_NWE_FILEINFO_XATTR "org.mars-nwe.fileinfo"
 #define MARS_NWE_FILEINFO_VERSION 1
 
 typedef struct {