Fixed typos and namespace issues