Improved namespace naming.