diff --git a/Xext/namespace/config.c b/Xext/namespace/config.c
index a59bd24b8a..eb2692180a 100644
--- a/Xext/namespace/config.c
+++ b/Xext/namespace/config.c
@@ -66,7 +66,7 @@ static int hex2bin(const char *in, char *out)
 /*
  * loadConfig
  *
- * Load the container config
+ * Load the namespace config
 */
 static void parseLine(char *line, struct Xnamespace **walk_ns)
 {
@@ -84,10 +84,11 @@ static void parseLine(char *line, struct Xnamespace **walk_ns)
     if (token == NULL)
         return;
 
-    // if no "container" statement hasn't been issued yet, use root NS
+    /* if no "namespace" statement hasn't been issued yet, use root NS */
     struct Xnamespace * curr = (*walk_ns ? *walk_ns : &ns_root);
 
-    if (strcmp(token, "container") == 0)
+    if ((strcmp(token, "namespace") == 0) ||
+        (strcmp(token, "container") == 0)) /* "container" is deprecated ! */
     {
         if ((token = strtok(NULL, " ")) == NULL)
         {
@@ -171,7 +172,7 @@ Bool XnsLoadConfig(void)
 
     FILE *fp = fopen(namespaceConfigFile, "r");
     if (fp == NULL) {
-        FatalError("failed loading container config: %s\n", namespaceConfigFile);
+        FatalError("failed loading namespace config: %s\n", namespaceConfigFile);
         return FALSE;
     }