Couple of namespace fixes and doco fix
Renamed namespaces and project