Namespace rewritten again, small fixes in other modules.