fixed some typos and a recent change of the namespaces