Fixed cpp namespaces