Adding Namespace mangling