Namespace bugs fixed.

Test branch