Fixed namespaces to match github project name.