more fixes to new namespace...