Fix namespaces for several classes.