Changed namespace, adjusted classnames

Fix typos