Fixed up the names of the namespaces