Improved Namespace naming.