Namespace fixes
Added description