Fixed issue with NameSpace so that it is consistent with original .20 namespaces.