Index: library/lib/nx-callback.add
===================================================================
diff -u -r8a1a24217e47f9201373a60162da255f6649d0b4 -r29ddc8b52b912da00cae24577e9eaa5aa4fb337b
--- library/lib/nx-callback.add	(.../nx-callback.add)	(revision 8a1a24217e47f9201373a60162da255f6649d0b4)
+++ library/lib/nx-callback.add	(.../nx-callback.add)	(revision 29ddc8b52b912da00cae24577e9eaa5aa4fb337b)
@@ -1,4 +1,4 @@
 # -*- Tcl -*-
 namespace eval ::nsf {
-  set traitIndex(nx::traits::callback) {script {package require nx::traits::callback}}
+  set traitIndex(nx::trait::callback) {script {package require nx::trait::callback}}
 } 
Index: library/lib/nx-callback.tcl
===================================================================
diff -u -rd31c271afb2488abafa0642b07538a3e62106130 -r29ddc8b52b912da00cae24577e9eaa5aa4fb337b
--- library/lib/nx-callback.tcl	(.../nx-callback.tcl)	(revision d31c271afb2488abafa0642b07538a3e62106130)
+++ library/lib/nx-callback.tcl	(.../nx-callback.tcl)	(revision 29ddc8b52b912da00cae24577e9eaa5aa4fb337b)
@@ -1,8 +1,8 @@
 package require nx
 package require nx::trait
-package provide nx::traits::callback 1.0
+package provide nx::trait::callback 1.0
 
-nx::Trait create nx::traits::callback {
+nx::Trait create nx::trait::callback {
   #
   # A small support trait to ease syntactically the reference to
   # instance variables and the registration of callbacks.
Index: library/nx/nx.tcl
===================================================================
diff -u -r9df6b50237ae89bc387ec217237538d08c0f8d39 -r29ddc8b52b912da00cae24577e9eaa5aa4fb337b
--- library/nx/nx.tcl	(.../nx.tcl)	(revision 9df6b50237ae89bc387ec217237538d08c0f8d39)
+++ library/nx/nx.tcl	(.../nx.tcl)	(revision 29ddc8b52b912da00cae24577e9eaa5aa4fb337b)
@@ -47,7 +47,7 @@
   namespace eval ::nsf::parameter {} ;# make pkg-indexer happy
 
   namespace eval ::nx::internal {}   ;# make pkg-indexer happy
-  namespace eval ::nx::traits {}     ;# make pkg-indexer happy
+  namespace eval ::nx::trait {}     ;# make pkg-indexer happy
 
   #
   # By setting the variable bootstrap, we can check later, whether we