fixes to namespace