diff --git a/Xext/namespace/config.c b/Xext/namespace/config.c
index eb2692180..d1bda9563 100644
--- a/Xext/namespace/config.c
+++ b/Xext/namespace/config.c
@@ -92,7 +92,7 @@ static void parseLine(char *line, struct Xnamespace **walk_ns)
     {
         if ((token = strtok(NULL, " ")) == NULL)
         {
-            XNS_LOG("container missing id\n");
+            XNS_LOG("namespace missing id\n");
             return;
         }
 
diff --git a/Xext/namespace/hook-resource.c b/Xext/namespace/hook-resource.c
index 68c559e24..79733f586 100644
--- a/Xext/namespace/hook-resource.c
+++ b/Xext/namespace/hook-resource.c
@@ -38,7 +38,7 @@ void hookResourceAccess(CallbackListPtr *pcbl, void *unused, void *calldata)
         }
     }
 
-    // resource access inside same container is always permitted
+    // resource access inside same namespace is always permitted
     if (XnsClientSameNS(subj, obj))
         goto pass;
 
diff --git a/Xext/namespace/ns.conf.example b/Xext/namespace/ns.conf.example
index 954d9f187..8b0ab919c 100644
--- a/Xext/namespace/ns.conf.example
+++ b/Xext/namespace/ns.conf.example
@@ -3,15 +3,15 @@
   auth MIT-MAGIC-COOKIE-1 46f8e62b78e58962de0ceefc05ad90b0
   auth MIT-MAGIC-COOKIE-1 56f8e62b78e58962de0ceefc05ad90b0
 
-# container <name> <parent_name>
-container xeyes root
+# namespace <name> <parent_name>
+namespace xeyes root
   auth MIT-MAGIC-COOKIE-1 46f8e62b78e58962de0ceefc05ad90b8
   auth MIT-MAGIC-COOKIE-1 46f8e62b78e58962de0ceefc05ad90a8
   allow mouse-motion
   allow shape
   allow xinput
 
-container xclock root
+namespace xclock root
   auth MIT-MAGIC-COOKIE-1 46f8e62b78e58962de0ceefc05ad90b7
   auth MIT-MAGIC-COOKIE-1 46f8e62b78e58962de0ceefc05ad91b7
   auth MIT-MAGIC-COOKIE-1 46f8e62b78e58962de0ceefc05ad92b7