Fixing namespaces
Fixing typos