Fix typos and namespacing