2.0.1 fixes to improve namespace