Fixing namespaces and typos